diff --git a/ring-android/app/src/main/res/values-ar/strings.xml b/ring-android/app/src/main/res/values-ar/strings.xml
index 2144e7a..19fc487 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -89,4 +89,6 @@
   <!--Conversation-->
   <string name="conversation_action_copy_peer_number">نسخ الرقم</string>
   <!--Contacts-->
+  <!--MenuHeaderView-->
+  <string name="unknown">مجهول</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ar/strings_account.xml b/ring-android/app/src/main/res/values-ar/strings_account.xml
index a40a8a7..86cdd54 100644
--- a/ring-android/app/src/main/res/values-ar/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ar/strings_account.xml
@@ -72,4 +72,5 @@
   <string name="account_rtp_port_range">نطاق المنفذ RTP الصوتي</string>
   <!--Import/export-->
   <string name="account_export">تصدير</string>
+  <string name="account_export_end_error_title">خطأ</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-bg/strings.xml b/ring-android/app/src/main/res/values-bg/strings.xml
index ce8d865..17dfd02 100644
--- a/ring-android/app/src/main/res/values-bg/strings.xml
+++ b/ring-android/app/src/main/res/values-bg/strings.xml
@@ -108,4 +108,7 @@
   <string name="conversation_action_copy_peer_number">Копиране на номера</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Добавяне на %1$s?</string>
+  <string name="prompt_new_password">Нова парола</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Неизвестно</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-bg/strings_account.xml b/ring-android/app/src/main/res/values-bg/strings_account.xml
index 19b00ec..67ed321 100644
--- a/ring-android/app/src/main/res/values-bg/strings_account.xml
+++ b/ring-android/app/src/main/res/values-bg/strings_account.xml
@@ -99,4 +99,5 @@
   <string name="error_passwords_not_equals">Паролите не съвпадат</string>
   <string name="import_failed_dialog_title">Неуспешно внасяне</string>
   <string name="import_failed_dialog_msg">Възникна грешка</string>
+  <string name="account_export_end_error_title">Грешка</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ca/strings.xml b/ring-android/app/src/main/res/values-ca/strings.xml
index 667dd14..24101a7 100644
--- a/ring-android/app/src/main/res/values-ca/strings.xml
+++ b/ring-android/app/src/main/res/values-ca/strings.xml
@@ -26,4 +26,5 @@
   <!--Settings-->
   <!--Conversation-->
   <!--Contacts-->
+  <!--MenuHeaderView-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
index 28cbb9d..861a195 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
@@ -107,4 +107,7 @@
   <string name="conversation_action_select_peer_number">Vyberte číslo</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Přidat %1$s ?</string>
+  <string name="prompt_new_password">Nové heslo</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Neznámý</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
index a24c96a..7a4a765 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
@@ -111,4 +111,5 @@
   <string name="error_passwords_not_equals">Hesla se neshodují</string>
   <string name="import_failed_dialog_title">Import selhal</string>
   <string name="import_failed_dialog_msg">Nastala chyba</string>
+  <string name="account_export_end_error_title">Chyba</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-da-rDK/strings.xml b/ring-android/app/src/main/res/values-da-rDK/strings.xml
index 47a83bc..4d5dfb0 100644
--- a/ring-android/app/src/main/res/values-da-rDK/strings.xml
+++ b/ring-android/app/src/main/res/values-da-rDK/strings.xml
@@ -113,4 +113,7 @@
   <string name="conversation_action_select_peer_number">Vælg et nummer</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Tilføj %1$s ?</string>
+  <string name="prompt_new_password">Nyt kodeord</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Ukendt</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-da-rDK/strings_account.xml b/ring-android/app/src/main/res/values-da-rDK/strings_account.xml
index d277d37..e4775f7 100644
--- a/ring-android/app/src/main/res/values-da-rDK/strings_account.xml
+++ b/ring-android/app/src/main/res/values-da-rDK/strings_account.xml
@@ -111,4 +111,5 @@
   <string name="error_passwords_not_equals">Kodeord stemmer ikke overens</string>
   <string name="import_failed_dialog_title">Import fejlede</string>
   <string name="import_failed_dialog_msg">Der skete en fejl</string>
+  <string name="account_export_end_error_title">Fejl</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings.xml b/ring-android/app/src/main/res/values-de-rDE/strings.xml
index c71a555..5561b44 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
@@ -1,9 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="section_licence">Lizenz</string>
+  <string name="sponsor_section">Ring ist eine 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>
+  <string name="no_email_app_installed">Keine E-Mail-App gefunden, installieren Sie eine, um uns einen Bericht zu schicken</string>
   <string name="email_chooser_title">Senden von E-Mails über...</string>
   <!--RingActivity-->
   <string name="title_section0">Wählen</string>
@@ -31,6 +33,10 @@
   <!--DetailsHistory Fragment-->
   <string name="detail_hist_call_number">%1$s anrufen</string>
   <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="one">%d Gespräche</item>
+    <item quantity="other">%d Gespräche</item>
+  </plurals>
   <string name="home_transfering">%1$s werden an %1$s übertragen</string>
   <string name="home_transfer_complet">Übertragung abgeschlossen</string>
   <!--ContactList Fragment-->
@@ -40,6 +46,7 @@
   <string name="choose_number">Nummer auswählen</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
+  <string name="transfer_to_another_call">Durchstellen zu einem anderen aktuellen Anruf:</string>
   <!--Notifications-->
   <string name="notif_missed_incoming_call">Verpasster Anruf von %1$s</string>
   <string name="notif_missed_outgoing_call">Verpasster Anruf zu %1$s</string>
@@ -55,25 +62,31 @@
   <string name="action_call_conference">Konferenz</string>
   <string name="action_call_hangup">Auflegen</string>
   <string name="action_settings">Einstellungen</string>
+  <string name="help_gestures">Diese Ansicht wird die Benutzer mit verschiedenen Interaktionen während der Gespräche helfen. Verschiedene Aktionen werden beschrieben; Langer Druck, fling, Swype, usw.</string>
   <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 nicht Ring starten!</string>
   <string name="action_call_accept">Abnehmen</string>
   <string name="action_call_decline">Ablehnen</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_question">Zu Kontakten hinzufügen?</string>
   <string name="ab_action_audio_call">Audioanruf</string>
   <string name="ab_action_video_call">Videoanruf</string>
   <string name="share_via">Teilen über</string>
   <string name="write_a_message">Eine Nachricht schreiben</string>
+  <string name="scan_qr">QR-Code scannen</string>
   <!--Text messages-->
   <string name="send_message">Nachricht senden</string>
   <string name="message_sending">Nachricht senden</string>
   <string name="time_just_now">Vorhin</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Kamera-Berechtigung</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--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>
@@ -87,4 +100,7 @@
   <string name="conversation_action_select_peer_number">Nummer auswählen</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Fügen %1$s hinzu?</string>
+  <string name="prompt_new_password">Neues Kennwort</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Unbekannt</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 0a374d8..22b8abe 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
@@ -88,4 +88,5 @@
   <string name="error_passwords_not_equals">Kennwörter stimmen nicht überein</string>
   <string name="import_failed_dialog_title">Fehler beim Import</string>
   <string name="import_failed_dialog_msg">Fehler aufgetreten</string>
+  <string name="account_export_end_error_title">Fehler</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 1e86474..8e5266f 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -5,12 +5,13 @@
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Beitragen</string>
   <string name="version_section">Version</string>
-  <string name="no_email_app_installed">Es konnte eine Email-Anwendung gefunden werden, installieren sie eine um uns einen Bericht senden zu können</string>
+  <string name="no_email_app_installed">Es konnte keine Email-Anwendung gefunden werden, installieren sie eine um uns einen Bericht zu senden</string>
   <string name="email_chooser_title">Mail wird gesendet mit...</string>
   <!--RingActivity-->
   <string name="title_section0">Wählen</string>
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Keine Netzwerkverbindung</string>
+  <string name="error_mobile_network_available_but_disabled">Bitte erlaube den Zugang zum Mobilfunknetz in den Einstellungen</string>
   <!--AB menus-->
   <string name="ab_account_creation">Neues Konto</string>
   <string name="ab_account_edition_1">Löschen</string>
@@ -39,7 +40,7 @@
     <item quantity="one">%d Unterhaltung</item>
     <item quantity="other">%d Unterhaltungen</item>
   </plurals>
-  <string name="home_transfering">Verbinde %1$s mit %1$s</string>
+  <string name="home_transfering">Übertrage %1$s zu %1$s</string>
   <string name="home_transfer_complet">Übertragung abgeschlossen</string>
   <!--ContactList Fragment-->
   <string name="no_contact_found">Kein Kontakt gefunden</string>
@@ -87,18 +88,18 @@
   <!--Text messages-->
   <string name="send_message">Nachricht senden</string>
   <string name="message_sending">Nachricht wird gesendet…</string>
-  <string name="time_just_now">Grade eben</string>
-  <string name="permission_read_denied">Die App hat keine Berechtigung den Speicher zu lesen und funktioniert deswegen nicht Richtig. Bitte schalten Sie diese Funktion frei.</string>
-  <string name="permission_write_denied">Die App hat keine Berechtigung in den Speicher zu schreiben und funktioniert deswegen nicht Richtig. Bitte schalten Sie diese Funktion frei.</string>
+  <string name="time_just_now">Gerade eben</string>
+  <string name="permission_read_denied">Die Anwendung hat keine Berechtigung den Speicher zu lesen und funktioniert deswegen nicht richtig. Bitte geben Sie diese Berechtigung frei.</string>
+  <string name="permission_write_denied">Die Anwendung hat keine Berechtigung in den Speicher zu schreiben und funktioniert deswegen nicht richtig. Bitte gaben Sie diese Berechtigung frei.</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera Berechtigung</string>
-  <string name="permission_dialog_camera_message">Für Video-Konversationen benötigt die App Zugriff auf die Kamera. Bitte geben Sie diese Berechtigung frei.</string>
+  <string name="permission_dialog_camera_message">Für Video-Konversationen benötigt die Anwendung Zugriff auf die Kamera. Bitte geben Sie diese Berechtigung frei.</string>
   <!--Read contacts permission-->
-  <string name="permission_dialog_read_contacts_message">Ring muss Kontaktdaten lesen um richtig zu funktionieren. Bitte aktiviere die Berechtigung \"Kontaktdaten lesen\".</string>
+  <string name="permission_dialog_read_contacts_message">Ring benötigt die Berechtigung \"Kontaktdaten lesen\" für diese Funktion. Bitte geben Sie sie frei.</string>
   <!--Write call log permission-->
-  <string name="permission_dialog_write_call_log_message">Ring muss Anruflisten schreiben um richtig zu funktionieren. Bitte aktiviere die Berechtigung \"Anruflisten schreiben\".</string>
+  <string name="permission_dialog_write_call_log_message">Ring benötigt die Berechtigung \"Anruflisten schreiben\" für diese Funktion. Bitte geben Sie sie frei.</string>
   <!--QRCode Scan-->
-  <string name="scan_qr_account_message">Scanne den QR-Code des Kontos das du hinzufügen möchtest.</string>
+  <string name="scan_qr_account_message">Scanne den QR-Code des Kontos, das du hinzufügen möchtest.</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>
@@ -108,6 +109,11 @@
   <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_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>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">%1$s hinzufügen?</string>
+  <string name="prompt_new_password">Neues Passwort</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Unbekannt</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de/strings_account.xml b/ring-android/app/src/main/res/values-de/strings_account.xml
index 60423ea..678eb04 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
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings related to account creation-->
-  <string name="prompt_alias">Aliasname</string>
+  <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Rechnername</string>
   <string name="prompt_username">Benutzername</string>
   <string name="prompt_password">Passwort</string>
@@ -9,7 +9,12 @@
   <string name="action_create_short">Registrieren</string>
   <string name="error_field_required">Dieses Feld ist erforderlich</string>
   <string name="dialog_wait_create">Konto hinzufügen</string>
-  <string name="dialog_wait_create_details">Bitte warten während das neue Konto eingerichtet wird...</string>
+  <string name="dialog_wait_create_details">Bitte warten Sie während Ihr neues Konto eingerichtet wird...</string>
+  <string name="dialog_warn_ip2ip_account_title">Ein leeres SIP-Konto erstellen?</string>
+  <string-array name="accountType">
+    <item>RING</item>
+    <item>SIP</item>
+  </string-array>
   <string name="help_ring_title">Ein Ring-Konto erstellen</string>
   <string name="help_ring">Ein Ring-Konto erlaubt es ihnen andere Menschen auf sichere Art direkt über ein verteiltes Netzwerk zu erreichen</string>
   <string name="help_sip_title">Ihr SIP-Konto hinzufgügen</string>
@@ -33,6 +38,7 @@
   <string name="account_optionnal_category">Weitere Einstellungen</string>
   <string name="account_useragent_label">User Agent</string>
   <string name="account_autoanswer_label">Automatisch antworten</string>
+  <string name="account_upnp_label"> UPnP aktivieren</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
   <string name="account_audio_label">Audio</string>
@@ -70,11 +76,11 @@
   <string name="account_tls_port_label">TLS Listener Port</string>
   <string name="account_tls_certificate_list_label">Zertifizierungsstellen</string>
   <string name="account_tls_certificate_file_label">Zertifikatsdatei</string>
-  <string name="account_tls_private_key_file_label">Pfad zu privaten schlüssel</string>
-  <string name="account_tls_password_label">Passwort für privaten schlüssel</string>
+  <string name="account_tls_private_key_file_label">Private Schlüsseldatei</string>
+  <string name="account_tls_password_label">Passwort für den privaten Schlüssel</string>
   <string name="account_tls_method_label">TLS-Methode</string>
-  <string name="account_tls_ciphers_label">TLS-Chiffre</string>
-  <string name="account_tls_server_name_label">Server-Name</string>
+  <string name="account_tls_ciphers_label">TLS-Verschlüsselungsverfahren</string>
+  <string name="account_tls_server_name_label">Servername</string>
   <string name="account_tls_verify_server_label">Server verifizieren</string>
   <string name="account_tls_verify_client_label">Client verifizieren</string>
   <string name="account_tls_negotiation_timeout_sec">Timeout für Verbindungsaufbau (sek.)</string>
@@ -86,7 +92,7 @@
   <string name="account_import_account">Ein Konto importieren</string>
   <string name="account_export_title">Ein Konto exportieren</string>
   <string name="account_import_title">Konten importieren</string>
-  <string name="account_import_explanation">Die kannst vorher exportierte Konten wieder importieren.</string>
+  <string name="account_import_explanation">Du kannst zuvor exportierte Konten wieder importieren.</string>
   <string name="account_export_message">Speichere Kontoeinstellungen und Zugangsdaten, verschlüsselt mit Passwort</string>
   <string name="account_export_new_password">Neues Passwort</string>
   <string name="account_export_confirm_password">Passwort bestätigen</string>
@@ -94,12 +100,13 @@
   <string name="account_import_decryption_password">Passwort zum Entschlüsseln</string>
   <string name="import_dialog_title">Import</string>
   <string name="import_export_wait">Bitte warten…</string>
-  <string name="export_dialog_title">Konto exportieren</string>
-  <string name="account_export_result">Konto wurde exportiert nach %1$s</string>
+  <string name="export_dialog_title">Konto wird exportiert</string>
+  <string name="account_export_result">Konto wurde nach %1$s exportiert</string>
   <string name="export_failed_dialog_title">Der Export ist fehlgeschlagen</string>
   <string name="export_failed_dialog_msg">Ein Fehler ist aufgetreten</string>
   <string name="error_password_char_count">Mindestens 6 Zeichen</string>
-  <string name="error_passwords_not_equals">Die Passwörter stimmen nciht überein</string>
+  <string name="error_passwords_not_equals">Die Passwörter stimmen nicht überein</string>
   <string name="import_failed_dialog_title">Der Import ist fehlgeschlagen</string>
   <string name="import_failed_dialog_msg">Ein Fehler ist aufgetreten</string>
+  <string name="account_export_end_error_title">Fehler</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de/strings_call.xml b/ring-android/app/src/main/res/values-de/strings_call.xml
index 9bcfabc..9951329 100644
--- a/ring-android/app/src/main/res/values-de/strings_call.xml
+++ b/ring-android/app/src/main/res/values-de/strings_call.xml
@@ -22,7 +22,8 @@
 -->
 <resources>
     <!-- SipCalls -->
-    <string name="call_human_state_incoming">Klingelnd</string>
+    <string name="call_human_state_incoming">Klingelt</string>
+    <string name="call_human_state_connecting">Verbindet</string>
     <string name="call_human_state_ringing">Rufaufbau</string>
     <string name="call_human_state_current">Sprechend</string>
     <string name="call_human_state_hungup">Über</string>
diff --git a/ring-android/app/src/main/res/values-de/strings_preferences.xml b/ring-android/app/src/main/res/values-de/strings_preferences.xml
index 696e2c1..e631ed0 100644
--- a/ring-android/app/src/main/res/values-de/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-de/strings_preferences.xml
@@ -9,7 +9,7 @@
   <string name="pref_systemContacts_title">Systemkontakte benutzen</string>
   <string name="pref_systemContacts_summary">Systemkontakte benutzen um Anruferdetails anzuzeigen</string>
   <string name="pref_systemDialer_title">Auch normale Anrufe über Ring abwickeln</string>
-  <string name="pref_systemDialer_summary">Ring für normale Anrufe verwenden</string>
+  <string name="pref_systemDialer_summary">Ring für normale Anrufe verwenden, wenn möglich.</string>
   <string name="pref_startOnBoot_title">Ring beim Hochfahren starten</string>
   <string name="pref_startOnBoot_summary">Ring im Hintergrund aktivieren während das System startet</string>
   <string name="pref_clearHistory_title">Verlauf leeren</string>
diff --git a/ring-android/app/src/main/res/values-el/strings.xml b/ring-android/app/src/main/res/values-el/strings.xml
index f35a5f0..6166568 100644
--- a/ring-android/app/src/main/res/values-el/strings.xml
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -3,28 +3,109 @@
   <string name="section_licence"> Άδεια</string>
   <string name="sponsor_section">Το Ring είναι δωρεάν/ελεύθερο λογισμικό αναπτυγμένο και υποστηριζόμενο από</string>
   <string name="copyright_section">Πνευματική ιδιοκτησία</string>
+  <string name="contribute_section">Πρόσφερε</string>
+  <string name="version_section">Έκδοση</string>
+  <string name="no_email_app_installed">Δεν βρέθηκε κάποια εφαρμογή email, εγκαταστήστε μια για μας στείλετε μια αναφορά</string>
+  <string name="email_chooser_title">Αποστολή email σε χρήση...</string>
   <!--RingActivity-->
+  <string name="title_section0">Κλήση</string>
+  <string name="title_activity_sflphone_home">Ring</string>
+  <string name="error_no_network">Καμία σύνδεση στο δίκτυο</string>
+  <string name="error_mobile_network_available_but_disabled">Παρακαλώ δώστε πρόσβαση στο δίκτυο κινητής τηλεφωνίας από τις  ρυθμίσεις του κινητού.</string>
   <!--AB menus-->
+  <string name="ab_account_creation">Νέος Λογαριασμός</string>
+  <string name="ab_account_edition_1">Διαγραφή</string>
+  <string name="ab_action_chat">Μήνυμα κειμένου</string>
   <!--Left Drawer-->
   <!--Accessibility-->
+  <string name="drawer_open">Άνοιγμα \"συρταριού\" πλοήγησης</string>
+  <string name="drawer_close">Κλείσιμο \"συρταριού\" πλοήγησης</string>
   <!--Sections-->
+  <string name="menu_item_home">Αρχική</string>
+  <string name="menu_item_accounts">Διαχείριση Λογαριασμών</string>
+  <string name="menu_item_settings">Ρυθμίσεις</string>
+  <string name="menu_item_about">Σχετικά</string>
   <!--Dialing Fragment-->
+  <string name="dial_action_call">Κλήση</string>
+  <string name="dial_number">Κλήση αριθμού</string>
+  <string name="dial_hint">Πληκτρολογήστε κάποιον αριθμό τηλεφώνου</string>
   <!--History Fragment-->
+  <string name="hist_replay_button">Απάντηση</string>
+  <string name="hist_replay_button_stop">Τερματισμός</string>
+  <string name="hist_no_history">Όχι Ιστορικό</string>
   <!--DetailsHistory Fragment-->
+  <string name="detail_hist_call_number">Κάλεσε %1$s</string>
   <!--Home Fragment-->
+  <string name="home_transfering">Μεταφορά κλήσης από %1$s σε %1$s</string>
+  <string name="home_transfer_complet">Η προώθηση ολοκληρώθηκε</string>
   <!--ContactList Fragment-->
+  <string name="no_contact_found">Δεν βρέθηκαν επαφές</string>
+  <string name="starred_contacts_title">Αγαπημένα</string>
+  <string name="searchbar_hint">Εισάγετε ένα όνομα ή αριθμό τηλεφώνου</string>
+  <string name="choose_number">Επιλέξτε αριθμό</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
+  <string name="transfer_to_another_call">Προώθηση σε ενεργή κλήση</string>
+  <string name="transfer_no_other_call">Δεν υπάρχουν εκκρεμείς κλήσεις</string>
+  <string name="transfer_type_number">Πληκτρολογείστε αριθμό για προώθηση</string>
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">Αναπάντητη κλήση από %1$s</string>
+  <string name="notif_missed_outgoing_call">Αναπάντητη κλήση σε %1$s</string>
+  <string name="notif_incoming_call_title">Εισερχόμενη κλήση από %1$s</string>
+  <string name="notif_incoming_call">Εισερχόμενη κλήση</string>
+  <string name="notif_outgoing_call_title">Εξερχόμενη κλήση  %1$s</string>
+  <string name="notif_outgoing_call">Εξερχόμενη κλήση</string>
+  <string name="notif_current_call_title">Κλήση σε εξέλιξη με %1$s</string>
+  <string name="notif_current_call">Κλήση σε εξέλιξη</string>
   <!--Call Fragment-->
   <string name="me">Εγώ</string>
+  <string name="you_txt_prefix">Εσύ</string>
   <string name="action_call_conference">Συνδιάσκεψη</string>
+  <string name="action_call_hangup">Κλείσιμο</string>
+  <string name="action_settings">Ρυθμίσεις</string>
+  <string name="help_gestures">Αυτή η οθόνη θα βοηθήσει χρήστες με διαφορετικές επιλογές κατά την διάρκεια των κλήσεων. Διαφορετικές ενέργειες θα εξηγηθούν. Παρατεταμένο πάτημα, καταχώρηση, σύρσιμο κ.α.</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">Η εφαρμογή Ring δεν μπορεί να ξεκινήσει !</string>
+  <string name="start_error_mic_required">Η εφαρμογή Ring θέλει να χρησιμοποιήσει το μικρόφωνο για να λειτουργήσει.</string>
+  <string name="action_call_accept">Κάνε μια κλήση</string>
+  <string name="action_call_decline">Απόρριψη κλήσης</string>
+  <string name="ab_action_speakerphone">Μεγάφωνο</string>
+  <string name="ab_action_contact_add">Προσθήκη στις επαφές</string>
+  <string name="ab_action_contact_add_question">Προσθήκη στις επαφές;</string>
+  <string name="ab_action_audio_call">Κλήση φωνής</string>
+  <string name="ab_action_video_call">Κλήση βίντεο</string>
+  <string name="write_a_message">Γράψε μήνυμα</string>
+  <string name="scan_qr">Σάρωση QR κώδικα</string>
+  <string name="ab_action_flipcamera">Εναλλαγή κάμερας</string>
   <!--Text messages-->
+  <string name="send_message">Στείλε μήνυμα</string>
+  <string name="message_sending">Μήνυμα αποστέλλεται...</string>
+  <string name="time_just_now">Μόλις τώρα</string>
+  <string name="permission_read_denied">Η εφαρμογή δεν ήταν σε θέση να διαβάσει τον δίσκο σας. Με αποτέλεσμα να μην δουλεύει σωστά. Σκεφτείτε να δώσετε δικαιώματα στην λειτουργία αυτή</string>
+  <string name="permission_write_denied">Η εφαρμογή δεν ήταν σε θέση να γράψει στον δίσκο σας. Με αποτέλεσμα να μην δουλεύει σωστά. Σκεφτείτε να δώσετε δικαιώματα στην λειτουργία αυτή</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Άδεια πρόσβασης στην κάμερα</string>
+  <string name="permission_dialog_camera_message">Οι κλήσεις μέσω βίντεο χρειάζεται την άδεια στην κάμερά  για να δουλέψει. Παρακαλώ σκεφτείτε να την ενεργοποιήσετε.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Η εφαρμογή Ring χρειάζεται να διαβάσει τις επαφές σας ώστε να ενεργοποιήσει αυτή την λειτουργία. Παρακαλώ δώστε την.</string>
   <!--Write call log permission-->
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Σαρώστε τον κώδικα QR του λογαριασμού που θέλετε να προσθέσετε.</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_action_delete_this">Διαγραφή αυτής της συνομιλίας</string>
+  <string name="conversation_action_delete_this_title">Διαγραφή αυτής της συνομιλίας;</string>
+  <string name="conversation_action_delete_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>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Προσθήκη %1$s ;</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Άγνωστοι</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-el/strings_account.xml b/ring-android/app/src/main/res/values-el/strings_account.xml
index e8b0613..1fb4120 100644
--- a/ring-android/app/src/main/res/values-el/strings_account.xml
+++ b/ring-android/app/src/main/res/values-el/strings_account.xml
@@ -1,17 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings related to account creation-->
+  <string name="prompt_alias">Ψευδώνυμο</string>
   <string name="prompt_hostname">Hostname</string>
+  <string name="prompt_username">Όνομα χρήστη</string>
+  <string name="prompt_password">Σύνθημα</string>
+  <string name="action_create">Προσθήκη λογαριασμού</string>
+  <string name="action_create_short">Εγγραφή</string>
   <!--Strings related to account deletion-->
   <!--AccountManagementFragment-->
+  <string name="normal_accounts_titles">Λογαριασμοί</string>
   <!--Basic Details-->
+  <string name="account_preferences_basic_tab">Γενικά</string>
   <string name="account_hostname_label">Hostname</string>
+  <string name="account_username_label">Όνομα χρήστη</string>
+  <string name="account_password_label">Σύνθημα</string>
+  <string name="account_proxy_field">Διαμεσολαβητής</string>
   <!--Audio Details-->
+  <string name="account_audio_label">Ήχος</string>
+  <string name="account_preferences_media_tab">Μέσα</string>
+  <string name="account_ringtone_label">Ringtones</string>
   <!--Video Details-->
+  <string name="account_video_label">Βίντεο</string>
+  <string name="account_video_enable">Ενεργοποίση βίνταο</string>
   <!--Advanced Details-->
+  <string name="account_preferences_advanced_tab">Για προχωρημένους</string>
+  <string name="account_turn_enable_label">Χρήση TURN</string>
+  <string name="account_published_address_label">Δημοσιευμένη διεύθυνση</string>
   <!--Security Details-->
   <!--SRTP Details-->
+  <string name="account_preferences_security_tab">Ασφάλεια</string>
   <!--SIP-->
   <!--TLS Details-->
+  <string name="account_rtp_port_range">Εύρος θυρών RTP ήχου</string>
   <!--Import/export-->
+  <string name="account_export">Εξαγωγή</string>
+  <string name="account_import_title">Εισαγωγή λογαριασμών</string>
+  <string name="account_export_end_error_title">Σφάλμα</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-el/strings_call.xml b/ring-android/app/src/main/res/values-el/strings_call.xml
index c24725d..011ac15 100644
--- a/ring-android/app/src/main/res/values-el/strings_call.xml
+++ b/ring-android/app/src/main/res/values-el/strings_call.xml
@@ -23,12 +23,16 @@
 <resources>
     <!-- SipCalls -->
     <string name="call_human_state_incoming">Κουδουνίζει</string>
+    <string name="call_human_state_connecting">Συνδέεται</string>
     <string name="call_human_state_ringing">Καλεί</string>
     <string name="call_human_state_current">Μιλά</string>
     <string name="call_human_state_hungup">Τέλος</string>
     <string name="call_human_state_busy">Απασχολημένο</string>
     <string name="call_human_state_failure">Απέτυχε</string>
     <string name="call_human_state_hold">Αναμονή</string>
+    <string name="call_human_state_unhold">Ακύρωση αναμονής</string>
     <string name="call_human_state_over">Τέλος</string>
+    <string name="call_human_state_none">Κανένα</string>
     <string name="conference_human_state_hold">Αναμονή</string>
-    </resources>
\ No newline at end of file
+    <string name="conference_human_state_default">Κανένα</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-el/strings_content_description.xml b/ring-android/app/src/main/res/values-el/strings_content_description.xml
new file mode 100644
index 0000000..8c0132b
--- /dev/null
+++ b/ring-android/app/src/main/res/values-el/strings_content_description.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings for xml content description of images-->
+  <string name="contact_quick_call_description">Γρήγορη Κλήση</string>
+  <string name="dial_numeric_pad">Αριθμητικό Πληκτρολόγιο</string>
+  <string name="dial_alphabetic_pad">Πληκτρολόγιο Γραφής</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-eo/strings.xml b/ring-android/app/src/main/res/values-eo/strings.xml
index 1354d1d..3d5b328 100644
--- a/ring-android/app/src/main/res/values-eo/strings.xml
+++ b/ring-android/app/src/main/res/values-eo/strings.xml
@@ -106,4 +106,7 @@
   <string name="conversation_action_select_peer_number">Elektu numeron</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Ĉu aldoni %1$s ?</string>
+  <string name="prompt_new_password">Nova pasvorto</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Nekonata</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-eo/strings_account.xml b/ring-android/app/src/main/res/values-eo/strings_account.xml
index e3dc9aa..d84d370 100644
--- a/ring-android/app/src/main/res/values-eo/strings_account.xml
+++ b/ring-android/app/src/main/res/values-eo/strings_account.xml
@@ -111,4 +111,5 @@
   <string name="error_passwords_not_equals">Pasvortoj ne kongruas</string>
   <string name="import_failed_dialog_title">Enporto fiaskis</string>
   <string name="import_failed_dialog_msg">Eraro okazis</string>
+  <string name="account_export_end_error_title">Eraro</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-es/strings.xml b/ring-android/app/src/main/res/values-es/strings.xml
index 087053a..6fdf457 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -113,4 +113,7 @@
   <string name="conversation_action_select_peer_number">Escoge un número</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">¿Añadir %1$s ?</string>
+  <string name="prompt_new_password">Contraseña nueva</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Desconocido</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-es/strings_account.xml b/ring-android/app/src/main/res/values-es/strings_account.xml
index 00c6902..c44e4b2 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
@@ -111,4 +111,5 @@
   <string name="error_passwords_not_equals">Las contraseñas no coinciden</string>
   <string name="import_failed_dialog_title">Error de importación</string>
   <string name="import_failed_dialog_msg">Ha ocurrido un error</string>
+  <string name="account_export_end_error_title">Error</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings.xml b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
index 8523205..feb5c5a 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
@@ -85,4 +85,5 @@
   <!--Settings-->
   <!--Conversation-->
   <!--Contacts-->
+  <!--MenuHeaderView-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
index f57966f..76a4617 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
@@ -78,4 +78,5 @@
   <string name="account_rtp_port_range">دامنهٔ درگاه RTP صدا</string>
   <!--Import/export-->
   <string name="account_import_title">درون‌ریزی حساب‌ها</string>
+  <string name="account_export_end_error_title">خطا</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fi/strings.xml b/ring-android/app/src/main/res/values-fi/strings.xml
index 373da8e..db4d55c 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -113,4 +113,7 @@
   <string name="conversation_action_select_peer_number">Valitse numero</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Lisätäänkö %1$s?</string>
+  <string name="prompt_new_password">Uusi salasana</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Tuntematon</string>
 </resources>
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 1268b93..8318b9c 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
@@ -93,4 +93,5 @@
   <string name="error_passwords_not_equals">Salasanat eivät täsmää</string>
   <string name="import_failed_dialog_title">Tuonti epäonnistui</string>
   <string name="import_failed_dialog_msg">Virhe tapahtui</string>
+  <string name="account_export_end_error_title">Virhe</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings.xml b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..0948882
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="section_licence">Licence</string>
+  <string name="sponsor_section">Ring est un logiciel développé et suporté par</string>
+  <string name="copyright_section">Droits d\'auteurs</string>
+  <string name="contribute_section">Contribuer</string>
+  <string name="version_section">Version</string>
+  <string name="no_email_app_installed">Aucune adresse courriel n\'a étée trouvée, ajoutez en une pour nous envoyer un rapport.</string>
+  <string name="email_chooser_title">Envoyer un courriel en utilisant</string>
+  <!--RingActivity-->
+  <string name="title_section0">Composez</string>
+  <string name="title_activity_sflphone_home">Ring</string>
+  <string name="error_mobile_network_available_but_disabled">Veuillez permettre l\'accès au réseau cellulaire dans l\'écran des réglages.</string>
+  <!--AB menus-->
+  <string name="ab_account_creation">Nouveau compte</string>
+  <string name="ab_account_edition_1">Supprimer</string>
+  <string name="ab_action_chat">Messagerie texte</string>
+  <!--Left Drawer-->
+  <!--Accessibility-->
+  <!--Sections-->
+  <string name="menu_item_home">Maison</string>
+  <string name="menu_item_accounts">Gérer les comptes</string>
+  <string name="menu_item_settings">Réglages</string>
+  <!--Dialing Fragment-->
+  <!--History Fragment-->
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <!--ContactList Fragment-->
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <!--Notifications-->
+  <!--Call Fragment-->
+  <string name="action_settings">Réglages</string>
+  <!--Text messages-->
+  <!--MediaPreferenceFragment-->
+  <!--Read contacts permission-->
+  <!--Write call log permission-->
+  <!--QRCode Scan-->
+  <!--Settings-->
+  <!--Conversation-->
+  <!--Contacts-->
+  <!--MenuHeaderView-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml b/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
new file mode 100644
index 0000000..3f75156
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account creation-->
+  <!--Strings related to account deletion-->
+  <!--AccountManagementFragment-->
+  <!--Basic Details-->
+  <!--Audio Details-->
+  <string name="account_audio_label">audio</string>
+  <string name="account_ringtone_label">Sonneries</string>
+  <!--Video Details-->
+  <string name="account_video_label">Vidéo</string>
+  <!--Advanced Details-->
+  <!--Security Details-->
+  <!--SRTP Details-->
+  <!--SIP-->
+  <!--TLS Details-->
+  <!--Import/export-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_content_description.xml b/ring-android/app/src/main/res/values-fr-rCA/strings_content_description.xml
new file mode 100644
index 0000000..28e65e5
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fr-rCA/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">Appel rapide</string>
+  <string name="contact_picture_description">Photo du contact</string>
+  <string name="dial_numeric_pad">Clavier numérique</string>
+  <string name="dial_alphabetic_pad">Clavier alphabétique</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml b/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
index f87e2c9..89f3b61 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
@@ -3,9 +3,15 @@
   <string name="pref_category_network">Réseau</string>
   <string name="pref_category_contacts">Contacts</string>
   <string name="pref_category_system">Système</string>
+  <string name="pref_category_privacy">Mode privée</string>
   <string name="pref_mobileData_title">Données mobiles</string>
   <string name="pref_mobileData_summary">Autoriser Ring à passer par le réseau 3G/LTE en plus du Wi-Fi</string>
   <string name="pref_systemContacts_title">Utiliser le système de contacts</string>
   <string name="pref_systemContacts_summary">Montrer les informations de l\'appelant en utilisant le système des contacts</string>
+  <string name="pref_systemDialer_title">Placer les appels en utilisant Ring</string>
+  <string name="pref_systemDialer_summary">Placer les appels en utilisant Ring quand c\'est possible</string>
+  <string name="pref_startOnBoot_title">Exécuter Ring lors du démarrage du téléphone</string>
   <string name="pref_startOnBoot_summary">Lancer Ring quand le système démarre.</string>
+  <string name="pref_clearHistory_title">Effacer l\'historique</string>
+  <string name="pref_clearHistory_summary">Effacer l\'historique des conversations. L\'action est irréversible.</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings.xml b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
new file mode 100644
index 0000000..160370f
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--RingActivity-->
+  <!--AB menus-->
+  <!--Left Drawer-->
+  <!--Accessibility-->
+  <!--Sections-->
+  <!--Dialing Fragment-->
+  <!--History Fragment-->
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <!--ContactList Fragment-->
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <!--Notifications-->
+  <!--Call Fragment-->
+  <!--Text messages-->
+  <!--MediaPreferenceFragment-->
+  <!--Read contacts permission-->
+  <!--Write call log permission-->
+  <!--QRCode Scan-->
+  <!--Settings-->
+  <!--Conversation-->
+  <!--Contacts-->
+  <!--MenuHeaderView-->
+  <string name="unknown">Inconnu</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-fr/strings.xml b/ring-android/app/src/main/res/values-fr/strings.xml
index 17fe258..c10823b 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -5,11 +5,13 @@
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Contribuer</string>
   <string name="version_section">Version</string>
+  <string name="no_email_app_installed">Application d\'envoi de courriel non-trouvée, installez-en un et renvoyez-nous votre rapport</string>
   <string name="email_chooser_title">Envoi du courriel à travers ...</string>
   <!--RingActivity-->
   <string name="title_section0">Numéroter</string>
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Pas d\'accès au réseau</string>
+  <string name="error_mobile_network_available_but_disabled">SVP, autorisez l\'accès au réseau cellulaire dans les options de configuration</string>
   <!--AB menus-->
   <string name="ab_account_creation">Nouveau compte</string>
   <string name="ab_account_edition_1">Supprimer</string>
@@ -87,9 +89,15 @@
   <string name="send_message">Envoyer le message</string>
   <string name="message_sending">Envoi du message</string>
   <string name="time_just_now">A l\'instant</string>
+  <string name="permission_read_denied">L\'application n\'a pas été autorisée à lire dans la mémoire du dispositif. En conséquence, elle ne peut pas fonctionner correctement. Merci de lui accorder cette permission.</string>
+  <string name="permission_write_denied">L\'application n\'a pas été autorisée à écrire dans la mémoire du dispositif. En conséquence, elle ne peut pas fonctionner correctement. Merci de lui accorder cette permission.</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Permission d\'accès au caméra</string>
+  <string name="permission_dialog_camera_message">Les conversation vidéo nécessitent la permission d\'utiliser l\'objectif. Merci de l\'autoriser.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring a besoin d\'accéder en lecture à votre liste de contact. SVP autorisez-le.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring a besoin d\'accéder en écriture à votre liste de contact. SVP autorisez-le.</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Numérisez le code QR de votre interlocuteur.</string>
   <!--Settings-->
@@ -101,5 +109,11 @@
   <string name="conversation_action_delete_this_title">Supprimer la conversation ?</string>
   <string name="conversation_action_delete_this_message">Cette action est irréversible.</string>
   <string name="conversation_action_copy_peer_number">Copier le numéro ou identifiant Ring</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s copié vers leclipboard</string>
+  <string name="conversation_action_select_peer_number">Choisir un numéro</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Ajouter %1$s</string>
+  <string name="prompt_new_password">Nouveau mot de passe</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Inconnu</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr/strings_account.xml b/ring-android/app/src/main/res/values-fr/strings_account.xml
index b97c048..60d3fe5 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
@@ -10,6 +10,16 @@
   <string name="error_field_required">Ce champ est requis</string>
   <string name="dialog_wait_create">Ajout du compte</string>
   <string name="dialog_wait_create_details">Merci de patienter pendant l\'ajout de votre compte…</string>
+  <string name="dialog_warn_ip2ip_account_title">Créer un compte SIP vide ?</string>
+  <string name="dialog_warn_ip2ip_account_message">Vous êtes sur le point de créer un compte SIP sans avoir fourni un nom d\'hôte correcte.
+Vous pourrez uniquement faire et recevoir des appels directs directs sur IP.
+Vous pouvez modifier le compte plus tard.</string>
+  <string-array name="accountType">
+    <item>RING</item>
+    <item>SIP</item>
+  </string-array>
+  <string name="help_ring_title">Créer un compte Ring</string>
+  <string name="help_ring">Un compte Ring permet de se connecter sécuritairement avec un autre interlocuteur à travers un réseau distribué</string>
   <string name="help_sip_title">Ajouter votre compte SIP</string>
   <string name="help_sip">Configurez un compte SIP existant.</string>
   <string name="create_sip_account">Ajouter</string>
@@ -31,6 +41,7 @@
   <string name="account_optionnal_category">Réglages optionnels</string>
   <string name="account_useragent_label">User-agent</string>
   <string name="account_autoanswer_label">Décroche automatiquement l\'appel</string>
+  <string name="account_upnp_label">Activer UPnP</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
   <string name="account_audio_label">Audio</string>
@@ -84,7 +95,21 @@
   <string name="account_import_account">Importer un compte</string>
   <string name="account_export_title">Exporter un compte</string>
   <string name="account_import_title">Importer compte</string>
+  <string name="account_import_explanation">Vous pouvez importer des comptes que vous avez précédemment exportés.</string>
+  <string name="account_export_message">Enregistre les paramètres du compte et les identifiants, en chiffrant le mot de passe.</string>
   <string name="account_export_new_password">Nouveau mot de passe</string>
   <string name="account_export_confirm_password">Confirmer le mot de passe</string>
   <string name="account_import_message">Entrer le mot de passe pour déchiffrer le fichier.</string>
+  <string name="account_import_decryption_password">Mot de passe en clair</string>
+  <string name="import_dialog_title">Importer</string>
+  <string name="import_export_wait">Veuillez patienter</string>
+  <string name="export_dialog_title">Compte exporté</string>
+  <string name="account_export_result">Compte exporté vers %1$s</string>
+  <string name="export_failed_dialog_title">Échec d\'exportation</string>
+  <string name="export_failed_dialog_msg">Une erreur s\'est produite</string>
+  <string name="error_password_char_count">6 caractères maximales</string>
+  <string name="error_passwords_not_equals">Mot de passe erronné</string>
+  <string name="import_failed_dialog_title">Échec d\'importation</string>
+  <string name="import_failed_dialog_msg">Une erreur s\'est produite</string>
+  <string name="account_export_end_error_title">Erreur</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr/strings_call.xml b/ring-android/app/src/main/res/values-fr/strings_call.xml
index 820d412..bbe240f 100644
--- a/ring-android/app/src/main/res/values-fr/strings_call.xml
+++ b/ring-android/app/src/main/res/values-fr/strings_call.xml
@@ -34,8 +34,11 @@
     <string name="call_human_state_over">Terminé</string>
     <string name="call_human_state_none">Aucun</string>
     <!-- Conferences -->
-    <string name="conference_human_state_active_attached">Active attached</string>
-    <string name="conference_human_state_active_detached">Active detached</string>
+    <string name="conference_human_state_active_attached">Connecté et présent</string>
+    <string name="conference_human_state_active_detached">Connecté mais absent</string>
+    <string name="conference_human_state_active_attached_rec">Connecté et présent, enregistre</string>
+    <string name="conference_human_state_active_detached_rec">Actif mais absent, enregistre</string>
     <string name="conference_human_state_hold">Mettre en attente</string>
+    <string name="conference_human_state_hold_rec">Pause d\'enregistrement</string>
     <string name="conference_human_state_default">Aucun</string>
 </resources>
\ No newline at end of file
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 54397fb..9bdcf00 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
@@ -3,6 +3,7 @@
   <string name="pref_category_network">Réseau</string>
   <string name="pref_category_contacts">Contacts</string>
   <string name="pref_category_system">Système</string>
+  <string name="pref_category_privacy">Privée</string>
   <string name="pref_mobileData_title">Données mobiles</string>
   <string name="pref_mobileData_summary">Autoriser Ring sur les réseaux mobiles en plus du Wi-fi.</string>
   <string name="pref_systemContacts_title">Utiliser les contacts de l\'appareil</string>
@@ -11,4 +12,6 @@
   <string name="pref_systemDialer_summary">Utiliser Ring par défaut pour les appels, si possible</string>
   <string name="pref_startOnBoot_title">Lancer Ring au démarrage</string>
   <string name="pref_startOnBoot_summary">Lancer ring en arrière plan au démarrage de l\'appareil.</string>
+  <string name="pref_clearHistory_title">Effacer l\'historique</string>
+  <string name="pref_clearHistory_summary">Effacer les historiques de conversation. L\'action est irréversible.</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-he/strings.xml b/ring-android/app/src/main/res/values-he/strings.xml
index 550d4bc..fce9392 100644
--- a/ring-android/app/src/main/res/values-he/strings.xml
+++ b/ring-android/app/src/main/res/values-he/strings.xml
@@ -49,4 +49,5 @@
   <!--Conversation-->
   <string name="conversation_action_copy_peer_number">העתק מספר</string>
   <!--Contacts-->
+  <!--MenuHeaderView-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-he/strings_account.xml b/ring-android/app/src/main/res/values-he/strings_account.xml
index 1b2e7fc..fcad40d 100644
--- a/ring-android/app/src/main/res/values-he/strings_account.xml
+++ b/ring-android/app/src/main/res/values-he/strings_account.xml
@@ -61,4 +61,5 @@
   <string name="account_rtp_max_port">מרבי</string>
   <string name="account_rtp_min_port">נומינלי</string>
   <!--Import/export-->
+  <string name="account_export_end_error_title">שגיאה</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-hr/strings.xml b/ring-android/app/src/main/res/values-hr/strings.xml
index 4819749..1222eb6 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -106,4 +106,7 @@
   <string name="conversation_action_select_peer_number">Odaberite broj</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Dodaj %1$s ?</string>
+  <string name="prompt_new_password">Nova lozinka</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Nepoznato</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-hr/strings_account.xml b/ring-android/app/src/main/res/values-hr/strings_account.xml
index 44212fc..aaa137b 100644
--- a/ring-android/app/src/main/res/values-hr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-hr/strings_account.xml
@@ -89,4 +89,5 @@
   <string name="error_passwords_not_equals">Lozinke se ne podudaraju</string>
   <string name="import_failed_dialog_title">Neuspjeli uvoz</string>
   <string name="import_failed_dialog_msg">Došlo je do greške</string>
+  <string name="account_export_end_error_title">Greška</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-hu/strings.xml b/ring-android/app/src/main/res/values-hu/strings.xml
index 6a3ce3e..45bf3c9 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -102,4 +102,6 @@
   <!--Conversation-->
   <string name="conversation_action_copy_peer_number">Szám másolása</string>
   <!--Contacts-->
+  <!--MenuHeaderView-->
+  <string name="unknown">Ismeretlen</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-id/strings.xml b/ring-android/app/src/main/res/values-id/strings.xml
index 64b4391..b1d1cd7 100644
--- a/ring-android/app/src/main/res/values-id/strings.xml
+++ b/ring-android/app/src/main/res/values-id/strings.xml
@@ -23,4 +23,6 @@
   <!--Settings-->
   <!--Conversation-->
   <!--Contacts-->
+  <!--MenuHeaderView-->
+  <string name="unknown">Tidak diketahui</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings.xml b/ring-android/app/src/main/res/values-it-rIT/strings.xml
index e3923a7..b8dd5aa 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings.xml
@@ -1,5 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="section_licence">Licenza</string>
+  <string name="sponsor_section">Ring è free software sviluppato e aggiornato da</string>
+  <string name="copyright_section">Copyright</string>
+  <string name="contribute_section">Contributi</string>
+  <string name="version_section">Versione</string>
   <!--RingActivity-->
   <string name="title_section0">Componi</string>
   <string name="error_no_network">Assenza di connessione di rete</string>
@@ -10,23 +15,53 @@
   <!--Left Drawer-->
   <!--Accessibility-->
   <!--Sections-->
+  <string name="menu_item_home">Home</string>
+  <string name="menu_item_settings">Opzioni</string>
   <!--Dialing Fragment-->
   <string name="dial_action_call">Chiamata</string>
+  <string name="dial_number">Chiama un numero</string>
+  <string name="dial_hint">Digita un numero di telefono</string>
   <!--History Fragment-->
+  <string name="hist_replay_button_stop">Stop</string>
+  <string name="hist_no_history">Nessuna cronologia</string>
   <!--DetailsHistory Fragment-->
   <!--Home Fragment-->
+  <string name="home_transfer_complet">Trasferimento completato</string>
   <!--ContactList Fragment-->
+  <string name="no_contact_found">Nessun contatto</string>
+  <string name="starred_contacts_title">Preferiti</string>
+  <string name="searchbar_hint">Digita un nome o un numero di telefono</string>
+  <string name="choose_number">Scegli un numero</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <!--Notifications-->
   <string name="notif_incoming_call">Chiamata in ingresso</string>
+  <string name="notif_current_call">Chiamata corrente</string>
   <!--Call Fragment-->
+  <string name="me">Io</string>
+  <string name="you_txt_prefix">Tu:</string>
+  <string name="action_call_conference">Conferenza</string>
+  <string name="action_settings">Opzioni</string>
+  <string name="ab_action_speakerphone">Attiva l\'audio</string>
+  <string name="ab_action_contact_add">Aggiungi alla rubrica</string>
+  <string name="ab_action_contact_add_question">Aggiungi alla rubrica?</string>
+  <string name="ab_action_audio_call">Chiamata</string>
+  <string name="ab_action_video_call">Videochiamata</string>
+  <string name="write_a_message">Scrivi un messaggio</string>
+  <string name="ab_action_flipcamera">Cambia videocamera</string>
   <!--Text messages-->
+  <string name="send_message">Invia messaggio</string>
+  <string name="time_just_now">Proprio ora</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Permesso videocamera</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
   <!--Settings-->
+  <string name="clear_history_dialog_title">Pulisco la cronologia?</string>
   <!--Conversation-->
+  <string name="conversation_action_copy_peer_number">Copia numero</string>
+  <string name="conversation_action_select_peer_number">Seleziona un numero</string>
   <!--Contacts-->
+  <!--MenuHeaderView-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
index ccf8ac3..b3bd484 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
@@ -16,6 +16,7 @@
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
   <string name="account_audio_label">Audio</string>
+  <string name="account_ringtone_label">Suonerie</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
   <!--Advanced Details-->
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_call.xml b/ring-android/app/src/main/res/values-it-rIT/strings_call.xml
new file mode 100644
index 0000000..e5ee478
--- /dev/null
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_call.xml
@@ -0,0 +1,25 @@
+<?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>
+    <string name="call_human_state_ringing">Sta chiamando</string>
+    </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-it/strings.xml b/ring-android/app/src/main/res/values-it/strings.xml
index 20149f0..b982065 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -5,11 +5,11 @@
   <string name="copyright_section">Diritti d\'autore</string>
   <string name="contribute_section">Contributi</string>
   <string name="version_section">Versione</string>
-  <string name="no_email_app_installed">Email app non torvata, installane una per inviarci un rapporto</string>
+  <string name="no_email_app_installed">Applicazione email non trovata, installane una per inviarci un rapporto</string>
   <string name="email_chooser_title">Mandaci un\'email usando...</string>
   <!--RingActivity-->
   <string name="title_section0">Chiama</string>
-  <string name="title_activity_sflphone_home">Suona</string>
+  <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Connessione di rete assente</string>
   <string name="error_mobile_network_available_but_disabled">Consenti l\'acceso alla rete cellulare dalla schermata impostazioni</string>
   <!--AB menus-->
@@ -32,7 +32,7 @@
   <!--History Fragment-->
   <string name="hist_replay_button">Ripeti</string>
   <string name="hist_replay_button_stop">Stop</string>
-  <string name="hist_no_history">History vuota</string>
+  <string name="hist_no_history">Cronologia vuota</string>
   <!--DetailsHistory Fragment-->
   <string name="detail_hist_call_number">Chiama %1$s</string>
   <!--Home Fragment-->
@@ -43,7 +43,7 @@
   <string name="home_transfering">Transferendo da %1$s a %1$s</string>
   <string name="home_transfer_complet">Trasferimento completato</string>
   <!--ContactList Fragment-->
-  <string name="no_contact_found">Contatto non trovato</string>
+  <string name="no_contact_found">Nessun contatto trovato</string>
   <string name="starred_contacts_title">Preferiti</string>
   <string name="searchbar_hint">Digita nome o numero telefonico</string>
   <string name="choose_number">Scegli un numero</string>
@@ -53,8 +53,8 @@
   <string name="transfer_no_other_call">Nessuna chiamata in corso</string>
   <string name="transfer_type_number">Digita il numero a cui traferire</string>
   <!--Notifications-->
-  <string name="notif_missed_incoming_call">Chiamata mancata da %1$s</string>
-  <string name="notif_missed_outgoing_call">Chiamata mancata a %1$s</string>
+  <string name="notif_missed_incoming_call">Chiamata persa da %1$s</string>
+  <string name="notif_missed_outgoing_call">Chiamata persa a %1$s</string>
   <string name="notif_incoming_call_title">Chiamata in arrivo da %1$s</string>
   <string name="notif_incoming_call">Chiamata in arrivo</string>
   <string name="notif_outgoing_call_title">Chiamata in uscita per %1$s</string>
@@ -68,7 +68,7 @@
   <string name="action_call_conference">Conferenza</string>
   <string name="action_call_hangup">Riattacca</string>
   <string name="action_settings">Impostazioni</string>
-  <string name="help_gestures">Questa finestra ausilia gli utenti consentendo mutiple interazioni durante le chiamate. Le interazioni multiple sono qui descritte; Pressione prolungata, fling, swipe, ecc.</string>
+  <string name="help_gestures">Questa finestra aiuta gli utenti consentendo multiple interazioni durante le chiamate. Le interazioni multiple sono qui descritte; Pressione prolungata, fling, swipe, ecc.</string>
   <string name="ongoing_call">Chiamata in corso</string>
   <string name="hist_in_call">Chiamata in arrivo di %1$s</string>
   <string name="hist_out_call">Chiamata a %1$s</string>
@@ -87,7 +87,7 @@
   <string name="ab_action_flipcamera">Gira la videocamera</string>
   <!--Text messages-->
   <string name="send_message">Invia messaggio</string>
-  <string name="message_sending">Messaggio in invio...</string>
+  <string name="message_sending">Invio messaggio in corso...</string>
   <string name="time_just_now">Immediatamente</string>
   <string name="permission_read_denied">L\'app non ha permessi di lettura della tua memoria. Non può funzionare correttamente. Concedile il permesso</string>
   <string name="permission_write_denied">L\'app non ha permessi di scrittura sulla tua memoria. Non può funzionare correttamente. Concedile il permesso</string>
@@ -108,9 +108,12 @@
   <string name="conversation_action_delete_this">Cancellare questa conversazione</string>
   <string name="conversation_action_delete_this_title">Cancellare questa conversazione ?</string>
   <string name="conversation_action_delete_this_message">Questa azione è irreversibilie</string>
-  <string name="conversation_action_copy_peer_number">Copia il numerp</string>
-  <string name="conversation_action_copied_peer_number_clipboard">%1$s copiato negli Appunti</string>
+  <string name="conversation_action_copy_peer_number">Copia il numero</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s copiato negli appunti</string>
   <string name="conversation_action_select_peer_number">Scegli un numero</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Aggiungi %1$s ?</string>
+  <string name="prompt_new_password">Nuovo password</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Sconosciuto</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-it/strings_account.xml b/ring-android/app/src/main/res/values-it/strings_account.xml
index f2426fd..abb55a8 100644
--- a/ring-android/app/src/main/res/values-it/strings_account.xml
+++ b/ring-android/app/src/main/res/values-it/strings_account.xml
@@ -1,20 +1,111 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings related to account creation-->
+  <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Nome Host</string>
+  <string name="prompt_username">Nome utente</string>
+  <string name="prompt_password">Password</string>
+  <string name="action_create">Aggiungiere un account</string>
+  <string name="action_create_short">Register</string>
+  <string name="error_field_required">Questo campo è richiesto</string>
+  <string name="dialog_wait_create">Aggiunta account </string>
+  <string name="dialog_wait_create_details">Aspettare mentre il nuovo account è aggiunto…</string>
+  <string name="dialog_warn_ip2ip_account_title">Creare un account SIP vuoto?</string>
+  <string name="dialog_warn_ip2ip_account_message">Si sta per creare un account SIP con un nome host non valido.
+Sara solo possibile fare e ricevere chiamate ip dirette.
+Si potra modificare questo account più tardi.</string>
+  <string name="help_ring_title">Creare un account Ring</string>
+  <string name="help_ring">Un account Ring permette di raggiungere persone in modo sicuro, in peer to peer attraverso una rete completamente distribuita</string>
+  <string name="help_sip_title">Aggiungere il suo account SIP</string>
+  <string name="help_sip">Importare un account SIP esistente</string>
+  <string name="create_sip_account">Aggiungiare</string>
+  <string name="share_number">Condividere il numero</string>
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">Rimuovere l\'account?</string>
+  <string name="account_delete_dialog_message">Quest\'azione non può essere annullata. Se non è stato ancora fatto, si dovrebbe considerar fare un export del account prima di rimuoverlo.</string>
   <!--AccountManagementFragment-->
+  <string name="empty_account_list">Nessun account registrato</string>
+  <string name="normal_accounts_titles">Accounts</string>
   <!--Basic Details-->
+  <string name="account_preferences_basic_tab">Generale</string>
+  <string name="account_basic_category">Impostazioni base</string>
+  <string name="account_alias_label">Nome dell\'account</string>
   <string name="account_hostname_label">Nome Host</string>
+  <string name="account_bootstrap_label">Innesco</string>
+  <string name="account_username_label">Nome utente</string>
+  <string name="account_password_label">Password</string>
+  <string name="account_optionnal_category">Impostazione facoltative</string>
+  <string name="account_useragent_label">User Agent</string>
+  <string name="account_autoanswer_label">Risposta automatica</string>
+  <string name="account_upnp_label">Attivare UPnP</string>
+  <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
   <string name="account_audio_label">Audio</string>
+  <string name="account_preferences_media_tab">Media</string>
   <string name="account_ringtone_label">Suonerie</string>
+  <string name="account_ringtone_enabled_label">Attivare le suonerie</string>
+  <string name="account_ringtone_path_label">Percorso suonerie</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
+  <string name="account_video_enable">Attivare Video</string>
   <!--Advanced Details-->
+  <string name="account_preferences_advanced_tab">Avanzato</string>
+  <string name="account_registration_exp_label">Registrazione scaduta</string>
+  <string name="account_local_interface_label">Interfaccia locale</string>
+  <string name="account_local_port_label">Porto locale</string>
+  <string name="account_stun_enable_label">Usare STUN</string>
+  <string name="account_stun_server_label">Server STUN</string>
+  <string name="account_turn_enable_label">Usare TURN</string>
+  <string name="account_turn_server_label">Server TURN</string>
+  <string name="account_turn_username_label">Nome utente TURN</string>
+  <string name="account_turn_password_label">Password TURN</string>
+  <string name="account_published_same_as_local_label">Identico alle impostazione locali</string>
+  <string name="account_published_port_label">Porto di publicazione</string>
+  <string name="account_published_address_label">Indirizzo di publicazione</string>
   <!--Security Details-->
+  <string name="account_credentials_label">Identificazione</string>
+  <string name="account_credentials_edit">Modificare i dati d\'identificazione</string>
+  <string name="account_credentials_add">Aggiungere dati d\'identificazione</string>
   <!--SRTP Details-->
+  <string name="account_preferences_security_tab">Sicurezza</string>
+  <string name="account_srtp_deactivated">Disattivato</string>
   <!--SIP-->
   <!--TLS Details-->
+  <string name="account_tls_transport_switch_label">Usare il trasporto TLS</string>
+  <string name="account_tls_port_label">Porto di ascolto TLS</string>
+  <string name="account_tls_certificate_list_label">Autorità di certificazione</string>
+  <string name="account_tls_certificate_file_label">File del certificato</string>
+  <string name="account_tls_private_key_file_label">File della chiave privata</string>
+  <string name="account_tls_password_label">Password della chiave privata</string>
+  <string name="account_tls_method_label">Metodo TLS</string>
+  <string name="account_tls_ciphers_label">Cifratura TLS</string>
+  <string name="account_tls_server_name_label">Nome server</string>
+  <string name="account_tls_verify_server_label">Verificare Server</string>
+  <string name="account_tls_verify_client_label">Verificare Client</string>
+  <string name="account_tls_negotiation_timeout_sec">Timeout di negoziazione (secondi)</string>
+  <string name="account_rtp_max_port">Massimo</string>
+  <string name="account_rtp_min_port">Minimo</string>
+  <string name="account_rtp_port_range">Intervallo porti audio RTP</string>
   <!--Import/export-->
+  <string name="account_export">Esportare</string>
+  <string name="account_import_account">Importare un account</string>
+  <string name="account_export_title">Esportare un account</string>
+  <string name="account_import_title">Importare più account</string>
+  <string name="account_import_explanation">È possibile importare degli account che erano stati esportati.</string>
+  <string name="account_export_message">Salvare le impostazioni dell\'account et gli identificanti con la password cifrata.</string>
+  <string name="account_export_new_password">Nuovo password</string>
+  <string name="account_export_confirm_password">Confermare password</string>
+  <string name="account_import_message">Digitare la password per decifrare il file.</string>
+  <string name="account_import_decryption_password">Password per decifrare</string>
+  <string name="import_dialog_title">Importazione in corso</string>
+  <string name="import_export_wait">Aspettare</string>
+  <string name="export_dialog_title">Esportazione account in corso</string>
+  <string name="account_export_result">Account esportato in %1$s</string>
+  <string name="export_failed_dialog_title">L\'esportazione è fallita</string>
+  <string name="export_failed_dialog_msg">C\'è stato un errore</string>
+  <string name="error_password_char_count">6 caratteri minimo</string>
+  <string name="error_passwords_not_equals">Le password no corrispondono</string>
+  <string name="import_failed_dialog_title">L\'importazione è fallita</string>
+  <string name="import_failed_dialog_msg">C\'è stato un errore</string>
+  <string name="account_export_end_error_title">Errore</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-it/strings_call.xml b/ring-android/app/src/main/res/values-it/strings_call.xml
index 6cde186..5aee59d 100644
--- a/ring-android/app/src/main/res/values-it/strings_call.xml
+++ b/ring-android/app/src/main/res/values-it/strings_call.xml
@@ -23,8 +23,22 @@
 <resources>
     <!-- SipCalls -->
     <string name="call_human_state_incoming">Suonando</string>
+    <string name="call_human_state_connecting">Connessione in corso </string>
     <string name="call_human_state_ringing">Chiamando</string>
     <string name="call_human_state_current">Parlando</string>
+    <string name="call_human_state_hungup">Finito</string>
     <string name="call_human_state_busy">Occupato</string>
     <string name="call_human_state_failure">Fallito</string>
-    </resources>
\ No newline at end of file
+    <string name="call_human_state_hold">Pausa</string>
+    <string name="call_human_state_unhold">Riprendere</string>
+    <string name="call_human_state_over">Finito</string>
+    <string name="call_human_state_none">Nessuno</string>
+    <!-- Conferences -->
+    <string name="conference_human_state_active_attached">Attivo e presente</string>
+    <string name="conference_human_state_active_detached">Attivo ma assente</string>
+    <string name="conference_human_state_active_attached_rec">Attivo, presente e registrando</string>
+    <string name="conference_human_state_active_detached_rec">Attivo, assente ma registrando</string>
+    <string name="conference_human_state_hold">Pausa</string>
+    <string name="conference_human_state_hold_rec">Pausa registrazione</string>
+    <string name="conference_human_state_default">Nessuno</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-it/strings_content_description.xml b/ring-android/app/src/main/res/values-it/strings_content_description.xml
new file mode 100644
index 0000000..af1ba1d
--- /dev/null
+++ b/ring-android/app/src/main/res/values-it/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">Chiamata veloce</string>
+  <string name="contact_picture_description">Foto del contatto</string>
+  <string name="dial_numeric_pad">Tastiera numerica</string>
+  <string name="dial_alphabetic_pad">Tastiera alfabetica</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-it/strings_preferences.xml b/ring-android/app/src/main/res/values-it/strings_preferences.xml
index 470d41f..96d6b50 100644
--- a/ring-android/app/src/main/res/values-it/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-it/strings_preferences.xml
@@ -1,4 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="pref_category_network">Rete</string>
   <string name="pref_category_contacts">Contatti</string>
+  <string name="pref_category_system">Sistema</string>
+  <string name="pref_category_privacy">Privacy</string>
+  <string name="pref_mobileData_title">Traffico dati mobile</string>
+  <string name="pref_mobileData_summary">Attivare Ring su le rete 3G/LTE oltre che in Wi-Fi</string>
+  <string name="pref_systemContacts_title">Usare i contatti del dispositivo</string>
+  <string name="pref_systemContacts_summary">Usare i contatti del dispositivo per mostrare i dettagli di chi chiama. </string>
+  <string name="pref_systemDialer_title">Usare Ring di default per le chiamate</string>
+  <string name="pref_systemDialer_summary">Usare Ring per le chiamate quando possibile.</string>
+  <string name="pref_startOnBoot_title">Eseguire Ring al avvio del sistema</string>
+  <string name="pref_startOnBoot_summary">Eseguire Ring in background quando si avvia il sistema.</string>
+  <string name="pref_clearHistory_title">Svuotare lo storico</string>
+  <string name="pref_clearHistory_summary">Rimuovere lo storico delle conversazione</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-lt/strings.xml b/ring-android/app/src/main/res/values-lt/strings.xml
index e873d61..43c30c7 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -3,13 +3,16 @@
   <string name="section_licence">Licencija</string>
   <string name="sponsor_section">Ring 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>
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Nėra tinklo ryšio</string>
+  <string name="error_mobile_network_available_but_disabled">Prašome nustatymų ekrane suteikti prieigą prie korinio tinklo.</string>
   <!--AB menus-->
   <string name="ab_account_creation">Nauja paskyra</string>
   <string name="ab_account_edition_1">Ištrinti</string>
+  <string name="ab_action_chat">Tekstinis susirašinėjimas</string>
   <!--Left Drawer-->
   <!--Accessibility-->
   <string name="drawer_open">Atidaryti naršymo stalčių</string>
@@ -25,17 +28,32 @@
   <string name="hist_replay_button_stop">Stabdyti</string>
   <!--DetailsHistory Fragment-->
   <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="one">%d pokalbis</item>
+    <item quantity="few">%d pokalbiai</item>
+    <item quantity="other">%d pokalbių</item>
+  </plurals>
   <!--ContactList Fragment-->
+  <string name="no_contact_found">Kontaktų nerasta</string>
   <string name="searchbar_hint">Įrašykite vardą ar telefono numerį...</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <!--Notifications-->
   <string name="notif_missed_incoming_call">Praleistas skambutis nuo %1$s</string>
-  <string name="notif_incoming_call">Įeinantis skambutis</string>
+  <string name="notif_incoming_call_title">Gaunamasis skambutis nuo %1$s</string>
+  <string name="notif_incoming_call">Gaunamasis skambutis</string>
+  <string name="notif_outgoing_call_title">Išsiunčiamasis skambutis naudotojui %1$s</string>
+  <string name="notif_outgoing_call">Išsiunčiamasis skambutis</string>
+  <string name="notif_current_call_title">Esamas skambutis su %1$s</string>
+  <string name="notif_current_call">Esamas skambutis</string>
   <!--Call Fragment-->
   <string name="me">Aš</string>
+  <string name="you_txt_prefix">Jūs:</string>
   <string name="action_call_hangup">Padėti ragelį</string>
   <string name="action_settings">Nustatymai</string>
+  <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 Ring !</string>
   <string name="start_error_mic_required">Ring darbui, reikalingas leidimas naudoti mikrofoną.</string>
   <string name="action_call_decline">Atmesti</string>
@@ -44,11 +62,14 @@
   <string name="ab_action_contact_add_question">Pridėti prie kontaktų ?</string>
   <string name="ab_action_audio_call">Garso skambutis</string>
   <string name="ab_action_video_call">Vaizdo skambutis</string>
+  <string name="share_via">Dalintis per</string>
+  <string name="write_a_message">Rašykite žinutę</string>
   <string name="scan_qr">Skenuoti QR kodą</string>
   <string name="ab_action_flipcamera">Apversti kamerą</string>
   <!--Text messages-->
   <string name="send_message">Siųsti žinutę</string>
   <string name="message_sending">Siunčiama žinutė...</string>
+  <string name="time_just_now">Ką tik</string>
   <!--MediaPreferenceFragment-->
   <!--Read contacts permission-->
   <!--Write call log permission-->
@@ -59,7 +80,14 @@
   <string name="clear_history_dialog_message">Šio veiksmo negalima bus atšaukti.</string>
   <string name="clear_history_completed">Istorija išvalyta.</string>
   <!--Conversation-->
+  <string name="conversation_action_delete_this">Ištrinti šį pokalbį</string>
+  <string name="conversation_action_delete_this_title">Ištrinti šį pokalbį ?</string>
   <string name="conversation_action_delete_this_message">Šio veiksmo negalima bus atšaukti.</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>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Pridėti %1$s ?</string>
+  <string name="prompt_new_password">Naujas slaptažodis</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Nežinomas</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-lt/strings_account.xml b/ring-android/app/src/main/res/values-lt/strings_account.xml
index 348a397..116175b 100644
--- a/ring-android/app/src/main/res/values-lt/strings_account.xml
+++ b/ring-android/app/src/main/res/values-lt/strings_account.xml
@@ -6,15 +6,20 @@
   <string name="prompt_username">Naudotojo vardas</string>
   <string name="prompt_password">Slaptažodis</string>
   <string name="action_create">Pridėti paskyrą</string>
+  <string name="action_create_short">Registruoti</string>
   <string name="error_field_required">Šis laukas yra būtinas</string>
   <string name="dialog_wait_create">Pridedama paskyra</string>
   <string name="dialog_wait_create_details">Prašome palaukti, kol jūsų nauja paskyra yra pridedama</string>
   <string name="dialog_warn_ip2ip_account_title">Sukurti tuščią SIP paskyrą ?</string>
+  <string name="dialog_warn_ip2ip_account_message">Jūs ruošiatės sukurti SIP paskyrą, nenurodę teisingo kompiuterio vardo.
+Jūs galėsite atlikti ir priimti tik tiesioginius ip skambučius. 
+Vėliau, galėsite pataisyti savo paskyros informaciją</string>
   <string-array name="accountType">
     <item>RING</item>
     <item>SIP</item>
   </string-array>
   <string name="help_ring_title">Sukurti Ring paskyrą</string>
+  <string name="help_sip_title">Pridėti savo SIP paskyrą</string>
   <string name="help_sip">Konfigūruokite esamą SIP paskyrą.</string>
   <string name="create_sip_account">Pridėti</string>
   <!--Strings related to account deletion-->
@@ -31,6 +36,9 @@
   <string name="account_bootstrap_label">Pradinė įkeltis</string>
   <string name="account_username_label">Naudotojo vardas</string>
   <string name="account_password_label">Slaptažodis</string>
+  <string name="account_optionnal_category">Pasirinktini nustatymai</string>
+  <string name="account_useragent_label">Naudotojo agentas</string>
+  <string name="account_autoanswer_label">Automatinis atsiliepimas</string>
   <string name="account_upnp_label">Įjungti UPnP</string>
   <string name="account_proxy_field">Įgaliotasis serveris</string>
   <!--Audio Details-->
@@ -44,6 +52,7 @@
   <string name="account_video_enable">Įjungti vaizdą</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Išplėstiniai</string>
+  <string name="account_registration_exp_label">Registracijos galiojimo laikas</string>
   <string name="account_local_interface_label">Vietinė sąsaja</string>
   <string name="account_local_port_label">Vietinis prievadas</string>
   <string name="account_stun_enable_label">Naudoti Stun</string>
@@ -56,18 +65,27 @@
   <string name="account_published_port_label">Paskelbtas prievadas</string>
   <string name="account_published_address_label">Paskelbtas adresas</string>
   <!--Security Details-->
+  <string name="account_credentials_label">Prisijungimo duomenys</string>
+  <string name="account_credentials_edit">Taisyti prisijungimo duomenis</string>
+  <string name="account_credentials_add">Pridėti prisijungimo duomenis</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Saugumas</string>
   <!--SIP-->
   <!--TLS Details-->
-  <string name="account_tls_private_key_file_label">Privataus rakto failas</string>
-  <string name="account_tls_password_label">Privataus rakto slaptažodis</string>
+  <string name="account_tls_transport_switch_label">Naudoti TLS perdavimą</string>
+  <string name="account_tls_port_label">TLS gavėjo prievadas</string>
+  <string name="account_tls_certificate_list_label">Liudijimų įstaiga</string>
+  <string name="account_tls_certificate_file_label">Liudijimo failas</string>
+  <string name="account_tls_private_key_file_label">Privačiojo rakto failas</string>
+  <string name="account_tls_password_label">Privačiojo rakto slaptažodis</string>
   <string name="account_tls_method_label">TLS metodas</string>
   <string name="account_tls_ciphers_label">TLS šifrai</string>
   <string name="account_tls_server_name_label">Serverio pavadinimas</string>
   <string name="account_tls_verify_server_label">Tikrinti serverį</string>
   <string name="account_tls_verify_client_label">Tikrinti klientą</string>
   <string name="account_tls_negotiation_timeout_sec">Derėjimuisi skirtas laikas (sek.)</string>
+  <string name="account_rtp_max_port">Didžiausias</string>
+  <string name="account_rtp_min_port">Mažiausias</string>
   <string name="account_rtp_port_range">Garso RTP prievadų rėžis</string>
   <!--Import/export-->
   <string name="account_export">Eksportuoti</string>
@@ -75,6 +93,7 @@
   <string name="account_export_title">Eksportuoti paskyrą</string>
   <string name="account_import_title">Importuoti paskyras</string>
   <string name="account_import_explanation">Galite importuoti anksčiau eksportuotas paskyras.</string>
+  <string name="account_export_message">Įrašykite paskyros nustatymus ir prisijungimo duomenis, užšifruotus slaptažodžiu.</string>
   <string name="account_export_new_password">Naujas slaptažodis</string>
   <string name="account_export_confirm_password">Patvirtinkite slaptažodį</string>
   <string name="account_import_message">Įrašykite slaptažodį, kad iššifruotumėte failą.</string>
@@ -89,4 +108,5 @@
   <string name="error_passwords_not_equals">Slaptažodžiai nesutampa</string>
   <string name="import_failed_dialog_title">Importavimas nepavyko</string>
   <string name="import_failed_dialog_msg">Įvyko klaida</string>
+  <string name="account_export_end_error_title">Klaida</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-lt/strings_content_description.xml b/ring-android/app/src/main/res/values-lt/strings_content_description.xml
index 302c985..d032439 100644
--- a/ring-android/app/src/main/res/values-lt/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-lt/strings_content_description.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings for xml content description of images-->
+  <string name="contact_quick_call_description">Greitasis skambutis</string>
   <string name="contact_picture_description">Kontakto paveikslas</string>
   <string name="dial_numeric_pad">Skaitmeninė klaviatūra</string>
   <string name="dial_alphabetic_pad">Raidinė klaviatūra</string>
diff --git a/ring-android/app/src/main/res/values-lt/strings_preferences.xml b/ring-android/app/src/main/res/values-lt/strings_preferences.xml
index cb1e4e4..9b6801e 100644
--- a/ring-android/app/src/main/res/values-lt/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-lt/strings_preferences.xml
@@ -5,7 +5,11 @@
   <string name="pref_category_system">Sistema</string>
   <string name="pref_category_privacy">Privatumas</string>
   <string name="pref_mobileData_title">Mobilūs duomenys</string>
+  <string name="pref_mobileData_summary">Leisti Ring 3G/LTE tinkluose, papildomai prie belaidžio tinklo</string>
   <string name="pref_systemContacts_title">Naudoti sistemos kontaktus</string>
+  <string name="pref_systemContacts_summary">Naudoti sistemos kontaktus, kad būtų rodoma skambinančio asmens informacija.</string>
+  <string name="pref_systemDialer_title">Vykdyti sistemos skambučius, naudojant Ring</string>
+  <string name="pref_systemDialer_summary">Kai įmanoma, naudoti Ring, norint vykdyti sistemos skambučius.</string>
   <string name="pref_startOnBoot_title">Paleisti Ring paleisties metu</string>
   <string name="pref_startOnBoot_summary">Vykdyti Ring fone, paleidus sistemą</string>
   <string name="pref_clearHistory_title">Išvalyti istoriją</string>
diff --git a/ring-android/app/src/main/res/values-nb/strings.xml b/ring-android/app/src/main/res/values-nb/strings.xml
index 23b85bc..e938f7a 100644
--- a/ring-android/app/src/main/res/values-nb/strings.xml
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -107,4 +107,7 @@
   <string name="conversation_action_delete_this_message">Denne handlingen kan ikke gjøres om.</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Legg til %1$s?</string>
+  <string name="prompt_new_password">Nytt passord</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Ukjent</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nb/strings_account.xml b/ring-android/app/src/main/res/values-nb/strings_account.xml
index 41224ec..6088abf 100644
--- a/ring-android/app/src/main/res/values-nb/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nb/strings_account.xml
@@ -107,4 +107,5 @@
   <string name="error_passwords_not_equals">Passordene stemmer ikke</string>
   <string name="import_failed_dialog_title">Importen feilet</string>
   <string name="import_failed_dialog_msg">Det skjedde en feil</string>
+  <string name="account_export_end_error_title">Feil</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings.xml b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
index 2157d4b..3e1bb97 100644
--- a/ring-android/app/src/main/res/values-nl-rNL/strings.xml
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
@@ -7,6 +7,7 @@
   <string name="no_email_app_installed">Geen emailapplicatie gevonden. Installeer deze om ons een rapportage toe te zenden</string>
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Bellen</string>
+  <string name="error_no_network">Geen netwerkverbinding</string>
   <!--AB menus-->
   <string name="ab_account_creation">Nieuw account</string>
   <string name="ab_account_edition_1">Verwijderen</string>
@@ -14,23 +15,42 @@
   <!--Accessibility-->
   <!--Sections-->
   <string name="menu_item_accounts">Accounts beheren</string>
+  <string name="menu_item_settings">Instellingen</string>
   <string name="menu_item_about">Over Ring</string>
   <!--Dialing Fragment-->
+  <string name="dial_action_call">Bellen</string>
   <!--History Fragment-->
+  <string name="hist_replay_button">Opnieuw afspelen</string>
   <string name="hist_replay_button_stop">Stoppen</string>
+  <string name="hist_no_history">Geen geschiedenis</string>
   <!--DetailsHistory Fragment-->
+  <string name="detail_hist_call_number">Bel %1$s</string>
   <!--Home Fragment-->
   <!--ContactList Fragment-->
+  <string name="no_contact_found">Geen contact gevonden</string>
+  <string name="starred_contacts_title">Favorieten</string>
+  <string name="searchbar_hint">Voer een naam of telefoonnummer in...</string>
+  <string name="choose_number">Kies een nummer</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
+  <string name="transfer_no_other_call">Geen andere gesprekken in de wacht</string>
   <!--Notifications-->
   <!--Call Fragment-->
+  <string name="action_call_hangup">Ophangen</string>
+  <string name="action_settings">Instellingen</string>
+  <string name="ab_action_contact_add">Voeg toe aan contacten</string>
   <!--Text messages-->
   <!--MediaPreferenceFragment-->
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
   <!--Settings-->
+  <string name="clear_history_dialog_message">Deze actie kan niet ongedaan worden</string>
   <!--Conversation-->
+  <string name="conversation_action_delete_this_title">Dit gesprek verwijderen?</string>
+  <string name="conversation_action_delete_this_message">Deze actie kan niet ongedaan worden</string>
+  <string name="conversation_action_copy_peer_number">Kopieër nummer</string>
+  <string name="conversation_action_select_peer_number">Selecteer een nummer</string>
   <!--Contacts-->
+  <!--MenuHeaderView-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml b/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
index 99187ba..c083a6f 100644
--- a/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
@@ -1,11 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings related to account creation-->
+  <string name="prompt_username">Gebruikersnaam</string>
+  <string name="prompt_password">Wachtwoord</string>
+  <string name="action_create_short">Registreren</string>
+  <string name="error_field_required">Dit invulveld is vereist</string>
+  <string name="dialog_wait_create">Account aan het toevoegen</string>
+  <string name="help_sip_title">Voeg je SIP account toe</string>
+  <string name="create_sip_account">Toevoegen</string>
+  <string name="share_number">Telefoonnummer delen</string>
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">Account verwijderen?</string>
   <!--AccountManagementFragment-->
   <string name="normal_accounts_titles">Accounts</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Algemeen</string>
+  <string name="account_alias_label">Naam account</string>
+  <string name="account_username_label">Gebruikersnaam</string>
+  <string name="account_password_label">Wachtwoord</string>
   <!--Audio Details-->
   <string name="account_audio_label">Geluid</string>
   <string name="account_preferences_media_tab">Media</string>
diff --git a/ring-android/app/src/main/res/values-nl/strings.xml b/ring-android/app/src/main/res/values-nl/strings.xml
index c7ed585..72709d5 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -5,12 +5,13 @@
   <string name="copyright_section">Auteursrecht</string>
   <string name="contribute_section">Bijdragen</string>
   <string name="version_section">Versie</string>
-  <string name="no_email_app_installed">Geen email applicatie gevonden, installeer er één om ons een rapport te kunnen sturen</string>
-  <string name="email_chooser_title">Verstuur email met...</string>
+  <string name="no_email_app_installed">Geen e-mailapplicatie gevonden, installeer er één om ons een rapport te kunnen sturen</string>
+  <string name="email_chooser_title">E-mail versturen met...</string>
   <!--RingActivity-->
   <string name="title_section0">Kiezen</string>
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Geen netwerkverbinding</string>
+  <string name="error_mobile_network_available_but_disabled">Geef toegang tot mobiel netwerk in de instellingen.</string>
   <!--AB menus-->
   <string name="ab_account_creation">Account aanmaken</string>
   <string name="ab_account_edition_1">Verwijderen</string>
@@ -22,12 +23,12 @@
   <!--Sections-->
   <string name="menu_item_home">Thuis</string>
   <string name="menu_item_accounts">Accounts beheren</string>
-  <string name="menu_item_settings">Instelllingen</string>
+  <string name="menu_item_settings">Instellingen</string>
   <string name="menu_item_about">Over Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_action_call">Oproep</string>
-  <string name="dial_number">Nummer kiezen</string>
-  <string name="dial_hint">Telefoonnummer ingeven</string>
+  <string name="dial_number">Kies een nummer</string>
+  <string name="dial_hint">Geef een telefoonnummer in</string>
   <!--History Fragment-->
   <string name="hist_replay_button">Opnieuw afspelen</string>
   <string name="hist_replay_button_stop">Stoppen</string>
@@ -36,16 +37,16 @@
   <string name="detail_hist_call_number">%1$s bellen</string>
   <!--Home Fragment-->
   <plurals name="home_conferences_title">
-    <item quantity="one">%d Conversatie</item>
-    <item quantity="other">%d Conversaties</item>
+    <item quantity="one">%d gesprek</item>
+    <item quantity="other">%d gesprekken</item>
   </plurals>
   <string name="home_transfering">Versturen van %1$s naar %1$s</string>
   <string name="home_transfer_complet">Overdracht compleet</string>
   <!--ContactList Fragment-->
   <string name="no_contact_found">Geen contacten gevonden</string>
   <string name="starred_contacts_title">Favorieten</string>
-  <string name="searchbar_hint">Naam of telefoonnummer ingeven...</string>
-  <string name="choose_number">Nummer kiezen</string>
+  <string name="searchbar_hint">Geef een naam of telefoonnummer in...</string>
+  <string name="choose_number">Kies een nummer</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <string name="transfer_to_another_call">Versturen naar een andere lopende oproep:</string>
@@ -54,8 +55,8 @@
   <!--Notifications-->
   <string name="notif_missed_incoming_call">Gemiste oproep van %1$s</string>
   <string name="notif_missed_outgoing_call">Mislukte oproep naar %1$s</string>
-  <string name="notif_incoming_call_title">Binnenkomende oproep van %1$s</string>
-  <string name="notif_incoming_call">Binnenkomende oproep</string>
+  <string name="notif_incoming_call_title">Inkomende oproep van %1$s</string>
+  <string name="notif_incoming_call">Inkomende oproep</string>
   <string name="notif_outgoing_call_title">Uitgaande oproep naar %1$s</string>
   <string name="notif_outgoing_call">Uitgaande oproep</string>
   <string name="notif_current_call_title">Huidige oproep met %1$s</string>
@@ -63,13 +64,13 @@
   <!--Call Fragment-->
   <string name="me">Ik</string>
   <string name="you_txt_prefix">U:</string>
-  <string name="action_call_attended_transfer">Bijgewoonde Overdracht</string>
+  <string name="action_call_attended_transfer">Bijgewoonde overdracht</string>
   <string name="action_call_conference">Vergadering</string>
   <string name="action_call_hangup">Ophangen</string>
   <string name="action_settings">Instelllingen</string>
   <string name="help_gestures">Dit scherm helpt gebruikers met de verschillende interacties tijdens oproepen. Verschillende acties worden beschreven; Lang aanraken; fling, swype etc.</string>
   <string name="ongoing_call">Lopende oproep</string>
-  <string name="hist_in_call">Binnenkomende oproep van %1$s</string>
+  <string name="hist_in_call">Inkomende oproep van %1$s</string>
   <string name="hist_out_call">Uitgaande oproep van %1$s</string>
   <string name="start_error_title">Ring kan niet opgestart worden!</string>
   <string name="start_error_mic_required">Ring vereist toestemming om de microfoon te kunnen gebruiken.</string>
@@ -82,32 +83,37 @@
   <string name="ab_action_video_call">Videogesprek</string>
   <string name="share_via">Delen via</string>
   <string name="write_a_message">Schrijf een bericht</string>
-  <string name="scan_qr">QR Code Scannen</string>
+  <string name="scan_qr">QR-code scannen</string>
   <string name="ab_action_flipcamera">Camera draaien</string>
   <!--Text messages-->
   <string name="send_message">Bericht versturen</string>
   <string name="message_sending">Bericht wordt verstuurd...</string>
   <string name="time_just_now">Zojuist</string>
-  <string name="permission_read_denied">De applicatie heeft geen machtiging om uw opslag te lezen, deze kan daardoor niet correct functioneren. Gelieve overwegen om deze machtiging alsnog toe te kennen.</string>
-  <string name="permission_write_denied">De applicatie heeft geen machtiging om naar uw opslag te schrijven, deze kan daardoor niet correct functioneren. Gelieve overwegen om deze machtiging alsnog toe te kennen.</string>
+  <string name="permission_read_denied">De applicatie heeft geen machtiging om uw opslag te lezen, deze kan daardoor niet correct functioneren. Gelieve te overwegen om deze machtiging alsnog toe te kennen.</string>
+  <string name="permission_write_denied">De applicatie heeft geen machtiging om naar uw opslag te schrijven, deze kan daardoor niet correct functioneren. Gelieve te overwegen om deze machtiging alsnog toe te kennen.</string>
   <!--MediaPreferenceFragment-->
-  <string name="permission_dialog_camera_title">Camera machtiging</string>
-  <string name="permission_dialog_camera_message">Video gesprekken vereisen machtiging voor gebruik van de camera. Gelieve overwegen om deze machtiging alsnog toe te kennen.</string>
+  <string name="permission_dialog_camera_title">Cameramachtiging</string>
+  <string name="permission_dialog_camera_message">Videogesprekken vereisen machtiging voor gebruik van de camera. Gelieve te overwegen om deze machtiging alsnog toe te kennen.</string>
   <!--Read contacts permission-->
-  <string name="permission_dialog_read_contacts_message">Ring vereist de \"Contacten\" machtiging voor deze feature. Gelieve deze machtiging toekennen.</string>
+  <string name="permission_dialog_read_contacts_message">Ring vereist de \"Contacten\"-machtiging voor deze functie. Gelieve deze machtiging toe te kennen.</string>
   <!--Write call log permission-->
-  <string name="permission_dialog_write_call_log_message">Ring vereist de \"Oproepgeschiedenis\" machtiging voor deze feature. Gelieve deze machtiging toekennen.</string>
+  <string name="permission_dialog_write_call_log_message">Ring vereist de \"Oproepgeschiedenis\"-machtiging voor deze functie. Gelieve deze machtiging toe te kennen.</string>
   <!--QRCode Scan-->
-  <string name="scan_qr_account_message">Scan de QR Code van het toe te voegen account.</string>
+  <string name="scan_qr_account_message">Scan de QR-code van het toe te voegen account.</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">Geschiedenis wissen?</string>
   <string name="clear_history_dialog_message">Handeling kan niet ongedaan gemaakt worden.</string>
   <string name="clear_history_completed">Geschiedenis is gewist.</string>
   <!--Conversation-->
-  <string name="conversation_action_delete_this">Deze conversatie verwijderen</string>
-  <string name="conversation_action_delete_this_title">Deze conversatie verwijderen?</string>
+  <string name="conversation_action_delete_this">Dit gesprek verwijderen</string>
+  <string name="conversation_action_delete_this_title">Dit gesprek verwijderen?</string>
   <string name="conversation_action_delete_this_message">Handeling kan niet ongedaan gemaakt worden.</string>
   <string name="conversation_action_copy_peer_number">Nummer kopiëren</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s gekopieerd naar klembord</string>
+  <string name="conversation_action_select_peer_number">Kies een nummer</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">%1$s toevoegen?</string>
+  <string name="prompt_new_password">Nieuw wachtwoord</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Onbekend</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings_account.xml b/ring-android/app/src/main/res/values-nl/strings_account.xml
index 11c411a..cdd652c 100644
--- a/ring-android/app/src/main/res/values-nl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_account.xml
@@ -9,11 +9,19 @@
   <string name="action_create_short">Registreren</string>
   <string name="error_field_required">Verplicht veld</string>
   <string name="dialog_wait_create">Account wordt toegevoegd</string>
-  <string name="dialog_wait_create_details">Even geduld aub terwijl uw nieuwe account wordt toegevoegd...</string>
-  <string name="help_ring_title">Een Ring account aanmaken</string>
-  <string name="help_ring">Een Ring account stelt u in staat andere mensen veilig te bereiken in peer to peer middels een volledig gedistribueerd netwerk.</string>
-  <string name="help_sip_title">Uw SIP account toevoegen</string>
-  <string name="help_sip">Een bestaand SIP account configureren</string>
+  <string name="dialog_wait_create_details">Uw nieuwe account wordt toegevoegd, even geduld...</string>
+  <string name="dialog_warn_ip2ip_account_title">Lege SIP-account aanmaken?</string>
+  <string name="dialog_warn_ip2ip_account_message">U staat op het punt een SIP-account zonder geldige hostnaam toe te voegen.
+U zal er enkel directe IP-oproepen mee kunnen maken en ontvangen.
+U kan uw account later bewerken</string>
+  <string-array name="accountType">
+    <item>RING</item>
+    <item>SIP</item>
+  </string-array>
+  <string name="help_ring_title">Een Ring-account aanmaken</string>
+  <string name="help_ring">Een Ring-account stelt u in staat andere mensen veilig te bereiken in peer to peer middels een volledig gedistribueerd netwerk.</string>
+  <string name="help_sip_title">Uw SIP-account toevoegen</string>
+  <string name="help_sip">Een bestaand SIP-account configureren</string>
   <string name="create_sip_account">Toevoegen</string>
   <string name="share_number">Nummer delen</string>
   <!--Strings related to account deletion-->
@@ -24,39 +32,40 @@
   <string name="normal_accounts_titles">Accounts</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Algemeen</string>
-  <string name="account_basic_category">Basis Instellingen</string>
+  <string name="account_basic_category">Basisinstellingen</string>
   <string name="account_alias_label">Accountnaam</string>
   <string name="account_hostname_label">Hostnaam</string>
   <string name="account_bootstrap_label">Bootstrap</string>
   <string name="account_username_label">Gebruikersnaam</string>
   <string name="account_password_label">Wachtwoord</string>
-  <string name="account_optionnal_category">Optionele Instellingen</string>
-  <string name="account_useragent_label">User Agent</string>
+  <string name="account_optionnal_category">Optionele instellingen</string>
+  <string name="account_useragent_label">Gebruikersagent</string>
   <string name="account_autoanswer_label">Automatisch beantwoorden</string>
+  <string name="account_upnp_label">UPnP inschakelen</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
   <string name="account_audio_label">Geluid</string>
   <string name="account_preferences_media_tab">Media</string>
   <string name="account_ringtone_label">Beltonen</string>
   <string name="account_ringtone_enabled_label">Beltonen inschakelen</string>
-  <string name="account_ringtone_path_label">Beltonen pad</string>
+  <string name="account_ringtone_path_label">Beltoonpad</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
   <string name="account_video_enable">Video inschakelen</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Geavanceerd</string>
-  <string name="account_registration_exp_label">Verval Registratie</string>
-  <string name="account_local_interface_label">Lokale Interface</string>
-  <string name="account_local_port_label">Lokale Poort</string>
-  <string name="account_stun_enable_label">Stun Gebruiken</string>
-  <string name="account_stun_server_label">Stun Server</string>
+  <string name="account_registration_exp_label">Verval registratie</string>
+  <string name="account_local_interface_label">Lokale interface</string>
+  <string name="account_local_port_label">Lokale poort</string>
+  <string name="account_stun_enable_label">Stun gebruiken</string>
+  <string name="account_stun_server_label">Stun-server</string>
   <string name="account_turn_enable_label">TURN gebruiken</string>
-  <string name="account_turn_server_label">TURN server</string>
-  <string name="account_turn_username_label">TURN gebruikersnaam</string>
-  <string name="account_turn_password_label">TURN wachtwoord</string>
+  <string name="account_turn_server_label">TURN-server</string>
+  <string name="account_turn_username_label">TURN-gebruikersnaam</string>
+  <string name="account_turn_password_label">TURN-wachtwoord</string>
   <string name="account_published_same_as_local_label">Gepubliceerd gelijk aan lokaal</string>
-  <string name="account_published_port_label">Gepubliceerde Poort</string>
-  <string name="account_published_address_label">Gepubliceerde Adres</string>
+  <string name="account_published_port_label">Gepubliceerde poort</string>
+  <string name="account_published_address_label">Gepubliceerd adres</string>
   <!--Security Details-->
   <string name="account_credentials_label">Legitimatie</string>
   <string name="account_credentials_edit">Legitimatie wijzigen</string>
@@ -66,21 +75,21 @@
   <string name="account_srtp_deactivated">Uitgeschakeld</string>
   <!--SIP-->
   <!--TLS Details-->
-  <string name="account_tls_transport_switch_label">TLS Transport Gebruiken</string>
-  <string name="account_tls_port_label">TLS Luister Poort</string>
+  <string name="account_tls_transport_switch_label">TLS-transport gebruiken</string>
+  <string name="account_tls_port_label">TLS-luisterpoort</string>
   <string name="account_tls_certificate_list_label">Certificeringsinstanties</string>
   <string name="account_tls_certificate_file_label">Certificaatbestand</string>
-  <string name="account_tls_private_key_file_label">Bestand Persoonlijke Sleutel</string>
-  <string name="account_tls_password_label">Wachtwoord Persoonlijke Sleutel</string>
-  <string name="account_tls_method_label">TLS Methode</string>
-  <string name="account_tls_ciphers_label">TLS Sleutels</string>
-  <string name="account_tls_server_name_label">Server Naam</string>
-  <string name="account_tls_verify_server_label">Server Verifiëren</string>
-  <string name="account_tls_verify_client_label">Client Verifiëren</string>
-  <string name="account_tls_negotiation_timeout_sec">Tijdslimiet Onderhandeling (sec)</string>
+  <string name="account_tls_private_key_file_label">Bestand met persoonlijke sleutel</string>
+  <string name="account_tls_password_label">Wachtwoord persoonlijke sleutel</string>
+  <string name="account_tls_method_label">TLS-methode</string>
+  <string name="account_tls_ciphers_label">TLS-sleutels</string>
+  <string name="account_tls_server_name_label">Servernaam</string>
+  <string name="account_tls_verify_server_label">Server verifiëren</string>
+  <string name="account_tls_verify_client_label">Cliënt verifiëren</string>
+  <string name="account_tls_negotiation_timeout_sec">Tijdslimiet onderhandeling (sec)</string>
   <string name="account_rtp_max_port">Maximum</string>
   <string name="account_rtp_min_port">Minimum</string>
-  <string name="account_rtp_port_range">Audio RTP Poortenreeks</string>
+  <string name="account_rtp_port_range">Audio RTP poortenreeks</string>
   <!--Import/export-->
   <string name="account_export">Exporteren</string>
   <string name="account_import_account">Account importeren</string>
@@ -91,15 +100,16 @@
   <string name="account_export_new_password">Nieuw wachtwoord</string>
   <string name="account_export_confirm_password">Wachtwoord bevestigen</string>
   <string name="account_import_message">Wachtwoord ingeven om bestand te ontsleutelen</string>
-  <string name="account_import_decryption_password">Ontsleutelwachtwoord</string>
+  <string name="account_import_decryption_password">Ontsleutelingswachtwoord</string>
   <string name="import_dialog_title">Importeren</string>
-  <string name="import_export_wait">Even geduld aub...</string>
+  <string name="import_export_wait">Even geduld...</string>
   <string name="export_dialog_title">Account exporteren</string>
   <string name="account_export_result">Account geëxporteerd naar %1$s</string>
-  <string name="export_failed_dialog_title">Export mislukt</string>
+  <string name="export_failed_dialog_title">Exporteren mislukt</string>
   <string name="export_failed_dialog_msg">Er is een fout opgetreden</string>
   <string name="error_password_char_count">Minimaal 6 karakters</string>
   <string name="error_passwords_not_equals">Wachtwoorden komen niet overeen</string>
-  <string name="import_failed_dialog_title">Import mislukt</string>
+  <string name="import_failed_dialog_title">Importeren mislukt</string>
   <string name="import_failed_dialog_msg">Er is een fout opgetreden</string>
+  <string name="account_export_end_error_title">Fout</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings_call.xml b/ring-android/app/src/main/res/values-nl/strings_call.xml
index 9226bbf..085ee90 100644
--- a/ring-android/app/src/main/res/values-nl/strings_call.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_call.xml
@@ -22,7 +22,8 @@
 -->
 <resources>
     <!-- SipCalls -->
-    <string name="call_human_state_incoming">Ringen</string>
+    <string name="call_human_state_incoming">Gaat over</string>
+    <string name="call_human_state_connecting">Verbinden</string>
     <string name="call_human_state_ringing">Bellen</string>
     <string name="call_human_state_current">Praten</string>
     <string name="call_human_state_hungup">Over</string>
@@ -31,5 +32,13 @@
     <string name="call_human_state_hold">In wacht zetten</string>
     <string name="call_human_state_unhold">Uit wacht halen</string>
     <string name="call_human_state_over">Over</string>
+    <string name="call_human_state_none">Geen</string>
+    <!-- Conferences -->
+    <string name="conference_human_state_active_attached">Actief aangesloten</string>
+    <string name="conference_human_state_active_detached">Actief losgekoppeld</string>
+    <string name="conference_human_state_active_attached_rec">Actief aangesloten rec</string>
+    <string name="conference_human_state_active_detached_rec">Actief losgekoppeld rec</string>
     <string name="conference_human_state_hold">In wacht zetten</string>
-    </resources>
\ No newline at end of file
+    <string name="conference_human_state_hold_rec">In wacht zetten rec</string>
+    <string name="conference_human_state_default">Geen</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-nl/strings_content_description.xml b/ring-android/app/src/main/res/values-nl/strings_content_description.xml
index 489dce4..69aa012 100644
--- a/ring-android/app/src/main/res/values-nl/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_content_description.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings for xml content description of images-->
-  <string name="contact_quick_call_description">Snel Bellen</string>
+  <string name="contact_quick_call_description">Snel bellen</string>
   <string name="contact_picture_description">Contactfoto</string>
   <string name="dial_numeric_pad">Numeriek toetsenbord</string>
   <string name="dial_alphabetic_pad">Alfabetisch toetsenbord</string>
diff --git a/ring-android/app/src/main/res/values-nl/strings_preferences.xml b/ring-android/app/src/main/res/values-nl/strings_preferences.xml
index 75943ae..e8aafe2 100644
--- a/ring-android/app/src/main/res/values-nl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_preferences.xml
@@ -5,7 +5,7 @@
   <string name="pref_category_system">Systeem</string>
   <string name="pref_category_privacy">Privacy</string>
   <string name="pref_mobileData_title">Mobiele data</string>
-  <string name="pref_mobileData_summary">Ring toestaan om 3G/LTE netwerken te gebruiken naast Wi-Fi</string>
+  <string name="pref_mobileData_summary">Ring toestaan om 3G/LTE-netwerken te gebruiken naast Wi-Fi</string>
   <string name="pref_systemContacts_title">Systeemcontacten gebruiken</string>
   <string name="pref_systemContacts_summary">Systeemcontacten gebruiken om details beller te tonen</string>
   <string name="pref_systemDialer_title">Systeemoproepen plaatsen met Ring</string>
@@ -13,5 +13,5 @@
   <string name="pref_startOnBoot_title">Ring automatisch starten</string>
   <string name="pref_startOnBoot_summary">Ring in achtergrond uitvoeren wanneer apparaat ingeschakeld wordt.</string>
   <string name="pref_clearHistory_title">Geschiedenis wissen</string>
-  <string name="pref_clearHistory_summary">Geschiedenis van alle conversaties wissen. Deze handeling kan niet ongedaan gemaakt worden.</string>
+  <string name="pref_clearHistory_summary">Geschiedenis van alle gesprekken wissen. Deze handeling kan niet ongedaan gemaakt worden.</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pa/strings.xml b/ring-android/app/src/main/res/values-pa/strings.xml
index 90ad685..1d05491 100644
--- a/ring-android/app/src/main/res/values-pa/strings.xml
+++ b/ring-android/app/src/main/res/values-pa/strings.xml
@@ -30,4 +30,5 @@
   <!--Settings-->
   <!--Conversation-->
   <!--Contacts-->
+  <!--MenuHeaderView-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings.xml b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
new file mode 100644
index 0000000..0d01d6c
--- /dev/null
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--RingActivity-->
+  <string name="title_activity_sflphone_home">Ring</string>
+  <!--AB menus-->
+  <string name="ab_account_edition_1">Usun</string>
+  <!--Left Drawer-->
+  <!--Accessibility-->
+  <!--Sections-->
+  <string name="menu_item_about">O Ringu</string>
+  <!--Dialing Fragment-->
+  <!--History Fragment-->
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <!--ContactList Fragment-->
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <!--Notifications-->
+  <!--Call Fragment-->
+  <!--Text messages-->
+  <!--MediaPreferenceFragment-->
+  <!--Read contacts permission-->
+  <!--Write call log permission-->
+  <!--QRCode Scan-->
+  <!--Settings-->
+  <!--Conversation-->
+  <!--Contacts-->
+  <!--MenuHeaderView-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-pl/strings.xml b/ring-android/app/src/main/res/values-pl/strings.xml
index a637ca4..2ea4248 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -114,4 +114,7 @@
   <string name="conversation_action_select_peer_number">Wybierz numer</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Dodać %1$s ?</string>
+  <string name="prompt_new_password">Nowe hasło</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Nieznane</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pl/strings_account.xml b/ring-android/app/src/main/res/values-pl/strings_account.xml
index 96cf67b..ed1a3e3 100644
--- a/ring-android/app/src/main/res/values-pl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pl/strings_account.xml
@@ -111,4 +111,5 @@
   <string name="error_passwords_not_equals">Hasła nie pasują do siebie</string>
   <string name="import_failed_dialog_title">Błąd w importowaniu</string>
   <string name="import_failed_dialog_msg">Wystąpił błąd</string>
+  <string name="account_export_end_error_title">Błąd</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pl/strings_call.xml b/ring-android/app/src/main/res/values-pl/strings_call.xml
index 1506738..d80ea3a 100644
--- a/ring-android/app/src/main/res/values-pl/strings_call.xml
+++ b/ring-android/app/src/main/res/values-pl/strings_call.xml
@@ -35,6 +35,9 @@
     <string name="call_human_state_none">Nic</string>
     <!-- Conferences -->
     <string name="conference_human_state_active_attached">Aktywny załącznik</string>
+    <string name="conference_human_state_active_detached">Aktywnie oderwany</string>
+    <string name="conference_human_state_active_attached_rec">Aktywnie podłączony nagrywanie</string>
+    <string name="conference_human_state_active_detached_rec">Aktywnie oderwany nagrywanie</string>
     <string name="conference_human_state_hold">Czekanie</string>
     <string name="conference_human_state_hold_rec">Przytrzymaj rec</string>
     <string name="conference_human_state_default">Nic</string>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings.xml b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
index 817d8e2..1f44978 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
@@ -113,4 +113,7 @@
   <string name="conversation_action_select_peer_number">Selecione um numero</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Adicionar %1$s ?</string>
+  <string name="prompt_new_password">Nova senha</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Desconhecido</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
index 9507431..46597d0 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
@@ -10,6 +10,14 @@
   <string name="error_field_required">Este campo é obrigatório</string>
   <string name="dialog_wait_create">Adicionando conta</string>
   <string name="dialog_wait_create_details">Por favor, aguarde enquanto sua nova conta é adicionada...</string>
+  <string name="dialog_warn_ip2ip_account_title">Criar uma conta SIP vazia?</string>
+  <string name="dialog_warn_ip2ip_account_message">Você está prestes a criar uma conta SIP com nenhum nome de host válido.
+Você só será capaz de fazer e receber chamadas IP diretos.
+Você pode editar sua conta depois.</string>
+  <string-array name="accountType">
+    <item>RING</item>
+    <item>SIP</item>
+  </string-array>
   <string name="help_ring_title">Criar uma conta no Ring</string>
   <string name="help_ring">Uma conta do Ring permite que você entre em contato com pessoas de forma segura em uma rede peer-to-peer totalmente distribuída.</string>
   <string name="help_sip_title">Adicionar sua conta SIP</string>
@@ -33,6 +41,7 @@
   <string name="account_optionnal_category">Configurações opcionais</string>
   <string name="account_useragent_label">Agente de usuário</string>
   <string name="account_autoanswer_label">Resposta automática</string>
+  <string name="account_upnp_label">Habilitar UPnP</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
   <string name="account_audio_label">Audio</string>
@@ -102,4 +111,5 @@
   <string name="error_passwords_not_equals">Senhas não correspondem</string>
   <string name="import_failed_dialog_title">Falha ao importar</string>
   <string name="import_failed_dialog_msg">Um erro ocorreu</string>
+  <string name="account_export_end_error_title">Erro</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_call.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_call.xml
index c197219..21d8dc0 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings_call.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_call.xml
@@ -32,5 +32,13 @@
     <string name="call_human_state_hold">Modo de espera</string>
     <string name="call_human_state_unhold">Soltar</string>
     <string name="call_human_state_over">Sobre</string>
+    <string name="call_human_state_none">Nenhum</string>
+    <!-- Conferences -->
+    <string name="conference_human_state_active_attached">Ativo anexado</string>
+    <string name="conference_human_state_active_detached">Ativo individual</string>
+    <string name="conference_human_state_active_attached_rec">Gravação ativa anexada</string>
+    <string name="conference_human_state_active_detached_rec">Gravação ativa individual</string>
     <string name="conference_human_state_hold">Modo de espera</string>
-    </resources>
\ No newline at end of file
+    <string name="conference_human_state_hold_rec">Gravação de espera</string>
+    <string name="conference_human_state_default">Nenhum</string>
+</resources>
\ No newline at end of file
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 7a8b241..45a11b8 100644
--- a/ring-android/app/src/main/res/values-pt/strings.xml
+++ b/ring-android/app/src/main/res/values-pt/strings.xml
@@ -27,4 +27,5 @@
   <!--Settings-->
   <!--Conversation-->
   <!--Contacts-->
+  <!--MenuHeaderView-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings.xml b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
index 8ecd785..db7ff79 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
@@ -1,10 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="section_licence">Лицензия</string>
+  <string name="sponsor_section">Ring является свободным ПО, которое разрабатывается и поддерживается</string>
+  <string name="copyright_section">Авторское право</string>
+  <string name="contribute_section">Помочь проекту</string>
   <string name="version_section">Версия</string>
+  <string name="no_email_app_installed">Не найдено приложение электронной почты. Пожалуйста, установите его для отправки нам отчета.</string>
+  <string name="email_chooser_title">Отправить почту, используя...</string>
   <!--RingActivity-->
-  <string name="title_section0">Вызов</string>
+  <string name="title_section0">Вызвать</string>
   <string name="title_activity_sflphone_home">Звонок</string>
   <string name="error_no_network">Отсутствует сетевое подключение</string>
+  <string name="error_mobile_network_available_but_disabled">Пожалуйста, разрешите доступ к мобильной сети в настройках</string>
   <!--AB menus-->
   <string name="ab_account_creation">Новая учетная запись</string>
   <string name="ab_account_edition_1">Удалить</string>
@@ -39,8 +46,8 @@
   <string name="home_transfer_complet">Перевод завершен</string>
   <!--ContactList Fragment-->
   <string name="no_contact_found">Контакт не обнаружен</string>
-  <string name="starred_contacts_title">Любимые</string>
-  <string name="searchbar_hint">Укажите имя или номер телефона</string>
+  <string name="starred_contacts_title">Избранное</string>
+  <string name="searchbar_hint">Введите имя или номер телефона</string>
   <string name="choose_number">Выбор номера</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
@@ -73,18 +80,42 @@
   <string name="action_call_decline">Отказаться</string>
   <string name="ab_action_speakerphone">Включить звук</string>
   <string name="ab_action_contact_add">Добавить контакт</string>
+  <string name="ab_action_contact_add_question">Добавить в контакты?</string>
   <string name="ab_action_audio_call">Аудиовызов</string>
+  <string name="ab_action_video_call">Видеозвонок</string>
   <string name="share_via">Поделится</string>
   <string name="write_a_message">Написать сообщение</string>
   <string name="scan_qr">Сканировать QR код</string>
   <string name="ab_action_flipcamera">Перевернуть камеру</string>
   <!--Text messages-->
   <string name="send_message">Отправить сообщение</string>
+  <string name="message_sending">Отправка сообщения...</string>
+  <string name="time_just_now">В данный момент</string>
+  <string name="permission_read_denied">Приложение не имеет прав чтения с накопителя, потому не может функционировать правильно. Пожалуйста, добавьте права доступа к хранилищу данных.</string>
+  <string name="permission_write_denied">Приложение не имеет прав записи в накопитель, потому не может функционировать правильно. Пожалуйста, добавьте права доступа к хранилищу данных.</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Разрешение на использование камеры</string>
+  <string name="permission_dialog_camera_message">Необходимо доступ к камере для работы с видеозвонками. Пожалуйста, предоставьте их.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Приложению необходимы права на чтение контактов для включения данной опции</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Приложению необходимы права на запись истории звонков для включения данной функции</string>
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Сканировать QR код аккаунта, который хотите добавить</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_action_delete_this">Удалить беседу</string>
+  <string name="conversation_action_delete_this_title">Удалить беседу?</string>
+  <string name="conversation_action_delete_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>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Добавить %1$s ?</string>
+  <string name="prompt_new_password">Новый пароль</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Неизвестно</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml b/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
index 487a9de..8ce530d 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
@@ -5,29 +5,104 @@
   <string name="prompt_hostname">Узел</string>
   <string name="prompt_username">Пользователь</string>
   <string name="prompt_password">Пароль</string>
+  <string name="action_create">Добавить аккаунт</string>
+  <string name="action_create_short">Зарегистрировать</string>
+  <string name="error_field_required">Это обязательное поле</string>
+  <string name="dialog_wait_create">Добавление аккаунта</string>
+  <string name="dialog_wait_create_details">Пожалуйста, подождите, пока Ваш новый аккаунт будет добавлен...</string>
+  <string name="dialog_warn_ip2ip_account_title">Создать пустой SIP аккаунт?</string>
+  <string name="help_ring_title">Создать Ring аккаунт</string>
+  <string name="help_ring">Ring аккаунт позволяет безопасно связываться между людьми через полностью распределенную сеть.</string>
+  <string name="help_sip_title">Добавить SIP аккаунт</string>
+  <string name="help_sip">Настройка существующего SIP аккаунта</string>
+  <string name="create_sip_account">Добавить</string>
+  <string name="share_number">Расшарить номер</string>
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">Удалить аккаунт?</string>
+  <string name="account_delete_dialog_message">Это действие не может быть отменено. Если вы еще не сделали этого, следует рассмотреть возможность экспортировать свою учетную запись перед её удалением.</string>
   <!--AccountManagementFragment-->
+  <string name="empty_account_list">Аккаунт не зарегистрирован</string>
   <string name="normal_accounts_titles">Учетные записи</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Основные</string>
+  <string name="account_basic_category">Основные настройки</string>
+  <string name="account_alias_label">Имя аккаунта</string>
   <string name="account_hostname_label">Узел</string>
   <string name="account_bootstrap_label">Начальная загрузка</string>
   <string name="account_username_label">Пользователь</string>
   <string name="account_password_label">Пароль</string>
+  <string name="account_optionnal_category">Дополнительные настройки</string>
+  <string name="account_useragent_label">Агент пользователя</string>
+  <string name="account_autoanswer_label">Автоматический ответ</string>
+  <string name="account_upnp_label">Включить UPnP</string>
   <string name="account_proxy_field">Прокси</string>
   <!--Audio Details-->
   <string name="account_audio_label">Звук</string>
   <string name="account_preferences_media_tab">Медиа</string>
   <string name="account_ringtone_label">Рингтоны</string>
+  <string name="account_ringtone_enabled_label">Активировать мелодии</string>
+  <string name="account_ringtone_path_label">Пусть до мелодий</string>
   <!--Video Details-->
   <string name="account_video_label">Видео</string>
+  <string name="account_video_enable">Включить видео</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Дополнительно</string>
+  <string name="account_registration_exp_label">Регистрация истекает</string>
+  <string name="account_local_interface_label">Локальный интерфейс</string>
+  <string name="account_local_port_label">Локальный порт</string>
+  <string name="account_stun_enable_label">Использовать STUN</string>
+  <string name="account_stun_server_label">Сервер STUN</string>
   <string name="account_turn_enable_label">Использовать TURN</string>
+  <string name="account_turn_server_label">Сервер TURN</string>
+  <string name="account_turn_username_label">Имя пользователя</string>
+  <string name="account_turn_password_label">Пароль</string>
+  <string name="account_published_same_as_local_label">Опубликовать локально</string>
+  <string name="account_published_port_label">Публичный порт</string>
+  <string name="account_published_address_label">Публичный адрес</string>
   <!--Security Details-->
+  <string name="account_credentials_label">Учетные данные</string>
+  <string name="account_credentials_edit">Редактировать учетные данные</string>
+  <string name="account_credentials_add">Добавить учетные данные</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Безопасность</string>
+  <string name="account_srtp_deactivated">Дезактивирован</string>
   <!--SIP-->
   <!--TLS Details-->
+  <string name="account_tls_transport_switch_label">Использовать TLS</string>
+  <string name="account_tls_port_label">Порт для TLS</string>
+  <string name="account_tls_certificate_list_label">Сертифицирующая организация</string>
+  <string name="account_tls_certificate_file_label">Файл сертификата</string>
+  <string name="account_tls_private_key_file_label">Файл закрытого ключа</string>
+  <string name="account_tls_password_label">Пароль закрытого ключа</string>
+  <string name="account_tls_method_label">Метод TLS</string>
+  <string name="account_tls_ciphers_label">Шифры TLS</string>
+  <string name="account_tls_server_name_label">Имя сервера</string>
+  <string name="account_tls_verify_server_label">Проверка сервера</string>
+  <string name="account_tls_verify_client_label">Проверка клиента</string>
+  <string name="account_tls_negotiation_timeout_sec">Тайм-аут (сек)</string>
+  <string name="account_rtp_max_port">Максимум</string>
+  <string name="account_rtp_min_port">Минимум</string>
+  <string name="account_rtp_port_range">Диапазон портов RTP</string>
   <!--Import/export-->
+  <string name="account_export">Экспорт</string>
+  <string name="account_import_account">Импорт аккаунта</string>
+  <string name="account_export_title">Экспорт аккаунта</string>
+  <string name="account_import_title">Импорт аккаунтов</string>
+  <string name="account_import_explanation">Вы можете импортировать ранее экспортированные аккаунты.</string>
+  <string name="account_export_message">Сохранить настройки аккаунта и учетные данные, пароль в зашифрованном виде.</string>
+  <string name="account_export_new_password">Новый пароль</string>
+  <string name="account_export_confirm_password">Подтвердите пароль</string>
+  <string name="account_import_message">Введите пароль для расшифровки файла.</string>
+  <string name="account_import_decryption_password">Дешифрование паролья</string>
+  <string name="import_dialog_title">Импортирование</string>
+  <string name="import_export_wait">Пожалуйста, подождите...</string>
+  <string name="export_dialog_title">Экспорт аккаунта</string>
+  <string name="account_export_result">Аккаунт экспортируется в %1$s</string>
+  <string name="export_failed_dialog_title">Ошибка экспорта</string>
+  <string name="export_failed_dialog_msg">Произошла ошибка</string>
+  <string name="error_password_char_count">Минимум 6 символов</string>
+  <string name="error_passwords_not_equals">Пароли не совпадают</string>
+  <string name="import_failed_dialog_title">Ошибка импорта</string>
+  <string name="import_failed_dialog_msg">Произошла ошибка</string>
+  <string name="account_export_end_error_title">Ошибка</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_call.xml b/ring-android/app/src/main/res/values-ru-rRU/strings_call.xml
index 1bcf997..6b2b709 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings_call.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings_call.xml
@@ -21,6 +21,10 @@
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- SipCalls -->
+    <string name="call_human_state_incoming">Вызов</string>
+    <string name="call_human_state_connecting">Подключение</string>
+    <string name="call_human_state_ringing">звонящий</string>
     <string name="call_human_state_current">Говорить</string>
     <string name="call_human_state_hungup">Окончен</string>
     <string name="call_human_state_busy">Занят</string>
@@ -28,5 +32,8 @@
     <string name="call_human_state_hold">Удержать</string>
     <string name="call_human_state_unhold">Возврат</string>
     <string name="call_human_state_over">Окончен</string>
+    <string name="call_human_state_none">Никто</string>
     <string name="conference_human_state_hold">Удержать</string>
-    </resources>
\ No newline at end of file
+    <string name="conference_human_state_hold_rec">Удержать запись</string>
+    <string name="conference_human_state_default">Никто</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-ru/strings.xml b/ring-android/app/src/main/res/values-ru/strings.xml
index 26c6386..1e464f8 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="section_licence">Лицензия</string>
   <string name="version_section">Версия</string>
   <!--RingActivity-->
   <string name="title_section0">Набрать</string>
@@ -74,18 +75,26 @@
   <string name="ab_action_speakerphone">Включить громкоговоритель</string>
   <string name="ab_action_contact_add">Добавить в контакты</string>
   <string name="ab_action_audio_call">Голосовой вызов</string>
+  <string name="ab_action_video_call">Видео звонок</string>
   <string name="share_via">Отправить с помощью</string>
   <string name="write_a_message">Составить сообщение</string>
   <string name="scan_qr">Сканировать QR код</string>
   <string name="ab_action_flipcamera">Панель камеры</string>
   <!--Text messages-->
   <string name="send_message">Отправить сообщение</string>
+  <string name="message_sending">Отправка сообщения...</string>
   <!--MediaPreferenceFragment-->
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
   <!--Settings-->
+  <string name="clear_history_dialog_title">Очистить историю ?</string>
+  <string name="clear_history_completed">История была очищена.</string>
   <!--Conversation-->
   <string name="conversation_action_copy_peer_number">Копировать номер</string>
+  <string name="conversation_action_select_peer_number">Выбрать номер</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Добавить %1$s ?</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Неизвестно</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings_account.xml b/ring-android/app/src/main/res/values-ru/strings_account.xml
index 2373fcd..be5f397 100644
--- a/ring-android/app/src/main/res/values-ru/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_account.xml
@@ -72,4 +72,5 @@
   <string name="account_rtp_min_port">Минимум</string>
   <string name="account_rtp_port_range">Диапазон портов для RTP аудио</string>
   <!--Import/export-->
+  <string name="account_export_end_error_title">Ошибка</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings_call.xml b/ring-android/app/src/main/res/values-ru/strings_call.xml
index 4d32a88..8255326 100644
--- a/ring-android/app/src/main/res/values-ru/strings_call.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_call.xml
@@ -21,6 +21,10 @@
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- SipCalls -->
+    <string name="call_human_state_incoming">Звоним</string>
+    <string name="call_human_state_connecting">Подключение</string>
+    <string name="call_human_state_ringing">Вызов</string>
     <string name="call_human_state_current">Говорить</string>
     <string name="call_human_state_hungup">Окончен</string>
     <string name="call_human_state_busy">Занят</string>
diff --git a/ring-android/app/src/main/res/values-sl/strings.xml b/ring-android/app/src/main/res/values-sl/strings.xml
new file mode 100644
index 0000000..654414f
--- /dev/null
+++ b/ring-android/app/src/main/res/values-sl/strings.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="section_licence">Licenca</string>
+  <string name="sponsor_section">Ring je prosto programje, ki ga razvija in podpira</string>
+  <string name="copyright_section">Avtorske pravice</string>
+  <string name="contribute_section">Prispevaj</string>
+  <string name="version_section">Različica</string>
+  <!--RingActivity-->
+  <string name="title_activity_sflphone_home">Ring</string>
+  <!--AB menus-->
+  <!--Left Drawer-->
+  <!--Accessibility-->
+  <!--Sections-->
+  <!--Dialing Fragment-->
+  <!--History Fragment-->
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <!--ContactList Fragment-->
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <!--Notifications-->
+  <!--Call Fragment-->
+  <!--Text messages-->
+  <!--MediaPreferenceFragment-->
+  <!--Read contacts permission-->
+  <!--Write call log permission-->
+  <!--QRCode Scan-->
+  <!--Settings-->
+  <!--Conversation-->
+  <!--Contacts-->
+  <!--MenuHeaderView-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-sv/strings.xml b/ring-android/app/src/main/res/values-sv/strings.xml
index 1a5076b..9990efa 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -113,4 +113,7 @@
   <string name="conversation_action_select_peer_number">Välj ett nummer</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Vill du lägga till %1$s ?</string>
+  <string name="prompt_new_password">Nytt lösenord</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Okänd</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sv/strings_account.xml b/ring-android/app/src/main/res/values-sv/strings_account.xml
index 0f88f9e..1d4bed8 100644
--- a/ring-android/app/src/main/res/values-sv/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sv/strings_account.xml
@@ -111,4 +111,5 @@
   <string name="error_passwords_not_equals">Lösenorden stämmer inte</string>
   <string name="import_failed_dialog_title">Importen misslyckades</string>
   <string name="import_failed_dialog_msg">Et fel inträffade</string>
+  <string name="account_export_end_error_title">Fel</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-tr/strings.xml b/ring-android/app/src/main/res/values-tr/strings.xml
index 6b144ae..8ef2b3b 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="section_licence">Lisans</string>
+  <string name="sponsor_section">Ring bir özgür yazılımdır ve şunun tarafından desteklenir</string>
   <string name="copyright_section">Telif Hakkı</string>
   <string name="contribute_section">Katkı Yap</string>
   <string name="version_section">Sürüm</string>
@@ -10,6 +11,7 @@
   <string name="title_section0">Çevir</string>
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Ağ bağlantısı yok</string>
+  <string name="error_mobile_network_available_but_disabled">Lütfen ayarlar ekranında hücre ağına erişim verin.</string>
   <!--AB menus-->
   <string name="ab_account_creation">Yeni hesap</string>
   <string name="ab_account_edition_1">Sil</string>
@@ -62,9 +64,11 @@
   <!--Call Fragment-->
   <string name="me">Ben</string>
   <string name="you_txt_prefix">Sen:</string>
+  <string name="action_call_attended_transfer">katılınmış aktarma</string>
   <string name="action_call_conference">Toplantı</string>
   <string name="action_call_hangup">Kapat</string>
   <string name="action_settings">Ayarlar</string>
+  <string name="help_gestures">Bu görünüm arama sırasında çeşitli etkileşimlerle kullanıcılara yardım edecektir. Çeşitli eylemler şunlardır; Uzun basmak, sallamak, kaydırmak vb.</string>
   <string name="ongoing_call">Giden arama</string>
   <string name="hist_in_call">%1$s gelen arama</string>
   <string name="hist_out_call">%1$s giden arama</string>
@@ -74,7 +78,9 @@
   <string name="action_call_decline">Reddet</string>
   <string name="ab_action_speakerphone">Hoparlörü etkinleştir</string>
   <string name="ab_action_contact_add">Kişilere ekle</string>
+  <string name="ab_action_contact_add_question">Kişilere eklensin mi?</string>
   <string name="ab_action_audio_call">Sesli arama</string>
+  <string name="ab_action_video_call">Görüntülü arama</string>
   <string name="share_via">Paylaş</string>
   <string name="write_a_message">Bir ileti yaz</string>
   <string name="scan_qr">Kare Kod Tara</string>
@@ -83,18 +89,31 @@
   <string name="send_message">İleti gönder</string>
   <string name="message_sending">İleti gönderiliyor...</string>
   <string name="time_just_now">Şimdi</string>
+  <string name="permission_read_denied">Uygulamaya deponuzu okuma izni verilmedi. Bu yüzden düzgün işleyemez. Lütfen bu izni vermeyi göz ardı etmeyin.</string>
+  <string name="permission_write_denied">Uygulamaya deponuza yazma izni verilmedi. Bu yüzden düzgün işleyemez. Lütfen bu izni vermeyi göz ardı etmeyin.</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera izni</string>
+  <string name="permission_dialog_camera_message">Görüntülü görüşme için kamera çalıştırma izni gereklidir.Lütfen etkinleştirmeyi gözden kaçırmayın.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring bu özelliği etkinleştirmek için \"Kişileri okuma\" iznine gereksiniyor. Lütfen verin.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring bu özelliği etkinleştirmek için \"Çağrı kaydına yazma\" iznine gereksiniyor. Lütfen verin.</string>
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Eklemek istediğiniz hesabın QR kodunu tarayın.</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">Geçmişi temizle ?</string>
   <string name="clear_history_dialog_message">Bu eylem geri alınamaz.</string>
+  <string name="clear_history_completed">Geçmiş temizlenmiş</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Bu konuşmayı sil</string>
   <string name="conversation_action_delete_this_title">Bu konuşmayı sil ?</string>
   <string name="conversation_action_delete_this_message">Bu eylem geri alınamaz.</string>
   <string name="conversation_action_copy_peer_number">Numarayı kopyala</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s panoya kopyalandı</string>
+  <string name="conversation_action_select_peer_number">Bir numara seçin</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">%1$s eklensin mi ?</string>
+  <string name="prompt_new_password">Yeni parola</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Bilinmeyen</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-tr/strings_account.xml b/ring-android/app/src/main/res/values-tr/strings_account.xml
index 441219a..c6c1cd7 100644
--- a/ring-android/app/src/main/res/values-tr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-tr/strings_account.xml
@@ -10,6 +10,14 @@
   <string name="error_field_required">Bu alan gerekli</string>
   <string name="dialog_wait_create">Hesap ekleniyor</string>
   <string name="dialog_wait_create_details">Yeni hesabınız eklenirken lütfen bekleyin...</string>
+  <string name="dialog_warn_ip2ip_account_title">Boş SIP hesabı oluşturulsun mu?</string>
+  <string name="dialog_warn_ip2ip_account_message">Bir SIP hesabı oluşturabilmeniz için makine adınız geçersiz.
+Sadece ip çağrıları alabilirsiniz.
+Hesabınızı daha sonra düzenleyebilirsiniz</string>
+  <string-array name="accountType">
+    <item>RING</item>
+    <item>SIP</item>
+  </string-array>
   <string name="help_ring_title">Bir Ring hesabı oluştur</string>
   <string name="help_ring">Bir Ring hesabı bütünüyle dağıtık ağ üzerinden insanlara uçtan uca güvenle ulaşmanızı sağlar.</string>
   <string name="help_sip_title">SIP hesabınızı ekleyin</string>
@@ -33,6 +41,7 @@
   <string name="account_optionnal_category">İsteğe Bağlı Ayarlar</string>
   <string name="account_useragent_label">Kullanıcı Kimliği</string>
   <string name="account_autoanswer_label">Otomatik Cevapla</string>
+  <string name="account_upnp_label">UPnP\'yi etkinleştir</string>
   <string name="account_proxy_field">Vekil</string>
   <!--Audio Details-->
   <string name="account_audio_label">Ses</string>
@@ -58,6 +67,9 @@
   <string name="account_published_port_label">Yayınlanan Delik</string>
   <string name="account_published_address_label">Yayınlanan Yer</string>
   <!--Security Details-->
+  <string name="account_credentials_label">Kimlik Bilgileri</string>
+  <string name="account_credentials_edit">Kimlik bilgilerini düzenle</string>
+  <string name="account_credentials_add">Kimlik bilgisi ekle</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Güvenlik</string>
   <string name="account_srtp_deactivated">Devre dışı</string>
@@ -70,6 +82,7 @@
   <string name="account_tls_private_key_file_label">Özel Anahtar Dosyası</string>
   <string name="account_tls_password_label">Özel Anahtar Parolası</string>
   <string name="account_tls_method_label">TLS Yöntemi</string>
+  <string name="account_tls_ciphers_label">TLS Şifreleri</string>
   <string name="account_tls_server_name_label">Sunucu Adı</string>
   <string name="account_tls_verify_server_label">Sunucu Doğrula</string>
   <string name="account_tls_verify_client_label">İstemciyi Doğrula</string>
@@ -83,12 +96,20 @@
   <string name="account_export_title">Hesabı dışa aktar</string>
   <string name="account_import_title">Hesapları içe aktar</string>
   <string name="account_import_explanation">Daha önceden dışa aktarılan hesapları içe aktarabilirsiniz.</string>
+  <string name="account_export_message">Hesap ayarlarını ve kimlik bilgilerini parola ile şifrelenmiş olarak kaydet.</string>
+  <string name="account_export_new_password">Yeni parola</string>
+  <string name="account_export_confirm_password">Parolayı onayla</string>
+  <string name="account_import_message">Dosya şifresini çözmek için parolayı girin.</string>
+  <string name="account_import_decryption_password">Şifre çözme parolası</string>
   <string name="import_dialog_title">İçe aktarılıyor</string>
   <string name="import_export_wait">Lütfen bekleyin...</string>
   <string name="export_dialog_title">Hesap dışa aktarılıyor</string>
+  <string name="account_export_result">Hesap %1$s\'e aktarıldı</string>
   <string name="export_failed_dialog_title">Dışa aktarma başarısız</string>
   <string name="export_failed_dialog_msg">Bir hata oluştu</string>
   <string name="error_password_char_count">En az 6 harf</string>
+  <string name="error_passwords_not_equals">Parolalar eşleşmedi</string>
   <string name="import_failed_dialog_title">İçe aktarma başarısız</string>
   <string name="import_failed_dialog_msg">Bir hata oluştu</string>
+  <string name="account_export_end_error_title">Hata</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-tr/strings_call.xml b/ring-android/app/src/main/res/values-tr/strings_call.xml
index b66f304..63661d1 100644
--- a/ring-android/app/src/main/res/values-tr/strings_call.xml
+++ b/ring-android/app/src/main/res/values-tr/strings_call.xml
@@ -21,10 +21,24 @@
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- SipCalls -->
+    <string name="call_human_state_incoming">Çalıyor</string>
+    <string name="call_human_state_connecting">Bağlanılıyor</string>
     <string name="call_human_state_ringing">Aranıyor</string>
     <string name="call_human_state_current">Konuşuyor</string>
+    <string name="call_human_state_hungup">Bitti</string>
     <string name="call_human_state_busy">Meşgul</string>
     <string name="call_human_state_failure">Başarısız</string>
     <string name="call_human_state_hold">Beklet</string>
+    <string name="call_human_state_unhold">Bekletmeyi kaldır</string>
+    <string name="call_human_state_over">Bitti</string>
+    <string name="call_human_state_none">Hiçbiri</string>
+    <!-- Conferences -->
+    <string name="conference_human_state_active_attached">Eklenmiş etkin</string>
+    <string name="conference_human_state_active_detached">Ayrılmış etkin</string>
+    <string name="conference_human_state_active_attached_rec">Eklenmiş kayıt etkin</string>
+    <string name="conference_human_state_active_detached_rec">Ayrılmış kayıt etkin</string>
     <string name="conference_human_state_hold">Beklet</string>
-    </resources>
\ No newline at end of file
+    <string name="conference_human_state_hold_rec">Kayda ara ver</string>
+    <string name="conference_human_state_default">Hiçbiri</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-tr/strings_preferences.xml b/ring-android/app/src/main/res/values-tr/strings_preferences.xml
index fa480f9..8b74053 100644
--- a/ring-android/app/src/main/res/values-tr/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-tr/strings_preferences.xml
@@ -8,6 +8,8 @@
   <string name="pref_mobileData_summary">Ring\'i Wi-Fi\'ye ek olarak 3G/LTE ağlarında da çalıştır</string>
   <string name="pref_systemContacts_title">Düzen kişilerini kullan</string>
   <string name="pref_systemContacts_summary">Arayan detaylarını göstermek için düzen kişilerini kullan</string>
+  <string name="pref_systemDialer_title">Ring kullanarak sistem aramalarını yerleştirin.</string>
+  <string name="pref_systemDialer_summary">Mümkün olduğunda Sistem aramalarını yerleştirmek için Ring\'i kullanın.</string>
   <string name="pref_startOnBoot_title">Ring\'i başlangıçta çalıştır</string>
   <string name="pref_startOnBoot_summary">Düzen başladığında arka planda Ring\'i çalıştır.</string>
   <string name="pref_clearHistory_title">Geçmişi temizle</string>
diff --git a/ring-android/app/src/main/res/values-uk/strings.xml b/ring-android/app/src/main/res/values-uk/strings.xml
index 4155760..3a006ed 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -114,4 +114,7 @@
   <string name="conversation_action_select_peer_number">Виберіть номер</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Додати %1$s ?</string>
+  <string name="prompt_new_password">Новий пароль</string>
+  <!--MenuHeaderView-->
+  <string name="unknown">Невідомий</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-uk/strings_account.xml b/ring-android/app/src/main/res/values-uk/strings_account.xml
index a92f246..afc3fe7 100644
--- a/ring-android/app/src/main/res/values-uk/strings_account.xml
+++ b/ring-android/app/src/main/res/values-uk/strings_account.xml
@@ -111,4 +111,5 @@
   <string name="error_passwords_not_equals">Паролі не збігаються</string>
   <string name="import_failed_dialog_title">Невдалий імпорт</string>
   <string name="import_failed_dialog_msg">Виникла помилка</string>
+  <string name="account_export_end_error_title">Помилка</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings.xml b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
index d810732..c0a0bd2 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
@@ -28,4 +28,5 @@
   <!--Settings-->
   <!--Conversation-->
   <!--Contacts-->
+  <!--MenuHeaderView-->
 </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 c85a3d4..eb0d3ae 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
@@ -86,4 +86,6 @@
   <string name="conversation_action_select_peer_number">選擇號碼</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">加入 %1$s 嗎？</string>
+  <string name="prompt_new_password">新密碼</string>
+  <!--MenuHeaderView-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh/strings.xml b/ring-android/app/src/main/res/values-zh/strings.xml
index 620b8fc..ba4e7f2 100644
--- a/ring-android/app/src/main/res/values-zh/strings.xml
+++ b/ring-android/app/src/main/res/values-zh/strings.xml
@@ -31,4 +31,6 @@
   <!--Conversation-->
   <string name="conversation_action_copy_peer_number">複製號碼</string>
   <!--Contacts-->
+  <!--MenuHeaderView-->
+  <string name="unknown">未知</string>
 </resources>