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 a88ec01..28cbb9d 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
@@ -3,34 +3,108 @@
   <string name="version_section">Verze</string>
   <!--RingActivity-->
   <string name="title_section0">Vytočit</string>
-  <string name="title_activity_sflphone_home">Kruh</string>
+  <string name="title_activity_sflphone_home">Ring</string>
+  <string name="error_no_network">Chybí připojení</string>
   <!--AB menus-->
   <string name="ab_account_creation">Nový účet</string>
-  <string name="ab_account_edition_1">Zmazat</string>
+  <string name="ab_account_edition_1">Odstranit</string>
+  <string name="ab_action_chat">Textové zprávy</string>
   <!--Left Drawer-->
   <!--Accessibility-->
+  <string name="drawer_open">Otevřít navigační šuplík</string>
+  <string name="drawer_close">Zavřít navigační šuplík</string>
   <!--Sections-->
+  <string name="menu_item_home">Domov</string>
+  <string name="menu_item_accounts">Spravovat účty</string>
   <string name="menu_item_settings">Nastavení</string>
+  <string name="menu_item_about">O Ring</string>
   <!--Dialing Fragment-->
-  <string name="dial_action_call">Hoover</string>
+  <string name="dial_action_call">Volat</string>
+  <string name="dial_number">Vytočit číslo</string>
+  <string name="dial_hint">Vložte telefonní číslo</string>
   <!--History Fragment-->
+  <string name="hist_replay_button">Znovu přehrát</string>
+  <string name="hist_replay_button_stop">Stop</string>
+  <string name="hist_no_history">Žádná historie</string>
   <!--DetailsHistory Fragment-->
+  <string name="detail_hist_call_number">Volat %1$s</string>
   <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="one">%d Konverzace</item>
+    <item quantity="few">%d Konverzace</item>
+    <item quantity="other">%d Konverzací</item>
+  </plurals>
+  <string name="home_transfering">Přesměrování %1$s na %1$s</string>
+  <string name="home_transfer_complet">Přesměrování hotovo</string>
   <!--ContactList Fragment-->
+  <string name="no_contact_found">Nenalezen žádný kontakt</string>
+  <string name="starred_contacts_title">Oblíbené</string>
+  <string name="searchbar_hint">Vložte jméno nebo číslo…</string>
+  <string name="choose_number">Vyberte číslo</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
+  <string name="transfer_to_another_call">Přesměrovat na čekající hovor:</string>
+  <string name="transfer_no_other_call">Žádné čekající hovory</string>
+  <string name="transfer_type_number">Vložte číslo na které chcete hovor přesměrovat:</string>
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">Zmeškaný hovor od %1$s</string>
+  <string name="notif_missed_outgoing_call">Zmeškaný hovor pro %1$s</string>
+  <string name="notif_incoming_call_title">Příchozí hovor od %1$s</string>
+  <string name="notif_incoming_call">Příchozí hovor</string>
+  <string name="notif_outgoing_call_title">Odchozí hovor to %1$s</string>
+  <string name="notif_outgoing_call">Odchozí hovor</string>
+  <string name="notif_current_call_title">Současný hovor s %1$s</string>
+  <string name="notif_current_call">Současný hovor</string>
   <!--Call Fragment-->
   <string name="me">Já</string>
+  <string name="you_txt_prefix">Vy:</string>
+  <string name="action_call_attended_transfer">Přesměrování na Čekající Hovor</string>
   <string name="action_call_conference">Konference</string>
+  <string name="action_call_hangup">Zavěsit</string>
   <string name="action_settings">Nastavení</string>
+  <string name="help_gestures"> Tento pohled pomůže uživatelům s různými činnostmi během hovorů. Různé činnosti budou popsány; Dlouhé podržení, posouvání, atd.</string>
+  <string name="ongoing_call">Probíhající hovor</string>
+  <string name="hist_in_call">Příchozí hovor %1$s</string>
+  <string name="hist_out_call">Odchozí hovor %1$s</string>
+  <string name="start_error_title">Nelze spustit Ring !</string>
+  <string name="start_error_mic_required">Ring ke své funkci vyžaduje povolení k mikrofonu.</string>
+  <string name="action_call_accept">Přijmout</string>
+  <string name="action_call_decline">Odmítnout</string>
+  <string name="ab_action_speakerphone">Zapnout reproduktor</string>
+  <string name="ab_action_contact_add">Přidat do kontaktů</string>
+  <string name="ab_action_contact_add_question">Přidat do kontaktů ?</string>
+  <string name="ab_action_audio_call">Audio hovor</string>
+  <string name="ab_action_video_call">Video hovor</string>
+  <string name="share_via">Sdílet přes</string>
+  <string name="write_a_message">Napsat zprávu</string>
+  <string name="scan_qr">Skenovat QR Kód</string>
+  <string name="ab_action_flipcamera">Otočit kameru</string>
   <!--Text messages-->
+  <string name="send_message">Odeslat zprávu</string>
+  <string name="message_sending">Odesílám zprávu…</string>
+  <string name="time_just_now">Právě teď</string>
+  <string name="permission_read_denied">Aplikace nemohla číst z vašeho úložiště, takže nemůže správně fungovat. Prosím zvažte poskytnutí jí tohoto povolení</string>
+  <string name="permission_write_denied">Aplikace nemohla zapisovat do vašeho úložiště, takže nemůže správně fungovat. Prosím zvažte poskytnutí jí tohoto povolení</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Povolení ke kameře</string>
+  <string name="permission_dialog_camera_message">Video konverzace vyžadují povolení ke kameře. Prosím zvažte jeho povolení.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring potřebuje povolení číst kontakty pro umožnění této vlastnosti. Prosím povolte jej.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring potřebuje povolení zapisovat do záznamu hovorů pro umožnění této vlastnosti. Prosím povolte jej.</string>
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Oskenujte QR Kód účtu, který chcete přidat.</string>
   <!--Settings-->
+  <string name="clear_history_dialog_title">Vymazat historii ?</string>
+  <string name="clear_history_dialog_message">Tuto činnost nelze vrátit zpět.</string>
+  <string name="clear_history_completed">Historie byla vymazána.</string>
   <!--Conversation-->
-  <string name="conversation_action_copy_peer_number">Zkopírovat číslo</string>
+  <string name="conversation_action_delete_this">Odstranit tuto konverzaci</string>
+  <string name="conversation_action_delete_this_title">Odstranit tuto konverzaci ?</string>
+  <string name="conversation_action_delete_this_message">Tuto činnost nelze vrátit zpět.</string>
+  <string name="conversation_action_copy_peer_number">Kopírovat číslo</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s zkopírováno do schránky</string>
+  <string name="conversation_action_select_peer_number">Vyberte číslo</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Přidat %1$s ?</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 3706512..a24c96a 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
@@ -5,27 +5,110 @@
   <string name="prompt_hostname">Hostitelské jméno</string>
   <string name="prompt_username">Uživatelské jméno</string>
   <string name="prompt_password">Heslo</string>
+  <string name="action_create">Přidat účet</string>
+  <string name="action_create_short">Zaregistrovat</string>
+  <string name="error_field_required">Toto pole je vyžadováno</string>
+  <string name="dialog_wait_create">Přidávám účet</string>
+  <string name="dialog_wait_create_details">Prosím vyčkejte, než bude váš účet přidán…</string>
+  <string name="dialog_warn_ip2ip_account_title">Vytvořit prázdný účet SIP ?</string>
+  <string name="dialog_warn_ip2ip_account_message">Vytváříte prázdný účet SIP bez platného hostitelského jména.
+        Budete moci pouze vytvářet a přijímat přímé ip hovory.
+        Svůj účet můžete upravit později</string>
+  <string-array name="accountType">
+    <item>RING</item>
+    <item>SIP</item>
+    <item>IAX</item>
+  </string-array>
+  <string name="help_ring_title">Vytvořit účet Ring</string>
+  <string name="help_ring">Účet Ring vám umožňuje spojit se s lidmi bezpečně, uživatel s uživatelem, skrze plně decentralizovanou síť.</string>
+  <string name="help_sip_title">Přidat váš účet SIP.</string>
+  <string name="help_sip">Nastavit existující účet SIP.</string>
+  <string name="create_sip_account">Přidat</string>
+  <string name="share_number">Sdílet číslo</string>
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">Odstranit účet ?</string>
+  <string name="account_delete_dialog_message">Tuto činnost nelze vrátit zpět. Poked jste tak ještě neučinili, měli byste zvážit export vašeho účtu, než ho odstraníte.</string>
   <!--AccountManagementFragment-->
+  <string name="empty_account_list">Žádný registrovaný účet</string>
+  <string name="normal_accounts_titles">Účty</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Obecné</string>
+  <string name="account_basic_category">Základní Nastavení</string>
+  <string name="account_alias_label">Název účtu</string>
   <string name="account_hostname_label">Hostitelské jméno</string>
+  <string name="account_bootstrap_label">Zavaděč</string>
   <string name="account_username_label">Uživatelské jméno</string>
   <string name="account_password_label">Heslo</string>
+  <string name="account_optionnal_category">Doplňková Nastavení</string>
+  <string name="account_useragent_label">Klientská Aplikace</string>
+  <string name="account_autoanswer_label">Automatická Odpověď</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
   <string name="account_audio_label">Zvuk</string>
+  <string name="account_preferences_media_tab">Multimédia</string>
+  <string name="account_ringtone_label">Vyzvánění</string>
+  <string name="account_ringtone_enabled_label">Zapnout vyzvánění</string>
+  <string name="account_ringtone_path_label">Cesta vyzvánění</string>
   <!--Video Details-->
   <string name="account_video_label">Obraz</string>
-  <string name="account_video_enable">Povolit obraz</string>
+  <string name="account_video_enable">Povolit Obraz</string>
   <!--Advanced Details-->
-  <string name="account_preferences_advanced_tab">Pokročilé</string>
+  <string name="account_preferences_advanced_tab">Pokročilá</string>
+  <string name="account_registration_exp_label">Vypršení Registrace</string>
+  <string name="account_local_interface_label">Místní Rozhraní</string>
+  <string name="account_local_port_label">Místní Port</string>
+  <string name="account_stun_enable_label">Použít Stun</string>
+  <string name="account_stun_server_label">Server Stun</string>
   <string name="account_turn_enable_label">Použít TURN</string>
+  <string name="account_turn_server_label">Server TURN</string>
+  <string name="account_turn_username_label">Uživatelské jméno TURN</string>
+  <string name="account_turn_password_label">Heslo TURN</string>
+  <string name="account_published_same_as_local_label">Zveřejněné stejně jako místní</string>
+  <string name="account_published_port_label">Zveřejněný Port</string>
+  <string name="account_published_address_label">Zveřejněná Adresa</string>
   <!--Security Details-->
+  <string name="account_credentials_label">Ověřovací Údaje</string>
+  <string name="account_credentials_edit">Upravit ověřovací údaje</string>
+  <string name="account_credentials_add">Přidat ověřovací údaje</string>
   <!--SRTP Details-->
-  <string name="account_preferences_security_tab">Zabezpečení</string>
+  <string name="account_preferences_security_tab">Bezpečnost</string>
+  <string name="account_srtp_deactivated">Vypnuto</string>
   <!--SIP-->
   <!--TLS Details-->
-  <string name="account_rtp_port_range">Rozsah portů pro zvuk RTP</string>
+  <string name="account_tls_transport_switch_label">Použít Transport TLS</string>
+  <string name="account_tls_port_label">Naslouchací Port TLS</string>
+  <string name="account_tls_certificate_list_label">Autority Certifikátů</string>
+  <string name="account_tls_certificate_file_label">Soubor Certifikátu</string>
+  <string name="account_tls_private_key_file_label">Soubor Osobního Klíče</string>
+  <string name="account_tls_password_label">Heslo Osobního Klíče</string>
+  <string name="account_tls_method_label">Metoda TLS</string>
+  <string name="account_tls_ciphers_label">Šifry TLS</string>
+  <string name="account_tls_server_name_label">Jméno Serveru</string>
+  <string name="account_tls_verify_server_label">Ověřit Server</string>
+  <string name="account_tls_verify_client_label">Ověrit Klient</string>
+  <string name="account_tls_negotiation_timeout_sec">Vypršení Vyjednávání (sek)</string>
+  <string name="account_rtp_max_port">Maximum</string>
+  <string name="account_rtp_min_port">Minimum</string>
+  <string name="account_rtp_port_range">Rozsah Portů Zvukového RTP</string>
   <!--Import/export-->
+  <string name="account_export">Export</string>
+  <string name="account_import_account">Importovat účet</string>
+  <string name="account_export_title">Exportovat účet</string>
+  <string name="account_import_title">Importovat účty</string>
+  <string name="account_import_explanation">Můžete importovat dříve exportované účty.</string>
+  <string name="account_export_message">Uložit nastavení a ověřovací údaje účtu, heslo zašifrované.</string>
+  <string name="account_export_new_password">Nové heslo</string>
+  <string name="account_export_confirm_password">Potvrdit heslo</string>
+  <string name="account_import_message">Vložte heslo pro dešifrování souboru.</string>
+  <string name="account_import_decryption_password">Heslo dešifrování</string>
+  <string name="import_dialog_title">Importuji</string>
+  <string name="import_export_wait">Please vyčkejte…</string>
+  <string name="export_dialog_title">Exportuji účet</string>
+  <string name="account_export_result">Účet exportován do %1$s</string>
+  <string name="export_failed_dialog_title">Export selhal</string>
+  <string name="export_failed_dialog_msg">Nastala chyba</string>
+  <string name="error_password_char_count">Minimálně 6 znaků</string>
+  <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>
 </resources>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_call.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_call.xml
index 2750811..44f9706 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings_call.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_call.xml
@@ -21,6 +21,9 @@
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- SipCalls -->
+    <string name="call_human_state_incoming">Vyzvánění</string>
+    <string name="call_human_state_ringing">Volání</string>
     <string name="call_human_state_current">Probíhá hovor</string>
     <string name="call_human_state_hungup">Hovor skončil</string>
     <string name="call_human_state_busy">Zaneprázdněn</string>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_content_description.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_content_description.xml
new file mode 100644
index 0000000..a506d20
--- /dev/null
+++ b/ring-android/app/src/main/res/values-cs-rCZ/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">Rychlý Hovor</string>
+  <string name="contact_picture_description">Obrázek Kontaktu</string>
+  <string name="dial_numeric_pad">Číselná klávesnice</string>
+  <string name="dial_alphabetic_pad">Abecední klávesnice</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml
index f7161b9..d99036b 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml
@@ -1,4 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="pref_category_network">Síť</string>
   <string name="pref_category_contacts">Kontakty</string>
+  <string name="pref_category_system">Systém</string>
+  <string name="pref_category_privacy">Soukromí</string>
+  <string name="pref_mobileData_title">Mobilní data</string>
+  <string name="pref_mobileData_summary">Povolit Ring na 3G/LTE sítích dodatečně k WiFi</string>
+  <string name="pref_systemContacts_title">Použít systémové kontakty</string>
+  <string name="pref_systemContacts_summary">Použít systémové kontakty pro zobrazení údajů volajícího.</string>
+  <string name="pref_systemDialer_title">Vykonávat systémové hovory skrze Ring</string>
+  <string name="pref_systemDialer_summary">Použít Ring k vykonání systémových hovorů, kdy to bude možné.</string>
+  <string name="pref_startOnBoot_title">Spustit Ring po zapnutí</string>
+  <string name="pref_startOnBoot_summary">Spustit Ring v pozadí systému po jeho nastartování.</string>
+  <string name="pref_clearHistory_title">Vymazat historii</string>
+  <string name="pref_clearHistory_summary">Vymaže celou historii konverzací. Tuto činnost nelze vrátit zpět.</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 e8cdaff..47a83bc 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
@@ -11,6 +11,7 @@
   <string name="title_section0">Indtast</string>
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Ingen netværksforbindelse</string>
+  <string name="error_mobile_network_available_but_disabled">Venligst tillad adgang til telefon netværk under Indstillinger.</string>
   <!--AB menus-->
   <string name="ab_account_creation">Ny konto</string>
   <string name="ab_account_edition_1">Slet</string>
@@ -107,6 +108,9 @@
   <string name="conversation_action_delete_this">Slet denne samtale</string>
   <string name="conversation_action_delete_this_title">Slet denne samtale?</string>
   <string name="conversation_action_delete_this_message">Denne handling kan ikke fortrydes.</string>
+  <string name="conversation_action_copy_peer_number">Kopier nummer</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s kopieret til udklipsholder</string>
+  <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>
 </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 23aa4e6..d277d37 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
@@ -10,6 +10,14 @@
   <string name="error_field_required">Dette felt er obligatorisk</string>
   <string name="dialog_wait_create">Tilføjer konto</string>
   <string name="dialog_wait_create_details">Vent venligst mens din nye konto tilføjes...</string>
+  <string name="dialog_warn_ip2ip_account_title">Opret tom SIP konto ?</string>
+  <string name="dialog_warn_ip2ip_account_message">Du er ved at oprette en SIP konto uden et gyldigt værtsnavn.
+Du vil kun kunne foretage eller modtage direkte IP opkald.
+Du kan rette din konto senere</string>
+  <string-array name="accountType">
+    <item>RING</item>
+    <item>SIP</item>
+  </string-array>
   <string name="help_ring_title">Opret en Ring-konto</string>
   <string name="help_ring">En Ring-konto gør dig i stand til at kontakte andre sikkert og direkte uden mellemmand gennem et fuldt distribueret netværk.</string>
   <string name="help_sip_title">Tilføj din SIP-konto</string>
@@ -17,7 +25,7 @@
   <string name="create_sip_account">Tilføj</string>
   <string name="share_number">Del nummer</string>
   <!--Strings related to account deletion-->
-  <string name="account_delete_dialog_title">Slet konto</string>
+  <string name="account_delete_dialog_title">Slet konto ?</string>
   <string name="account_delete_dialog_message">Dette kan ikke fortrydes. Hvis du ikke har gjort det endnu, bør du overveje at eksportere din konto før du sletter den.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Ingen konto registreret</string>
@@ -33,6 +41,7 @@
   <string name="account_optionnal_category">Valgfrie Indstillinger</string>
   <string name="account_useragent_label">Brugerklient</string>
   <string name="account_autoanswer_label">Svar Opkald Automatisk</string>
+  <string name="account_upnp_label">Aktivér UPnP</string>
   <string name="account_proxy_field">Stedfortræder</string>
   <!--Audio Details-->
   <string name="account_audio_label">Lyd</string>
diff --git a/ring-android/app/src/main/res/values-da-rDK/strings_call.xml b/ring-android/app/src/main/res/values-da-rDK/strings_call.xml
index 017fdf9..4f0bdcd 100644
--- a/ring-android/app/src/main/res/values-da-rDK/strings_call.xml
+++ b/ring-android/app/src/main/res/values-da-rDK/strings_call.xml
@@ -23,6 +23,7 @@
 <resources>
     <!-- SipCalls -->
     <string name="call_human_state_incoming">Ringer</string>
+    <string name="call_human_state_connecting">Forbinder</string>
     <string name="call_human_state_ringing">Ringer op</string>
     <string name="call_human_state_current">Taler</string>
     <string name="call_human_state_hungup">Ovre</string>
@@ -31,5 +32,13 @@
     <string name="call_human_state_hold">Parkeret</string>
     <string name="call_human_state_unhold">Uparker</string>
     <string name="call_human_state_over">Ovre</string>
+    <string name="call_human_state_none">Ingen</string>
+    <!-- Conferences -->
+    <string name="conference_human_state_active_attached">Aktiv tilføjet</string>
+    <string name="conference_human_state_active_detached">Aktiv frakoblet</string>
+    <string name="conference_human_state_active_attached_rec">Aktive tilføjet optag</string>
+    <string name="conference_human_state_active_detached_rec">Aktiv frakoblet optag</string>
     <string name="conference_human_state_hold">Parkeret</string>
-    </resources>
\ No newline at end of file
+    <string name="conference_human_state_hold_rec">Pause optag</string>
+    <string name="conference_human_state_default">Ingen</string>
+</resources>
\ No newline at end of file
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
new file mode 100644
index 0000000..c71a555
--- /dev/null
+++ b/ring-android/app/src/main/res/values-de-rDE/strings.xml
@@ -0,0 +1,90 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="section_licence">Lizenz</string>
+  <string name="copyright_section">Copyright</string>
+  <string name="contribute_section">Mitwirken</string>
+  <string name="version_section">Version</string>
+  <string name="email_chooser_title">Senden von E-Mails über...</string>
+  <!--RingActivity-->
+  <string name="title_section0">Wählen</string>
+  <string name="title_activity_sflphone_home">Ring</string>
+  <string name="error_no_network">Keine Netzwerkkonnektivität</string>
+  <!--AB menus-->
+  <string name="ab_account_creation">Neues Konto</string>
+  <string name="ab_account_edition_1">Löschen</string>
+  <string name="ab_action_chat">Textnachrichten</string>
+  <!--Left Drawer-->
+  <!--Accessibility-->
+  <!--Sections-->
+  <string name="menu_item_home">Home</string>
+  <string name="menu_item_accounts">Konten verwalten</string>
+  <string name="menu_item_settings">Einstellungen</string>
+  <string name="menu_item_about">Über Ring</string>
+  <!--Dialing Fragment-->
+  <string name="dial_action_call">Anrufen</string>
+  <string name="dial_number">Nummer wählen</string>
+  <string name="dial_hint">Geben Sie die Telefonnummer ein</string>
+  <!--History Fragment-->
+  <string name="hist_replay_button">Wiedergeben</string>
+  <string name="hist_replay_button_stop">Beenden</string>
+  <string name="hist_no_history">Kein Verlauf</string>
+  <!--DetailsHistory Fragment-->
+  <string name="detail_hist_call_number">%1$s anrufen</string>
+  <!--Home Fragment-->
+  <string name="home_transfering">%1$s werden an %1$s übertragen</string>
+  <string name="home_transfer_complet">Übertragung abgeschlossen</string>
+  <!--ContactList Fragment-->
+  <string name="no_contact_found">Es wurde kein Kontakt gefunden</string>
+  <string name="starred_contacts_title">Favoriten</string>
+  <string name="searchbar_hint">Namen oder Telefonnummer eingeben</string>
+  <string name="choose_number">Nummer auswählen</string>
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <!--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>
+  <string name="notif_incoming_call_title">Eingehender Anruf von %1$s</string>
+  <string name="notif_incoming_call">Eingehender Anruf</string>
+  <string name="notif_outgoing_call_title">Ausgehende Anruf zu %1$s</string>
+  <string name="notif_outgoing_call">Ausgehende Anruf</string>
+  <string name="notif_current_call_title">Aktueller Anruf mit %1$s</string>
+  <string name="notif_current_call">Aktueller Anruf</string>
+  <!--Call Fragment-->
+  <string name="me">Ich</string>
+  <string name="you_txt_prefix">Sie:</string>
+  <string name="action_call_conference">Konferenz</string>
+  <string name="action_call_hangup">Auflegen</string>
+  <string name="action_settings">Einstellungen</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="action_call_accept">Abnehmen</string>
+  <string name="action_call_decline">Ablehnen</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>
+  <!--Text messages-->
+  <string name="send_message">Nachricht senden</string>
+  <string name="message_sending">Nachricht senden</string>
+  <string name="time_just_now">Vorhin</string>
+  <!--MediaPreferenceFragment-->
+  <!--Read contacts permission-->
+  <!--Write call log permission-->
+  <!--QRCode Scan-->
+  <!--Settings-->
+  <string name="clear_history_dialog_title">Verlauf löschen?</string>
+  <string name="clear_history_dialog_message">Diese Aktion kann nicht rückgängig gemacht werden.</string>
+  <string name="clear_history_completed">Verlauf wurde gelöscht.</string>
+  <!--Conversation-->
+  <string name="conversation_action_delete_this">Diese Unterhaltung löschen</string>
+  <string name="conversation_action_delete_this_title">Löschen diese Unterhaltung?</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 wurde in die Zwischenablage kopiert.</string>
+  <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>
+</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
new file mode 100644
index 0000000..0a374d8
--- /dev/null
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
@@ -0,0 +1,91 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account creation-->
+  <string name="prompt_alias">Alias</string>
+  <string name="prompt_hostname">Hostname</string>
+  <string name="prompt_username">Benutzername</string>
+  <string name="prompt_password">Kennwort</string>
+  <string name="action_create">Konto hinzufügen</string>
+  <string name="action_create_short">Registrieren</string>
+  <string name="error_field_required">Dieses Feld ist erforderlich</string>
+  <string name="dialog_wait_create">Konto wird hinzugefügt</string>
+  <string-array name="accountType">
+    <item>RING</item>
+    <item>SIP</item>
+  </string-array>
+  <string name="help_ring_title">Erstellen einen Ring Konto</string>
+  <string name="help_sip_title">Fügen Sie Ihre SIP-Account</string>
+  <string name="create_sip_account">Hinzufügen</string>
+  <string name="share_number">Telefonnummer teilen</string>
+  <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">Konto löschen?</string>
+  <!--AccountManagementFragment-->
+  <string name="normal_accounts_titles">Kontos</string>
+  <!--Basic Details-->
+  <string name="account_preferences_basic_tab">Allgemein</string>
+  <string name="account_basic_category">Grundeinstellungen</string>
+  <string name="account_alias_label">Kontoname</string>
+  <string name="account_hostname_label">Hostname</string>
+  <string name="account_bootstrap_label">Bootstrap</string>
+  <string name="account_username_label">Benutzername</string>
+  <string name="account_password_label">Kennwort</string>
+  <string name="account_optionnal_category">Optionale Einstellungen</string>
+  <string name="account_useragent_label">Benutzer-Agent</string>
+  <string name="account_autoanswer_label">Automatische Anrufannahme</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>
+  <string name="account_preferences_media_tab">Media</string>
+  <string name="account_ringtone_label">Klingeltöne</string>
+  <string name="account_ringtone_enabled_label">Klingeltöne aktivieren</string>
+  <!--Video Details-->
+  <string name="account_video_label">Video</string>
+  <string name="account_video_enable">Video aktivieren</string>
+  <!--Advanced Details-->
+  <string name="account_preferences_advanced_tab">Erweitert</string>
+  <string name="account_local_interface_label">Lokale Schnittstelle</string>
+  <string name="account_local_port_label">Lokaler Port</string>
+  <string name="account_stun_enable_label">STUN benutzen</string>
+  <string name="account_stun_server_label">STUN-Server</string>
+  <string name="account_turn_enable_label">TURN benutzen</string>
+  <string name="account_turn_server_label">TURN-Server</string>
+  <string name="account_turn_username_label">TURN-Benutzername</string>
+  <string name="account_turn_password_label">TURN-Kennwort</string>
+  <!--Security Details-->
+  <string name="account_credentials_label">Anmeldeinformationen</string>
+  <string name="account_credentials_edit">Anmeldeinformationen bearbeiten</string>
+  <string name="account_credentials_add">Anmeldeinformationen hinzufügen</string>
+  <!--SRTP Details-->
+  <string name="account_preferences_security_tab">Sicherheit</string>
+  <string name="account_srtp_deactivated">Deaktiviert</string>
+  <!--SIP-->
+  <!--TLS Details-->
+  <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">Datei des privaten Schlüssels</string>
+  <string name="account_tls_password_label">Kennwort für privaten Schlüssel</string>
+  <string name="account_tls_server_name_label">Servername</string>
+  <string name="account_tls_verify_server_label">Server überprüfen</string>
+  <string name="account_tls_verify_client_label">Client überprüfen</string>
+  <string name="account_rtp_max_port">Maximum</string>
+  <string name="account_rtp_min_port">Minimum</string>
+  <!--Import/export-->
+  <string name="account_export">Exportieren</string>
+  <string name="account_import_account">Importieren ein Konto</string>
+  <string name="account_export_title">Exportieren ein Konto</string>
+  <string name="account_import_title">Kontos importieren</string>
+  <string name="account_export_new_password">Neues Kennwort</string>
+  <string name="account_export_confirm_password">Konto bestätigen</string>
+  <string name="account_import_decryption_password">Entschlüsselungskennwort</string>
+  <string name="import_dialog_title">Importieren</string>
+  <string name="import_export_wait">Bitte warten...</string>
+  <string name="export_dialog_title">Konto wird exportiert</string>
+  <string name="account_export_result">Konto nach %1$s exportiert</string>
+  <string name="export_failed_dialog_title">Fehler beim Exportieren</string>
+  <string name="export_failed_dialog_msg">Fehler aufgetreten</string>
+  <string name="error_password_char_count">Mindestens 6 Zeichen</string>
+  <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>
+</resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_call.xml b/ring-android/app/src/main/res/values-de-rDE/strings_call.xml
new file mode 100644
index 0000000..1afc233
--- /dev/null
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_call.xml
@@ -0,0 +1,39 @@
+<?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>
+    <!-- SipCalls -->
+    <string name="call_human_state_incoming">Läuten</string>
+    <string name="call_human_state_connecting">Verbinden</string>
+    <string name="call_human_state_ringing">Rufen an</string>
+    <string name="call_human_state_current">Sprechen</string>
+    <string name="call_human_state_hungup">Vorbei</string>
+    <string name="call_human_state_busy">Besetzt</string>
+    <string name="call_human_state_failure">Fehlgeschlagen</string>
+    <string name="call_human_state_hold">In die Warteschleife schalten</string>
+    <string name="call_human_state_unhold">Gespräch fortsetzen</string>
+    <string name="call_human_state_over">Vorbei</string>
+    <string name="call_human_state_none">Keine</string>
+    <string name="conference_human_state_hold">In die Warteschleife schalten</string>
+    <string name="conference_human_state_hold_rec">Drücken Sie REC</string>
+    <string name="conference_human_state_default">Keine</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_content_description.xml b/ring-android/app/src/main/res/values-de-rDE/strings_content_description.xml
new file mode 100644
index 0000000..32f0d3b
--- /dev/null
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_content_description.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings for xml content description of images-->
+  <string name="contact_quick_call_description">Kurzer Anruf</string>
+  <string name="contact_picture_description">Kontaktbild</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml b/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
new file mode 100644
index 0000000..ab85ea6
--- /dev/null
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="pref_category_network">Netzwerk</string>
+  <string name="pref_category_contacts">Kontakte</string>
+  <string name="pref_category_system">System</string>
+  <string name="pref_category_privacy">Datenschutz</string>
+  <string name="pref_mobileData_title">Mobile-Daten</string>
+  <string name="pref_clearHistory_title">Verlauf löschen</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-el/strings.xml b/ring-android/app/src/main/res/values-el/strings.xml
index 3bc0c38..f35a5f0 100644
--- a/ring-android/app/src/main/res/values-el/strings.xml
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="section_licence"> Άδεια</string>
+  <string name="sponsor_section">Το Ring είναι δωρεάν/ελεύθερο λογισμικό αναπτυγμένο και υποστηριζόμενο από</string>
+  <string name="copyright_section">Πνευματική ιδιοκτησία</string>
   <!--RingActivity-->
   <!--AB menus-->
   <!--Left Drawer-->
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 2372982..1354d1d 100644
--- a/ring-android/app/src/main/res/values-eo/strings.xml
+++ b/ring-android/app/src/main/res/values-eo/strings.xml
@@ -2,42 +2,108 @@
 <resources>
   <string name="version_section">Eldono</string>
   <!--RingActivity-->
+  <string name="title_section0">Diski</string>
   <string name="title_activity_sflphone_home">Ring</string>
+  <string name="error_no_network">Sen reta konekto</string>
   <!--AB menus-->
   <string name="ab_account_creation">Nova konto</string>
+  <string name="ab_account_edition_1">Forigi</string>
+  <string name="ab_action_chat">Text messaging</string>
   <!--Left Drawer-->
   <!--Accessibility-->
+  <string name="drawer_open">Malfermu navigan tirkeston</string>
+  <string name="drawer_close">Fermu navigan tirkeston</string>
   <!--Sections-->
   <string name="menu_item_home">Hejmo</string>
+  <string name="menu_item_accounts">Administri kontojn</string>
   <string name="menu_item_settings">Agordoj</string>
   <string name="menu_item_about">Pri Ring</string>
   <!--Dialing Fragment-->
-  <string name="dial_action_call">Voki</string>
-  <string name="dial_hint">Tajpu telefonnumeron</string>
+  <string name="dial_action_call">Voko</string>
+  <string name="dial_number">Diski numeron</string>
+  <string name="dial_hint">Entajpu telefonnumeron</string>
   <!--History Fragment-->
-  <string name="hist_no_history">Neniu historio</string>
+  <string name="hist_replay_button">Reludi</string>
+  <string name="hist_replay_button_stop">Stopi</string>
+  <string name="hist_no_history">Sen historio</string>
   <!--DetailsHistory Fragment-->
+  <string name="detail_hist_call_number">Voki %1$s</string>
   <!--Home Fragment-->
-  <string name="home_transfer_complet">Transmeto kompleta</string>
+  <plurals name="home_conferences_title">
+    <item quantity="one">%d Konversacio</item>
+    <item quantity="other">%d Konversacioj</item>
+  </plurals>
+  <string name="home_transfering">Transiganta %1$s al %1$s</string>
+  <string name="home_transfer_complet">Transigo finita</string>
   <!--ContactList Fragment-->
+  <string name="no_contact_found">Neniu kontakto trovita</string>
+  <string name="starred_contacts_title">Favorataj</string>
+  <string name="searchbar_hint">Entajpu nomon aŭ telefonnumeron…</string>
+  <string name="choose_number">Elektu numeron</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
+  <string name="transfer_to_another_call">Transigu al alian vokon:</string>
+  <string name="transfer_no_other_call">Sen aliaj vokoj</string>
+  <string name="transfer_type_number">Entajpu numeron por transigi al:</string>
   <!--Notifications-->
-  <string name="notif_incoming_call">Envena alvoko</string>
+  <string name="notif_missed_incoming_call">Maltrafita voko de %1$s</string>
+  <string name="notif_missed_outgoing_call">Maltrafita voko al %1$s</string>
+  <string name="notif_incoming_call_title">Eniranta voko de %1$s</string>
+  <string name="notif_incoming_call">Eniranta voko</string>
+  <string name="notif_outgoing_call_title">Eliranta voko al %1$s</string>
+  <string name="notif_outgoing_call">Eliranta voko</string>
+  <string name="notif_current_call_title">Aktiva voko kun %1$s</string>
+  <string name="notif_current_call">Aktiva voko</string>
   <!--Call Fragment-->
   <string name="me">Mi</string>
   <string name="you_txt_prefix">Vi:</string>
+  <string name="action_call_attended_transfer">Attended Transfer</string>
   <string name="action_call_conference">Konferenco</string>
+  <string name="action_call_hangup">Fini vokon</string>
   <string name="action_settings">Agordoj</string>
+  <string name="help_gestures"> Tiu ĉi vido helpos al uzantoj kun diversaj interagoj dum vokoj. Diversaj agoj priskribatos; Long press, fling, swype etc.</string>
+  <string name="ongoing_call">Aktiva voko</string>
+  <string name="hist_in_call">Eniranta voko de %1$s</string>
+  <string name="hist_out_call">Eliranta voko de %1$s</string>
+  <string name="start_error_title">Ne povas lanĉi Ring !</string>
+  <string name="start_error_mic_required">Ring bezonas permeson je mikrofono por funkcii.</string>
+  <string name="action_call_accept">Akcepti</string>
+  <string name="action_call_decline">Rifuzi</string>
+  <string name="ab_action_speakerphone">Ŝalti laŭtparolilon</string>
   <string name="ab_action_contact_add">Aldoni al kontaktoj</string>
+  <string name="ab_action_contact_add_question">Ĉu aldoni al kontaktoj ?</string>
+  <string name="ab_action_audio_call">Sona voko</string>
+  <string name="ab_action_video_call">Videa voko</string>
+  <string name="share_via">Kunhavi per</string>
+  <string name="write_a_message">Skribi mesaĝon</string>
+  <string name="scan_qr">Skani QR Kodon</string>
+  <string name="ab_action_flipcamera">Renversi kameraon</string>
   <!--Text messages-->
   <string name="send_message">Sendi mesaĝon</string>
+  <string name="message_sending">Sendanta mesaĝon…</string>
+  <string name="time_just_now">Ĵus</string>
+  <string name="permission_read_denied">La aplikaĵo ne permesatis legi vian konservadon. Tial, ĝi ne funkcias ĝuste. Bonvole pripensu permesi ĝin</string>
+  <string name="permission_write_denied">La aplikaĵo ne permesatis skribi en vian konservadon. Tial, ĝi ne funkcias ĝuste. Bonvole pripensu permesi ĝin</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Permeso je kamerao</string>
+  <string name="permission_dialog_camera_message">Video-konversacioj bezonas permeson je kamerao por funkcii. Bonvole pripensu permesi ĝin.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring bezonas la \"Legu kontaktojn\" permeson por ŝalti tiu ĉi funkcion. Bonvole permesu ĝin.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring bezonas la \"Skribu protokolon de vokoj\" permeson por ŝalti tiu ĉi funkcion. Bonvole permesu ĝin.</string>
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Skanu la QR Kodon de la konto, kiun vi volas aldoni.</string>
   <!--Settings-->
+  <string name="clear_history_dialog_title">Ĉu vakigi historion ?</string>
+  <string name="clear_history_dialog_message">Tiu ĉi ago ne povos malfariĝî.</string>
+  <string name="clear_history_completed">Historio vakigita.</string>
   <!--Conversation-->
+  <string name="conversation_action_delete_this">Forigi tiu ĉi konversacion</string>
+  <string name="conversation_action_delete_this_title">Ĉu forigi tiu ĉi konversacion ?</string>
+  <string name="conversation_action_delete_this_message">Tiu ĉi ago ne povos malfariĝi.</string>
   <string name="conversation_action_copy_peer_number">Kopii numeron</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s kopiita en tondejon</string>
+  <string name="conversation_action_select_peer_number">Elektu numeron</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Ĉu aldoni %1$s ?</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 b90b261..e3dc9aa 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
@@ -5,33 +5,110 @@
   <string name="prompt_hostname">Nomo de gastiga komputilo</string>
   <string name="prompt_username">Uzantnomo</string>
   <string name="prompt_password">Pasvorto</string>
+  <string name="action_create">Aldoni konton</string>
+  <string name="action_create_short">Registri</string>
+  <string name="error_field_required">Tiu ĉi kampo bezonatas.</string>
+  <string name="dialog_wait_create">Aldonanta konton</string>
+  <string name="dialog_wait_create_details">Bonvole atendu dum via konto aldonatas…</string>
+  <string name="dialog_warn_ip2ip_account_title">Ĉu krei malplenan SIP konton ?</string>
+  <string name="dialog_warn_ip2ip_account_message">Vi kreontas novan SIP konton sen valida nomo de gastiga komputilo.
+        Vi nur eblos fari kaj ricevi senperajn ip vokojn.
+        Vi povas redakti vian konton poste</string>
+  <string-array name="accountType">
+    <item>RING</item>
+    <item>SIP</item>
+    <item>IAX</item>
+  </string-array>
+  <string name="help_ring_title">Krei Ring konton</string>
+  <string name="help_ring">Ring konto ebligas al vi kontakti homojn sekure en plene disa samtavola reto.</string>
+  <string name="help_sip_title">Aldoni vian SIP konton</string>
+  <string name="help_sip">Agordi ekzistantan SIP konton.</string>
   <string name="create_sip_account">Aldoni</string>
+  <string name="share_number">Kunhavi numeron</string>
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">Ĉu forigi konton ?</string>
+  <string name="account_delete_dialog_message">Tiu ĉi ago ne povos malfariĝi. Se vi ne faris ĝin jam, eble pripensu elporti vian konton antaŭ forigi ĝin.</string>
   <!--AccountManagementFragment-->
+  <string name="empty_account_list">Sen registrita konto</string>
   <string name="normal_accounts_titles">Kontoj</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Ĝenerala</string>
   <string name="account_basic_category">Bazaj Agordoj</string>
+  <string name="account_alias_label">Nomo de konto</string>
   <string name="account_hostname_label">Nomo de gastiga komputilo</string>
   <string name="account_bootstrap_label">Praŝarĝo</string>
   <string name="account_username_label">Uzantnomo</string>
   <string name="account_password_label">Pasvorto</string>
   <string name="account_optionnal_category">Malnepraj Agordoj</string>
-  <string name="account_proxy_field">Prokura servilo</string>
+  <string name="account_useragent_label">Klienta Aplikaĵo</string>
+  <string name="account_autoanswer_label">Aŭtomata Respondo</string>
+  <string name="account_proxy_field">Prokura Servilo</string>
   <!--Audio Details-->
   <string name="account_audio_label">Aŭdio</string>
-  <string name="account_preferences_media_tab">Aŭdvidaĵo</string>
+  <string name="account_preferences_media_tab">Aŭdvidaĵoj</string>
+  <string name="account_ringtone_label">Vokosonoj</string>
+  <string name="account_ringtone_enabled_label">Aktivigi vokosonojn</string>
+  <string name="account_ringtone_path_label">Vokosona dosierindiko</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
-  <string name="account_video_enable">Ŝalti videon</string>
+  <string name="account_video_enable">Ŝalti Videon</string>
   <!--Advanced Details-->
-  <string name="account_preferences_advanced_tab">Speciala</string>
+  <string name="account_preferences_advanced_tab">Specialaj</string>
+  <string name="account_registration_exp_label">Datlimo de registrado</string>
+  <string name="account_local_interface_label">Loka Interfaco</string>
+  <string name="account_local_port_label">Loka Pordo</string>
+  <string name="account_stun_enable_label">Uzi Stun</string>
+  <string name="account_stun_server_label">Stun Servilo</string>
   <string name="account_turn_enable_label">Uzi TURN</string>
+  <string name="account_turn_server_label">TURN servilo</string>
+  <string name="account_turn_username_label">TURN uzantnomo</string>
+  <string name="account_turn_password_label">TURN pasvorto</string>
+  <string name="account_published_same_as_local_label">Publikita same kiel local</string>
+  <string name="account_published_port_label">Publikito Pordo</string>
+  <string name="account_published_address_label">Publikita Adreso</string>
   <!--Security Details-->
+  <string name="account_credentials_label">Ensalutiloj</string>
+  <string name="account_credentials_edit">Redakti ensalutilojn</string>
+  <string name="account_credentials_add">Aldoni ensalutilojn</string>
   <!--SRTP Details-->
-  <string name="account_preferences_security_tab">Sekurigo</string>
+  <string name="account_preferences_security_tab">Sekuro</string>
+  <string name="account_srtp_deactivated">Malŝaltita</string>
   <!--SIP-->
   <!--TLS Details-->
-  <string name="account_rtp_port_range">Porda amplekso de aŭdia RTP</string>
+  <string name="account_tls_transport_switch_label">Uzi TLS Transporton</string>
+  <string name="account_tls_port_label">TLS Aŭdanta Pordo</string>
+  <string name="account_tls_certificate_list_label">Aŭtoritatoj de Atestado</string>
+  <string name="account_tls_certificate_file_label">Dosiero de Atestilo</string>
+  <string name="account_tls_private_key_file_label">Dosiero de Privata Ŝlosilo</string>
+  <string name="account_tls_password_label">Pasvorto de Privata Ŝlosilo</string>
+  <string name="account_tls_method_label">TLS Metodo</string>
+  <string name="account_tls_ciphers_label">TLS Ĉifroj</string>
+  <string name="account_tls_server_name_label">Nomo de Servilo</string>
+  <string name="account_tls_verify_server_label">Kontroli Servilon</string>
+  <string name="account_tls_verify_client_label">Kontroli Klienton</string>
+  <string name="account_tls_negotiation_timeout_sec">Tempolimo de Intertraktado (sek)</string>
+  <string name="account_rtp_max_port">Maksimumo</string>
+  <string name="account_rtp_min_port">Minimumo</string>
+  <string name="account_rtp_port_range">Intervalo de Aŭdia RTP</string>
   <!--Import/export-->
+  <string name="account_export">Elporti</string>
+  <string name="account_import_account">Enporti konton</string>
+  <string name="account_export_title">Elporti konton</string>
+  <string name="account_import_title">Enporti kontojn</string>
+  <string name="account_import_explanation">Vi povas enporti elportitajn kontojn.</string>
+  <string name="account_export_message">Savi agordojn kaj ensalutilojn de konto, pasvorto ĉifrita.</string>
+  <string name="account_export_new_password">Nova pasvorto</string>
+  <string name="account_export_confirm_password">Konfirmu pasvorton</string>
+  <string name="account_import_message">Entajpu pasvorton por malĉifri la dosieron.</string>
+  <string name="account_import_decryption_password">Malĉifra pasvorto</string>
+  <string name="import_dialog_title">Enportanta</string>
+  <string name="import_export_wait">Bonvole atendu…</string>
+  <string name="export_dialog_title">Elportanta konton</string>
+  <string name="account_export_result">Konto elportita al %1$s</string>
+  <string name="export_failed_dialog_title">Elporto fiaskis</string>
+  <string name="export_failed_dialog_msg">Eraro okazis</string>
+  <string name="error_password_char_count">6 signoj minimume</string>
+  <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>
 </resources>
diff --git a/ring-android/app/src/main/res/values-eo/strings_call.xml b/ring-android/app/src/main/res/values-eo/strings_call.xml
index fa76223..204113d 100644
--- a/ring-android/app/src/main/res/values-eo/strings_call.xml
+++ b/ring-android/app/src/main/res/values-eo/strings_call.xml
@@ -21,6 +21,9 @@
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- SipCalls -->
+    <string name="call_human_state_incoming">Sonoriĝanta</string>
+    <string name="call_human_state_ringing">Sonoriganta</string>
     <string name="call_human_state_current">Parolanta</string>
     <string name="call_human_state_hungup">Finita</string>
     <string name="call_human_state_busy">Okupata</string>
diff --git a/ring-android/app/src/main/res/values-eo/strings_content_description.xml b/ring-android/app/src/main/res/values-eo/strings_content_description.xml
index 97e7cd8..605270a 100644
--- a/ring-android/app/src/main/res/values-eo/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-eo/strings_content_description.xml
@@ -1,4 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings for xml content description of images-->
+  <string name="contact_quick_call_description">Rapida Voko</string>
+  <string name="contact_picture_description">Kontakta Bildo</string>
+  <string name="dial_numeric_pad">Ciferilo</string>
+  <string name="dial_alphabetic_pad">Alfabeta Ciferilo</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-eo/strings_preferences.xml b/ring-android/app/src/main/res/values-eo/strings_preferences.xml
index ea27b6f..55861eb 100644
--- a/ring-android/app/src/main/res/values-eo/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-eo/strings_preferences.xml
@@ -1,5 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="pref_category_network">Reto</string>
   <string name="pref_category_contacts">Kontaktoj</string>
   <string name="pref_category_system">Sistemo</string>
+  <string name="pref_category_privacy">Privacy</string>
+  <string name="pref_mobileData_title">Porteblaj datumoj</string>
+  <string name="pref_mobileData_summary">Permesi Ring sur 3G/LTE retoj aldone al Wi-Fi</string>
+  <string name="pref_systemContacts_title">Uzi sistemajn kontaktojn</string>
+  <string name="pref_systemContacts_summary">Uzi sistemajn kontaktojn por montri detalojn de la vokanto.</string>
+  <string name="pref_systemDialer_title">Fari sistemajn vokojn per Ring</string>
+  <string name="pref_systemDialer_summary">Uzi Ring por fari sistemajn vokojn kiam tio eblas.</string>
+  <string name="pref_startOnBoot_title">Lanĉi Ring je startigo</string>
+  <string name="pref_startOnBoot_summary">Lanĉi Ring fone when kiam la sistemo startas.</string>
+  <string name="pref_clearHistory_title">Vakigi historion</string>
+  <string name="pref_clearHistory_summary">Vakigi la tutan historion de konversacioj. Tia ĉi ago ne povos malfariĝi.</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 f448f22..087053a 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -1,31 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="section_licence">Licencia</string>
-  <string name="sponsor_section">Ring es software libre desarrollado y mantenido por</string>
-  <string name="copyright_section">Derechos de autor</string>
+  <string name="sponsor_section">Ring es un software libre desarrollado y mantenido por</string>
+  <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Contribuir</string>
   <string name="version_section">Versión</string>
-  <string name="no_email_app_installed">No se ha encontrado ninguna aplicación de correo, por favor instale una para enviarnos el informe</string>
+  <string name="no_email_app_installed">No se ha encontrado ninguna aplicación de correo. Instala una para enviarnos el informe</string>
   <string name="email_chooser_title">Enviar correo usando...</string>
   <!--RingActivity-->
   <string name="title_section0">Marcar</string>
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Sin conexión a la red</string>
+  <string name="error_mobile_network_available_but_disabled">Permite el acceso a la red móvil en el menú de configuración.</string>
   <!--AB menus-->
-  <string name="ab_account_creation">Nueva cuenta</string>
+  <string name="ab_account_creation">Cuenta nueva</string>
   <string name="ab_account_edition_1">Borrar</string>
   <string name="ab_action_chat">Mensaje de texto</string>
   <!--Left Drawer-->
   <!--Accessibility-->
-  <string name="drawer_open">Abrir cajón de navegación</string>
-  <string name="drawer_close">Cerrar cajón de navegación</string>
+  <string name="drawer_open">Abrir menú lateral</string>
+  <string name="drawer_close">Cerrar menú lateral</string>
   <!--Sections-->
   <string name="menu_item_home">Inicio</string>
   <string name="menu_item_accounts">Administrar cuentas</string>
   <string name="menu_item_settings">Configuración</string>
   <string name="menu_item_about">Acerca de Ring</string>
   <!--Dialing Fragment-->
-  <string name="dial_action_call">Llamada</string>
+  <string name="dial_action_call">Llamar</string>
   <string name="dial_number">Marcar un Número</string>
   <string name="dial_hint">Escribir un número de teléfono</string>
   <!--History Fragment-->
@@ -33,27 +34,27 @@
   <string name="hist_replay_button_stop">Parar</string>
   <string name="hist_no_history">No hay historial</string>
   <!--DetailsHistory Fragment-->
-  <string name="detail_hist_call_number">Llamada %1$s</string>
+  <string name="detail_hist_call_number">Llamar a %1$s</string>
   <!--Home Fragment-->
   <plurals name="home_conferences_title">
     <item quantity="one">%d Conversacion</item>
-    <item quantity="other">%d Conversaciones</item>
+    <item quantity="other">Conversaciones: %d</item>
   </plurals>
   <string name="home_transfering">Transfiriendo %1$s a %1$s</string>
-  <string name="home_transfer_complet">Transferencia realizada</string>
+  <string name="home_transfer_complet">Transferencia completada</string>
   <!--ContactList Fragment-->
   <string name="no_contact_found">No se ha encontrado el contacto</string>
   <string name="starred_contacts_title">Favoritos</string>
-  <string name="searchbar_hint">Ingresa nombre o número telefonico</string>
+  <string name="searchbar_hint">Introduce nombre o número de teléfono...</string>
   <string name="choose_number">Escoge un número</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
-  <string name="transfer_to_another_call">Transferir llamada actual</string>
+  <string name="transfer_to_another_call">Transferir a otra llamada en curso:</string>
   <string name="transfer_no_other_call">No hay llamadas pendientes</string>
-  <string name="transfer_type_number">Escribir el número para transferir</string>
+  <string name="transfer_type_number">Escribe el número al que transferir:</string>
   <!--Notifications-->
   <string name="notif_missed_incoming_call">Llamada perdida de %1$s</string>
-  <string name="notif_missed_outgoing_call">Llamada perdida de %1$s</string>
+  <string name="notif_missed_outgoing_call">Llamada perdida a %1$s</string>
   <string name="notif_incoming_call_title">Llamada entrante de %1$s</string>
   <string name="notif_incoming_call">Llamada entrante</string>
   <string name="notif_outgoing_call_title">Llamando a %1$s</string>
@@ -65,38 +66,38 @@
   <string name="you_txt_prefix">Tú:</string>
   <string name="action_call_attended_transfer">Transferencia atendida</string>
   <string name="action_call_conference">Conferencia</string>
-  <string name="action_call_hangup">Cortar</string>
+  <string name="action_call_hangup">Colgar</string>
   <string name="action_settings">Configuración</string>
-  <string name="help_gestures">Esta vista ayuda a los usuarios con diferentes interacciones durante las llamadas. Las diferentes acciones serán descritas: Pulsación larga, fling, swype...</string>
+  <string name="help_gestures">Esta vista ayuda a los usuarios con diferentes interacciones durante las llamadas. Las diferentes acciones se describen a continuación: pulsación larga, función fling y swype del teclado...</string>
   <string name="ongoing_call">Llamada en curso</string>
   <string name="hist_in_call">Llamada entrante de %1$s</string>
   <string name="hist_out_call">Llamada saliente a %1$s</string>
-  <string name="start_error_title">¡Ring no puede arrancar!</string>
-  <string name="start_error_mic_required">Ring necesita el permiso de acceso al micro para funcionar.</string>
-  <string name="action_call_accept">Tomar llamada</string>
-  <string name="action_call_decline">Declinar</string>
+  <string name="start_error_title">Ring no puede iniciarse</string>
+  <string name="start_error_mic_required">Ring necesita permiso de acceso al micro para funcionar.</string>
+  <string name="action_call_accept">Contestar a la llamada</string>
+  <string name="action_call_decline">Rechazar</string>
   <string name="ab_action_speakerphone">Activar el altavoz</string>
-  <string name="ab_action_contact_add">Agregar a contactos</string>
+  <string name="ab_action_contact_add">Añadir a contactos</string>
   <string name="ab_action_contact_add_question">¿Añadir a contactos?</string>
   <string name="ab_action_audio_call">Llamada de voz</string>
   <string name="ab_action_video_call">Videollamada</string>
   <string name="share_via">Compatir via</string>
   <string name="write_a_message">Escribir un mensaje</string>
-  <string name="scan_qr">Leer Codigo de Lectura Rapida</string>
-  <string name="ab_action_flipcamera">Cambiar de camara</string>
+  <string name="scan_qr">Escanear código QR</string>
+  <string name="ab_action_flipcamera">Cambiar de cámara</string>
   <!--Text messages-->
   <string name="send_message">Enviar mensaje</string>
   <string name="message_sending">Enviando mensaje...</string>
-  <string name="time_just_now">Justo ahora</string>
-  <string name="permission_read_denied">La aplicación no tiene permiso para leer sus archivos. Por esto no puede funcionar como debería. Por favor considere darle los permisos necesarios</string>
-  <string name="permission_write_denied">La aplicación no tiene permiso para modificar sus archivos. Por esto no puede funcionar como debería. Por favor considere darle los permisos necesarios</string>
+  <string name="time_just_now">En este momento</string>
+  <string name="permission_read_denied">La aplicación no puede funcionar correctamente porque tiene permiso para leer tus archivos. Considera darle los permisos necesarios</string>
+  <string name="permission_write_denied">La aplicación no puede funcionar correctamente porque no tiene permiso para modificar tus archivos. Considera otorgarle los permisos necesarios</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permiso de cámara</string>
-  <string name="permission_dialog_camera_message">Las conversaciones con vídeo requieren el permiso de utilizar la cámara para funcionar. Por favor considere concederlo.</string>
+  <string name="permission_dialog_camera_message">Las conversaciones con vídeo requieren utilizar la cámara. Considera conceder este permiso.</string>
   <!--Read contacts permission-->
-  <string name="permission_dialog_read_contacts_message">Ring necesita el permiso de \"Leer los contactos\" para habilitar esta funcionalidad. Por favor conceda este permiso.</string>
+  <string name="permission_dialog_read_contacts_message">Ring necesita permiso para leer los contactos. Por favor, concede este permiso.</string>
   <!--Write call log permission-->
-  <string name="permission_dialog_write_call_log_message">Ring necesita el permiso de \"Escribir en el registro de llamadas\" para habilitar esta funcionalidad. Por favor conceda este permiso.</string>
+  <string name="permission_dialog_write_call_log_message">Ring necesita permiso para escribir en el registro de llamadas. Por favor, concede este permiso.</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Escanear el código QR de la cuenta que quieres añadir.</string>
   <!--Settings-->
@@ -107,7 +108,9 @@
   <string name="conversation_action_delete_this">Borrar esta conversación</string>
   <string name="conversation_action_delete_this_title">¿Borrar esta conversación?</string>
   <string name="conversation_action_delete_this_message">Esta acción no puede deshacerse.</string>
-  <string name="conversation_action_copy_peer_number">Copiar Número</string>
+  <string name="conversation_action_copy_peer_number">Copiar número</string>
+  <string name="conversation_action_copied_peer_number_clipboard">Se ha copiado %1$s al portapapeles</string>
+  <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>
 </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 c27337b..00c6902 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
@@ -5,14 +5,22 @@
   <string name="prompt_hostname">Nombre del host</string>
   <string name="prompt_username">Nombre de usuario</string>
   <string name="prompt_password">Contraseña</string>
-  <string name="action_create">Agregar Cuenta</string>
+  <string name="action_create">Agregar cuenta</string>
   <string name="action_create_short">Registrar</string>
   <string name="error_field_required">Este campo es obligatorio</string>
-  <string name="dialog_wait_create">Agregando Cuenta</string>
-  <string name="dialog_wait_create_details">Por favor espere mientras su nueva cuenta es agregada</string>
+  <string name="dialog_wait_create">Agregando cuenta</string>
+  <string name="dialog_wait_create_details">Espera mientras se agrega tu nueva cuenta</string>
+  <string name="dialog_warn_ip2ip_account_title">¿Crear nueva cuenta SIP?</string>
+  <string name="dialog_warn_ip2ip_account_message">Estás a punto de crear una cuenta SIP con un nombre de host inválido.
+Solo podrás realizar y recibir llamadas directas a la IP.
+Puedes editar tu cuenta luego</string>
+  <string-array name="accountType">
+    <item>RING</item>
+    <item>SIP</item>
+  </string-array>
   <string name="help_ring_title">Crear una cuenta en Ring</string>
-  <string name="help_ring">Una cuenta en Ring le permite comunicarse con gente de forma segura a través de una red P2P completamente distribuida.</string>
-  <string name="help_sip_title">Añadir su cuenta SIP</string>
+  <string name="help_ring">Una cuenta en Ring te permite comunicarte con gente de forma segura a través de una red P2P completamente distribuida.</string>
+  <string name="help_sip_title">Añadir tu cuenta SIP</string>
   <string name="help_sip">Configurar una cuenta SIP existente</string>
   <string name="create_sip_account">Agregar</string>
   <string name="share_number">Compartir número</string>
@@ -24,15 +32,16 @@
   <string name="normal_accounts_titles">Cuentas</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">General</string>
-  <string name="account_basic_category">Configuraciones Básicas</string>
-  <string name="account_alias_label">Nombre de la Cuenta</string>
+  <string name="account_basic_category">Ajustes básicos</string>
+  <string name="account_alias_label">Nombre de la cuenta</string>
   <string name="account_hostname_label">Nombre del host</string>
   <string name="account_bootstrap_label">Cargador de inicio</string>
   <string name="account_username_label">Nombre de usuario</string>
   <string name="account_password_label">Contraseña</string>
-  <string name="account_optionnal_category">Configuraciones Opcionales</string>
+  <string name="account_optionnal_category">Configuración opcional</string>
   <string name="account_useragent_label">Agente de usuario</string>
   <string name="account_autoanswer_label">Respuesta automática</string>
+  <string name="account_upnp_label">Activar UPnP</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
   <string name="account_audio_label">Audio</string>
@@ -45,61 +54,61 @@
   <string name="account_video_enable">Habilitar vídeo</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Avanzado</string>
-  <string name="account_registration_exp_label">Expiración del Registro</string>
-  <string name="account_local_interface_label">Interface Local</string>
-  <string name="account_local_port_label">Puerto Local</string>
-  <string name="account_stun_enable_label">Usar Stun</string>
+  <string name="account_registration_exp_label">Expiración del registro</string>
+  <string name="account_local_interface_label">Interfaz local</string>
+  <string name="account_local_port_label">Puerto local</string>
+  <string name="account_stun_enable_label">Usar STUN</string>
   <string name="account_stun_server_label">Servidor STUN</string>
-  <string name="account_turn_enable_label">Utilizar TURN</string>
+  <string name="account_turn_enable_label">Usar TURN</string>
   <string name="account_turn_server_label">Servidor TURN</string>
   <string name="account_turn_username_label">Nombre de usuario en TURN</string>
   <string name="account_turn_password_label">Contraseña TURN</string>
   <string name="account_published_same_as_local_label">Publicar el mismo como local</string>
-  <string name="account_published_port_label">Puerto Publicado</string>
-  <string name="account_published_address_label">Dirección IP Publicada</string>
+  <string name="account_published_port_label">Puerto publicado</string>
+  <string name="account_published_address_label">Dirección IP publicada</string>
   <!--Security Details-->
   <string name="account_credentials_label">Credenciales</string>
-  <string name="account_credentials_edit">Edite las credenciales</string>
+  <string name="account_credentials_edit">Editar credenciales</string>
   <string name="account_credentials_add">Agregar credenciales</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Seguridad</string>
   <string name="account_srtp_deactivated">Desactivado</string>
   <!--SIP-->
   <!--TLS Details-->
-  <string name="account_tls_transport_switch_label">Usar Transporte TLS</string>
-  <string name="account_tls_port_label">TLS Puerto de escucha</string>
-  <string name="account_tls_certificate_list_label">Autoridades de Certificación</string>
-  <string name="account_tls_certificate_file_label">Archivo de Certificación</string>
-  <string name="account_tls_private_key_file_label">Archivo de Llave Privada</string>
+  <string name="account_tls_transport_switch_label">Usar protocolo TLS</string>
+  <string name="account_tls_port_label">Puerto de escucha TLS</string>
+  <string name="account_tls_certificate_list_label">Autoridades de certificación</string>
+  <string name="account_tls_certificate_file_label">Archivo de certificado</string>
+  <string name="account_tls_private_key_file_label">Archivo de clave privada</string>
   <string name="account_tls_password_label">Contraseña de clave privada</string>
   <string name="account_tls_method_label">Método TLS</string>
-  <string name="account_tls_ciphers_label">TLS Cifrados</string>
-  <string name="account_tls_server_name_label">Nombre del Servidor</string>
+  <string name="account_tls_ciphers_label">Cifrados TLS</string>
+  <string name="account_tls_server_name_label">Nombre del servidor</string>
   <string name="account_tls_verify_server_label">Verificar el servidor</string>
-  <string name="account_tls_verify_client_label">Verificar</string>
+  <string name="account_tls_verify_client_label">Verificar cliente</string>
   <string name="account_tls_negotiation_timeout_sec">Tiempo de espera de negociación (seg)</string>
   <string name="account_rtp_max_port">Máximo</string>
   <string name="account_rtp_min_port">Mínimo</string>
-  <string name="account_rtp_port_range">Rango de Puertos RTP</string>
+  <string name="account_rtp_port_range">Intervalo de puertos de audio RTP</string>
   <!--Import/export-->
   <string name="account_export">Exportar</string>
   <string name="account_import_account">Importar una cuenta</string>
   <string name="account_export_title">Exportar una cuenta</string>
   <string name="account_import_title">Importar cuentas</string>
-  <string name="account_import_explanation">Puede importar cuentas exportadas previamente.</string>
+  <string name="account_import_explanation">Puedes importar cuentas exportadas previamente.</string>
   <string name="account_export_message">Guardar configuración y credenciales de la cuenta, contraseña cifrada.</string>
   <string name="account_export_new_password">Contraseña nueva</string>
   <string name="account_export_confirm_password">Confirmar contraseña</string>
-  <string name="account_import_message">Introduzca la contraseña para descifrar el archivo.</string>
+  <string name="account_import_message">Introduce la contraseña para descifrar el archivo.</string>
   <string name="account_import_decryption_password">Contraseña de descifrado</string>
   <string name="import_dialog_title">Importando</string>
-  <string name="import_export_wait">Por favor espere...</string>
+  <string name="import_export_wait">Por favor, espera...</string>
   <string name="export_dialog_title">Exportando cuenta</string>
   <string name="account_export_result">Cuenta exportada a %1$s</string>
-  <string name="export_failed_dialog_title">Fallo en la exportación</string>
+  <string name="export_failed_dialog_title">Error de exportación</string>
   <string name="export_failed_dialog_msg">Ha ocurrido un error</string>
   <string name="error_password_char_count">6 caracteres mínimo</string>
   <string name="error_passwords_not_equals">Las contraseñas no coinciden</string>
-  <string name="import_failed_dialog_title">La importación falló</string>
+  <string name="import_failed_dialog_title">Error de importación</string>
   <string name="import_failed_dialog_msg">Ha ocurrido un error</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-es/strings_call.xml b/ring-android/app/src/main/res/values-es/strings_call.xml
index 0459c03..eb729f7 100644
--- a/ring-android/app/src/main/res/values-es/strings_call.xml
+++ b/ring-android/app/src/main/res/values-es/strings_call.xml
@@ -23,6 +23,7 @@
 <resources>
     <!-- SipCalls -->
     <string name="call_human_state_incoming">Sonando</string>
+    <string name="call_human_state_connecting">Conectando</string>
     <string name="call_human_state_ringing">Llamando</string>
     <string name="call_human_state_current">Hablando</string>
     <string name="call_human_state_hungup">Terminado</string>
@@ -31,5 +32,13 @@
     <string name="call_human_state_hold">Espera</string>
     <string name="call_human_state_unhold">Reanudar</string>
     <string name="call_human_state_over">Terminado</string>
+    <string name="call_human_state_none">Nada</string>
+    <!-- Conferences -->
+    <string name="conference_human_state_active_attached">Conexión activa</string>
+    <string name="conference_human_state_active_detached">Conexión activa desconectada</string>
+    <string name="conference_human_state_active_attached_rec">Conexión activa grabar</string>
+    <string name="conference_human_state_active_detached_rec">Conexión activa desconectada grabar</string>
     <string name="conference_human_state_hold">Espera</string>
-    </resources>
\ No newline at end of file
+    <string name="conference_human_state_hold_rec">Pulsar REC</string>
+    <string name="conference_human_state_default">Nada</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-es/strings_content_description.xml b/ring-android/app/src/main/res/values-es/strings_content_description.xml
index d17b988..9409200 100644
--- a/ring-android/app/src/main/res/values-es/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-es/strings_content_description.xml
@@ -2,7 +2,7 @@
 <resources>
   <!--Strings for xml content description of images-->
   <string name="contact_quick_call_description">Llamada rápida</string>
-  <string name="contact_picture_description">Foto del Contacto</string>
+  <string name="contact_picture_description">Foto del contacto</string>
   <string name="dial_numeric_pad">Teclado numérico</string>
-  <string name="dial_alphabetic_pad">Teclado Alfabético</string>
+  <string name="dial_alphabetic_pad">Teclado alfabético</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 bd85e10..373da8e 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -9,25 +9,108 @@
   <string name="email_chooser_title">Lähetä sähköpostia käyttäen...</string>
   <!--RingActivity-->
   <string name="title_section0">Numeristo</string>
+  <string name="title_activity_sflphone_home">Ring</string>
+  <string name="error_no_network">Ei verkkoyhteyttä</string>
+  <string name="error_mobile_network_available_but_disabled">Anna lupa muuttaa verkkoasetuksia asetusruudussa</string>
   <!--AB menus-->
+  <string name="ab_account_creation">Uusi tunnus</string>
+  <string name="ab_account_edition_1">Poista</string>
+  <string name="ab_action_chat">Tekstiviestittely</string>
   <!--Left Drawer-->
   <!--Accessibility-->
+  <string name="drawer_open">Avaa sivuvalikko</string>
+  <string name="drawer_close">Sulje sivuvalikko</string>
   <!--Sections-->
+  <string name="menu_item_home">Koti</string>
+  <string name="menu_item_accounts">Hallitse tunnuksia</string>
+  <string name="menu_item_settings">Asetukset</string>
+  <string name="menu_item_about">Tietoa Ringistä</string>
   <!--Dialing Fragment-->
+  <string name="dial_action_call">Soita</string>
+  <string name="dial_number">Valitse numero</string>
+  <string name="dial_hint">Näppäile puhelinnumero</string>
   <!--History Fragment-->
+  <string name="hist_replay_button">Toista uudelleen</string>
+  <string name="hist_replay_button_stop">Lopeta</string>
+  <string name="hist_no_history">Ei historiaa</string>
   <!--DetailsHistory Fragment-->
+  <string name="detail_hist_call_number">Puhelu %1$s</string>
   <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="one">%d keskustelu</item>
+    <item quantity="other">%d Keskustelut</item>
+  </plurals>
+  <string name="home_transfering">Lähetetään %1$s - %1$s</string>
+  <string name="home_transfer_complet">Lähetys valmis</string>
   <!--ContactList Fragment-->
+  <string name="no_contact_found">Yhteystietoa ei löytynyt</string>
+  <string name="starred_contacts_title">Suosikit</string>
+  <string name="searchbar_hint">Syötä nimi tai puhelinnumero...</string>
+  <string name="choose_number">Valitse numero</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
+  <string name="transfer_to_another_call">Vaihda puhelua:</string>
+  <string name="transfer_no_other_call">Ei muita odottavia puheluita</string>
+  <string name="transfer_type_number">Kirjoita numero lähettääksesi: </string>
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">Ohi mennyt puhelu %1$s</string>
+  <string name="notif_missed_outgoing_call">Ohi mennyt lähtevä puhelu: %1$s</string>
+  <string name="notif_incoming_call_title">Saapuva puhelu %1$s</string>
+  <string name="notif_incoming_call">Saapuva puhelu</string>
+  <string name="notif_outgoing_call_title">Lähtevä puhelu %1$s</string>
+  <string name="notif_outgoing_call">Lähtevä puhelu</string>
+  <string name="notif_current_call_title">Puhelu %1$s</string>
+  <string name="notif_current_call">Puhelu</string>
   <!--Call Fragment-->
+  <string name="me">Minä</string>
+  <string name="you_txt_prefix">Sinä:</string>
+  <string name="action_call_attended_transfer">Yritetty siirto</string>
+  <string name="action_call_conference">Kokous</string>
+  <string name="action_call_hangup">Katkaise puhelu</string>
+  <string name="action_settings">Asetukset</string>
+  <string name="help_gestures">Tämä näkymä ohjeistaa käyttäjiä puhelunaikaisten eletoimintojen kanssa. Kuten esimerkiksi: pitkä painallus, sinkoaminen, pyyhkäisy ja niin edelleen.</string>
+  <string name="ongoing_call">Tämänhetkinen puhelu</string>
+  <string name="hist_in_call">Saapuva puhelu %1$s</string>
+  <string name="hist_out_call">Lähtevä puhelu %1$s</string>
+  <string name="start_error_title">Ringiä ei </string>
+  <string name="start_error_mic_required">Ring tarvitsee toimiakseen mikrofonin käyttöoikeuden.</string>
+  <string name="action_call_accept">Vastaanota puhelu</string>
+  <string name="action_call_decline">Kieltäydy</string>
+  <string name="ab_action_speakerphone">Kaiutin päälle</string>
+  <string name="ab_action_contact_add">Lisää yhteystietoihin</string>
+  <string name="ab_action_contact_add_question">Lisätäänkö yhteystietoihin?</string>
+  <string name="ab_action_audio_call">Äänipuhelu</string>
+  <string name="ab_action_video_call">Videopuhelu</string>
+  <string name="share_via">Jaa</string>
+  <string name="write_a_message">Kirjoita viesti</string>
+  <string name="scan_qr">Skannaa QR-koodi</string>
+  <string name="ab_action_flipcamera">Käännä kamera</string>
   <!--Text messages-->
+  <string name="send_message">Lähetä viesti</string>
+  <string name="message_sending">Viestiä lähetetään...</string>
+  <string name="time_just_now">Juuri nyt</string>
+  <string name="permission_read_denied">Ohjelmalla ei ole oikeuksia lukea massamuistia. </string>
+  <string name="permission_write_denied">Ohjelmalla ei ole kirjoitusoikeuksia massamuistiin.</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Kamera oikeudet</string>
+  <string name="permission_dialog_camera_message">Videopuhelut vaativat toimiakseen kameran käyttöoikeudet.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring tarvitsee yhteystietojen lukuoikeudet tätä toimintoa varten.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring tarvitsee kirjoitusoikeudet soittolokiin tätä toimintoa varten.</string>
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Skannaa lisättävän tunnuksen QR-koodi.</string>
   <!--Settings-->
+  <string name="clear_history_dialog_title">Tyhjennä historia?</string>
+  <string name="clear_history_dialog_message">Tätä toimintoa ei voi perua.</string>
+  <string name="clear_history_completed">Historia on tyhjennetty.</string>
   <!--Conversation-->
+  <string name="conversation_action_delete_this">Poista tämä keskustelu</string>
+  <string name="conversation_action_delete_this_title">Poistetaanko tämä keskustelu?</string>
+  <string name="conversation_action_delete_this_message">Tätä toimintoa ei voi perua.</string>
+  <string name="conversation_action_copy_peer_number">Kopioi numero</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s kopioitu leikepöydälle</string>
+  <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>
 </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 25910d3..1268b93 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
@@ -1,18 +1,96 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings related to account creation-->
+  <string name="prompt_alias">Lempinimi</string>
+  <string name="prompt_hostname">Yhteysosoite</string>
+  <string name="prompt_username">Käyttäjänimi</string>
+  <string name="prompt_password">Salasana</string>
+  <string name="action_create">Lisää tunnus</string>
+  <string name="action_create_short">Rekistöröi</string>
+  <string name="error_field_required">Tämä kenttä on vaadittu</string>
+  <string name="dialog_wait_create">Lisätään tunnusta</string>
+  <string name="dialog_wait_create_details">Odota kunnes tunnuksesi on lisätty...</string>
+  <string name="dialog_warn_ip2ip_account_title">Luo tyhjä SIP tunnus?</string>
+  <string name="dialog_warn_ip2ip_account_message">Olet luomassa SIP tunnusta epäkelvolla yhteysosoitteella, pystyt tekemään ja vastaanottamaan vain IP-puheluita. Voit muokata tunnustasi myöhemmin.</string>
+  <string name="help_ring_title">Luo Ring tunnus</string>
+  <string name="help_ring">Ring tunnuksella tavoitat ihmiset turvalliseseti hajautetun verkon kautta.</string>
+  <string name="help_sip_title">Lisää SIP tunnuksesi</string>
+  <string name="help_sip">Määritä olemassa oleva SIP tunnus.</string>
+  <string name="create_sip_account">Lisää</string>
+  <string name="share_number">Jaa numero</string>
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">Poistetaanko tunnus?</string>
+  <string name="account_delete_dialog_message">Tätä toimintoa ei voi perua. Jos et ole vielä varmuuskopioinut tunnustasi niin tässä on hyvä paikka tehdä niin.</string>
   <!--AccountManagementFragment-->
+  <string name="empty_account_list">Ei rekistöröityjä tunnuksia</string>
+  <string name="normal_accounts_titles">Tunnukset</string>
   <!--Basic Details-->
+  <string name="account_preferences_basic_tab">Yleiset</string>
+  <string name="account_basic_category">Yleiset asetukset</string>
+  <string name="account_alias_label">Tunnuksen nimi</string>
+  <string name="account_hostname_label">Yhteysosoite</string>
+  <string name="account_username_label">Käyttäjänimi</string>
+  <string name="account_password_label">Salasana</string>
+  <string name="account_optionnal_category">Valinnaiset asetukset</string>
+  <string name="account_autoanswer_label">Automaattinen vastaus</string>
+  <string name="account_upnp_label">UPnP päälle</string>
+  <string name="account_proxy_field">Välityspalvelin</string>
   <!--Audio Details-->
   <string name="account_audio_label">Ääni</string>
+  <string name="account_preferences_media_tab">Media</string>
   <string name="account_ringtone_label">Soittoäänet</string>
+  <string name="account_ringtone_enabled_label">Aktivoi soittoäänet</string>
+  <string name="account_ringtone_path_label">Soittoäänen polku</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
+  <string name="account_video_enable">Video päälle</string>
   <!--Advanced Details-->
+  <string name="account_preferences_advanced_tab">Edistyneet asetukset</string>
+  <string name="account_registration_exp_label">Rekistöröinti vanhentuu</string>
+  <string name="account_local_interface_label">Paikallinen liitäntä</string>
+  <string name="account_local_port_label">Paikallinen portti</string>
+  <string name="account_turn_password_label">TURN salasana</string>
   <!--Security Details-->
+  <string name="account_credentials_label">Käyttöoikeudet</string>
+  <string name="account_credentials_edit">Muokkaa käyttöoikeuksia</string>
+  <string name="account_credentials_add">Lisää käyttöoikeudet</string>
   <!--SRTP Details-->
+  <string name="account_preferences_security_tab">Turvallisuus</string>
+  <string name="account_srtp_deactivated">Poistettu käytöstä</string>
   <!--SIP-->
   <!--TLS Details-->
+  <string name="account_tls_transport_switch_label">Käytä TLS:ää</string>
+  <string name="account_tls_port_label">Kuunneltava TLS portti</string>
+  <string name="account_tls_certificate_list_label">Varmenteiden myöntäjät</string>
+  <string name="account_tls_certificate_file_label">Varmennetiedosto</string>
+  <string name="account_tls_private_key_file_label">Salausavain-tiedosto</string>
+  <string name="account_tls_password_label">Salausavaimen salassana</string>
+  <string name="account_tls_method_label">TLS menetelmä</string>
+  <string name="account_tls_ciphers_label">TLS koodaus</string>
+  <string name="account_tls_server_name_label">Palvelinnimi</string>
+  <string name="account_tls_negotiation_timeout_sec">Neuvottelun aikakatkaisu (s)</string>
+  <string name="account_rtp_max_port">Maksimi</string>
+  <string name="account_rtp_min_port">Minimi</string>
+  <string name="account_rtp_port_range">RTP porttiväli</string>
   <!--Import/export-->
+  <string name="account_export">Vie</string>
+  <string name="account_import_account">Tuo tunnus</string>
+  <string name="account_export_title">Vie tunnus</string>
+  <string name="account_import_title">Tuo tunnuksia</string>
+  <string name="account_import_explanation">Voit tuoda aikaisemmin viemiäsi tunnuksia.</string>
+  <string name="account_export_message">Tallenna tunnuksen asetukset ja käyttäjäoikeudet, salasana salattuna.</string>
+  <string name="account_export_new_password">Uusi salasana</string>
+  <string name="account_export_confirm_password">Varmista salasana</string>
+  <string name="account_import_message">Syötä salasana purkaaksesi tiedoton salauksen.</string>
+  <string name="account_import_decryption_password">Salauksen purku salasana</string>
+  <string name="import_dialog_title">Tuonti</string>
+  <string name="import_export_wait">Odota hetki...</string>
+  <string name="export_dialog_title">Tunnuksen vienti</string>
+  <string name="account_export_result">Tunnus viety %1$s</string>
+  <string name="export_failed_dialog_title">Vienti epäonnistui</string>
+  <string name="export_failed_dialog_msg">Virhe tapahtui</string>
+  <string name="error_password_char_count">Vähintään 6 merkkiä</string>
+  <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>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fi/strings_call.xml b/ring-android/app/src/main/res/values-fi/strings_call.xml
new file mode 100644
index 0000000..68289d3
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fi/strings_call.xml
@@ -0,0 +1,38 @@
+<?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>
+    <!-- SipCalls -->
+    <string name="call_human_state_incoming">Soi</string>
+    <string name="call_human_state_connecting">Yhdistää</string>
+    <string name="call_human_state_ringing">Soittaa</string>
+    <string name="call_human_state_current">Puhuu</string>
+    <string name="call_human_state_hungup">Katkaistu</string>
+    <string name="call_human_state_busy">Kiireinen</string>
+    <string name="call_human_state_failure">Epäonnistui</string>
+    <string name="call_human_state_hold">Laita pitoon</string>
+    <string name="call_human_state_unhold">Poista pidosta</string>
+    <string name="call_human_state_over">Loppu</string>
+    <string name="call_human_state_none">Ei mitään</string>
+    <string name="conference_human_state_hold">Pidossa</string>
+    <string name="conference_human_state_default">Ei mitään</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-fi/strings_content_description.xml b/ring-android/app/src/main/res/values-fi/strings_content_description.xml
new file mode 100644
index 0000000..626fdbe
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fi/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">Pikapuhelu</string>
+  <string name="contact_picture_description">Yhteystiedon kuva</string>
+  <string name="dial_numeric_pad">Numeeriset valintanäppäimet</string>
+  <string name="dial_alphabetic_pad">Aakkoselliset valintanäppäimet</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-fi/strings_preferences.xml b/ring-android/app/src/main/res/values-fi/strings_preferences.xml
new file mode 100644
index 0000000..72c215d
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fi/strings_preferences.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="pref_category_network">Verkko</string>
+  <string name="pref_category_contacts">Yhteystiedot</string>
+  <string name="pref_category_system">Järjestelmä</string>
+  <string name="pref_category_privacy">Yksityisyys</string>
+  <string name="pref_mobileData_title">Mobiilidata</string>
+  <string name="pref_mobileData_summary">Salli Ringin käyttää mobiiliverkkoa</string>
+  <string name="pref_systemContacts_title">Käytä järjestelmän yhteystietoja</string>
+  <string name="pref_systemContacts_summary">Käytä järjestelmän yhteystietoja soittajan tietojen esittämisessä</string>
+  <string name="pref_systemDialer_title">Käytä Ring-puheluita tavallisten puheluiden sijaan</string>
+  <string name="pref_systemDialer_summary">Käytä Ring internet puheluita tavallisten puheluiden sijaan kun mahdollista.</string>
+  <string name="pref_startOnBoot_title">Käynnistä Ring laitteen käynnistyessä</string>
+  <string name="pref_startOnBoot_summary">Aja Ringiä taustalla järjestelmän käynnistyttyä</string>
+  <string name="pref_clearHistory_title">Tyhjennä historia</string>
+  <string name="pref_clearHistory_summary">Tyhjennä kaikki keskusteluhistoria. Tätä toimintoa ei voi perua.</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 92d8021..820d412 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
@@ -23,6 +23,7 @@
 <resources>
     <!-- SipCalls -->
     <string name="call_human_state_incoming">Sonne</string>
+    <string name="call_human_state_connecting">En cours de connexion</string>
     <string name="call_human_state_ringing">Appel en cours</string>
     <string name="call_human_state_current">En cours</string>
     <string name="call_human_state_hungup">Terminé</string>
@@ -31,5 +32,10 @@
     <string name="call_human_state_hold">Mettre en attente</string>
     <string name="call_human_state_unhold">Reprendre</string>
     <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_hold">Mettre en attente</string>
-    </resources>
\ No newline at end of file
+    <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-hr/strings.xml b/ring-android/app/src/main/res/values-hr/strings.xml
index 504a217..4819749 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -11,6 +11,7 @@
   <string name="title_section0">Biraj</string>
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Veza nedostupna</string>
+  <string name="error_mobile_network_available_but_disabled">Molimo, dozvolite aplikaciji pristup mobilnim podacima u postavkama.</string>
   <!--AB menus-->
   <string name="ab_account_creation">Novi račun</string>
   <string name="ab_account_edition_1">Izbriši</string>
@@ -47,6 +48,8 @@
   <string name="choose_number">Izaberite broj</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
+  <string name="transfer_to_another_call">Prenesi na drugi razgovor:</string>
+  <string name="transfer_no_other_call">Nema dolazećih poziva</string>
   <!--Notifications-->
   <string name="notif_missed_incoming_call">Propušteni poziv od %1$s</string>
   <string name="notif_missed_outgoing_call">Propušteni poziv za %1$s</string>
@@ -59,12 +62,16 @@
   <!--Call Fragment-->
   <string name="me">Ja</string>
   <string name="you_txt_prefix">Ti:</string>
+  <string name="action_call_conference">Konferencija</string>
   <string name="action_call_hangup">Poklopi</string>
   <string name="action_settings">Postavke</string>
   <string name="ongoing_call">Poziv koji je u tijeku</string>
-  <string name="start_error_title">Ne može zvoniti!</string>
-  <string name="start_error_mic_required">Zvonu je potrebna dozvola mikrofona da bi radilo.</string>
+  <string name="hist_in_call">Dolazni poziv od %1$s</string>
+  <string name="hist_out_call">Odlazni poziv prema %1$s</string>
+  <string name="start_error_title">Nije moguće pokrenuti Ring !</string>
+  <string name="start_error_mic_required">Ring aplikaciji je potrebna dozvola mikrofona da bi radilo.</string>
   <string name="action_call_accept">Preuzmi poziv</string>
+  <string name="action_call_decline">Odbij</string>
   <string name="ab_action_speakerphone">Omogući zvučnik</string>
   <string name="ab_action_contact_add">Dodaj u kontakte</string>
   <string name="ab_action_contact_add_question">Dodati u kontakte?</string>
@@ -72,16 +79,20 @@
   <string name="ab_action_video_call">Video poziv</string>
   <string name="share_via">Dijeli putem</string>
   <string name="write_a_message">Napiši poruku</string>
+  <string name="scan_qr">Skeniraj QR kod</string>
   <string name="ab_action_flipcamera">Okreni kameru</string>
   <!--Text messages-->
   <string name="send_message">Pošalji poruku</string>
   <string name="message_sending">Šaljem poruku...</string>
   <string name="time_just_now">Upravo sada</string>
+  <string name="permission_read_denied">Aplikacija nema dozvolu čitanja podataka. Zato ne može normalno funkcionirati. Molimo dozvolite aplikaciji čitanje podataka.</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Dozvola kamere</string>
+  <string name="permission_dialog_camera_message">Video pozivi zahtjevaju dozvolu korištenja kamere. Molimo dozvolite aplikaciji korištenje kamere.</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Skenirajte QR kod korisnika kojeg želite dodati.</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">Očistiti povijest?</string>
   <string name="clear_history_dialog_message"> Ova se radnja ne može poništiti.</string>
@@ -91,6 +102,8 @@
   <string name="conversation_action_delete_this_title">Izbrisati ovaj razgovor?</string>
   <string name="conversation_action_delete_this_message"> Ova se radnja ne može poništiti.</string>
   <string name="conversation_action_copy_peer_number">Kopiraj broj</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s kopiran u međuspremnik</string>
+  <string name="conversation_action_select_peer_number">Odaberite broj</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Dodaj %1$s ?</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 d891238..44212fc 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
@@ -2,6 +2,7 @@
 <resources>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Alias</string>
+  <string name="prompt_hostname">Ime poslužitelja</string>
   <string name="prompt_username">Korisničko ime</string>
   <string name="prompt_password">Lozinka</string>
   <string name="action_create">Dodaj račun</string>
@@ -9,6 +10,10 @@
   <string name="error_field_required">Potrebno je ovo polje</string>
   <string name="dialog_wait_create">Dodajem račun</string>
   <string name="dialog_wait_create_details">Molim pričekajte dok se vaš novi račun ne doda...</string>
+  <string name="dialog_warn_ip2ip_account_title">Kreirati prazan SIP račun?</string>
+  <string name="dialog_warn_ip2ip_account_message">kreirati ćete SIP račun bez pravilnog imena poslužitelja.
+Moći ćete uspostavljati i primati samo direktne IP pozive.
+Moćete urediti vaš račun kasnije</string>
   <string name="help_ring_title">Napravite Ring račun</string>
   <string name="help_sip_title">Dodajte vaš SIP račun</string>
   <string name="help_sip">Konfigurirajte postojeći SIP račun.</string>
@@ -23,8 +28,12 @@
   <string name="account_preferences_basic_tab">Opće</string>
   <string name="account_basic_category">Osnovne postavke</string>
   <string name="account_alias_label">Ime računa</string>
+  <string name="account_hostname_label">Ime poslužitelja</string>
   <string name="account_username_label">Korisničko ime</string>
   <string name="account_password_label">Lozinka</string>
+  <string name="account_optionnal_category">Dodatne postavke</string>
+  <string name="account_autoanswer_label">Automatski odgovor</string>
+  <string name="account_upnp_label">Omogući UPnP</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
   <string name="account_audio_label">Zvuk</string>
@@ -37,8 +46,11 @@
   <string name="account_video_enable">Omogući video</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Napredno</string>
+  <string name="account_registration_exp_label">Registracija istjeće</string>
   <string name="account_local_interface_label">Lokalno sučelje</string>
   <string name="account_local_port_label">Lokalni port</string>
+  <string name="account_stun_enable_label">Koristi Stun</string>
+  <string name="account_stun_server_label">Stun poslužitelj</string>
   <string name="account_turn_enable_label">Koristi TURN</string>
   <string name="account_turn_server_label">TURN poslužitelj</string>
   <string name="account_turn_username_label">TURN korisničko ime</string>
@@ -49,8 +61,12 @@
   <string name="account_srtp_deactivated">Deaktivirano</string>
   <!--SIP-->
   <!--TLS Details-->
+  <string name="account_tls_private_key_file_label">Datoteka privatnog ključa</string>
+  <string name="account_tls_password_label">Lozinka privatnog ključa</string>
   <string name="account_tls_method_label">TLS metoda</string>
   <string name="account_tls_server_name_label">Ime poslužitelja</string>
+  <string name="account_tls_verify_server_label">Provjeri poslužitelja</string>
+  <string name="account_tls_verify_client_label">Provjeri klijent</string>
   <string name="account_rtp_max_port">Maksimum</string>
   <string name="account_rtp_min_port">Minimum</string>
   <!--Import/export-->
@@ -61,6 +77,8 @@
   <string name="account_import_explanation">Možete uvesti prethodno izvezene račune.</string>
   <string name="account_export_new_password">Nova lozinka</string>
   <string name="account_export_confirm_password">Potvrdi lozinku</string>
+  <string name="account_import_message">Unesite lozinku za dešifriranje datoteke.</string>
+  <string name="account_import_decryption_password">Lozinka za dešifriranje</string>
   <string name="import_dialog_title">Uvozim</string>
   <string name="import_export_wait">Molim pričekajte...</string>
   <string name="export_dialog_title">izvozim račun</string>
diff --git a/ring-android/app/src/main/res/values-hr/strings_call.xml b/ring-android/app/src/main/res/values-hr/strings_call.xml
index 7529ce6..b498cad 100644
--- a/ring-android/app/src/main/res/values-hr/strings_call.xml
+++ b/ring-android/app/src/main/res/values-hr/strings_call.xml
@@ -22,11 +22,14 @@
 -->
 <resources>
     <!-- SipCalls -->
-    <string name="call_human_state_incoming">Zvonjenje</string>
+    <string name="call_human_state_incoming">Zvoni</string>
+    <string name="call_human_state_connecting">Spajanje</string>
     <string name="call_human_state_ringing">Zovem</string>
     <string name="call_human_state_current">Razgovaram</string>
     <string name="call_human_state_busy">Zauzeto</string>
     <string name="call_human_state_failure">Neuspjelo</string>
     <string name="call_human_state_hold">Na čekanje</string>
+    <string name="call_human_state_none">Nema</string>
     <string name="conference_human_state_hold">Na čekanje</string>
-    </resources>
\ No newline at end of file
+    <string name="conference_human_state_default">Nema</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-hr/strings_preferences.xml b/ring-android/app/src/main/res/values-hr/strings_preferences.xml
index c839262..9627012 100644
--- a/ring-android/app/src/main/res/values-hr/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-hr/strings_preferences.xml
@@ -4,8 +4,12 @@
   <string name="pref_category_contacts">Kontakti</string>
   <string name="pref_category_system">Sustav</string>
   <string name="pref_category_privacy">Privatnost</string>
+  <string name="pref_mobileData_title">Mobilni podaci</string>
+  <string name="pref_mobileData_summary">Dopustite Ring aplikaciji korištenje 3G/LTE mreže uz Wi-Fi</string>
   <string name="pref_systemContacts_title">Koristi kontakte sustava</string>
   <string name="pref_systemContacts_summary">Koristi kontakte sustava za prikaz pojedinosti pozivatelja.</string>
+  <string name="pref_startOnBoot_title">Pokreni Ring s uređajem</string>
+  <string name="pref_startOnBoot_summary">Pokreni Ring u pozadini prilikom pokretanja sustava.</string>
   <string name="pref_clearHistory_title">Očisti povijest</string>
   <string name="pref_clearHistory_summary">Očisti povijest svih razgovora. Ova se radnja ne može poništiti.</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
new file mode 100644
index 0000000..6a3ce3e
--- /dev/null
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -0,0 +1,105 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="section_licence">Licensz</string>
+  <string name="sponsor_section">A Ring egy szabad szoftver, amelynek fejlesztője és támogatója:</string>
+  <string name="copyright_section">Jogvédelem</string>
+  <string name="contribute_section">Hozzájárulás</string>
+  <string name="version_section">Verzió</string>
+  <string name="no_email_app_installed">Nem találtam emailalkalmazást. Telepítsen egyet, hogy jelentést tudjon küldeni nekünk!</string>
+  <string name="email_chooser_title">Levél küldése a következővel…</string>
+  <!--RingActivity-->
+  <string name="title_section0">Tárcsázás</string>
+  <string name="title_activity_sflphone_home">Ring</string>
+  <string name="error_no_network">Nincs hálózati csatlakozás</string>
+  <string name="error_mobile_network_available_but_disabled">Kérem, engedélyezze a mobilhálózat-elérést a beállítások képernyőn!</string>
+  <!--AB menus-->
+  <string name="ab_account_creation">Új fiók</string>
+  <string name="ab_account_edition_1">Törlés</string>
+  <string name="ab_action_chat">Szöveges üzenetek</string>
+  <!--Left Drawer-->
+  <!--Accessibility-->
+  <string name="drawer_open">Navigációs fiók kinyitása</string>
+  <string name="drawer_close">Navigációs fiók bezárása</string>
+  <!--Sections-->
+  <string name="menu_item_home">Főoldal</string>
+  <string name="menu_item_accounts">Fiókok kezelése</string>
+  <string name="menu_item_settings">Beállítások</string>
+  <string name="menu_item_about">A Ringről</string>
+  <!--Dialing Fragment-->
+  <string name="dial_action_call">Hívás</string>
+  <string name="dial_number">Szám tárcsázása</string>
+  <string name="dial_hint">Telefonszám beírása</string>
+  <!--History Fragment-->
+  <string name="hist_replay_button">Visszajátszás</string>
+  <string name="hist_replay_button_stop">Megállítás</string>
+  <string name="hist_no_history">Nincsenek előzmények</string>
+  <!--DetailsHistory Fragment-->
+  <string name="detail_hist_call_number">%1$s hívása</string>
+  <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="one">%d beszélgetés</item>
+    <item quantity="other">%d beszélgetés</item>
+  </plurals>
+  <string name="home_transfering">%1$s átirányítása erre: %1$s</string>
+  <string name="home_transfer_complet">Átirányítás kész.</string>
+  <!--ContactList Fragment-->
+  <string name="no_contact_found">Nem találtam partnereket</string>
+  <string name="starred_contacts_title">Kedvencek</string>
+  <string name="searchbar_hint">Név vagy telenfonszám beírása…</string>
+  <string name="choose_number">Válasszon egy számot</string>
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <string name="transfer_to_another_call">Átirányítás egy másik jelenlévő hívásra:</string>
+  <string name="transfer_no_other_call">Nincs más függő hívás</string>
+  <string name="transfer_type_number">Átirányítás a következő számra:</string>
+  <!--Notifications-->
+  <string name="notif_missed_incoming_call">Nem fogadott hívás a következőtől: %1$s</string>
+  <string name="notif_missed_outgoing_call">Nem fogadott hívás a következő felé: %1$s</string>
+  <string name="notif_incoming_call_title">Bejövő hívás a következőtől: %1$s</string>
+  <string name="notif_incoming_call">Bejövő hívás</string>
+  <string name="notif_outgoing_call_title">Kimenő hívás a következő felé: %1$s</string>
+  <string name="notif_outgoing_call">Kimenő hívás</string>
+  <string name="notif_current_call_title">Jelenlegi hívás a következővel: %1$s</string>
+  <string name="notif_current_call">Jelenlegi hívás</string>
+  <!--Call Fragment-->
+  <string name="me">Én</string>
+  <string name="you_txt_prefix">Ön:</string>
+  <string name="action_call_conference">Konferencia</string>
+  <string name="action_call_hangup">Lerak</string>
+  <string name="action_settings">Beállítások</string>
+  <string name="help_gestures">Ez a nézet különféle műveletek intézését segíti elő hívások közben. A különböző műveletek le lesznek írva; Hosszan tart, pöccint, oldalra húz stb.</string>
+  <string name="ongoing_call">Folyamatban lévő hívás </string>
+  <string name="hist_in_call">Bejövő hívás ennyi ideje: %1$s</string>
+  <string name="hist_out_call">Kimenő hívás ennyi ideje: %1$s</string>
+  <string name="start_error_title">Nem lehet elindítani a Ringet!</string>
+  <string name="start_error_mic_required">A Ring működéséhez szükséges engedélyezni a mikrofont elérését.</string>
+  <string name="action_call_accept">Hívás fogadása</string>
+  <string name="action_call_decline">Elutasítás</string>
+  <string name="ab_action_speakerphone">Hangszóró engedélyezése</string>
+  <string name="ab_action_contact_add">Hozzáadás a partnerek listájához</string>
+  <string name="ab_action_contact_add_question">Hozzáadjuk a partnerek listájához?</string>
+  <string name="ab_action_audio_call">Hanghívás</string>
+  <string name="ab_action_video_call">Videóhívás</string>
+  <string name="share_via">Megosztás a következőn át:</string>
+  <string name="write_a_message">Üzenet írása</string>
+  <string name="scan_qr">QR-kód szkennelése</string>
+  <string name="ab_action_flipcamera">Kamera megfordítása</string>
+  <!--Text messages-->
+  <string name="send_message">Üzenet küldése</string>
+  <string name="message_sending">Üzenet küldése…</string>
+  <string name="time_just_now">Éppen most</string>
+  <string name="permission_read_denied">Az alkalmazás nem kapott engedélyt a tárhelye olvasásához, így nem képes megfelelően működni. Kérem, fontolja meg ennek az engedélynek a bekapcsolását!</string>
+  <string name="permission_write_denied">Az alkalmazás nem kapott engedélyt a tárhelyére való íráshoz, így nem képes megfelelően működni. Kérem, fontolja meg ennek az engedélynek a bekapcsolását!</string>
+  <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Kameraengedély</string>
+  <string name="permission_dialog_camera_message">A videóhívások igénylik a kameraengedély jelenlétét. Kérem, fontolja meg ennek az engedélynek a bekapcsolását!</string>
+  <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">A Ringnek engedélyre van szüksége a névjegyek olvasásához. Kérem, engedélyezze!</string>
+  <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">A Ringnek engedélyre van szüksége a névjegyek olvasásához. Kérem, engedélyezze!</string>
+  <!--QRCode Scan-->
+  <!--Settings-->
+  <!--Conversation-->
+  <string name="conversation_action_copy_peer_number">Szám másolása</string>
+  <!--Contacts-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-hu/strings_account.xml b/ring-android/app/src/main/res/values-hu/strings_account.xml
new file mode 100644
index 0000000..ce37c95
--- /dev/null
+++ b/ring-android/app/src/main/res/values-hu/strings_account.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account creation-->
+  <string name="prompt_alias">Álnév</string>
+  <string name="prompt_hostname">Kiszolgálónév</string>
+  <string name="prompt_username">Felhasználónév</string>
+  <string name="prompt_password">Jelszó</string>
+  <!--Strings related to account deletion-->
+  <!--AccountManagementFragment-->
+  <string name="normal_accounts_titles">Fiókok</string>
+  <!--Basic Details-->
+  <string name="account_preferences_basic_tab">Általános</string>
+  <string name="account_hostname_label">Kiszolgálónév</string>
+  <string name="account_username_label">Felhasználónév</string>
+  <string name="account_password_label">Jelszó</string>
+  <string name="account_proxy_field">Proxy</string>
+  <!--Audio Details-->
+  <string name="account_audio_label">Hang</string>
+  <string name="account_preferences_media_tab">Média</string>
+  <!--Video Details-->
+  <string name="account_video_label">Videó</string>
+  <string name="account_video_enable">Videó engedélyezése</string>
+  <!--Advanced Details-->
+  <string name="account_preferences_advanced_tab">Haladó</string>
+  <string name="account_turn_enable_label">TURN használata</string>
+  <string name="account_published_address_label">Nyilvános cím</string>
+  <!--Security Details-->
+  <!--SRTP Details-->
+  <string name="account_preferences_security_tab">Biztonság</string>
+  <!--SIP-->
+  <!--TLS Details-->
+  <string name="account_rtp_port_range">Hang RTP port korlát</string>
+  <!--Import/export-->
+  <string name="account_export">Exportálás</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-hu/strings_call.xml b/ring-android/app/src/main/res/values-hu/strings_call.xml
new file mode 100644
index 0000000..0b6e0cb
--- /dev/null
+++ b/ring-android/app/src/main/res/values-hu/strings_call.xml
@@ -0,0 +1,26 @@
+<?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_hold">Tartás</string>
+    <string name="conference_human_state_hold">Tartás</string>
+    </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-hu/strings_preferences.xml b/ring-android/app/src/main/res/values-hu/strings_preferences.xml
new file mode 100644
index 0000000..61842d8
--- /dev/null
+++ b/ring-android/app/src/main/res/values-hu/strings_preferences.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="pref_category_contacts">Partnerek</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-it/strings.xml b/ring-android/app/src/main/res/values-it/strings.xml
new file mode 100644
index 0000000..20149f0
--- /dev/null
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,116 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="section_licence">Licenza</string>
+  <string name="sponsor_section">Ring è un free software sviluppato e supportato da</string>
+  <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="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="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-->
+  <string name="ab_account_creation">Nuovo profilo</string>
+  <string name="ab_account_edition_1">Cancella</string>
+  <string name="ab_action_chat">Messaggio di testo</string>
+  <!--Left Drawer-->
+  <!--Accessibility-->
+  <string name="drawer_open">Apri gli strumenti di navigazione</string>
+  <string name="drawer_close">Chiudi gli strumenti di navigazione</string>
+  <!--Sections-->
+  <string name="menu_item_home">Home</string>
+  <string name="menu_item_accounts">Gestisci profili</string>
+  <string name="menu_item_settings">Impostazioni</string>
+  <string name="menu_item_about">Info su Ring</string>
+  <!--Dialing Fragment-->
+  <string name="dial_action_call">Chiama</string>
+  <string name="dial_number">Chiama un numero</string>
+  <string name="dial_hint">Digita un numero</string>
+  <!--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>
+  <!--DetailsHistory Fragment-->
+  <string name="detail_hist_call_number">Chiama %1$s</string>
+  <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="one">%d Conversazione</item>
+    <item quantity="other">%d Conversazione</item>
+  </plurals>
+  <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="starred_contacts_title">Preferiti</string>
+  <string name="searchbar_hint">Digita nome o numero telefonico</string>
+  <string name="choose_number">Scegli un numero</string>
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <string name="transfer_to_another_call">Trasferisci a altri la chiamata corrente</string>
+  <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_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>
+  <string name="notif_outgoing_call">Chiamata in uscita</string>
+  <string name="notif_current_call_title">Chiamata in corso con %1$s</string>
+  <string name="notif_current_call">Chiamata attiva</string>
+  <!--Call Fragment-->
+  <string name="me">Io</string>
+  <string name="you_txt_prefix">Tu</string>
+  <string name="action_call_attended_transfer">Rispondere alla chiamata</string>
+  <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="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>
+  <string name="start_error_title">Impossibile aprire Ring !</string>
+  <string name="start_error_mic_required">Per funzionare Ring richiede l\'accesso al microfono.</string>
+  <string name="action_call_accept">Accetta la chiamata</string>
+  <string name="action_call_decline">Rifiuta</string>
+  <string name="ab_action_speakerphone">Attiva gli altoparlanti</string>
+  <string name="ab_action_contact_add">Aggiungi contatti</string>
+  <string name="ab_action_contact_add_question">Aggiungere contatti ?</string>
+  <string name="ab_action_audio_call">Audiochiamata</string>
+  <string name="ab_action_video_call">Videochiamata</string>
+  <string name="share_via">Condividi via</string>
+  <string name="write_a_message">Scrivi un messaggio</string>
+  <string name="scan_qr">Scansiona QR Code</string>
+  <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="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>
+  <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Attivare videocamera</string>
+  <string name="permission_dialog_camera_message">La videochiamata richiede l\'attivazione della videocamera. Concedi il permesso.</string>
+  <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring richiede permesso di \"Lettura dei contatti\" per abilitare questa funzione. Concedi il permesso.</string>
+  <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring richiede permesso di \"Scrittura sul log delle chiamate\" per abilitare questa funzione. Concedi il permesso.</string>
+  <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Scansiona il QR Code del profilo che desideri aggiungere.</string>
+  <!--Settings-->
+  <string name="clear_history_dialog_title">Cancellare cronologia ?</string>
+  <string name="clear_history_dialog_message">Questa azione è irreversibilie.</string>
+  <string name="clear_history_completed">La cronologia è stata cancellata</string>
+  <!--Conversation-->
+  <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_select_peer_number">Scegli un numero</string>
+  <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Aggiungi %1$s ?</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
new file mode 100644
index 0000000..f2426fd
--- /dev/null
+++ b/ring-android/app/src/main/res/values-it/strings_account.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account creation-->
+  <string name="prompt_hostname">Nome Host</string>
+  <!--Strings related to account deletion-->
+  <!--AccountManagementFragment-->
+  <!--Basic Details-->
+  <string name="account_hostname_label">Nome Host</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-->
+  <!--Security Details-->
+  <!--SRTP Details-->
+  <!--SIP-->
+  <!--TLS Details-->
+  <!--Import/export-->
+</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
new file mode 100644
index 0000000..6cde186
--- /dev/null
+++ b/ring-android/app/src/main/res/values-it/strings_call.xml
@@ -0,0 +1,30 @@
+<?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>
+    <!-- SipCalls -->
+    <string name="call_human_state_incoming">Suonando</string>
+    <string name="call_human_state_ringing">Chiamando</string>
+    <string name="call_human_state_current">Parlando</string>
+    <string name="call_human_state_busy">Occupato</string>
+    <string name="call_human_state_failure">Fallito</string>
+    </resources>
\ No newline at end of file
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
new file mode 100644
index 0000000..470d41f
--- /dev/null
+++ b/ring-android/app/src/main/res/values-it/strings_preferences.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="pref_category_contacts">Contatti</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 05bd174..e873d61 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -33,6 +33,7 @@
   <string name="notif_missed_incoming_call">Praleistas skambutis nuo %1$s</string>
   <string name="notif_incoming_call">Įeinantis skambutis</string>
   <!--Call Fragment-->
+  <string name="me">Aš</string>
   <string name="action_call_hangup">Padėti ragelį</string>
   <string name="action_settings">Nustatymai</string>
   <string name="start_error_title">Nepavyksta paleisti Ring !</string>
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 cf4eaff..348a397 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
@@ -9,6 +9,11 @@
   <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-array name="accountType">
+    <item>RING</item>
+    <item>SIP</item>
+  </string-array>
   <string name="help_ring_title">Sukurti Ring paskyrą</string>
   <string name="help_sip">Konfigūruokite esamą SIP paskyrą.</string>
   <string name="create_sip_account">Pridėti</string>
@@ -26,6 +31,7 @@
   <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_upnp_label">Įjungti UPnP</string>
   <string name="account_proxy_field">Įgaliotasis serveris</string>
   <!--Audio Details-->
   <string name="account_audio_label">Garsas</string>
diff --git a/ring-android/app/src/main/res/values-lt/strings_call.xml b/ring-android/app/src/main/res/values-lt/strings_call.xml
index 15b925c..4362d8a 100644
--- a/ring-android/app/src/main/res/values-lt/strings_call.xml
+++ b/ring-android/app/src/main/res/values-lt/strings_call.xml
@@ -21,6 +21,9 @@
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- SipCalls -->
+    <string name="call_human_state_incoming">Skambina</string>
+    <string name="call_human_state_connecting">Sujungiama</string>
     <string name="call_human_state_ringing">Skambinama</string>
     <string name="call_human_state_current">Kalbama</string>
     <string name="call_human_state_hungup">Baigta</string>
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 403c804..41224ec 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
@@ -10,6 +10,14 @@
   <string name="error_field_required">Dette feltet er påkrevd</string>
   <string name="dialog_wait_create">Legger til konto</string>
   <string name="dialog_wait_create_details">Vent litt mens din nye konto blir lagt til...</string>
+  <string name="dialog_warn_ip2ip_account_title">Lag tom SIP-konto?</string>
+  <string name="dialog_warn_ip2ip_account_message">Du er igang med å lage en SIP-konto uten et gyldig vertsnavn.
+Du vil kun være i stand til å gjennomføre direkte IP-samtaler.
+Du kan endre kontoen din senere</string>
+  <string-array name="accountType">
+    <item>RING</item>
+    <item>SIP</item>
+  </string-array>
   <string name="help_ring_title">Opprett en Ring-konto</string>
   <string name="help_ring">En Ring-konto lar deg na folk på sikkert via mellom likemenn via et fullstendig distribuert nettverk.</string>
   <string name="help_sip_title">Legg til SIP-kontoen din</string>
@@ -33,6 +41,7 @@
   <string name="account_optionnal_category">Valgfritt oppsett</string>
   <string name="account_useragent_label">Brukeragent</string>
   <string name="account_autoanswer_label">Autosvar</string>
+  <string name="account_upnp_label">Aktiver UPnP</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
   <string name="account_audio_label">Lyd</string>
diff --git a/ring-android/app/src/main/res/values-nb/strings_call.xml b/ring-android/app/src/main/res/values-nb/strings_call.xml
index c526d08..951623c 100644
--- a/ring-android/app/src/main/res/values-nb/strings_call.xml
+++ b/ring-android/app/src/main/res/values-nb/strings_call.xml
@@ -23,6 +23,7 @@
 <resources>
     <!-- SipCalls -->
     <string name="call_human_state_incoming">Ringer</string>
+    <string name="call_human_state_connecting">Kobler opp</string>
     <string name="call_human_state_ringing">Kaller opp</string>
     <string name="call_human_state_current">Snakker</string>
     <string name="call_human_state_hungup">Over</string>
@@ -31,5 +32,13 @@
     <string name="call_human_state_hold">Parker</string>
     <string name="call_human_state_unhold">Gjenoppta parkert</string>
     <string name="call_human_state_over">Over</string>
+    <string name="call_human_state_none">Ingen</string>
+    <!-- Conferences -->
+    <string name="conference_human_state_active_attached">Aktive tilkoblet</string>
+    <string name="conference_human_state_active_detached">Aktive frakoblet</string>
+    <string name="conference_human_state_active_attached_rec">Aktive tilkoblet oppt</string>
+    <string name="conference_human_state_active_detached_rec">Aktive frakoblet oppt</string>
     <string name="conference_human_state_hold">Parker</string>
-    </resources>
\ No newline at end of file
+    <string name="conference_human_state_hold_rec">Parker oppt</string>
+    <string name="conference_human_state_default">Ingen</string>
+</resources>
\ No newline at end of file
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 0a4285b..2157d4b 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
@@ -1,13 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="section_licence">Licentie</string>
+  <string name="sponsor_section">Ring is vrije software ontwikkeld en ondersteund door</string>
+  <string name="contribute_section">Bijdragen</string>
+  <string name="version_section">Versie</string>
+  <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>
   <!--AB menus-->
+  <string name="ab_account_creation">Nieuw account</string>
+  <string name="ab_account_edition_1">Verwijderen</string>
   <!--Left Drawer-->
   <!--Accessibility-->
   <!--Sections-->
+  <string name="menu_item_accounts">Accounts beheren</string>
+  <string name="menu_item_about">Over Ring</string>
   <!--Dialing Fragment-->
   <!--History Fragment-->
+  <string name="hist_replay_button_stop">Stoppen</string>
   <!--DetailsHistory Fragment-->
   <!--Home Fragment-->
   <!--ContactList Fragment-->
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 23fa67d..a637ca4 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -11,6 +11,7 @@
   <string name="title_section0">Wykręć</string>
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Brak połączenia z siecią</string>
+  <string name="error_mobile_network_available_but_disabled">Proszę w ustawieniach udzielić dostępu do sieci komórkowej.</string>
   <!--AB menus-->
   <string name="ab_account_creation">Nowe konto</string>
   <string name="ab_account_edition_1">Usuń</string>
@@ -109,6 +110,8 @@
   <string name="conversation_action_delete_this_title">Czy usunąć tę rozmowę?</string>
   <string name="conversation_action_delete_this_message">Tego działania nie można cofnąć.</string>
   <string name="conversation_action_copy_peer_number">Skopiuj numer</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s skopiowany do schowka</string>
+  <string name="conversation_action_select_peer_number">Wybierz numer</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Dodać %1$s ?</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 522f80d..96cf67b 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
@@ -10,6 +10,14 @@
   <string name="error_field_required">To pole jest wymagane</string>
   <string name="dialog_wait_create">Dodawanie konta</string>
   <string name="dialog_wait_create_details">Proszę poczekaj aż twoje nowe konto jest dodane...</string>
+  <string name="dialog_warn_ip2ip_account_title">Utworzyć puste konto SIP?</string>
+  <string name="dialog_warn_ip2ip_account_message">Zamierzasz założyć konto SIP bez prawidłowego hosta.
+Będziesz mógł nawiązywać i odbierać połączenia wyłącznie od bezpośrednich adresów IP.
+Możesz edytować swoje konto później</string>
+  <string-array name="accountType">
+    <item>RING</item>
+    <item>SIP</item>
+  </string-array>
   <string name="help_ring_title">Stwórz konto Ring</string>
   <string name="help_ring">Konto Ring pozwala Ci na dotarcie do ludzi bezpośrednio za pomocą sieci peer to peer w sieci całkowicie rozdzielonej.</string>
   <string name="help_sip_title">Dodaj twoje konto SIP</string>
@@ -33,6 +41,7 @@
   <string name="account_optionnal_category">Ustawienia Opcjonalne</string>
   <string name="account_useragent_label">User Agent</string>
   <string name="account_autoanswer_label">Automatyczna Odpowiedź</string>
+  <string name="account_upnp_label">Włącz UPnP</string>
   <string name="account_proxy_field">Pełnomocnik</string>
   <!--Audio Details-->
   <string name="account_audio_label">Audio</string>
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 fe5554d..1506738 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
@@ -23,6 +23,7 @@
 <resources>
     <!-- SipCalls -->
     <string name="call_human_state_incoming">Dzwonienie</string>
+    <string name="call_human_state_connecting">Łączenie</string>
     <string name="call_human_state_ringing">Dzwonienie</string>
     <string name="call_human_state_current">Rozmawianie</string>
     <string name="call_human_state_hungup">Koniec</string>
@@ -31,5 +32,10 @@
     <string name="call_human_state_hold">Czekanie</string>
     <string name="call_human_state_unhold">Wznów</string>
     <string name="call_human_state_over">Koniec</string>
+    <string name="call_human_state_none">Nic</string>
+    <!-- Conferences -->
+    <string name="conference_human_state_active_attached">Aktywny załącznik</string>
     <string name="conference_human_state_hold">Czekanie</string>
-    </resources>
\ No newline at end of file
+    <string name="conference_human_state_hold_rec">Przytrzymaj rec</string>
+    <string name="conference_human_state_default">Nic</string>
+</resources>
\ No newline at end of file
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 5373119..817d8e2 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
@@ -11,6 +11,7 @@
   <string name="title_section0">Discar</string>
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Sem conectividade</string>
+  <string name="error_mobile_network_available_but_disabled">Por favor, conceda acesso a rede do celular na tela de configurações .</string>
   <!--AB menus-->
   <string name="ab_account_creation">Nova conta</string>
   <string name="ab_account_edition_1">Deletar</string>
@@ -108,6 +109,8 @@
   <string name="conversation_action_delete_this_title">Deletar esta conversa ?</string>
   <string name="conversation_action_delete_this_message">Esta ação não pode ser revista.</string>
   <string name="conversation_action_copy_peer_number">Copiar número</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s copiado para área de transferência</string>
+  <string name="conversation_action_select_peer_number">Selecione um numero</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Adicionar %1$s ?</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 34a1c3f..c197219 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
@@ -23,6 +23,7 @@
 <resources>
     <!-- SipCalls -->
     <string name="call_human_state_incoming">Tocando</string>
+    <string name="call_human_state_connecting">Conectando</string>
     <string name="call_human_state_ringing">Chamando</string>
     <string name="call_human_state_current">Falando</string>
     <string name="call_human_state_hungup">Sobre</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 7b6f939..4155760 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -11,6 +11,7 @@
   <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>
@@ -54,7 +55,7 @@
   <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_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>
@@ -109,6 +110,8 @@
   <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>
 </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 cb30529..a92f246 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
@@ -10,6 +10,14 @@
   <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="dialog_warn_ip2ip_account_message">Ви збираєтесь створити обліковий запис SIP без імені хоста.
+Вам будуть доступні лише прямі IP дзвінки. 
+Ви зможете відредагувати цей обліковий запис пізніше</string>
+  <string-array name="accountType">
+    <item>RING</item>
+    <item>SIP</item>
+  </string-array>
   <string name="help_ring_title">Створити обліковий запис Ring</string>
   <string name="help_ring">Акаунт Ring дозволяє досягати людей безпечно у рівноправній та повністю розподіленій мережі.</string>
   <string name="help_sip_title">Додати Ваш обліковий запис SIP</string>
@@ -33,6 +41,7 @@
   <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>
diff --git a/ring-android/app/src/main/res/values-uk/strings_call.xml b/ring-android/app/src/main/res/values-uk/strings_call.xml
index a933b5b..2fe8732 100644
--- a/ring-android/app/src/main/res/values-uk/strings_call.xml
+++ b/ring-android/app/src/main/res/values-uk/strings_call.xml
@@ -23,13 +23,22 @@
 <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_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>
+    <!-- Conferences -->
+    <string name="conference_human_state_active_attached">Активний приєднаний</string>
+    <string name="conference_human_state_active_detached">Активний від\'єднаний</string>
+    <string name="conference_human_state_active_attached_rec">Активний приєднаний запис</string>
+    <string name="conference_human_state_active_detached_rec">Активний від\'єднаний запис</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-zh-rTW/strings.xml b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..c85a3d4
--- /dev/null
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,89 @@
+<?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_activity_sflphone_home">Ring</string>
+  <string name="error_no_network">沒有網路連接</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-->
+  <!--Sections-->
+  <string name="menu_item_home">首頁</string>
+  <string name="menu_item_accounts">管理帳號</string>
+  <string name="menu_item_settings">設定</string>
+  <string name="menu_item_about">關於 Ring</string>
+  <!--Dialing Fragment-->
+  <string name="dial_number">播打一個號碼</string>
+  <string name="dial_hint">輸入電話號碼</string>
+  <!--History Fragment-->
+  <string name="hist_replay_button_stop">停止</string>
+  <string name="hist_no_history">沒有記錄</string>
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="other">%d 個對話</item>
+  </plurals>
+  <!--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-->
+  <!--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="start_error_title">無法啟動 Ring ！</string>
+  <string name="action_call_decline">拒絕</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 Code</string>
+  <!--Text messages-->
+  <string name="send_message">傳送訊息</string>
+  <string name="message_sending">正在傳送訊息...</string>
+  <string name="time_just_now">剛剛</string>
+  <!--MediaPreferenceFragment-->
+  <!--Read contacts permission-->
+  <!--Write call log permission-->
+  <!--QRCode Scan-->
+  <string name="scan_qr_account_message">掃描你想要加入的帳號的 QR Code 。</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>
+</resources>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
new file mode 100644
index 0000000..6d32b94
--- /dev/null
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
@@ -0,0 +1,83 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account creation-->
+  <string name="prompt_alias">別名</string>
+  <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_warn_ip2ip_account_title">建立空的 SIP 帳號嗎？</string>
+  <string-array name="accountType">
+    <item>RING</item>
+    <item>SIP</item>
+  </string-array>
+  <string name="help_ring_title">建立一個 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>
+  <!--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_username_label">使用者名稱</string>
+  <string name="account_password_label">密碼</string>
+  <string name="account_optionnal_category">選擇性的設定</string>
+  <string name="account_upnp_label">啟用 UPnP</string>
+  <string name="account_proxy_field">Proxy</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_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">TURN 使用者名稱</string>
+  <string name="account_turn_password_label">TURN 密碼</string>
+  <!--Security Details-->
+  <!--SRTP Details-->
+  <string name="account_preferences_security_tab">安全性</string>
+  <!--SIP-->
+  <!--TLS Details-->
+  <string name="account_tls_server_name_label">伺服器名稱</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_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>
+</resources>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml
new file mode 100644
index 0000000..1bdc904
--- /dev/null
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml
@@ -0,0 +1,34 @@
+<?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>
+    <!-- SipCalls -->
+    <string name="call_human_state_incoming">響鈴中</string>
+    <string name="call_human_state_connecting">連接中</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_over">結束</string>
+    <string name="call_human_state_none">無</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-zh-rTW/strings_preferences.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
new file mode 100644
index 0000000..e32701f
--- /dev/null
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="pref_category_network">網路</string>
+  <string name="pref_category_contacts">聯絡人</string>
+  <string name="pref_category_system">系統</string>
+  <string name="pref_category_privacy">隱私</string>
+  <string name="pref_mobileData_title">行動數據</string>
+  <string name="pref_systemContacts_title">使用系統聯絡人</string>
+  <string name="pref_startOnBoot_title">開機時啟動 Ring</string>
+  <string name="pref_startOnBoot_summary">開機時在背景啟動 Ring</string>
+  <string name="pref_clearHistory_title">清除記錄</string>
+</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 dc4ade1..620b8fc 100644
--- a/ring-android/app/src/main/res/values-zh/strings.xml
+++ b/ring-android/app/src/main/res/values-zh/strings.xml
@@ -1,10 +1,14 @@
 <?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">刪除</string>
   <!--Left Drawer-->
   <!--Accessibility-->
   <!--Sections-->
+  <string name="menu_item_settings">設定</string>
+  <string name="menu_item_about">關於Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_action_call">播打</string>
   <!--History Fragment-->
@@ -16,6 +20,8 @@
   <!--Notifications-->
   <string name="notif_incoming_call">來電</string>
   <!--Call Fragment-->
+  <string name="action_settings">設定</string>
+  <string name="ab_action_contact_add">加到聯絡人</string>
   <!--Text messages-->
   <!--MediaPreferenceFragment-->
   <!--Read contacts permission-->
@@ -23,5 +29,6 @@
   <!--QRCode Scan-->
   <!--Settings-->
   <!--Conversation-->
+  <string name="conversation_action_copy_peer_number">複製號碼</string>
   <!--Contacts-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh/strings_account.xml b/ring-android/app/src/main/res/values-zh/strings_account.xml
index 7c81286..47fd8bd 100644
--- a/ring-android/app/src/main/res/values-zh/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh/strings_account.xml
@@ -11,19 +11,26 @@
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">通用</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_proxy_field">代理</string>
   <!--Audio Details-->
   <string name="account_audio_label">語音</string>
+  <string name="account_preferences_media_tab">媒體</string>
+  <string name="account_ringtone_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_turn_enable_label">使用</string>
+  <string name="account_published_address_label">公開發佈地址</string>
   <!--Security Details-->
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">安全</string>
   <!--SIP-->
   <!--TLS Details-->
   <!--Import/export-->
+  <string name="account_export">輸出</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh/strings_call.xml b/ring-android/app/src/main/res/values-zh/strings_call.xml
index 47a4f33..4632fed 100644
--- a/ring-android/app/src/main/res/values-zh/strings_call.xml
+++ b/ring-android/app/src/main/res/values-zh/strings_call.xml
@@ -21,6 +21,7 @@
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <string name="call_human_state_ringing">撥打</string>
     <string name="call_human_state_hold">保持通話</string>
     <string name="conference_human_state_hold">保持通話</string>
     </resources>
\ No newline at end of file