i18n: update translations

Change-Id: I16fa2440cff2707becaae82416415c2882787f28
Reviewed-by: Aline Bonnet <aline.bonnet@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/res/values-ar/strings.xml b/ring-android/app/src/main/res/values-ar/strings.xml
index 75a12be..3a22de7 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">الترخيص</string>
   <string name="sponsor_section">Ring برمجية حرّة طوّرت ودعمت بواسطة</string>
   <string name="copyright_section">الحقوق محفوظة</string>
   <string name="contribute_section">مساهمة</string>
@@ -81,7 +80,9 @@
   <!--Conversation-->
   <string name="conversation_action_copy_peer_number">نسخ الرقم</string>
   <!--Contacts-->
+  <string name="wizard_next">التالي</string>
   <!--MenuHeaderView-->
   <string name="unknown">مجهول</string>
   <!--Share fragment-->
+  <string name="generic_error_migration">خطأ</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ar/strings_account.xml b/ring-android/app/src/main/res/values-ar/strings_account.xml
index b324c4b..32c23cb 100644
--- a/ring-android/app/src/main/res/values-ar/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ar/strings_account.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">إحذف</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">الاسم المستعار</string>
   <string name="prompt_hostname">اسم المضيف</string>
@@ -70,4 +72,7 @@
   <!--restore/backup-->
   <string name="account_export_end_error_title">خطأ</string>
   <!--Name registration-->
+  <string name="account_status_unknown">مجهول</string>
+  <!--Create account-->
+  <string name="account_creation_home">مرحبا بك في Ring</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-bg/strings.xml b/ring-android/app/src/main/res/values-bg/strings.xml
index ee0e78e..32e17fa 100644
--- a/ring-android/app/src/main/res/values-bg/strings.xml
+++ b/ring-android/app/src/main/res/values-bg/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Лиценз</string>
   <string name="sponsor_section">Ring е безплатен софтуер, разработван и поддържан от</string>
   <string name="copyright_section">Авторски права</string>
   <string name="contribute_section">Принос</string>
@@ -97,11 +96,27 @@
   <string name="conversation_action_delete_this_title">Изтриване на този разговор?</string>
   <string name="conversation_action_delete_this_message">Това действие е необратимо.</string>
   <string name="conversation_action_copy_peer_number">Копиране на номера</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s е копиран</string>
+  <string name="conversation_action_select_peer_number">Изберете номер</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Добавяне на %1$s?</string>
   <string name="prompt_new_password">Нова парола</string>
+  <string name="prompt_new_password_repeat">Повторете новата парола</string>
   <string name="account_create_title">Създаване на акаунт за Ring</string>
+  <string name="prompt_new_username">Въведете ново потребителско име</string>
+  <string name="help_password_choose">Изберете сигурна парола, която ще запомните, за да е защитен акаунтът Ви.</string>
+  <string name="help_password_enter">Въведете основната си парола за Ring</string>
+  <string name="wizard_next">Напред</string>
+  <string name="account_device_updated_message">Вие обновихте акаунта си успешно.</string>
   <!--MenuHeaderView-->
+  <string name="profile">Моят профил</string>
+  <string name="profile_message_warning">Това се вижда от контактите Ви</string>
+  <string name="open_the_gallery">Отваряне на галерията</string>
+  <string name="take_a_photo">Снимане</string>
+  <string name="unknowm_if_empty">Неизвестно, ако е празно</string>
   <string name="unknown">Неизвестно</string>
   <!--Share fragment-->
+  <string name="share_message">Сканирайте този QR-код с вградения скенер на приложението Ring, което иска да се свърже с Вас.</string>
+  <string name="share_your_account_information">Споделяне на информацията аз връзка с мен</string>
+  <string name="generic_error_migration">Грешка</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-bg/strings_account.xml b/ring-android/app/src/main/res/values-bg/strings_account.xml
index 0b208ce..3a96a4e 100644
--- a/ring-android/app/src/main/res/values-bg/strings_account.xml
+++ b/ring-android/app/src/main/res/values-bg/strings_account.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Изтриване</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Псевдоним</string>
   <string name="prompt_hostname">Име на сървъра</string>
@@ -77,11 +79,60 @@
   <!--restore/backup-->
   <string name="account_restore_message">Въведете парола за дешифриране на файла.</string>
   <string name="account_restore_decryption_password">Парола за дешифриране</string>
+  <string name="account_new_device_password">Въведете основната парола, за да отключите акаунта</string>
+  <string name="restore_dialog_title">Възстановяване</string>
   <string name="restore_backup_wait">Моля, изчакайте…</string>
   <string name="error_password_char_count">Най-малко 6 знака</string>
   <string name="error_passwords_not_equals">Паролите не съвпадат</string>
+  <string name="restore_failed_dialog_title">Неуспешно възстановяване</string>
   <string name="restore_failed_dialog_msg">Възникна грешка</string>
+  <string name="export_account_wait_title">Моля, изчакайте…</string>
+  <string name="export_account_wait_message">Публикуване на новата информация за акаунта</string>
+  <string name="account_export_end_decryption_message">Отключването на акаунта Ви с предоставената парола не беше успешно.</string>
+  <string name="account_export_end_network_title">Мрежова грешка</string>
+  <string name="account_export_end_network_message">Акаунтът не може да бъде изнесен през мрежата. Проверете връзката си.</string>
   <string name="account_export_end_error_title">Грешка</string>
+  <string name="account_export_end_error_message">Акаунтът не може да бъде изнесен. Възникна непозната грешка.</string>
+  <string name="account_enter_password">Въведете парола</string>
+  <string name="account_contact_me">Свържете се с мен в Ring !</string>
+  <string name="update_account">Обновяване на акаунта</string>
+  <string name="ring_account">Акаунт</string>
+  <string name="account_migration_title_dialog">Пренасяне на акаунта</string>
+  <string name="account_update_needed">Нужно е обновяване</string>
+  <string name="account_creation_file_too_big">Файлът е твърде голям</string>
+  <string name="account_cannot_read">Неуспешен прочит на: %1$s</string>
+  <string name="account_cannot_be_found_title">Акаунтът не може да бъде открит</string>
+  <string name="account_cannot_be_found_message">Акаунтът не може да бъде открит в мрежата на Ring.\nУверете се, че е бил изнесен от Ring чрез съществуващо устройство, както и че данните за идентификация са правилни</string>
+  <string name="account_no_network_title">Неуспешна връзка с мрежата</string>
+  <string name="account_no_network_message">Акаунтът не може да бъде добавен, тъй като Ring не може да се свърже с разпределената мрежа. Проверете връзката на устройството си.</string>
+  <string name="account_device_added_title">Акаунтът е добавен на устройството</string>
+  <string name="account_device_added_message">Настройката на акаунта Ви на това устройство беше успешна.</string>
+  <string name="account_device_updated_title">Акаунтът на устройството е обновен</string>
+  <string name="account_link_button">Свързване на това устройство с акаунт</string>
+  <string name="account_import_title">Свързване с съществуващ акаунт</string>
+  <string name="account_link_prompt_pin">Въведете ПИН</string>
+  <string name="account_wizard_title">Добре дошли в</string>
   <string name="account_new_button">Създаване на акаунт за Ring</string>
+  <string name="account_link_export_button">Свързване на друго устройство с този акаунт</string>
+  <string name="account_link_export_info">За да използвате този акаунт на други устройства, трябва първо да го направите видим в Ring. Това ще създаде ПИН код , който трябва да въведете на новото устройство, за да настроите акаунта. Кодът има давност 10 минути\n\nМоля, въведете паролата си, за да започнем:</string>
+  <string name="account_start_export_button">Създаване на ПИН код</string>
+  <string name="account_end_export_button">затваряне</string>
+  <string name="account_end_export_infos">Вашият ПИН код е:\n\n%%\n\nЗа да завършите процеса, трябва да пуснете Ring на новото устройство. Създайте нов профил чрез „Свързване на това устройство с акаунт“. Кодът има давност 10 минути.</string>
   <!--Name registration-->
+  <string name="register_name_wrong_password">Името не може да бъде регистрирано: грешна парола.</string>
+  <string name="register_name_invalid">Името не може да бъде регистрирано: несъществуващо име.</string>
+  <string name="register_name_already_taken">Името не може да бъде регистрирано: името е заето.</string>
+  <string name="register_name_network_error">Името не може да бъде регистрирано: грешка в мрежата или сървъра.</string>
+  <string name="error_username_empty">Въведете потребителско име</string>
+  <string name="no_registered_name_for_account">Няма открито регистрирано име за този акаунт</string>
+  <string name="register_name">Регистриране на име</string>
+  <string name="trying_to_register_name">Протича опит за регистриране на името</string>
+  <string name="registered_username">Регистрирано потребителско име</string>
+  <string name="username_already_taken">Потребителското име е вече заето</string>
+  <string name="invalid_username">Грешно потребителско име</string>
+  <string name="looking_for_username_availability">Проверка дали потребителското име е свободно…</string>
+  <string name="account_status_connecting">Свързване</string>
+  <string name="account_status_unknown">Неизвестно</string>
+  <!--Create account-->
+  <string name="account_creation_home">Добре дошли в Ring</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-bg/strings_call.xml b/ring-android/app/src/main/res/values-bg/strings_call.xml
index 99a3ce0..71bd86b 100644
--- a/ring-android/app/src/main/res/values-bg/strings_call.xml
+++ b/ring-android/app/src/main/res/values-bg/strings_call.xml
@@ -23,6 +23,7 @@
 <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>
diff --git a/ring-android/app/src/main/res/values-ca/strings.xml b/ring-android/app/src/main/res/values-ca/strings.xml
index 57448a4..724be88 100644
--- a/ring-android/app/src/main/res/values-ca/strings.xml
+++ b/ring-android/app/src/main/res/values-ca/strings.xml
@@ -1,29 +1,129 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="sponsor_section">Ring és software lliure desenvolupat i mantingut per</string>
+  <string name="copyright_section">Copyright</string>
+  <string name="contribute_section">Contribueix</string>
+  <string name="version_section">Versió</string>
+  <string name="no_email_app_installed">No s\'ha trobat cap aplicació de correu, instal·leu una per enviar-nos un informe </string>
+  <string name="email_chooser_title">Enviar correu fent servir...</string>
   <!--RingActivity-->
+  <string name="title_activity_sflphone_home">Ring</string>
+  <string name="error_no_network">No hi ha connexió a la xarxa</string>
+  <string name="error_mobile_network_available_but_disabled">Per favor doneu accés a la xarxa mòbil en la pantalla d\'ajustaments.</string>
   <!--AB menus-->
+  <string name="ab_account_creation">Nou compte</string>
+  <string name="ab_action_chat">Missatge de text</string>
   <!--Left Drawer-->
   <!--Accessibility-->
+  <string name="drawer_open">Obrir el calaix de navegació</string>
+  <string name="drawer_close">Tancar el calaix de navegació</string>
   <!--Sections-->
+  <string name="menu_item_home">Inici</string>
+  <string name="menu_item_accounts">Gestionar els comptes</string>
   <string name="menu_item_settings">Opcions</string>
+  <string name="menu_item_share">Comparteix el meu contacte</string>
+  <string name="menu_item_about">Sobre Ring</string>
   <!--Dialing Fragment-->
+  <string name="dial_number">Marca un número</string>
   <!--History Fragment-->
+  <string name="hist_replay_button">Repetir</string>
+  <string name="hist_replay_button_stop">Para</string>
   <!--DetailsHistory Fragment-->
   <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="one">%d Conversa</item>
+    <item quantity="other">%d Converses</item>
+  </plurals>
+  <string name="home_transfering">Transferint %1$s a %1$s</string>
+  <string name="home_transfer_complet">Transferència completada</string>
   <!--ContactList Fragment-->
+  <string name="no_contact_found">Contacte no trobat</string>
+  <string name="starred_contacts_title">Favorits</string>
+  <string name="searchbar_hint">Fiqueu un nom o número de telèfon</string>
+  <string name="choose_number">Escolliu un número</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
+  <string name="transfer_to_another_call">Transferir a altra trucada actual:</string>
+  <string name="transfer_no_other_call">No hi ha altres trucades pendents</string>
+  <string name="transfer_type_number">Escriure un número per transferir a:</string>
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">Trucada perduda de %1$s</string>
+  <string name="notif_missed_outgoing_call">Trucada perduda a %1$s</string>
+  <string name="notif_incoming_call_title">Trucada entrant de %1$s</string>
   <string name="notif_incoming_call">Trucada entrant</string>
+  <string name="notif_outgoing_call_title">Trucada sortint de %1$s</string>
+  <string name="notif_outgoing_call">Trucada sortint</string>
+  <string name="notif_current_call_title">Trucada actual amb %1$s</string>
+  <string name="notif_current_call">Trucada actual</string>
   <!--Call Fragment-->
+  <string name="you_txt_prefix">Tu:</string>
+  <string name="action_call_attended_transfer">Transferència Atesa</string>
+  <string name="action_call_conference">Conferència</string>
+  <string name="action_call_hangup">Penjar</string>
+  <string name="ongoing_call">Trucada en marxa</string>
+  <string name="hist_in_call">Trucada entrant de %1$s</string>
+  <string name="hist_out_call">Trucada en marxa de %1$s</string>
+  <string name="start_error_title">No es pot iniciar Ring !</string>
+  <string name="start_error_mic_required">Ring necessita el permís del micròfon per funcionar.</string>
+  <string name="action_call_accept">Agafar trucada</string>
+  <string name="action_call_decline">Rebutjar</string>
+  <string name="ab_action_speakerphone">Habilitar l\'altaveu</string>
+  <string name="ab_action_contact_add">Afegir als contactes</string>
+  <string name="ab_action_contact_add_question">Afegir als contactes ?</string>
+  <string name="ab_action_audio_call">Trucada de veu</string>
+  <string name="ab_action_video_call">Videotrucada </string>
+  <string name="share_via">Comparteix via</string>
+  <string name="write_a_message">Escriu un missatge</string>
+  <string name="scan_qr">Escanejar un codi QR</string>
+  <string name="ab_action_flipcamera">Canviar de càmera</string>
   <!--Text messages-->
+  <string name="send_message">Enviar el missatge</string>
+  <string name="message_sending">Enviant missatge</string>
+  <string name="time_just_now">Ara mateix</string>
+  <string name="permission_read_denied">L\'aplicació no té permís per llegir al seu emmagatzematge. Per tant, no pot funcionar. Si us plau, considereu la concessió d\'aquest permís</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Permís de la càmera</string>
+  <string name="permission_dialog_camera_message">Les videotrucades necessiten el permís de la càmera per feuncionar. Si us plau, considereu habilitar-lo.</string>
+  <string name="ringtone_error_title">Error</string>
+  <string name="ringtone_error_format_not_supported">Aquest format no és compatible.</string>
+  <string name="ringtone_error_size_too_big">L\'arxiu és massa gran. La mida màxim és de %1$ikB.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring necessita el permís de llegir contactes per a habilitar aquesta funcionalitat. Si us plau, concediu-lo.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring necessita el permís d\'escriure al registre de trucades per a habilitar aquesta funcionalitat. Si us plau, concediu-lo.</string>
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Escanejar el codi QR del compte que vulgueu afegir.</string>
   <!--Settings-->
+  <string name="clear_history_dialog_title">Netejar l\'historial ?</string>
+  <string name="clear_history_dialog_message">Aquesta acció no pot ser desfeta.</string>
+  <string name="clear_history_completed">L\'historial s\'ha netejat.</string>
   <!--Conversation-->
+  <string name="conversation_action_delete_this">Esborra aquesta conversa</string>
+  <string name="conversation_action_delete_this_title">Esborrar aquesta conversa ?</string>
+  <string name="conversation_action_delete_this_message">Aquesta acció no pot ser desfeta.</string>
+  <string name="conversation_action_copy_peer_number">Copia el número</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s copiat al porta-retalls</string>
+  <string name="conversation_action_select_peer_number">Seleccia un número</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Afegir %1$s ?</string>
+  <string name="prompt_new_password">Nova contrasenya</string>
+  <string name="prompt_new_password_repeat">Repetir la nova contrasenya</string>
+  <string name="account_create_title">Crear un compte de Ring</string>
+  <string name="prompt_new_username">Escriu un nou nom d\'usuari</string>
+  <string name="help_password_choose">Escollir una contrasenya forta que haureu de recordar per protegir el vostre compte de Ring.</string>
+  <string name="help_password_enter">Escriure la contrasenya del vostre compte principal de Ring</string>
+  <string name="help_pin_enter">Ficar el PIN d\'altre compte configurat de Ring. Feu servir la funció \"exportar compte a Ring\" per obtenir el PIN.</string>
+  <string name="wizard_next">Següent</string>
+  <string name="account_device_updated_message">S\'ha actualitzat correctament el vostre compte de Ring.</string>
   <!--MenuHeaderView-->
+  <string name="profile">El meu perfil</string>
+  <string name="profile_message_warning">Aquesta és compartida amb el vostres contactes</string>
+  <string name="open_the_gallery">Obrir la galeria</string>
+  <string name="take_a_photo">Fer una foto</string>
+  <string name="unknowm_if_empty">Es desconeix si està buit</string>
+  <string name="unknown">Desconegut</string>
   <!--Share fragment-->
+  <string name="share_message">Escaneja aquest codi QR amb l\'escàner de l\'aplicació Ring que vulga comunicar-se amb tu.</string>
+  <string name="share_your_account_information">Compartir la meua informació de contacte</string>
+  <string name="generic_error_migration">Error</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ca/strings_account.xml b/ring-android/app/src/main/res/values-ca/strings_account.xml
index 7aa893f..e28692d 100644
--- a/ring-android/app/src/main/res/values-ca/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ca/strings_account.xml
@@ -1,11 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Esborrar</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Àlies</string>
   <string name="prompt_hostname">Nom d\'amfitrió</string>
   <string name="prompt_username">Nom d\'usuari</string>
   <string name="prompt_password">Contrasenya</string>
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_message">Aquesta acció no pot ser desfeta.</string>
   <!--AccountManagementFragment-->
   <string name="normal_accounts_titles">Comptes</string>
   <!--Basic Details-->
@@ -18,6 +21,7 @@
   <!--Audio Details-->
   <string name="account_audio_label">Àudio</string>
   <string name="account_preferences_media_tab">Mitjans</string>
+  <string name="account_ringtone_label">To de trucada</string>
   <!--Video Details-->
   <string name="account_video_label">Vídeo</string>
   <string name="account_video_enable">Habilita el vídeo</string>
@@ -30,5 +34,9 @@
   <!--SIP-->
   <!--TLS Details-->
   <!--restore/backup-->
+  <string name="account_export_end_error_title">Error</string>
+  <string name="account_new_button">Crear un compte de Ring</string>
   <!--Name registration-->
+  <string name="account_status_unknown">Desconegut</string>
+  <!--Create account-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
index 9a0a7a0..0ba5aa5 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
@@ -1,9 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="sponsor_section">Ring je svobodný software, jejž vyvíjí a podporuje</string>
+  <string name="copyright_section">Copyright</string>
+  <string name="contribute_section">Přispět</string>
   <string name="version_section">Verze</string>
+  <string name="no_email_app_installed">Nenalezena mailová aplikace, nějakou si nainstalujte, abyste nám poslali hlášení</string>
+  <string name="email_chooser_title">Poslat zprávu pomocí…</string>
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Chybí připojení</string>
+  <string name="error_mobile_network_available_but_disabled">Povolte prosím v nastavení přístup k mobilním datům</string>
   <!--AB menus-->
   <string name="ab_account_creation">Nový účet</string>
   <string name="ab_action_chat">Textové zprávy</string>
@@ -15,18 +21,19 @@
   <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_share">Sdílet můj kontakt</string>
   <string name="menu_item_about">O Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Vytočit čí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_replay_button_stop">Zastavit</string>
   <!--DetailsHistory Fragment-->
   <!--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>
+    <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>
@@ -39,36 +46,36 @@
   <!--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>
+  <string name="transfer_type_number">Vložte číslo, na něž 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_title">Odchozí hovor k %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="you_txt_prefix">Vy:</string>
-  <string name="action_call_attended_transfer">Přesměrování na Čekající Hovor</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="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="start_error_title">Nelze spustit Ring!</string>
+  <string name="start_error_mic_required">Aby Ring správně pracoval, vyžaduje přístup 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_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="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>
@@ -79,28 +86,45 @@
   <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>
   <string name="ringtone_error_title">Chyba</string>
+  <string name="ringtone_error_format_not_supported">Tento formát je nepodporovaný.</string>
+  <string name="ringtone_error_size_too_big">Soubor je příliš velký. Maximální velikost je %1$ikB.</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>
+  <string name="permission_dialog_read_contacts_message">Pro tuto funkci Ring vyžaduje povolení „Číst kontakty“. Povolte jej prosím.</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>
+  <string name="permission_dialog_write_call_log_message">Pro tuto funkci Ring vyžaduje povolení „Zapisovat záznam hovorů“. Povolte jej prosím.</string>
   <!--QRCode Scan-->
-  <string name="scan_qr_account_message">Oskenujte QR Kód účtu, který chcete přidat.</string>
+  <string name="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_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_delete_this">Odstranit tuto konverzaci</string>
-  <string name="conversation_action_delete_this_title">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>
+  <string name="add_call_contact_number_to_contacts">Přidat %1$s?</string>
   <string name="prompt_new_password">Nové heslo</string>
+  <string name="prompt_new_password_repeat">Zopakujte nové heslo</string>
   <string name="account_create_title">Vytvořit účet Ring</string>
+  <string name="prompt_new_username">Zadejte nové uživatelské jméno</string>
+  <string name="help_password_choose">K ochraně účtu Ring si zvolte silné heslo, které si dovedete zapamatovat.</string>
+  <string name="help_password_enter">Zadejte hlavní heslo ke svému účtu Ring</string>
+  <string name="help_pin_enter">Zadejte PIN z jiného nastaveného účtu Ring. Abyste PIN získali, použijte volbu „exportovat účet na Ring“.</string>
+  <string name="wizard_next">Další</string>
+  <string name="account_device_updated_message">Úspěšně jste si aktualizovali účet Ring.</string>
   <!--MenuHeaderView-->
-  <string name="unknown">Neznámý</string>
+  <string name="profile">Můj profil</string>
+  <string name="profile_message_warning">Toto je sdíleno s vašimi kontakty</string>
+  <string name="open_the_gallery">Otevřít galerii</string>
+  <string name="take_a_photo">Pořídit fotku</string>
+  <string name="unknowm_if_empty">Neznámé, pokud prázdné</string>
+  <string name="unknown">Neznámé</string>
   <!--Share fragment-->
+  <string name="share_message">Naskenujte QR kód zabudovaným skenerem aplikace Ring, která s vámi chce komunikovat.</string>
+  <string name="share_your_account_information">Sdílet mé kontaktní informace</string>
+  <string name="generic_error_migration">Chyba</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 46fcab0..45dd85e 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
@@ -1,54 +1,62 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Odstranit</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Přezdívka</string>
   <string name="prompt_hostname">Hostitelské jméno</string>
   <string name="prompt_username">Uživatelské jméno</string>
   <string name="prompt_password">Heslo</string>
+  <string name="action_create">Vytvořit úč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_wait_update">Aktualizuje se účet</string>
+  <string name="dialog_wait_update_details">Počkejte prosím, než bude váš účet aktualizová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>
+Budete moci pouze vytvářet a přijímat přímé ip hovory.
+Svůj účet můžete upravit později</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_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>
   <!--Strings related to account deletion-->
-  <string name="account_delete_dialog_title">Odstranit účet ?</string>
+  <string name="account_delete_dialog_title">Odstranit účet?</string>
   <string name="account_delete_dialog_message">Tuto činnost nelze vrátit zpět.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Žádný registrovaný účet</string>
   <string name="normal_accounts_titles">Účty</string>
+  <string name="normal_devices_titles">Známá zařízení připojená k tomuto účtu Ring</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_basic_category">Základní nastavení</string>
+  <string name="account_alias_label">Jméno účtu</string>
   <string name="account_hostname_label">Hostitelské jméno</string>
-  <string name="account_bootstrap_label">Zavaděč</string>
+  <string name="account_bootstrap_label">Bootstrap</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_optionnal_category">Doplňková nastavení</string>
+  <string name="account_useragent_label">Identifikace klienta</string>
+  <string name="account_autoanswer_label">Automatická odpověď</string>
+  <string name="account_upnp_label">Povolit UPnP</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_preferences_media_tab">Mé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>
+  <string name="account_ringtone_custom_label">Použít vlastní 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_label">Video</string>
+  <string name="account_video_enable">Povolit video</string>
   <!--Advanced Details-->
-  <string name="account_preferences_advanced_tab">Pokročilá</string>
-  <string name="account_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_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>
@@ -56,39 +64,91 @@
   <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>
+  <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_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">Bezpečnost</string>
+  <string name="account_preferences_security_tab">Zabezpečení</string>
   <!--SIP-->
   <!--TLS Details-->
   <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_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 soukromého klíče</string>
+  <string name="account_tls_password_label">Heslo soukromé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_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ěřit klient</string>
+  <string name="account_tls_negotiation_timeout_sec">Limit vyjednávání (sekundy)</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>
+  <string name="account_rtp_port_range">Rozsah portů zvukového RTP</string>
   <!--restore/backup-->
+  <string name="account_restore_account">Obnovit účet</string>
   <string name="account_restore_message">Vložte heslo pro dešifrování souboru.</string>
-  <string name="account_restore_decryption_password">Heslo dešifrování</string>
-  <string name="restore_backup_wait">Please vyčkejte…</string>
-  <string name="error_password_char_count">Minimálně 6 znaků</string>
+  <string name="account_restore_decryption_password">Dešifrovací heslo</string>
+  <string name="account_new_device_password">Pro odemčení účtu zadejte hlavní heslo</string>
+  <string name="restore_dialog_title">Obnovuje se</string>
+  <string name="restore_backup_wait">Počkejte prosím…</string>
+  <string name="error_password_char_count">Nejméně 6 znaků</string>
   <string name="error_passwords_not_equals">Hesla se neshodují</string>
+  <string name="restore_failed_dialog_title">Obnova selhala</string>
   <string name="restore_failed_dialog_msg">Nastala chyba</string>
+  <string name="export_account_wait_title">Počkejte prosím…</string>
+  <string name="export_account_wait_message">Zveřejňují se informace o novém účtu</string>
+  <string name="account_export_end_decryption_message">Zadaným heslem nebylo možné váš účet odemknout.</string>
+  <string name="account_export_end_network_title">Chyba sítě</string>
+  <string name="account_export_end_network_message">Nebylo možné exportovat účet do sítě. Zkontrolujte si připojení.</string>
   <string name="account_export_end_error_title">Chyba</string>
+  <string name="account_export_end_error_message">Nebylo možné účet exportovat. Nastala neznámá chyba.</string>
+  <string name="account_enter_password">Zadejte heslo</string>
+  <string name="account_contact_me">Kontaktujte mě na Ring!</string>
+  <string name="update_account">Aktualizovat účet</string>
+  <string name="ring_account">Účet Ring</string>
+  <string name="account_migration_title_dialog">Převod účtu</string>
+  <string name="account_update_needed">Nutná aktualizace</string>
+  <string name="account_creation_file_too_big">Soubor je příliš velký</string>
+  <string name="account_cannot_read">Nelze přečíst %1$s</string>
+  <string name="account_cannot_be_found_title">Nelze nalézt účet</string>
+  <string name="account_cannot_be_found_message">Na síti Ring nebyl účet nalezen.\nUjistěte se, že byl exportován na Ring z existujícího zařízení a že jsou přihlašovací údaje správné.</string>
+  <string name="account_no_network_title">Nelze se připojit k síti</string>
+  <string name="account_no_network_message">Nebylo možno přidat účet, protože se Ring nedokázal připojit k distribuované síti. Zkontrolujte si síťové připojení.</string>
+  <string name="account_device_added_title">Přístroj přidán k účtu</string>
+  <string name="account_device_added_message">Úspěšně jste si na tomto zařízení nastavili svůj účet Ring.</string>
+  <string name="account_device_updated_title">Aktualizován přístroj v účtu</string>
+  <string name="account_link_button">Připojit toto zařízení k účtu</string>
+  <string name="account_import_title">Připojit k už existujícímu účtu</string>
+  <string name="account_link_prompt_pin">Zadejte PIN</string>
+  <string name="account_wizard_title">Vítejte v</string>
   <string name="account_new_button">Vytvořit účet Ring</string>
+  <string name="account_link_export_button">Připojit k tomuto účtu další zařízení</string>
+  <string name="account_link_export_info">Pro použití tohoto účtu na dalších zařízeních jej musíte nejdříve vystavit na Ring. Tím se vygeneruje kód PIN, který musíte zadat na novém zařízení, kde nastavujete účet. PIN zůstává platný 10 minut. \n\nPro začátek prosím poskytněte své heslo:</string>
+  <string name="account_start_export_button">Vygenerovat PIN</string>
+  <string name="account_end_export_button">zavřít</string>
+  <string name="account_end_export_infos">Váš PIN je:\n\n%%\n\nK dokončení tohoto procesu otevřete na novém zařízení Ring. Přihlaste se k účtu pomocí „Připojit toto zařízení k účtu“. Váš PIN zůstává platný 10 minut.</string>
   <!--Name registration-->
+  <string name="register_name_wrong_password">Jméno nelze zaregistrovat: chybné heslo k účtu.</string>
+  <string name="register_name_invalid">Jméno nelze zaregistrovat: neplatné jméno.</string>
+  <string name="register_name_already_taken">Jméno nelze zaregistrovat: jméno je již zabrané.</string>
+  <string name="register_name_network_error">Jméno nelze zaregistrovat: chyba sítě nebo serveru.</string>
+  <string name="error_username_empty">Zadejte uživatelské jméno</string>
+  <string name="no_registered_name_for_account">Pro tento účet nenalezeno žádné registrované jméno</string>
+  <string name="register_name">Zaregistrovat jméno</string>
+  <string name="trying_to_register_name">Pokus o registraci jména</string>
+  <string name="registered_username">Registrované uživatelské jméno</string>
+  <string name="register_username">Zaregistrovat jméno veřejně (experimentální)</string>
+  <string name="username_already_taken">Uživatelské jméno je již obsazené</string>
+  <string name="invalid_username">Neplatné uživatelské jméno</string>
+  <string name="looking_for_username_availability">Zjišťuje se dostupnost uživatelského jména…</string>
+  <string name="account_status_connecting">Spojování</string>
+  <string name="account_status_unknown">Neznámé</string>
+  <!--Create account-->
+  <string name="account_creation_home">Vítejte v Ringu</string>
+  <string name="account_creation_profile">Vytvořit vlastní profil</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 44f9706..db68fc5 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
@@ -23,13 +23,22 @@
 <resources>
     <!-- SipCalls -->
     <string name="call_human_state_incoming">Vyzvánění</string>
+    <string name="call_human_state_connecting">Spojová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>
     <string name="call_human_state_failure">Hovor selhal</string>
-    <string name="call_human_state_hold">Hovor pozastaven</string>
+    <string name="call_human_state_hold">Pozastavit</string>
     <string name="call_human_state_unhold">Pokračovat v hovoru</string>
     <string name="call_human_state_over">Hovor skončil</string>
-    <string name="conference_human_state_hold">Hovor pozastaven</string>
-    </resources>
\ No newline at end of file
+    <string name="call_human_state_none">Nic</string>
+    <!-- Conferences -->
+    <string name="conference_human_state_active_attached">Aktivní připojen</string>
+    <string name="conference_human_state_active_detached">Aktivní odpojen</string>
+    <string name="conference_human_state_active_attached_rec">Aktivní připoji záznam</string>
+    <string name="conference_human_state_active_detached_rec">Aktivní odpojil záznam</string>
+    <string name="conference_human_state_hold">Pozastavit</string>
+    <string name="conference_human_state_hold_rec">Pozastavit nahrávání</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-da-rDK/strings.xml b/ring-android/app/src/main/res/values-da-rDK/strings.xml
index 0e48707..a59531d 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
@@ -1,11 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Licens</string>
   <string name="sponsor_section">Ring er fri software, udviklet og støttet af</string>
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Bidrag</string>
   <string name="version_section">Version</string>
-  <string name="no_email_app_installed">Ingen email-app fundet, installerer en for at sende os en rapport</string>
+  <string name="no_email_app_installed">Ingen email-app fundet, installér en for at sende os en rapport</string>
   <string name="email_chooser_title">Send mail ved brug af...</string>
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
@@ -20,8 +19,9 @@
   <string name="drawer_close">Luk navigationsskuffen</string>
   <!--Sections-->
   <string name="menu_item_home">Hjem</string>
-  <string name="menu_item_accounts">Håndter konti</string>
+  <string name="menu_item_accounts">Håndtér konti</string>
   <string name="menu_item_settings">Indstillinger</string>
+  <string name="menu_item_share">Del min kontakt</string>
   <string name="menu_item_about">Om Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Indtast et nummer</string>
@@ -31,8 +31,8 @@
   <!--DetailsHistory Fragment-->
   <!--Home Fragment-->
   <plurals name="home_conferences_title">
-    <item quantity="one">%d Samtale</item>
-    <item quantity="other">%d Samtaler</item>
+    <item quantity="one">%d samtale</item>
+    <item quantity="other">%d samtaler</item>
   </plurals>
   <string name="home_transfering">Overfører %1$s til %1$s</string>
   <string name="home_transfer_complet">Overførsel afsluttet</string>
@@ -57,7 +57,7 @@
   <string name="notif_current_call">Nuværende opkald</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Dig:</string>
-  <string name="action_call_attended_transfer">Overvåget Overførsel</string>
+  <string name="action_call_attended_transfer">Overvåget overførsel</string>
   <string name="action_call_conference">Konference</string>
   <string name="action_call_hangup">Læg på</string>
   <string name="ongoing_call">Aktivt opkald</string>
@@ -85,6 +85,8 @@
   <string name="permission_dialog_camera_title">Kamera-tilladelse</string>
   <string name="permission_dialog_camera_message">Video-samtaler kræver kamera-tilladelse for at fungere. Overvej venligst at give denne tilladelse.</string>
   <string name="ringtone_error_title">Fejl</string>
+  <string name="ringtone_error_format_not_supported">Dette format understøttes ikke.</string>
+  <string name="ringtone_error_size_too_big">Denne fil er for stor. Maksimalt tilladte størrelse er %1$ikB.</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring har brug for \"Læs kontakter\"-tilladelse for at kunne udføre denne funktion. Vær venlig at tillade den.</string>
   <!--Write call log permission-->
@@ -99,14 +101,29 @@
   <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_copy_peer_number">Kopiér 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>
   <string name="prompt_new_password">Nyt kodeord</string>
+  <string name="prompt_new_password_repeat">Gentag nyt kodeord</string>
   <string name="account_create_title">Opret en Ring-konto</string>
+  <string name="prompt_new_username">Indtast nyt brugernavn</string>
+  <string name="help_password_choose">Vælg et stærkt kodeord, som du kan huske, til at beskytte din Ring-konto.</string>
+  <string name="help_password_enter">Indtast dit primære Ring-konto kodeord</string>
+  <string name="help_pin_enter">Indtast PIN-koden fra en anden konfigureret Ring-konto. Brug eksporter-konto-funktionaliteten for at få adgang til en PIN-kode. </string>
+  <string name="wizard_next">Næste</string>
+  <string name="account_device_updated_message">Du har opdateret din Ring-konto.</string>
   <!--MenuHeaderView-->
+  <string name="profile">Min profil</string>
+  <string name="profile_message_warning">Dette deles med dine kontakter</string>
+  <string name="open_the_gallery">Åben galleriet</string>
+  <string name="take_a_photo">Tag et billede</string>
+  <string name="unknowm_if_empty">Ukendt hvis tom</string>
   <string name="unknown">Ukendt</string>
   <!--Share fragment-->
+  <string name="share_message">Skan denne QRCode med den indbyggede scanner i Ring-applikationen.</string>
+  <string name="share_your_account_information">Del min kontaktinformation</string>
+  <string name="generic_error_migration">Fejl</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 7e25643..7e6e43f 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
@@ -1,14 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Slet</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Værtsnavn</string>
   <string name="prompt_username">Brugernavn</string>
   <string name="prompt_password">Kodeord</string>
+  <string name="action_create">Opret konto</string>
   <string name="action_create_short">Registrer</string>
   <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_wait_update">Opdaterer konto</string>
+  <string name="dialog_wait_update_details">Vent venligst mens din nye konto opdateres...</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.
@@ -23,6 +28,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Ingen konto registreret</string>
   <string name="normal_accounts_titles">Konti</string>
+  <string name="normal_devices_titles">Kendte enheder som er tilknyttet denne Ring-konto</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Generelt</string>
   <string name="account_basic_category">Almindelige Indstillinger</string>
@@ -42,6 +48,7 @@
   <string name="account_ringtone_label">Ringetoner</string>
   <string name="account_ringtone_enabled_label">Aktiver ringetoner</string>
   <string name="account_ringtone_path_label">Ringetone sti</string>
+  <string name="account_ringtone_custom_label">Anvend brugervalgt ringetone</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
   <string name="account_video_enable">Aktiver Video</string>
@@ -83,13 +90,64 @@
   <string name="account_rtp_min_port">Minimum</string>
   <string name="account_rtp_port_range">Portinterval for Lyd-RTP</string>
   <!--restore/backup-->
+  <string name="account_restore_account">Gendan en konto</string>
   <string name="account_restore_message">Indtast kodeord for at dekryptere filen.</string>
   <string name="account_restore_decryption_password">Dekrypteringskodeord</string>
+  <string name="account_new_device_password">Indtast primære kodeord for at oplåse konto</string>
+  <string name="restore_dialog_title">Genskaber</string>
   <string name="restore_backup_wait">Vent venligt...</string>
   <string name="error_password_char_count">Mindst 6 tegn</string>
   <string name="error_passwords_not_equals">Kodeord stemmer ikke overens</string>
+  <string name="restore_failed_dialog_title">Genskabelse mislykkedes</string>
   <string name="restore_failed_dialog_msg">Der skete en fejl</string>
+  <string name="export_account_wait_title">Vent venligst...</string>
+  <string name="export_account_wait_message">Publicierer ny konto-information</string>
+  <string name="account_export_end_decryption_message">Kunne ikke låse din konto op med brug af det angivne kodeord.</string>
+  <string name="account_export_end_network_title">Netværksfejl</string>
+  <string name="account_export_end_network_message">Kunne ikke eksportere kontoen til netværket. Kontroller forbindelsen.</string>
   <string name="account_export_end_error_title">Fejl</string>
+  <string name="account_export_end_error_message">Kunne ikke eksportere kontoen. En ukendt fejl opstod.</string>
+  <string name="account_enter_password">Indtast kodeord</string>
+  <string name="account_contact_me">Kontakt mig på Ring !</string>
+  <string name="update_account">Opdater konto</string>
+  <string name="ring_account">Ring-konto</string>
+  <string name="account_migration_title_dialog">Konto-migrering</string>
+  <string name="account_update_needed">Opdatering nødvendig</string>
+  <string name="account_creation_file_too_big">Filen er for stor</string>
+  <string name="account_cannot_read">Kan ikke læse %1$s</string>
+  <string name="account_cannot_be_found_title">Kan ikke finde konto</string>
+  <string name="account_cannot_be_found_message">Kontoen kunne ikke findes på Ring-netværket.\nSikr dig at den er eksporteret fra en eksisterende enhed, og at de angivne bruger-oplysninger er korrekte.</string>
+  <string name="account_no_network_title">Kan ikke forbinde til netværket</string>
+  <string name="account_no_network_message">Kunne ikke tilføje kontoen fordi Ring ikke kunne forbinde til det distribuerede netværk. Kontroller enhedens netværksforbindelse.</string>
+  <string name="account_device_added_title">Enheds-konto tilføjet</string>
+  <string name="account_device_added_message">Du har nu konfigureret din Ring-konto på denne enhed.</string>
+  <string name="account_device_updated_title">Enheds-konto opdateret</string>
+  <string name="account_link_button">Tilknyt denne enhed til en konto</string>
+  <string name="account_import_title">Tilnyt til en eksisterende konto</string>
+  <string name="account_link_prompt_pin">Indtast PIN-kode</string>
+  <string name="account_wizard_title">Velkommen til</string>
   <string name="account_new_button">Opret en Ring-konto</string>
+  <string name="account_link_export_button">Tilknyt en anden enhed til denne konto</string>
+  <string name="account_link_export_info">For at bruge denne konto på andre enheder, skal du først gøre den tilgængelig for Ring. Dette vil generere en PIN-kode som skal indtastes på den nye enhed for at installere kontoen. Pin-koden er gyldig i 10 minutter. \n\nIndtast dit kodeord for at starte:</string>
+  <string name="account_start_export_button">Generer PIN-kode</string>
+  <string name="account_end_export_button">luk</string>
+  <string name="account_end_export_infos">Din PIN-kode er:\n\n%%\n\nFor at afslutte processen skal du åbne Ring på den nye enhed, og oprette en ny konto med \"Tilknyt denne enhed til en konto\". PIN-koden er gyldig i 10 minutter.</string>
   <!--Name registration-->
+  <string name="register_name_wrong_password">Kan ikke registrere navn: forkert kodeord.</string>
+  <string name="register_name_invalid">Kan ikke registrere navn: ugyldigt navn</string>
+  <string name="register_name_already_taken">Kan ikke registrere navn: navnet er optaget</string>
+  <string name="register_name_network_error">Kan ikke registrere navn: netværk eller server-fejl</string>
+  <string name="error_username_empty">Indtast et brugernavn</string>
+  <string name="no_registered_name_for_account">Intet registreret navn fundet for denne konto</string>
+  <string name="register_name">Registrer navn</string>
+  <string name="trying_to_register_name">Forsøger at registrere navn</string>
+  <string name="registered_username">Registreret brugernavn</string>
+  <string name="username_already_taken">Brugernavn er allerede taget</string>
+  <string name="invalid_username">Ugyldigt brugernavn</string>
+  <string name="looking_for_username_availability">Tjekker brugernavnets tilgængelighed ...</string>
+  <string name="account_status_connecting">Forbinder</string>
+  <string name="account_status_unknown">Ukendt</string>
+  <!--Create account-->
+  <string name="account_creation_home">Velkommen til Ring</string>
+  <string name="account_creation_profile">Opret din profil</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings.xml b/ring-android/app/src/main/res/values-de-rDE/strings.xml
index 9ea391d..95cbea3 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Lizenz</string>
-  <string name="sponsor_section">Ring ist eine freie Software entwickelt und unterstützt von</string>
+  <string name="sponsor_section">Ring ist freie Software. Sie wurde entwickelt und wird unterstützt von</string>
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Mitwirken</string>
   <string name="version_section">Version</string>
@@ -10,15 +9,19 @@
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Keine Netzwerkkonnektivität</string>
+  <string name="error_mobile_network_available_but_disabled">Bitte in den Einstellungen Zugriff auf mobile Daten erlauben.</string>
   <!--AB menus-->
   <string name="ab_account_creation">Neues Konto</string>
   <string name="ab_action_chat">Textnachrichten</string>
   <!--Left Drawer-->
   <!--Accessibility-->
+  <string name="drawer_open">Navigationsfenster öffnen</string>
+  <string name="drawer_close">Navigationsfenster schließen</string>
   <!--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_share">Teile meine RING-ID</string>
   <string name="menu_item_about">Über Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Nummer wählen</string>
@@ -41,6 +44,8 @@
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <string name="transfer_to_another_call">Durchstellen zu einem anderen aktuellen Anruf:</string>
+  <string name="transfer_no_other_call">Keine weiteren Anrufe wartend</string>
+  <string name="transfer_type_number">Eingabe Empfänger-Nummer:</string>
   <!--Notifications-->
   <string name="notif_missed_incoming_call">Verpasster Anruf von %1$s</string>
   <string name="notif_missed_outgoing_call">Verpasster Anruf zu %1$s</string>
@@ -58,6 +63,7 @@
   <string name="hist_in_call">Eingehender Anruf von %1$s</string>
   <string name="hist_out_call">Ausgehende Anruf von %1$s</string>
   <string name="start_error_title">Kann nicht Ring starten!</string>
+  <string name="start_error_mic_required">Ring erfordert Mikrofon-Zugriff.</string>
   <string name="action_call_accept">Abnehmen</string>
   <string name="action_call_decline">Ablehnen</string>
   <string name="ab_action_speakerphone">Lautsprecher aktivieren</string>
@@ -68,15 +74,22 @@
   <string name="share_via">Teilen über</string>
   <string name="write_a_message">Eine Nachricht schreiben</string>
   <string name="scan_qr">QR-Code scannen</string>
+  <string name="ab_action_flipcamera">Kamera wechseln</string>
   <!--Text messages-->
   <string name="send_message">Nachricht senden</string>
   <string name="message_sending">Nachricht senden</string>
-  <string name="time_just_now">Vorhin</string>
+  <string name="time_just_now">Gerade eben</string>
+  <string name="permission_read_denied">Der Anwendung wurde der lesende Speicherzugriff verwehrt. Daher kann sie nicht ordnungsgemäß funktionieren. Bitte erlaube diesen Zugriff.</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera-Berechtigung</string>
+  <string name="permission_dialog_camera_message">Video-Konferenzen benötigen Zugriff auf die Kamera. Bitte erlauben Sie diesen Zugriff.</string>
   <string name="ringtone_error_title">Fehler</string>
+  <string name="ringtone_error_format_not_supported">Dieses Format wird nicht unterstützt.</string>
+  <string name="ringtone_error_size_too_big">Diese Datei ist zu groß. Maximal %1$ikB sind erlaubt.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring benötigt für diese Funktion die Erlaubnis \"Kontakte lesen\". Bitte zulassen.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring benötigt für diese Funktion die Erlaubnis \"Anruf-Log schreiben\". Bitte zulassen.</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Scannen Sie den QR-Code des Kontos, das Sie hinzufügen möchten.</string>
   <!--Settings-->
@@ -85,16 +98,31 @@
   <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_title">Diese Unterhaltung löschen?</string>
   <string name="conversation_action_delete_this_message">Diese Aktion kann nicht rückgängig gemacht werden.</string>
   <string name="conversation_action_copy_peer_number">Nummer kopieren</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s 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>
-  <string name="prompt_new_password">Neues Kennwort</string>
+  <string name="prompt_new_password">Neues Passwort</string>
+  <string name="prompt_new_password_repeat">Neues Passwort wiederholen</string>
   <string name="account_create_title">Erstellen einen Ring Konto</string>
+  <string name="prompt_new_username">Neuen Benutzername eingeben</string>
+  <string name="help_password_choose">Wählen Sie ein sicheres Passwort und merken Sie es sich um Ihre Ring-Zugangsdaten zu schützen.</string>
+  <string name="help_password_enter">Geben Sie Ring-Konto-Passwort ein.</string>
+  <string name="help_pin_enter">Geben Sie die PIN eines anderen konfigurierten Ring-Kontos ein.</string>
+  <string name="wizard_next">Weiter</string>
+  <string name="account_device_updated_message">Sie haben ihr Ring-Konto erfolgreich aktualisiert.</string>
   <!--MenuHeaderView-->
+  <string name="profile">Mein Profil</string>
+  <string name="profile_message_warning">Dies wird mit Ihren Kontakten geteilt.</string>
+  <string name="open_the_gallery">Galerie öffnen</string>
+  <string name="take_a_photo">Mache ein Foto</string>
+  <string name="unknowm_if_empty">Unbekannt, wenn leer</string>
   <string name="unknown">Unbekannt</string>
   <!--Share fragment-->
+  <string name="share_message">Scanne diesen QR-Code mit dem Ring-QR-Code-Scanner des neuen Kommunikationspartners.</string>
+  <string name="share_your_account_information">Teile meine RING-ID</string>
+  <string name="generic_error_migration">Fehler</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_account.xml b/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
index daca0d1..a597026 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Löschen</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Hostname</string>
@@ -72,4 +74,8 @@
   <string name="account_export_end_error_title">Fehler</string>
   <string name="account_new_button">Erstellen einen Ring Konto</string>
   <!--Name registration-->
+  <string name="account_status_connecting">Verbinden</string>
+  <string name="account_status_unknown">Unbekannt</string>
+  <!--Create account-->
+  <string name="account_creation_home">Willkommen bei Ring</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de/strings.xml b/ring-android/app/src/main/res/values-de/strings.xml
index 76fab35..9212183 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Lizenz</string>
-  <string name="sponsor_section">Ring ist freie Software, entwickelt und unterstützt durch</string>
+  <string name="sponsor_section">Ring ist eine freie Software, entwickelt und unterstützt durch</string>
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Beitragen</string>
   <string name="version_section">Version</string>
-  <string name="no_email_app_installed">Es konnte keine Email-Anwendung gefunden werden, installieren sie eine um uns einen Bericht zu senden</string>
+  <string name="no_email_app_installed">Es konnte keine Email-Anwendung gefunden werden, installieren Sie eine um uns einen Bericht zu senden</string>
   <string name="email_chooser_title">Mail wird gesendet mit...</string>
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Keine Netzwerkverbindung</string>
-  <string name="error_mobile_network_available_but_disabled">Bitte erlaube den Zugang zum Mobilfunknetz in den Einstellungen</string>
+  <string name="error_mobile_network_available_but_disabled">Bitte erlauben Sie den Zugang zum Mobilfunknetz in den Einstellungen</string>
   <!--AB menus-->
   <string name="ab_account_creation">Neues Konto</string>
   <string name="ab_action_chat">Textnachrichten</string>
   <!--Left Drawer-->
   <!--Accessibility-->
-  <string name="drawer_open">Navigationsschublade öffnen</string>
-  <string name="drawer_close">Navigationsschublade schließen</string>
+  <string name="drawer_open">Navigationsleiste öffnen</string>
+  <string name="drawer_close">Navigationsleiste schließen</string>
   <!--Sections-->
   <string name="menu_item_home">Start</string>
   <string name="menu_item_accounts">Konten verwalten</string>
   <string name="menu_item_settings">Einstellungen</string>
+  <string name="menu_item_share">Meinen Kontakt teilen</string>
   <string name="menu_item_about">über Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Nummer wählen</string>
@@ -44,7 +44,7 @@
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <string name="transfer_to_another_call">Auf einen anderen aktuellen Anruf weiterleiten</string>
-  <string name="transfer_no_other_call">Keine anderen Anrufe wartend</string>
+  <string name="transfer_no_other_call">Kein anderer Anrufe wartend</string>
   <string name="transfer_type_number">Nummer für Übertragung eingeben:</string>
   <!--Notifications-->
   <string name="notif_missed_incoming_call">Verpasster Anruf von %1$s</string>
@@ -60,7 +60,7 @@
   <string name="action_call_attended_transfer">Überwachter Transfer</string>
   <string name="action_call_conference">Konferenz</string>
   <string name="action_call_hangup">Auflegen</string>
-  <string name="ongoing_call">Fortlaufender Anruf</string>
+  <string name="ongoing_call">Derzeitiger Anruf</string>
   <string name="hist_in_call">Eingehender Anruf von %1$s</string>
   <string name="hist_out_call">Ausgehender Anruf von %1$s</string>
   <string name="start_error_title">Ring konnte nicht gestartet werden!</string>
@@ -75,20 +75,22 @@
   <string name="share_via">Teilen mit</string>
   <string name="write_a_message">Sende eine Nachricht</string>
   <string name="scan_qr">QR-Code scannen</string>
-  <string name="ab_action_flipcamera">Flipkamera</string>
+  <string name="ab_action_flipcamera">Kamerabild kippen</string>
   <!--Text messages-->
   <string name="send_message">Nachricht senden</string>
   <string name="message_sending">Nachricht wird gesendet…</string>
   <string name="time_just_now">Gerade eben</string>
-  <string name="permission_read_denied">Die Anwendung hat keine Berechtigung den Speicher zu lesen und funktioniert deswegen nicht richtig. Bitte geben Sie diese Berechtigung frei.</string>
+  <string name="permission_read_denied">Die Anwendung hat keine Berechtigung den Speicher zu lesen und funktioniert deswegen nicht richtig. Bitte erteilen Sie diese Berechtigung.</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera Berechtigung</string>
-  <string name="permission_dialog_camera_message">Für Video-Konversationen benötigt die Anwendung Zugriff auf die Kamera. Bitte geben Sie diese Berechtigung frei.</string>
+  <string name="permission_dialog_camera_message">Für Video-Konversationen benötigt die Anwendung Zugriff auf die Kamera. Bitte erteilen Sie diese Berechtigung.</string>
   <string name="ringtone_error_title">Fehler</string>
+  <string name="ringtone_error_format_not_supported">Dieses Format wird nicht unterstützt.</string>
+  <string name="ringtone_error_size_too_big">Die Datei ist zu groß. Die maximale Größe ist %1$ikB.</string>
   <!--Read contacts permission-->
-  <string name="permission_dialog_read_contacts_message">Ring benötigt die Berechtigung \"Kontaktdaten lesen\" für diese Funktion. Bitte geben Sie sie frei.</string>
+  <string name="permission_dialog_read_contacts_message">Ring benötigt die Berechtigung \"Kontaktdaten lesen\" für diese Funktion. Bitte erteilen Sie diese.</string>
   <!--Write call log permission-->
-  <string name="permission_dialog_write_call_log_message">Ring benötigt die Berechtigung \"Anruflisten schreiben\" für diese Funktion. Bitte geben Sie sie frei.</string>
+  <string name="permission_dialog_write_call_log_message">Ring benötigt die Berechtigung \"Anruflisten schreiben\" für diese Funktion. Bitte erteilen Sie diese.</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Scanne den QR-Code des Kontos, das du hinzufügen möchtest.</string>
   <!--Settings-->
@@ -107,7 +109,12 @@
   <string name="prompt_new_password">Neues Passwort</string>
   <string name="prompt_new_password_repeat">Neues Passwort wiederholen</string>
   <string name="account_create_title">Ein Ring-Konto erstellen</string>
-  <string name="account_device_updated_message">Sie haben erfolgreich ihr Ring-Konto aktualisiert</string>
+  <string name="prompt_new_username">Neuen Benutzernamen eingeben</string>
+  <string name="help_password_choose">Wähle ein sicheres Passwort, an das du dich erinnern kannst, um deinen Ringaccount zu schützen.</string>
+  <string name="help_password_enter">Geben Sie Ihr Haupt-Ring-Kontopasswort ein</string>
+  <string name="help_pin_enter">Gebe die PIN eines anderen konfigurierten Ringaccounts ein. Benutzen Sie die Funktion \"Exportiere Account auf Ring\" um die PIN zu erhalten.</string>
+  <string name="wizard_next">Weiter</string>
+  <string name="account_device_updated_message">Sie haben erfolgreich Ihr Ring-Konto aktualisiert</string>
   <!--MenuHeaderView-->
   <string name="profile">Mein Profil</string>
   <string name="profile_message_warning">Dies wird mit ihren Kontakten geteilt</string>
@@ -116,4 +123,7 @@
   <string name="unknowm_if_empty">\'Unbekannt\' falls leer...</string>
   <string name="unknown">Unbekannt</string>
   <!--Share fragment-->
+  <string name="share_message">Scannen Sie diesen QR-Code mit dem eingebauten Scanner der Ringanwendung, die mit Ihnen kommunizieren will.</string>
+  <string name="share_your_account_information">Teile meine Kontaktinformationen</string>
+  <string name="generic_error_migration">Fehler</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de/strings_account.xml b/ring-android/app/src/main/res/values-de/strings_account.xml
index e8f5375..0870e67 100644
--- a/ring-android/app/src/main/res/values-de/strings_account.xml
+++ b/ring-android/app/src/main/res/values-de/strings_account.xml
@@ -1,31 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Löschen</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Rechnername</string>
   <string name="prompt_username">Benutzername</string>
   <string name="prompt_password">Passwort</string>
+  <string name="action_create">Konto erstellen</string>
   <string name="action_create_short">Registrieren</string>
   <string name="error_field_required">Dieses Feld ist erforderlich</string>
   <string name="dialog_wait_create">Konto hinzufügen</string>
   <string name="dialog_wait_create_details">Bitte warten Sie während Ihr neues Konto eingerichtet wird...</string>
   <string name="dialog_wait_update">Konto wird aktualisiert</string>
-  <string name="dialog_wait_update_details">Bitte warten sie während ihr Konto aktualisiert wird</string>
+  <string name="dialog_wait_update_details">Bitte warten Sie während ihr Konto aktualisiert wird</string>
   <string name="dialog_warn_ip2ip_account_title">Ein leeres SIP-Konto erstellen?</string>
-  <string name="dialog_warn_ip2ip_account_message">Sie sind im Begriff ein SIP-Konto ohne gültigen Hostnamen anzulegen
-Es wird ihnen nur möglich sein direkte IP-Anrufe zu machen und empfangen
+  <string name="dialog_warn_ip2ip_account_message">Sie sind im Begriff ein SIP-Konto ohne gültigen Hostnamen anzulegen.
+Es wird ihnen nur möglich sein direkte IP-Anrufe zu machen und zu empfangen.
 Sie können ihr Konto später bearbeiten</string>
-  <string name="help_ring">Ein Ring-Konto erlaubt es ihnen andere Menschen auf sichere Art direkt über ein verteiltes Netzwerk zu erreichen</string>
+  <string name="help_ring">Ein Ring-Konto erlaubt es Ihnen andere Menschen auf sichere Art direkt über ein verteiltes Netzwerk zu erreichen</string>
   <string name="help_sip_title">Ihr SIP-Konto hinzufgügen</string>
   <string name="help_sip">Mit bereits bestehendem SIP-Konto anmelden.</string>
   <string name="create_sip_account">Hinzufügen</string>
   <!--Strings related to account deletion-->
-  <string name="account_delete_dialog_title">Konto lôschen</string>
+  <string name="account_delete_dialog_title">Konto löschen?</string>
   <string name="account_delete_dialog_message">Diese Aktion kann nicht rückgängig gemacht werden.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Kein Konto registriert</string>
   <string name="normal_accounts_titles">Konten</string>
-  <string name="normal_devices_titles">Bekannte Geräte die mit diesem Ring Konto verknüpft sind</string>
+  <string name="normal_devices_titles">Bekannte Geräte, die mit diesem Ring-Konto verknüpft sind</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Allgemein</string>
   <string name="account_basic_category">Grundlegende Einstellungen</string>
@@ -45,6 +48,7 @@
   <string name="account_ringtone_label">Klingeltöne</string>
   <string name="account_ringtone_enabled_label">Klingelton benutzen</string>
   <string name="account_ringtone_path_label">Klingeltonpfad</string>
+  <string name="account_ringtone_custom_label">Eigenen Klingelton benutzen</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
   <string name="account_video_enable">Video aktivieren</string>
@@ -86,11 +90,15 @@
   <string name="account_rtp_min_port">Minimum</string>
   <string name="account_rtp_port_range">Audio RTP Portbereich</string>
   <!--restore/backup-->
+  <string name="account_restore_account">Konto wiederherstellen</string>
   <string name="account_restore_message">Passwort eingeben um die Datei zu entschlüsseln</string>
   <string name="account_restore_decryption_password">Passwort zum Entschlüsseln</string>
+  <string name="account_new_device_password">Geben Sie das Hauptpasswort ein, um das Konto zu entsperren</string>
+  <string name="restore_dialog_title">Wiederherstellungsvorgang</string>
   <string name="restore_backup_wait">Bitte warten…</string>
   <string name="error_password_char_count">Mindestens 6 Zeichen</string>
   <string name="error_passwords_not_equals">Die Passwörter stimmen nicht überein</string>
+  <string name="restore_failed_dialog_title">Wiederherstellen fehlgeschlagen</string>
   <string name="restore_failed_dialog_msg">Ein Fehler ist aufgetreten</string>
   <string name="export_account_wait_title">Bitte warten…</string>
   <string name="export_account_wait_message">Neue Konto-Informationen veröffentlichen</string>
@@ -100,24 +108,47 @@
   <string name="account_export_end_error_title">Fehler</string>
   <string name="account_export_end_error_message">Konto konnte nicht exportiert werden. Ein unbekannter Fehler ist aufgetreten.</string>
   <string name="account_enter_password">Passwort eingeben</string>
-  <string name="account_share_body">Kontaktieren sie mich mit %1$s auf der verteilten Kommunikationsplatform Ring: http://ring.cx</string>
-  <string name="account_contact_me">Kontaktieren sie mich mit Ring!</string>
+  <string name="account_contact_me">Kontaktieren Sie mich mit Ring!</string>
   <string name="update_account">Konto aktualisieren</string>
-  <string name="account_migration">Ihr Ring-Konto kann nun zwischen all ihren Geräten geteilt werden.  Sie müssen nur ein Passwort angeben.</string>
   <string name="ring_account">Ring-Konto</string>
   <string name="account_migration_title_dialog">Konto-Migration</string>
-  <string name="account_migration_message_dialog">Damit sie auf mehreren Geräten verwendet werden können müssen ihren Konten aktualisert werden. Wollen sie die Konto-Verwaltung anzeigen, um die Operation durchzuführen.</string>
   <string name="account_update_needed">Aktualisierung durchführen</string>
   <string name="account_creation_file_too_big">Datei ist zu gross</string>
   <string name="account_cannot_read">Kann %1$s nicht lesen</string>
   <string name="account_cannot_be_found_title">Kann Konto nicht finden</string>
-  <string name="account_cannot_be_found_message">Konto kann im Ring-Netzwerk nicht gefunden werden.\nStellen sie sicher das es von einem existierenden Konto in Ring exportiert wurde und das die angegebenen Zugansdaten korrekt sind.</string>
+  <string name="account_cannot_be_found_message">Konto kann im Ring-Netzwerk nicht gefunden werden.\nStellen Sie sicher, dass es von einem bereits konfiguierten Gerät exportiert wurde und dass die angegebenen Zugansdaten korrekt sind.</string>
   <string name="account_no_network_title">Verbindung mit dem Netzwerk nicht möglich</string>
   <string name="account_no_network_message">Konto konnte nicht hinzugefügt werden, da Ring sich nicht mit dem verteilten Netzwerk verbinden konnte. Überprüfen sie die Verbindung ihres Gerätes.</string>
-  <string name="account_device_added_title">Geräte-Konto hinzugefügt</string>
+  <string name="account_device_added_title">Konto-Gerät hinzugefügt</string>
   <string name="account_device_added_message">Sie haben erfolgreich ihr Ring-Konto auf diesem Gerät erstellt.</string>
-  <string name="account_device_updated_title">Geräte-Konto aktualisiert</string>
-  <string name="account_wizard_title">Ring-Konto</string>
+  <string name="account_device_updated_title">Konto-Gerät aktualisiert</string>
+  <string name="account_link_button">Dieses Gerät mit einem Konto verknüpfen</string>
+  <string name="account_import_title">Mit einem vorhandenen Konto verknüpfen</string>
+  <string name="account_link_prompt_pin">PIN eingeben</string>
+  <string name="account_wizard_title">Willkommen bei</string>
   <string name="account_new_button">Ein Ring-Konto erstellen</string>
+  <string name="account_link_export_button">Weiteres Gerät mit diesem Konto verknüpfen</string>
+  <string name="account_link_export_info">Um dieses Konto auf weiteren Geräten zu verwenden, müssen Sie zuerst in den Kontoeinstellungen eine PIN generieren. Diese muss auf dem neuen Gerät eingeben werden, um das Konto zu importieren. Die PIN ist für 10 Minuten gültig. \n\nBitte geben Sie Ihr Passwort ein um zu beginnen:</string>
+  <string name="account_start_export_button">PIN generieren</string>
+  <string name="account_end_export_button">Schließen</string>
+  <string name="account_end_export_infos">Ihre PIN ist:\n\n%%\n\nUm den Prozess abzuschließen, öffnen Sie Ring auf dem neuen Gerät. Erstellen Sie ein Konto mit \"Dieses Gerät mit einem Konto verknüpfen\". Ihre PIN ist 10 Minuten gültig.</string>
   <!--Name registration-->
+  <string name="register_name_wrong_password">Name konnte nicht registriert werden: Falches Passwort.</string>
+  <string name="register_name_invalid">Name konnte nicht registriert werden: Ungültiger Name.</string>
+  <string name="register_name_already_taken">Name konnte nicht registriert werden: Name existiert bereits.</string>
+  <string name="register_name_network_error">Name konnte nicht registriert werden: Netzwerk oder Server Fehler.</string>
+  <string name="error_username_empty">Benutzername eingeben</string>
+  <string name="no_registered_name_for_account">Es wurde kein registrierter Name für dieses Konto gefunden.</string>
+  <string name="register_name">Name registrieren</string>
+  <string name="trying_to_register_name">Name wird registriert</string>
+  <string name="registered_username">Benutzername wurde registriert</string>
+  <string name="register_username">Melden Sie sich für einen allgemein-bekannten Benutzername an (experimentell)</string>
+  <string name="username_already_taken">Dieser Benutzername ist bereits vergeben</string>
+  <string name="invalid_username">Ungültiger Benutzername</string>
+  <string name="looking_for_username_availability">Verfügbarkeit des Benutzernamens wird geprüft ...</string>
+  <string name="account_status_connecting">Verbindet</string>
+  <string name="account_status_unknown">Unbekannt</string>
+  <!--Create account-->
+  <string name="account_creation_home">Willkommen zu Ring</string>
+  <string name="account_creation_profile">Erstellen Sie Ihr Profil</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 fc84759..44f71a5 100644
--- a/ring-android/app/src/main/res/values-el/strings.xml
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license"> Άδεια</string>
   <string name="sponsor_section">Το Ring είναι δωρεάν/ελεύθερο λογισμικό αναπτυγμένο και υποστηριζόμενο από</string>
   <string name="copyright_section">Πνευματική ιδιοκτησία</string>
   <string name="contribute_section">Πρόσφερε</string>
@@ -22,6 +21,7 @@
   <string name="menu_item_home">Αρχική</string>
   <string name="menu_item_accounts">Διαχείριση Λογαριασμών</string>
   <string name="menu_item_settings">Ρυθμίσεις</string>
+  <string name="menu_item_share">Μοίρασε τις επαφές μου</string>
   <string name="menu_item_about">Σχετικά</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Κλήση αριθμού</string>
@@ -67,6 +67,7 @@
   <string name="ab_action_contact_add_question">Προσθήκη στις επαφές;</string>
   <string name="ab_action_audio_call">Κλήση φωνής</string>
   <string name="ab_action_video_call">Κλήση βίντεο</string>
+  <string name="share_via">Μοίρασμα μέσω</string>
   <string name="write_a_message">Γράψε μήνυμα</string>
   <string name="scan_qr">Σάρωση QR κώδικα</string>
   <string name="ab_action_flipcamera">Εναλλαγή κάμερας</string>
@@ -79,6 +80,7 @@
   <string name="permission_dialog_camera_title">Άδεια πρόσβασης στην κάμερα</string>
   <string name="permission_dialog_camera_message">Οι κλήσεις μέσω βίντεο χρειάζεται την άδεια στην κάμερά  για να δουλέψει. Παρακαλώ σκεφτείτε να την ενεργοποιήσετε.</string>
   <string name="ringtone_error_title">Σφάλμα</string>
+  <string name="ringtone_error_size_too_big">Το αρχείο είναι πολύ μεγάλο. Το μέγιστο μέγεθος είναι %1$ikB.</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Η εφαρμογή Ring χρειάζεται να διαβάσει τις επαφές σας ώστε να ενεργοποιήσει αυτή την λειτουργία. Παρακαλώ δώστε την.</string>
   <!--Write call log permission-->
@@ -97,7 +99,17 @@
   <string name="conversation_action_select_peer_number">Επιλέξτε αριθμό </string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Προσθήκη %1$s ;</string>
+  <string name="prompt_new_password">Νέο συνθηματικό</string>
+  <string name="prompt_new_password_repeat">Επανάληψη νέου συνθηματικού</string>
+  <string name="account_create_title">Δημιουργία λογαριασμού Ring</string>
+  <string name="help_password_enter">Εισαγωγή συνθηματικού του κύριου Ring λογαριασμού σας</string>
+  <string name="wizard_next">Επόμενο</string>
+  <string name="account_device_updated_message">Ο Ring λογαριασμός σας αναβαθμίστηκε επιτυχώς.</string>
   <!--MenuHeaderView-->
+  <string name="profile">Το προφίλ μου</string>
+  <string name="take_a_photo">Λήψη φωτογραφίας</string>
   <string name="unknown">Άγνωστοι</string>
   <!--Share fragment-->
+  <string name="share_your_account_information">Μοίρασε τις πληροφορίες των επαφών μου</string>
+  <string name="generic_error_migration">Σφάλμα</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-el/strings_account.xml b/ring-android/app/src/main/res/values-el/strings_account.xml
index 94506c1..16284a6 100644
--- a/ring-android/app/src/main/res/values-el/strings_account.xml
+++ b/ring-android/app/src/main/res/values-el/strings_account.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Διαγραφή</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Ψευδώνυμο</string>
   <string name="prompt_hostname">Hostname</string>
@@ -35,5 +37,12 @@
   <string name="account_rtp_port_range">Εύρος θυρών RTP ήχου</string>
   <!--restore/backup-->
   <string name="account_export_end_error_title">Σφάλμα</string>
+  <string name="account_wizard_title">Καλώς ήλθατε στο</string>
+  <string name="account_new_button">Δημιουργία λογαριασμού Ring</string>
   <!--Name registration-->
+  <string name="invalid_username">Μη έγκυρο όνομα χρήστη</string>
+  <string name="account_status_connecting">Συνδέεται</string>
+  <string name="account_status_unknown">Άγνωστοι</string>
+  <!--Create account-->
+  <string name="account_creation_home">Καλώς ήλθατε στο Ring</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-el/strings_preferences.xml b/ring-android/app/src/main/res/values-el/strings_preferences.xml
index 4806eb4..7086f65 100644
--- a/ring-android/app/src/main/res/values-el/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-el/strings_preferences.xml
@@ -1,4 +1,6 @@
 <?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>
 </resources>
diff --git a/ring-android/app/src/main/res/values-en-rGB/strings_account.xml b/ring-android/app/src/main/res/values-en-rGB/strings_account.xml
new file mode 100644
index 0000000..0d6667e
--- /dev/null
+++ b/ring-android/app/src/main/res/values-en-rGB/strings_account.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account edition screen-->
+  <!--Strings related to account creation-->
+  <!--Strings related to account deletion-->
+  <!--AccountManagementFragment-->
+  <!--Basic Details-->
+  <!--Audio Details-->
+  <string name="account_audio_label">Audio</string>
+  <string name="account_ringtone_label">Ringtones</string>
+  <!--Video Details-->
+  <string name="account_video_label">Video</string>
+  <!--Advanced Details-->
+  <!--Security Details-->
+  <!--SRTP Details-->
+  <!--SIP-->
+  <!--TLS Details-->
+  <!--restore/backup-->
+  <!--Name registration-->
+  <!--Create account-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-eo/strings.xml b/ring-android/app/src/main/res/values-eo/strings.xml
index c8fdb75..d57b865 100644
--- a/ring-android/app/src/main/res/values-eo/strings.xml
+++ b/ring-android/app/src/main/res/values-eo/strings.xml
@@ -99,7 +99,9 @@
   <string name="add_call_contact_number_to_contacts">Ĉu aldoni %1$s ?</string>
   <string name="prompt_new_password">Nova pasvorto</string>
   <string name="account_create_title">Krei Ring konton</string>
+  <string name="wizard_next">Sekva</string>
   <!--MenuHeaderView-->
   <string name="unknown">Nekonata</string>
   <!--Share fragment-->
+  <string name="generic_error_migration">Eraro</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 d199947..2b790ce 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
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Forigi</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Kromnomo</string>
   <string name="prompt_hostname">Nomo de gastiga komputilo</string>
@@ -88,7 +90,14 @@
   <string name="error_password_char_count">6 signoj minimume</string>
   <string name="error_passwords_not_equals">Pasvortoj ne kongruas</string>
   <string name="restore_failed_dialog_msg">Eraro okazis</string>
+  <string name="account_export_end_network_title">Reta eraro</string>
   <string name="account_export_end_error_title">Eraro</string>
+  <string name="account_wizard_title">Bonvenu al</string>
   <string name="account_new_button">Krei Ring konton</string>
   <!--Name registration-->
+  <string name="username_already_taken">Uzantnomo jam prenita</string>
+  <string name="invalid_username">Nevalida uzantnomo</string>
+  <string name="account_status_unknown">Nekonata</string>
+  <!--Create account-->
+  <string name="account_creation_home">Bonvenu al Ring</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 66aca32..542f8767 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Licencia</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>
@@ -22,6 +21,7 @@
   <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_share">Compartir mi contacto</string>
   <string name="menu_item_about">Acerca de Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Marcar un Número</string>
@@ -85,6 +85,8 @@
   <string name="permission_dialog_camera_title">Permiso de cámara</string>
   <string name="permission_dialog_camera_message">Las conversaciones con vídeo requieren utilizar la cámara. Considera conceder este permiso.</string>
   <string name="ringtone_error_title">Error</string>
+  <string name="ringtone_error_format_not_supported">Este formato no está soportado.</string>
+  <string name="ringtone_error_size_too_big">El archivo es demasiado grande. El tamaño máximo es %1$ikB.</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring necesita permiso para leer los contactos. Por favor, concede este permiso.</string>
   <!--Write call log permission-->
@@ -105,8 +107,23 @@
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">¿Añadir %1$s ?</string>
   <string name="prompt_new_password">Contraseña nueva</string>
+  <string name="prompt_new_password_repeat">Repite la nueva contraseña</string>
   <string name="account_create_title">Crear una cuenta en Ring</string>
+  <string name="prompt_new_username">Ingresa un nuevo nombre de usuario</string>
+  <string name="help_password_choose">Elige una contraseña robusta que podrás recordar para proteger tu cuenta de Ring.</string>
+  <string name="help_password_enter">Ingresa la contraseña de tu cuenta principal de Ring</string>
+  <string name="help_pin_enter">Ingresa el PIN de otra cuenta de Ring configurada. Utiliza la opción \"Exportar cuenta en Ring\" para obtener un PIN.</string>
+  <string name="wizard_next">Siguiente</string>
+  <string name="account_device_updated_message">Has actualizado tu cuenta de Ring exitosamente</string>
   <!--MenuHeaderView-->
+  <string name="profile">Mi perfil</string>
+  <string name="profile_message_warning">Esto se comparte con tus contactos</string>
+  <string name="open_the_gallery">Abrir la galería</string>
+  <string name="take_a_photo">Tomar una foto</string>
+  <string name="unknowm_if_empty">Desconocido si está vacío</string>
   <string name="unknown">Desconocido</string>
   <!--Share fragment-->
+  <string name="share_message">Escanea este QRCode con el escáner integrado de la aplicación Ring que desea comunicarse contigo.</string>
+  <string name="share_your_account_information">Compartir mi información de contacto</string>
+  <string name="generic_error_migration">Error</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 311ec4d..d336d1a 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
@@ -1,14 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Borrar</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Alias</string>
   <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">Crear 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">Espera mientras se agrega tu nueva cuenta</string>
+  <string name="dialog_wait_update">Actualizando cuenta</string>
+  <string name="dialog_wait_update_details">Por favor espera mientras tu nueva cuenta se actualiza...</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.
@@ -23,6 +28,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">No hay cuentas registradas</string>
   <string name="normal_accounts_titles">Cuentas</string>
+  <string name="normal_devices_titles">Dispositivos conocidos conectados a esta cuenta de Ring</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">General</string>
   <string name="account_basic_category">Ajustes básicos</string>
@@ -42,6 +48,7 @@
   <string name="account_ringtone_label">Tonos de llamada</string>
   <string name="account_ringtone_enabled_label">Activar tonos de llamada</string>
   <string name="account_ringtone_path_label">Directorio de tonos de llamada</string>
+  <string name="account_ringtone_custom_label">Utilizar un tono de llamada personalizado</string>
   <!--Video Details-->
   <string name="account_video_label">Vídeo</string>
   <string name="account_video_enable">Habilitar vídeo</string>
@@ -83,13 +90,65 @@
   <string name="account_rtp_min_port">Mínimo</string>
   <string name="account_rtp_port_range">Intervalo de puertos de audio RTP</string>
   <!--restore/backup-->
+  <string name="account_restore_account">Restaurar una cuenta</string>
   <string name="account_restore_message">Introduce la contraseña para descifrar el archivo.</string>
   <string name="account_restore_decryption_password">Contraseña de descifrado</string>
+  <string name="account_new_device_password">Ingresa la contraseña principal para desbloquear cuenta</string>
+  <string name="restore_dialog_title">Restaurando</string>
   <string name="restore_backup_wait">Por favor, espera...</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="restore_failed_dialog_title">La restauración ha fallado</string>
   <string name="restore_failed_dialog_msg">Ha ocurrido un error</string>
+  <string name="export_account_wait_title">Por favor, espera...</string>
+  <string name="export_account_wait_message">Publicando nueva información de la cuenta</string>
+  <string name="account_export_end_decryption_message">Error al desbloquear tu cuenta con la contraseña provista</string>
+  <string name="account_export_end_network_title">Error en la red</string>
+  <string name="account_export_end_network_message">Error al exportar la cuenta a la red. Verifica tu conectividad.</string>
   <string name="account_export_end_error_title">Error</string>
+  <string name="account_export_end_error_message">Error al exportar la cuenta. Se ha producido un error desconocido.</string>
+  <string name="account_enter_password">Ingresa la contraseña</string>
+  <string name="account_contact_me">¡Contáctame en Ring!</string>
+  <string name="update_account">Actualizar cuenta</string>
+  <string name="ring_account">Cuenta de Ring</string>
+  <string name="account_migration_title_dialog">Migración de la cuenta</string>
+  <string name="account_update_needed">Actualización requerida</string>
+  <string name="account_creation_file_too_big">El archivo es demasiado grande</string>
+  <string name="account_cannot_read">Error al leer %1$s</string>
+  <string name="account_cannot_be_found_title">Error al encontrar la cuenta</string>
+  <string name="account_cannot_be_found_message">La cuenta no ha podido ser encontrada en la red de Ring.\nAsegúrate de que haya sido exportada en Ring desde un dispositivo existente, y que las credenciales provistas son correctas.</string>
+  <string name="account_no_network_title">Error al conectarse a la red</string>
+  <string name="account_no_network_message">Error al agregar la cuenta porque Ring no pudo conectarse a la red distribuida. Verifica la conectividad de tu dispositivo.</string>
+  <string name="account_device_added_title">El dispositivo de la cuenta ha sido agregado</string>
+  <string name="account_device_added_message">Has configurado tu cuenta de Ring en este dispositivo exitosamente</string>
+  <string name="account_device_updated_title">La cuenta del dispositivo ha sido actualizada</string>
+  <string name="account_link_button">Conectar este dispositivo a una cuenta</string>
+  <string name="account_import_title">Conectarse a una cuenta existente</string>
+  <string name="account_link_prompt_pin">Ingresa tu PIN</string>
+  <string name="account_wizard_title">Bienvenido a</string>
   <string name="account_new_button">Crear una cuenta en Ring</string>
+  <string name="account_link_export_button">Conectar otro dispositivo a esta cuenta</string>
+  <string name="account_link_export_info">Para utilizar esta cuenta con otros dispositivos, primero debes exponer tu cuenta en Ring. Esto generará un PIN que deberás ingresar en tu nuevo dispositivo para configurar la cuenta. El PIN es válido por 10 minutos.\n\nPor favor provee tu contraseña para comenzar:</string>
+  <string name="account_start_export_button">Generar PIN</string>
+  <string name="account_end_export_button">cerrar</string>
+  <string name="account_end_export_infos">Tu PIN es:\n\n%%\n\nPara completar el proceso, necesitas abrir Ring en el nuevo dispositivo. Crea una nueva cuenta con \"Vincular este dispositivo a una cuenta\". Tu PIN es válido por 10 minutos.</string>
   <!--Name registration-->
+  <string name="register_name_wrong_password">Error al registrar el nombre: la contraseña de la cuenta es incorrecta.</string>
+  <string name="register_name_invalid">Error al registrar el nombre: nombre inválido.</string>
+  <string name="register_name_already_taken">Error al registrar el nombre: este nombre ya ha sido utilizado.</string>
+  <string name="register_name_network_error">Error al registrar el nombre: error de red o servidor.</string>
+  <string name="error_username_empty">Ingresa un nombre de usuario</string>
+  <string name="no_registered_name_for_account">No se ha encontrado un nombre registrado con esta cuenta</string>
+  <string name="register_name">Registrar nombre</string>
+  <string name="trying_to_register_name">Intentando registrar nombre</string>
+  <string name="registered_username">Nombre de usuario registrado</string>
+  <string name="register_username">Registrar un nombre público (experimental)</string>
+  <string name="username_already_taken">El nombre de usuario ya está en uso</string>
+  <string name="invalid_username">Nombre de usuario no válido</string>
+  <string name="looking_for_username_availability">Verificando la disponibilidad del nombre de usuario...</string>
+  <string name="account_status_connecting">Conectando</string>
+  <string name="account_status_unknown">Desconocido</string>
+  <!--Create account-->
+  <string name="account_creation_home">Bienvenido a Ring</string>
+  <string name="account_creation_profile">Crea tu perfil</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings.xml b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
index 085c0d5..41f8f54 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
@@ -1,8 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="sponsor_section">رینگ نرم‌افزار آزادی است که توسعه داده و پشتیبانی می‌شود توسّط</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_activity_sflphone_home">رینگ</string>
   <string name="error_no_network">بدون اتصال شبکه</string>
+  <string name="error_mobile_network_available_but_disabled">لطفاً در صفحهٔ تنظمیات به شبکهٔ سلولی دسترسی دهید.</string>
   <!--AB menus-->
   <string name="ab_account_creation">حساب جدید</string>
   <string name="ab_action_chat">پیام متنی</string>
@@ -14,6 +21,7 @@
   <string name="menu_item_home">خانه</string>
   <string name="menu_item_accounts">مدیریت حساب‌ها</string>
   <string name="menu_item_settings">تنظیمات</string>
+  <string name="menu_item_share">هم‌رسانی اطّلاعات تماس</string>
   <string name="menu_item_about">دربارهٔ رینگ</string>
   <!--Dialing Fragment-->
   <string name="dial_number">تماس با یک شماره</string>
@@ -60,7 +68,9 @@
   <string name="action_call_decline">رد کردن</string>
   <string name="ab_action_speakerphone">فعال کردن بلندگو</string>
   <string name="ab_action_contact_add">افزودن به مخاطبان</string>
+  <string name="ab_action_contact_add_question">افزودن به مخاطبان؟</string>
   <string name="ab_action_audio_call">تماس صوتی</string>
+  <string name="ab_action_video_call">تماس ویدیویی</string>
   <string name="share_via">هم‌رسانی با</string>
   <string name="write_a_message">پیامی بنویسید</string>
   <string name="scan_qr">پویش رمز QR</string>
@@ -69,14 +79,49 @@
   <string name="send_message">ارسال پیام</string>
   <string name="message_sending">در حال ارسال پیام…</string>
   <string name="time_just_now">هم‌اکنون</string>
+  <string name="permission_read_denied">کاره اجازهٔ خواندن از حافظه‌تان را ندارد، بنابراین نمی‌تواند درست رفتار کند. لطفاً این دسترسی را اعطا کنید.</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">دسترسی دوربین</string>
+  <string name="permission_dialog_camera_message">گفت‌وگوی ویدیویی برای کار کردن نیاز به دسترسی دوربین دارد. لطفاً آن را فعّال کنید.</string>
   <string name="ringtone_error_title">خطا</string>
+  <string name="ringtone_error_format_not_supported">این قالب پشتیبانی نمی‌شود.</string>
+  <string name="ringtone_error_size_too_big">این پرونده خیلی بزرگ است. بیشینهٔ اندازه %1$iک‌ب است.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">رینگ برای فعّال کردن این ویژگی نیاز به دسترسی «خواندن مخاطبان» دارد. لطفاً اعطایش کنید.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">رینگ برای فعّال کردن این ویژگی نیاز به دسترسی «خواندن گزارش تماس» دارد. لطفاً اعطایش کنید.</string>
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">رمز QR حسابی که می‌خواهید بیفزایید را بپویید.</string>
   <!--Settings-->
+  <string name="clear_history_dialog_title">پاک‌سازی تاریخچه؟</string>
+  <string name="clear_history_dialog_message">این کار قابل بازگشت نیست.</string>
+  <string name="clear_history_completed">تاریخچه پاک‌سازی شد.</string>
   <!--Conversation-->
+  <string name="conversation_action_delete_this">حذف این گفت‌وگو</string>
+  <string name="conversation_action_delete_this_title">حذف این گفت‌وگو؟</string>
+  <string name="conversation_action_delete_this_message">این کار قابل بازگشت نیست.</string>
+  <string name="conversation_action_copy_peer_number">رونوشت از شماره</string>
+  <string name="conversation_action_copied_peer_number_clipboard">‫%1$s در حافظه رونویسی شد</string>
+  <string name="conversation_action_select_peer_number">گزینش یک شماره</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">افزودن%1$s؟</string>
+  <string name="prompt_new_password">گذرواژهٔ نو</string>
+  <string name="prompt_new_password_repeat">گذرواژهٔ نو را تکرار کنید</string>
+  <string name="account_create_title">ساخت یک حساب رینگ</string>
+  <string name="prompt_new_username">نام کاربری نو را وارد کنید</string>
+  <string name="help_password_choose">برای محافظت از حساب رینگتان، گذرواژه‌ای قوی که به خاطر خواهید سپرد را برگزینید.</string>
+  <string name="help_password_enter">گذرواژهٔ حساب رینگ اصلیتان را وارد کنید</string>
+  <string name="help_pin_enter">پین را از دیگر حساب رینگ پیکربندی‌شده وارد کنید. برای به دست آوردن یک پین، از ویژگی «برون‌ریزی حساب روی رینگ» استفاده کنید.</string>
+  <string name="account_device_updated_message">با موفّقیت حساب رینگتان را به‌روز کردید.</string>
   <!--MenuHeaderView-->
+  <string name="profile">نمایهٔ من</string>
+  <string name="profile_message_warning">این با مخاطبانتان هم‌رسانی شده است</string>
+  <string name="open_the_gallery">گشودن جُنگ</string>
+  <string name="take_a_photo">گرفتن عکس</string>
+  <string name="unknowm_if_empty">ناشناخته در صورت خالی بودن</string>
+  <string name="unknown">ناشناخته</string>
   <!--Share fragment-->
+  <string name="share_message">این رمز QR را با پویشگر تعبیه شده در کارهٔ رینگی که می‌خواهد با شما گفت‌وگو کند، بپویید.</string>
+  <string name="share_your_account_information">هم‌رسانی اطّلاعات تماس من</string>
+  <string name="generic_error_migration">خطا</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
index 5129c03..1248bd7 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
@@ -1,20 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">حذف</string>
   <!--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_wait_create_details">لطفاً صبر کنید تا حساب جدیدتان افزوده شود…</string>
+  <string name="dialog_wait_update">در حال به‌روز رسانی حساب</string>
+  <string name="dialog_wait_update_details">لطفاً صبر کنید تا حساب جدیدتان به‌روز شود…</string>
+  <string name="dialog_warn_ip2ip_account_title">ایجاد حساب سیپ خالی؟</string>
+  <string name="dialog_warn_ip2ip_account_message">در حال ایجاد یک حساب سیپ بدون هیچ نام دامنهٔ معتبری هستید.
+تنها خواهید توانست تماس‌های ip مستقیم ساخته و بگیرید.
+می‌توانید بعدها حسابتان را ویرایش کنید</string>
+  <string name="help_ring">حساب رینگ اجازه می‌دهد از درون یک شبکهٔ کاملاً توزیع‌شده، به صورت امن با افراد در تماس باشید.</string>
+  <string name="help_sip_title">افزودن حساب سیپتان</string>
   <string name="help_sip">پیکربندی یک حساب سیپ موجود.</string>
   <string name="create_sip_account">افزودن</string>
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">حذف حساب؟</string>
+  <string name="account_delete_dialog_message">این کار قابل بازگشت نیست.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">هیچ حسابی ثبت نشده</string>
   <string name="normal_accounts_titles">حساب‌ها</string>
+  <string name="normal_devices_titles">افزاره‌های شناخته شدهٔ پیوسته به این حساب رینگ</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">عمومی</string>
   <string name="account_basic_category">تنظیمات پایه</string>
@@ -26,6 +40,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>
@@ -33,6 +48,7 @@
   <string name="account_ringtone_label">صداهای زنگ</string>
   <string name="account_ringtone_enabled_label">فعّال کردن صداهای زنگ</string>
   <string name="account_ringtone_path_label">مسیر صدای زنگ</string>
+  <string name="account_ringtone_custom_label">استفاده از صدای زنگ سفارشی</string>
   <!--Video Details-->
   <string name="account_video_label">ویدیو</string>
   <string name="account_video_enable">فعّال کردن ویدیو</string>
@@ -74,6 +90,65 @@
   <string name="account_rtp_min_port">کمینه</string>
   <string name="account_rtp_port_range">دامنهٔ درگاه RTP صدا</string>
   <!--restore/backup-->
+  <string name="account_restore_account">بازگردانی یک حساب</string>
+  <string name="account_restore_message">برای رمزگشایی پرونده، گذرواژه را وارد کنید.</string>
+  <string name="account_restore_decryption_password">گذرواژهٔ رمزگشایی</string>
+  <string name="account_new_device_password">برای قفل‌گشایی حساب، گذرواژهٔ اصلی را وارد کنید</string>
+  <string name="restore_dialog_title">در حال بازگردانی</string>
+  <string name="restore_backup_wait">لطفاً صبر کنید…</string>
+  <string name="error_password_char_count">کمینه ۶ نویسه</string>
+  <string name="error_passwords_not_equals">گذرواژه‌ها همتا نیستند</string>
+  <string name="restore_failed_dialog_title">بارگردانی شکست خورد</string>
+  <string name="restore_failed_dialog_msg">خطایی رخ داد</string>
+  <string name="export_account_wait_title">لطفاً صبر کنید</string>
+  <string name="export_account_wait_message">در حال انتشار اطّلاعات حساب نو</string>
+  <string name="account_export_end_decryption_message">نمی‌توان قفل حسابتان را با گذواژهٔ فراهم شده گشود.</string>
+  <string name="account_export_end_network_title">خطای شبکه</string>
+  <string name="account_export_end_network_message">نمی‌توان حساب را روی شبکه برون‌ریخت. اتّصالتان را بررسی کنید.</string>
   <string name="account_export_end_error_title">خطا</string>
+  <string name="account_export_end_error_message">نمی‌توان حساب را برون‌ریخت. خطایی ناشناخته رخ داد.</string>
+  <string name="account_enter_password">گذرواژه را وارد کنید</string>
+  <string name="account_contact_me">با من روی رینگ در تماس باشید!</string>
+  <string name="update_account">به‌روز رسانی حساب</string>
+  <string name="ring_account">حساب رینگ</string>
+  <string name="account_migration_title_dialog">مهاجرت حساب</string>
+  <string name="account_update_needed">نیاز به به‌روز رسانی است</string>
+  <string name="account_creation_file_too_big">پرونده خیلی بزرگ است</string>
+  <string name="account_cannot_read">نمی‌توان %1$s را خواند</string>
+  <string name="account_cannot_be_found_title">نمی‌تواند حساب را یافت</string>
+  <string name="account_cannot_be_found_message">حساب نتوانست روی شبکهٔ رینگ پیدا شود.\nمطمئن شوید از یک افزارهٔ موجود، روی رینگ برون‌ریزی شده است و اعتبارنامه‌های فراهم شده درست هستند.</string>
+  <string name="account_no_network_title">نمی‌توان به شبکه وصل شد</string>
+  <string name="account_no_network_message">نمی‌توان حساب را افزود، زیرا رینگ نتوانست به شبکهٔ توزیع شده وصل شود. اتّصال شبکه‌تان را بررسی کنید.</string>
+  <string name="account_device_added_title">افزاره به حساب افزوده شد</string>
+  <string name="account_device_added_message">حساب رینگتان را موفقّیت روی این افزاره برپا کردید.</string>
+  <string name="account_device_updated_title">حساب افزاره به‌روز شد</string>
+  <string name="account_link_button">پیوند این افزاره به یک حساب</string>
+  <string name="account_import_title">پیوند به یک حساب موجود</string>
+  <string name="account_link_prompt_pin">پین را وارد کنید</string>
+  <string name="account_wizard_title">خوش آمدید به</string>
+  <string name="account_new_button">ساخت یک حساب رینگ</string>
+  <string name="account_link_export_button">پیوند افزاره‌ای دیگر به این حساب</string>
+  <string name="account_link_export_info">برای استفاده از این حساب روی افزاره‌های دیگر، باید نخست آن را روی رینگ آشکار کنید. این کار یک رمز پین تولید خواهد کرد که باید برای برپایی حساب، روی افزارهٔ نو وارد کنید. پین تا ۱۰ دقیقه معتبر است. \n\nلطفاً برای شروع، گذرواژه‌تان را وارد کنید.</string>
+  <string name="account_start_export_button">تولید پین</string>
+  <string name="account_end_export_button">بستن</string>
+  <string name="account_end_export_infos">پین شما:\n\n%%\n\nبرای کامل کردن فرایند، باید رینگ را روی افزارهٔ نو گشوده و حساب جدیدی را با انتخاب «پیوند این افزاره به یک حساب» ایجاد کنید. پینتان برای ۱۰ دقیقه معتبر است.</string>
   <!--Name registration-->
+  <string name="register_name_wrong_password">نمی‌تواند نام را ثبت کرد: گذرواژهٔ حساب اشتباه</string>
+  <string name="register_name_invalid">نمی‌تواند نام را ثبت کرد: نام نامعتبر</string>
+  <string name="register_name_already_taken">نمی‌تواند نام را ثبت کرد: نام فبلاً برداشته شده</string>
+  <string name="register_name_network_error">نمی‌تواند نام را ثبت کرد: خطای شبکه یا کارساز</string>
+  <string name="error_username_empty">یک نام کاربری وارد کنید</string>
+  <string name="no_registered_name_for_account">هیچ نام ثبت‌شده‌ای برای این حساب پیدا نشد</string>
+  <string name="register_name">ثبت نام</string>
+  <string name="trying_to_register_name">در حال تلاش برای ثبت نام</string>
+  <string name="registered_username">نام کاربری ثبت شد</string>
+  <string name="register_username">ثبت نام کاربری عمومی (آزمایشی)</string>
+  <string name="username_already_taken">نام کاربری قبلاً برداشته شده</string>
+  <string name="invalid_username">نام کاربری نامعتبر</string>
+  <string name="looking_for_username_availability">جست‌وجو برای موجود بودن نام کاربری…</string>
+  <string name="account_status_connecting">در حال اتّصال</string>
+  <string name="account_status_unknown">ناشناخته</string>
+  <!--Create account-->
+  <string name="account_creation_home">به رینگ خوش آمدید</string>
+  <string name="account_creation_profile">نمایه خود را بسازید</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml
index 7fbf3fe..690650e 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml
@@ -21,6 +21,16 @@
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- SipCalls -->
+    <string name="call_human_state_incoming">در حال زنگ خوردن</string>
+    <string name="call_human_state_connecting">در حال اتّصال</string>
+    <string name="call_human_state_ringing">در حال تماس</string>
+    <string name="call_human_state_current">در حال صحبت</string>
+    <string name="call_human_state_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_none">هیچ‌کدام</string>
     <string name="conference_human_state_hold">نگه داشتن</string>
-    </resources>
\ No newline at end of file
+    <string name="conference_human_state_default">هیچ‌کدام</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml
index fd21333..8e5cb6f 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml
@@ -3,12 +3,15 @@
   <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_mobileData_summary">اجاز به رینگ برای کار کردن روی شبکه‌های نسل سوم و LTE، علاوه بر وای‌فای</string>
   <string name="pref_systemContacts_title">استفاده از مخاطبین سامانه</string>
   <string name="pref_systemContacts_summary">استفاده از مخاطبین سامانه برای نمایش جزییات تماس گیرنده.</string>
   <string name="pref_systemDialer_title">انجام تماس‌های سامانه با استفاده از رینگ</string>
-  <string name="pref_systemDialer_summary">ایتفاده از رینگ برای انجام تماس‌ها سامانه در صورت امکان.</string>
+  <string name="pref_systemDialer_summary">استفاده از رینگ برای انجام تماس‌های سامانه در صورت امکان.</string>
   <string name="pref_startOnBoot_title">به کار انداختن رینگ هنگام شروع به کار</string>
   <string name="pref_startOnBoot_summary">اجرای رینگ در پس‌زمینه هنگام آغاز به کار سامانه.</string>
+  <string name="pref_clearHistory_title">پاک‌سازی تاریخچه</string>
+  <string name="pref_clearHistory_summary">پاک‌سازی تمام تاریخچهٔ گفت‌وگوها. این کار قابل بازگشت نیست.</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 42da9c5..da96550 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Lisenssi</string>
   <string name="sponsor_section">Ring on vapaa ohjelma jonka on kehittänyt ja jota tukee</string>
   <string name="copyright_section">Tekijänoikeus</string>
   <string name="contribute_section">Tuo panoksesi</string>
@@ -106,7 +105,9 @@
   <string name="add_call_contact_number_to_contacts">Lisätäänkö %1$s?</string>
   <string name="prompt_new_password">Uusi salasana</string>
   <string name="account_create_title">Luo Ring tunnus</string>
+  <string name="wizard_next">Seuraava</string>
   <!--MenuHeaderView-->
   <string name="unknown">Tuntematon</string>
   <!--Share fragment-->
+  <string name="generic_error_migration">Virhe</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 62129a0..85b16df 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,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Poista</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Lempinimi</string>
   <string name="prompt_hostname">Yhteysosoite</string>
@@ -78,4 +80,8 @@
   <string name="account_export_end_error_title">Virhe</string>
   <string name="account_new_button">Luo Ring tunnus</string>
   <!--Name registration-->
+  <string name="account_status_connecting">Yhdistää</string>
+  <string name="account_status_unknown">Tuntematon</string>
+  <!--Create account-->
+  <string name="account_creation_home">Tervetuloa Ringiin</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings.xml b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
index bfad6dc..8914762 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Licence</string>
   <string name="sponsor_section">Ring est un logiciel développé et suporté par</string>
   <string name="copyright_section">Droits d\'auteurs</string>
   <string name="contribute_section">Contribuer</string>
@@ -9,33 +8,121 @@
   <string name="email_chooser_title">Envoyer un courriel en utilisant</string>
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
+  <string name="error_no_network">Aucune connectivité réseau</string>
   <string name="error_mobile_network_available_but_disabled">Veuillez permettre l\'accès au réseau cellulaire dans l\'écran des réglages.</string>
   <!--AB menus-->
   <string name="ab_account_creation">Nouveau compte</string>
   <string name="ab_action_chat">Messagerie texte</string>
   <!--Left Drawer-->
   <!--Accessibility-->
+  <string name="drawer_open">Ouvrir le NavigationDrawer</string>
+  <string name="drawer_close">Fermer le NavigationDrawer</string>
   <!--Sections-->
-  <string name="menu_item_home">Maison</string>
+  <string name="menu_item_home">Accueil</string>
   <string name="menu_item_accounts">Gérer les comptes</string>
   <string name="menu_item_settings">Réglages</string>
+  <string name="menu_item_share">Partager mes informations de contact</string>
+  <string name="menu_item_about">A propos de Ring</string>
   <!--Dialing Fragment-->
+  <string name="dial_number">Composer un numéro</string>
   <!--History Fragment-->
+  <string name="hist_replay_button">Rejouer</string>
+  <string name="hist_replay_button_stop">Arrêter</string>
   <!--DetailsHistory Fragment-->
   <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="one">Conversations %d</item>
+    <item quantity="other">Conversations %d</item>
+  </plurals>
+  <string name="home_transfering">Transfert en cours de %1$s à %1$s</string>
+  <string name="home_transfer_complet">Transfert complété</string>
   <!--ContactList Fragment-->
+  <string name="no_contact_found">Aucun contact trouvé</string>
+  <string name="starred_contacts_title">Favoris</string>
+  <string name="searchbar_hint">Entrer le nom ou le numéro de téléphone</string>
+  <string name="choose_number">Choisissez un numéro</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
+  <string name="transfer_to_another_call">Transférer à un autre appel en cours</string>
+  <string name="transfer_no_other_call">Aucun appel en attente</string>
+  <string name="transfer_type_number">Entrer le numéro pour transférer à:</string>
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">Appel manqué de %1$s</string>
+  <string name="notif_missed_outgoing_call">Appel manqué de %1$s</string>
+  <string name="notif_incoming_call_title">Appel entrant de %1$s</string>
+  <string name="notif_incoming_call">Appel entrant</string>
+  <string name="notif_outgoing_call_title">Appel sortant à %1$s</string>
+  <string name="notif_outgoing_call">Appel sortant</string>
+  <string name="notif_current_call_title">Appel en cours avec %1$s</string>
+  <string name="notif_current_call">Appel en cours</string>
   <!--Call Fragment-->
+  <string name="you_txt_prefix">Toi</string>
+  <string name="action_call_attended_transfer">Transfert en cours</string>
+  <string name="action_call_conference">Conférence</string>
+  <string name="action_call_hangup">Raccrocher</string>
+  <string name="ongoing_call">Appel en cours</string>
+  <string name="hist_in_call">Appel entrant de %1$s</string>
+  <string name="hist_out_call">Appel sortant de %1$s</string>
+  <string name="start_error_title">Impossible de démarrer Ring!</string>
+  <string name="start_error_mic_required">Ring requiert l\'accès au microphone pour fonctionner</string>
+  <string name="action_call_accept">Répondre à un appel</string>
+  <string name="action_call_decline">Refuser</string>
+  <string name="ab_action_speakerphone">Activer le haut-parleur</string>
+  <string name="ab_action_contact_add">Ajouter aux contacts</string>
+  <string name="ab_action_contact_add_question">Ajouter aux contacts?</string>
+  <string name="ab_action_audio_call">Appel audio</string>
+  <string name="ab_action_video_call">Appel vidéo</string>
+  <string name="share_via">Partager par</string>
+  <string name="write_a_message">Écrire un message</string>
+  <string name="scan_qr">Numériser le code QR</string>
+  <string name="ab_action_flipcamera">Inverser la caméra</string>
   <!--Text messages-->
+  <string name="send_message">Envoyer le message</string>
+  <string name="message_sending">Transmission du message</string>
+  <string name="time_just_now">Maintenant</string>
+  <string name="permission_read_denied">L\'application n\'a pas les droits de lecture de votre espace de stockage. Il ne peut donc pas fonctionner efficacement. S.v.p. envisager l\'octroi des droits de lecture.</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Droits d\'accès à la caméra</string>
+  <string name="permission_dialog_camera_message">Les conversations vidéos requièrent les droits d\'accès à la caméra pour fonctionner. S.v.p. envisager d\'octroyer ces droits.</string>
+  <string name="ringtone_error_title">Erreur</string>
+  <string name="ringtone_error_format_not_supported">Ce format n\'est pas supporté.</string>
+  <string name="ringtone_error_size_too_big">Ce fichier est trop volumineux. Le volume maximal accepté est de %1$ikB</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring requiert les droits de lecture des contacts pour activer cette fonction. S.v.p. les accorder.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring requiert les droits d\'écriture du registre d\'appel pour activer cette fonction. S.v.p. les accorder.</string>
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Numériser le code QR du compte que vous désirez ajouter.</string>
   <!--Settings-->
+  <string name="clear_history_dialog_title">Effacer l\'historique?</string>
+  <string name="clear_history_dialog_message">Cette action ne peut pas être annulée.</string>
+  <string name="clear_history_completed">L\'historique a été effacé.</string>
   <!--Conversation-->
+  <string name="conversation_action_delete_this">Supprimer cette conversation</string>
+  <string name="conversation_action_delete_this_title">Supprimer cette conversation?</string>
+  <string name="conversation_action_delete_this_message">Cette action ne peut être annulée.</string>
+  <string name="conversation_action_copy_peer_number">Copier le numéro</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s copié sur le tableau de bord</string>
+  <string name="conversation_action_select_peer_number">Sélectionner un numéro de téléphone</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Ajouter %1$s ?</string>
+  <string name="prompt_new_password">Nouveau mot de passe</string>
+  <string name="prompt_new_password_repeat">Retaper le nouveau mot de passe</string>
+  <string name="account_create_title">Créer un compte Ring</string>
+  <string name="prompt_new_username">Entrer un nouveau nom d\'utilisateur</string>
+  <string name="help_password_choose">Choisir un mot de passe fort dont vous vous souviendrez pour protéger votre compte Ring.</string>
+  <string name="help_password_enter">Entrer votre mot de passe Ring principal</string>
+  <string name="help_pin_enter">Entrer le NIP d\'un autre compte Ring déjà configuré. Utiliser la fonction \"exporter le compte dans Ring\" pour obtenir un PIN.</string>
+  <string name="account_device_updated_message">Votre compte Ring a bien été mis à jour.</string>
   <!--MenuHeaderView-->
+  <string name="profile">Mon profil</string>
+  <string name="profile_message_warning">Ceci est partagé avec vos contacts.</string>
+  <string name="open_the_gallery">Ouvrir la galerie</string>
+  <string name="take_a_photo">Prendre un photo.</string>
+  <string name="unknowm_if_empty">Inconnu si vide</string>
+  <string name="unknown">Inconnu</string>
   <!--Share fragment-->
+  <string name="share_message">Numériser ce code QR à partir du scan intégré de l\'application Ring qui veut communiquer avec vous.</string>
+  <string name="share_your_account_information">Partager mes informations de contact</string>
+  <string name="generic_error_migration">Erreur</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml b/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
index b8c96f8..f0d0f8c 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Supprimer</string>
   <!--Strings related to account creation-->
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_message">Cette action ne peut être annulée</string>
   <!--AccountManagementFragment-->
   <!--Basic Details-->
   <!--Audio Details-->
@@ -15,4 +18,10 @@
   <!--SIP-->
   <!--TLS Details-->
   <!--restore/backup-->
+  <string name="account_export_end_error_title">Erreur</string>
+  <string name="account_new_button">Créer un compte Ring</string>
+  <!--Name registration-->
+  <string name="account_status_connecting">connexion en cours</string>
+  <string name="account_status_unknown">Inconnu</string>
+  <!--Create account-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_call.xml b/ring-android/app/src/main/res/values-fr-rCA/strings_call.xml
new file mode 100644
index 0000000..a48bcfe
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings_call.xml
@@ -0,0 +1,44 @@
+<?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">ça sonne</string>
+    <string name="call_human_state_connecting">connexion en cours</string>
+    <string name="call_human_state_ringing">appel en cours </string>
+    <string name="call_human_state_current">conversation en cours </string>
+    <string name="call_human_state_hungup">sur</string>
+    <string name="call_human_state_busy">occupé </string>
+    <string name="call_human_state_failure">échoué </string>
+    <string name="call_human_state_hold">tenir</string>
+    <string name="call_human_state_unhold">ne pas tenir</string>
+    <string name="call_human_state_over">sur</string>
+    <string name="call_human_state_none">rien</string>
+    <!-- Conferences -->
+    <string name="conference_human_state_active_attached">active attaché </string>
+    <string name="conference_human_state_active_detached">active détaché</string>
+    <string name="conference_human_state_active_attached_rec">attachement d\'un enregistrement vidéo  </string>
+    <string name="conference_human_state_active_detached_rec">déttachement d\'un enregistrement vidéo  </string>
+    <string name="conference_human_state_hold">tenir</string>
+    <string name="conference_human_state_hold_rec">tenir l\'enregistrement </string>
+    <string name="conference_human_state_default">rien </string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings.xml b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
index 160370f..ae49f3e 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
@@ -1,27 +1,128 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="sponsor_section">Ring est un logiciel open-source développé et supporté par </string>
+  <string name="copyright_section">droit d\'auteur</string>
+  <string name="contribute_section">Contribuer</string>
+  <string name="version_section">Version</string>
+  <string name="no_email_app_installed">Aucun logiciel de messagerie n\'a été trouvé, merci d\'installer un logiciel de messagerie pour nous envoyer un rapport</string>
+  <string name="email_chooser_title">Envoyer un courriel en utilisant...</string>
   <!--RingActivity-->
+  <string name="title_activity_sflphone_home">Ring</string>
+  <string name="error_no_network">Aucune connexion au réseau n\'est possible</string>
+  <string name="error_mobile_network_available_but_disabled">Merci d\'accéder au réseau mobile dans les paramètres de l\'écran</string>
   <!--AB menus-->
+  <string name="ab_account_creation">Nouveau compte</string>
+  <string name="ab_action_chat">Messages textes</string>
   <!--Left Drawer-->
   <!--Accessibility-->
+  <string name="drawer_open">Ouvrir le panneau de navigation Android</string>
+  <string name="drawer_close">Fermer le panneau de navigation Android</string>
   <!--Sections-->
+  <string name="menu_item_home">Accueil</string>
+  <string name="menu_item_accounts">Gérer des comptes</string>
+  <string name="menu_item_settings">Réglages</string>
+  <string name="menu_item_share">Partager mes contacts</string>
+  <string name="menu_item_about">A propos de Ring</string>
   <!--Dialing Fragment-->
+  <string name="dial_number">Composer un numéro </string>
   <!--History Fragment-->
+  <string name="hist_replay_button">Répéter</string>
+  <string name="hist_replay_button_stop">Arrêter</string>
   <!--DetailsHistory Fragment-->
   <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="one">%d Conversations</item>
+    <item quantity="other">%d Conversations</item>
+  </plurals>
+  <string name="home_transfering">Transfert de %1$s à %1$s</string>
+  <string name="home_transfer_complet">Le transfert est terminé</string>
   <!--ContactList Fragment-->
+  <string name="no_contact_found">Aucun contact n\'a été trouvé</string>
+  <string name="starred_contacts_title">Favoris</string>
+  <string name="searchbar_hint">Entrer un nom ou un numéro de téléphone</string>
+  <string name="choose_number">Choisir un numéro de téléphone</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
+  <string name="transfer_to_another_call">Transférer à un autre appel en cours</string>
+  <string name="transfer_no_other_call">Aucun appel en attente</string>
+  <string name="transfer_type_number">Saisir le numéro de téléphone sur lequel transféré l\'appel</string>
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">Appel manqué de %1$s</string>
+  <string name="notif_missed_outgoing_call">Appel manqué à %1$s</string>
+  <string name="notif_incoming_call_title">Appel entrant de %1$s</string>
+  <string name="notif_incoming_call">Appel entrant</string>
+  <string name="notif_outgoing_call_title">Appel sortant à %1$s</string>
+  <string name="notif_outgoing_call">Appel sortant</string>
+  <string name="notif_current_call_title">Appel en cours avec %1$s</string>
+  <string name="notif_current_call">Appel en cours</string>
   <!--Call Fragment-->
+  <string name="you_txt_prefix">Toi</string>
+  <string name="action_call_attended_transfer">En attente du transfert d\'appel</string>
+  <string name="action_call_conference">Conférence</string>
+  <string name="action_call_hangup">Raccrocher</string>
+  <string name="ongoing_call">Appel en cours</string>
+  <string name="hist_in_call">Appel entrant de %1$s</string>
+  <string name="hist_out_call">Appel sortant de %1$s</string>
+  <string name="start_error_title">Ring ne démarre pas</string>
+  <string name="start_error_mic_required">Ring requiert une permission pour utiliser le micro</string>
+  <string name="action_call_accept">Prendre un appel</string>
+  <string name="action_call_decline">Refuser</string>
+  <string name="ab_action_speakerphone">Activer le haut-parleur</string>
+  <string name="ab_action_contact_add">Ajouter dans les contacts</string>
+  <string name="ab_action_contact_add_question">Voulez-vous l\'ajouter à vos contacts?</string>
+  <string name="ab_action_audio_call">Appel audio</string>
+  <string name="ab_action_video_call">Appel vidéo</string>
+  <string name="share_via">Partager via</string>
+  <string name="write_a_message">Écrire un message</string>
+  <string name="scan_qr">Scanner un code QR</string>
+  <string name="ab_action_flipcamera">Inverser la caméra</string>
   <!--Text messages-->
+  <string name="send_message">Envoyer un message</string>
+  <string name="message_sending">Envoi du message en cours</string>
+  <string name="time_just_now">maintenant</string>
+  <string name="permission_read_denied">Le logiciel n\'a pas les permissions \"en lecture\" pour lire l\'espace de stockage d\'où un problème de fonctionnement. Merci d\'accorder ces permissions.</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Autoriser la caméra</string>
+  <string name="permission_dialog_camera_message">Les conversations en mode vidéo demandent à ce que les permissions soient accordées. Merci d\'activer les permissions.</string>
+  <string name="ringtone_error_title">Erreur</string>
+  <string name="ringtone_error_format_not_supported">Ce format n\'est pas supporté</string>
+  <string name="ringtone_error_size_too_big">Ce document est trop lourd. La taille maximum autorisé est de %1$ikB.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring souhaite accéder à vos contacts pour activer cette fonctionnalité. Merci d\'accorder les permissions nécessaires.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring nécessite d\'avoir des accès pour activer cette fonctionnalité. Merci d\'accorder les permissions nécessaires.</string>
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Merci de scanner le Code QR du compte que vous souhaitez ajouter.</string>
   <!--Settings-->
+  <string name="clear_history_dialog_title">Voulez-vous effacer l\'historique?</string>
+  <string name="clear_history_dialog_message">Cette action ne peut pas être annulée</string>
+  <string name="clear_history_completed">L\'historique a été effacée</string>
   <!--Conversation-->
+  <string name="conversation_action_delete_this">Supprimer cette conversation</string>
+  <string name="conversation_action_delete_this_title">Voulez-vous supprimer cette conversation?</string>
+  <string name="conversation_action_delete_this_message">Cette action ne peut pas être annulée</string>
+  <string name="conversation_action_copy_peer_number">Copier le numéro de téléphone</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s a été copié dans le presse-papier</string>
+  <string name="conversation_action_select_peer_number">Choisir un numéro </string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Voulez-vous ajouter %1$s ?</string>
+  <string name="prompt_new_password">Nouveau mot de passe</string>
+  <string name="prompt_new_password_repeat">Saisir à nouveau le mot de passe</string>
+  <string name="account_create_title">Créer un compte Ring</string>
+  <string name="prompt_new_username">Saisir un nouveau nom d\'utilisateur</string>
+  <string name="help_password_choose">Saisir un mot de passe sécuritaire facile à retenir pour protéger votre compte Ring</string>
+  <string name="help_password_enter">Entrer votre mot de passe pour votre compte Ring principal</string>
+  <string name="help_pin_enter">Entrer votre PIN (numéro d\'identification personnel) configuré sur un autre compte Ring. Utiliser la fonction \"exporter un compte dans Ring\" pour obtenir votre numéro d\'identification personnel.</string>
+  <string name="account_device_updated_message">Votre profil Ring a bien été mis à jour.</string>
   <!--MenuHeaderView-->
+  <string name="profile">Mon profil</string>
+  <string name="profile_message_warning">Partage fait avec vos contacts</string>
+  <string name="open_the_gallery">Ouvrir la galerie</string>
+  <string name="take_a_photo">Prendre une photo</string>
+  <string name="unknowm_if_empty">État inconnu si le champ est vide</string>
   <string name="unknown">Inconnu</string>
+  <!--Share fragment-->
+  <string name="share_message">Scanner le code QR avec le scanner intégré du logiciel Ring pour pouvoir communiquer</string>
+  <string name="share_your_account_information">Partager mes coordonnées</string>
+  <string name="generic_error_migration">Erreur</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml b/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
new file mode 100644
index 0000000..2013d05
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Supprimer</string>
+  <!--Strings related to account creation-->
+  <string name="prompt_password">mot de passe</string>
+  <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_message">Cette action ne peut pas être annulée</string>
+  <!--AccountManagementFragment-->
+  <!--Basic Details-->
+  <string name="account_password_label">mot de passe</string>
+  <!--Audio Details-->
+  <!--Video Details-->
+  <!--Advanced Details-->
+  <!--Security Details-->
+  <!--SRTP Details-->
+  <!--SIP-->
+  <!--TLS Details-->
+  <!--restore/backup-->
+  <string name="account_export_end_error_title">Erreur</string>
+  <string name="account_new_button">Créer un compte Ring</string>
+  <string name="account_link_export_button">Connecter un autre appareil à ce compte</string>
+  <!--Name registration-->
+  <string name="account_status_unknown">Inconnu</string>
+  <!--Create account-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml b/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml
index 725afc8..b5b16ca 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml
@@ -22,5 +22,7 @@
 -->
 <resources>
     <string name="call_human_state_hungup">Terminé</string>
+    <string name="call_human_state_hold">Patienter</string>
     <string name="call_human_state_over">Terminé</string>
+    <string name="conference_human_state_hold">Patienter</string>
     </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-fr/strings.xml b/ring-android/app/src/main/res/values-fr/strings.xml
index 1ea61db..89f42e2 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Licence</string>
   <string name="sponsor_section">Ring est un logiciel libre développé et soutenu par</string>
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Contribuer</string>
@@ -114,6 +113,7 @@
   <string name="help_password_choose">Choisissez un mot de passe sécurisé dont vous vous rappellerez pour protéger votre compte Ring.</string>
   <string name="help_password_enter">Entrez le mot de passe de votre compte Ring</string>
   <string name="help_pin_enter">Entrez le code PIN obtenu en configurant un autre compte Ring . Utilisez la fonction \"exportez un compte sur Ring\" pour obtenir un code PIN.</string>
+  <string name="wizard_next">Suivant</string>
   <string name="account_device_updated_message">Mise à jour de votre compte Ring réalisée avec succès. </string>
   <!--MenuHeaderView-->
   <string name="profile">Mon profil</string>
@@ -125,4 +125,5 @@
   <!--Share fragment-->
   <string name="share_message">Scannez ce QRCode avec le scanner intégré de l\'application Ring qui souhaite communiquer avec vous.</string>
   <string name="share_your_account_information">Partagez mes coordonnées</string>
+  <string name="generic_error_migration">Erreur</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr/strings_account.xml b/ring-android/app/src/main/res/values-fr/strings_account.xml
index aa9f5e4..1d45ffe 100644
--- a/ring-android/app/src/main/res/values-fr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr/strings_account.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Supprimer</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Nom du serveur</string>
@@ -106,13 +108,10 @@
   <string name="account_export_end_error_title">Erreur</string>
   <string name="account_export_end_error_message">Impossible d\'exporter le compte. Une erreur inconnue s\'est produite.</string>
   <string name="account_enter_password">Entrer le mot de passe</string>
-  <string name="account_share_body">Contactez moi en utilisant %1$s sur Ring, la plateforme de communication disponible sur: http://ring.cx</string>
   <string name="account_contact_me">Contactez moi sur Ring !</string>
   <string name="update_account">Mise à jour du compte </string>
-  <string name="account_migration">Votre compte Ring peut maintenant être partagé entre tous vos appareils. Vous devez seulement fournir un mot de passe. </string>
   <string name="ring_account">Compte Ring</string>
   <string name="account_migration_title_dialog">Migration du compte</string>
-  <string name="account_migration_message_dialog">Vos comptes doivent être mis à jour pour pouvoir être utilisés sur plusieurs appareils. Voulez vous aller à l\'écran de gestion des comptes pour effectuer cette opération ?</string>
   <string name="account_update_needed">Mise à jour nécessaire</string>
   <string name="account_creation_file_too_big">Fichier trop gros</string>
   <string name="account_cannot_read">Impossible de lire %1$s</string>
@@ -126,7 +125,7 @@
   <string name="account_link_button">Lier cet appareil à un compte</string>
   <string name="account_import_title">Lier à un compte existant</string>
   <string name="account_link_prompt_pin">Entrer votre code PIN</string>
-  <string name="account_wizard_title">Compte Ring</string>
+  <string name="account_wizard_title">Bienvenue à </string>
   <string name="account_new_button">Créer un compte Ring</string>
   <string name="account_link_export_button">Lier un autre appareil à ce compte</string>
   <string name="account_link_export_info">Pour utiliser ce compte sur un autre appareil, vous devez d\'abord l\'exposer sur Ring. Ceci générera un code PIN que vous devrez entrer sur le nouvel appareil pour configurer le compte. Le code PIN sera valable pendant 10 minutes. \n\nMerci de commencer par entrer votre mot de passe:</string>
@@ -143,8 +142,13 @@
   <string name="register_name">Enregistrer un nom</string>
   <string name="trying_to_register_name">Enregistrement du nom en cours</string>
   <string name="registered_username">Nom d\'utilisateur enregistré</string>
-  <string name="register_username">Enregistrer un nom public (expérimental)</string>
+  <string name="register_username">Enregistrer un nom d\'utilisateur public (expérimental)</string>
   <string name="username_already_taken">Ce nom d\'utilisateur est déjà utilisé</string>
   <string name="invalid_username">Nom d\'utilisateur incorrect</string>
   <string name="looking_for_username_availability">Vérification en cours de la disponibilité du nom d\'utilisateur...</string>
+  <string name="account_status_connecting">En cours de connexion</string>
+  <string name="account_status_unknown">Inconnu</string>
+  <!--Create account-->
+  <string name="account_creation_home">Bienvenue sur Ring</string>
+  <string name="account_creation_profile">Créer votre profil</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-he/strings.xml b/ring-android/app/src/main/res/values-he/strings.xml
index 3f99b53..9367e35 100644
--- a/ring-android/app/src/main/res/values-he/strings.xml
+++ b/ring-android/app/src/main/res/values-he/strings.xml
@@ -44,6 +44,8 @@
   <!--Conversation-->
   <string name="conversation_action_copy_peer_number">העתק מספר</string>
   <!--Contacts-->
+  <string name="wizard_next">קדימה</string>
   <!--MenuHeaderView-->
   <!--Share fragment-->
+  <string name="generic_error_migration">שגיאה</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-he/strings_account.xml b/ring-android/app/src/main/res/values-he/strings_account.xml
index 57aea3f..8e25bce 100644
--- a/ring-android/app/src/main/res/values-he/strings_account.xml
+++ b/ring-android/app/src/main/res/values-he/strings_account.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">מחק</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">כינוי</string>
   <string name="prompt_hostname">שם מארח</string>
@@ -61,4 +63,5 @@
   <!--restore/backup-->
   <string name="account_export_end_error_title">שגיאה</string>
   <!--Name registration-->
+  <!--Create account-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-hr/strings.xml b/ring-android/app/src/main/res/values-hr/strings.xml
index 47f5f06..e16aab9 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Licenca</string>
   <string name="sponsor_section">Ring je slobodi software koji razvijaju i podržavaju</string>
   <string name="copyright_section">Autorska prava</string>
   <string name="contribute_section">Doprinesite</string>
@@ -101,7 +100,9 @@
   <string name="add_call_contact_number_to_contacts">Dodaj %1$s ?</string>
   <string name="prompt_new_password">Nova lozinka</string>
   <string name="account_create_title">Napravite Ring račun</string>
+  <string name="wizard_next">Slijedeće</string>
   <!--MenuHeaderView-->
   <string name="unknown">Nepoznato</string>
   <!--Share fragment-->
+  <string name="generic_error_migration">Greška</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 8ea859d..1efa4ab 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
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Izbriši</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Ime poslužitelja</string>
@@ -76,4 +78,8 @@
   <string name="account_export_end_error_title">Greška</string>
   <string name="account_new_button">Napravite Ring račun</string>
   <!--Name registration-->
+  <string name="account_status_connecting">Spajanje</string>
+  <string name="account_status_unknown">Nepoznato</string>
+  <!--Create account-->
+  <string name="account_creation_home">Dobrodošli u Ring</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-hu/strings.xml b/ring-android/app/src/main/res/values-hu/strings.xml
index 6ca1b8f..bbac936 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">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>
@@ -83,16 +82,44 @@
   <!--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>
+  <string name="ringtone_error_title">Hiba</string>
+  <string name="ringtone_error_format_not_supported">Ez a formátum nem támogatott</string>
+  <string name="ringtone_error_size_too_big">Ez a fájl túl nagy. A maximum méret %1$ikB</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-->
+  <string name="clear_history_dialog_title">Napló törlése ?</string>
+  <string name="clear_history_dialog_message">Ez a művelet nem vonható vissza.</string>
+  <string name="clear_history_completed">A napló törölve.</string>
   <!--Conversation-->
+  <string name="conversation_action_delete_this">A beszélgetés törlése.</string>
+  <string name="conversation_action_delete_this_title">A beszélgetés törlése ?</string>
+  <string name="conversation_action_delete_this_message">Ez a művelet nem vonható vissza.</string>
   <string name="conversation_action_copy_peer_number">Szám másolása</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s a vágólapra másolva</string>
+  <string name="conversation_action_select_peer_number">Válasszon egy számot</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">%1$s hozzáadása?</string>
+  <string name="prompt_new_password">Új jelszó</string>
+  <string name="prompt_new_password_repeat">Új jelszó még egyszer</string>
+  <string name="account_create_title">Egy Ringfiók létrehozása</string>
+  <string name="prompt_new_username">Új felhasználónév megadása</string>
+  <string name="help_password_choose">Válasszon egy erős jelszavat, amelyre emlékezni fog a Ringfiókja védelme érdekében</string>
+  <string name="help_password_enter">Adja meg a Ringfiók jelszavát</string>
+  <string name="help_pin_enter">Adja meg egy másik beállított Ringfiók PIN-jét! Használja a „fiók exportálása a Ringen” funkciót a PIN eléréséhez!</string>
+  <string name="wizard_next">Következő</string>
+  <string name="account_device_updated_message">Sikeresen frissítette a Ringfiókját.</string>
   <!--MenuHeaderView-->
+  <string name="profile">Profilom</string>
+  <string name="profile_message_warning">Ez meg van osztva a partnereivel</string>
+  <string name="open_the_gallery">Galéria megnyitása</string>
+  <string name="take_a_photo">Fotó készítése</string>
+  <string name="unknowm_if_empty">Ismeretlen, ha üres</string>
   <string name="unknown">Ismeretlen</string>
   <!--Share fragment-->
+  <string name="share_your_account_information">Elérési adataim megosztása</string>
+  <string name="generic_error_migration">Hiba</string>
 </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
index d64fe49..2997750 100644
--- a/ring-android/app/src/main/res/values-hu/strings_account.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_account.xml
@@ -1,11 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Törlés</string>
   <!--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-->
+  <string name="account_delete_dialog_message">Ez a művelet nem vonható vissza.</string>
   <!--AccountManagementFragment-->
   <string name="normal_accounts_titles">Fiókok</string>
   <!--Basic Details-->
@@ -17,6 +20,7 @@
   <!--Audio Details-->
   <string name="account_audio_label">Hang</string>
   <string name="account_preferences_media_tab">Média</string>
+  <string name="account_ringtone_label">Csengőhang</string>
   <!--Video Details-->
   <string name="account_video_label">Videó</string>
   <string name="account_video_enable">Videó engedélyezése</string>
@@ -31,5 +35,9 @@
   <!--TLS Details-->
   <string name="account_rtp_port_range">Hang RTP port korlát</string>
   <!--restore/backup-->
+  <string name="account_export_end_error_title">Hiba</string>
+  <string name="account_new_button">Egy Ringfiók létrehozása</string>
   <!--Name registration-->
+  <string name="account_status_unknown">Ismeretlen</string>
+  <!--Create account-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-id/strings.xml b/ring-android/app/src/main/res/values-id/strings.xml
index ddf5dc3..25069de 100644
--- a/ring-android/app/src/main/res/values-id/strings.xml
+++ b/ring-android/app/src/main/res/values-id/strings.xml
@@ -26,4 +26,5 @@
   <!--MenuHeaderView-->
   <string name="unknown">Tidak diketahui</string>
   <!--Share fragment-->
+  <string name="generic_error_migration">Eror</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-id/strings_account.xml b/ring-android/app/src/main/res/values-id/strings_account.xml
new file mode 100644
index 0000000..b6a5430
--- /dev/null
+++ b/ring-android/app/src/main/res/values-id/strings_account.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account edition screen-->
+  <!--Strings related to account creation-->
+  <!--Strings related to account deletion-->
+  <!--AccountManagementFragment-->
+  <!--Basic Details-->
+  <!--Audio Details-->
+  <!--Video Details-->
+  <!--Advanced Details-->
+  <!--Security Details-->
+  <!--SRTP Details-->
+  <!--SIP-->
+  <!--TLS Details-->
+  <!--restore/backup-->
+  <string name="account_export_end_error_title">Eror</string>
+  <!--Name registration-->
+  <string name="account_status_unknown">Tidak diketahui</string>
+  <!--Create account-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings.xml b/ring-android/app/src/main/res/values-it-rIT/strings.xml
index 8ac83ce..ddb8feb 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings.xml
@@ -1,61 +1,129 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Licenza</string>
-  <string name="sponsor_section">Ring è free software sviluppato e aggiornato da</string>
+  <string name="sponsor_section">Ring è un software libero sviluppato e supportato da</string>
   <string name="copyright_section">Copyright</string>
-  <string name="contribute_section">Contributi</string>
+  <string name="contribute_section">Contribuisci</string>
   <string name="version_section">Versione</string>
+  <string name="no_email_app_installed">Nessuna app email trovata, installane una per inviarci il report</string>
+  <string name="email_chooser_title">Invia email con...</string>
   <!--RingActivity-->
+  <string name="title_activity_sflphone_home">Squilla</string>
   <string name="error_no_network">Assenza di connessione di rete</string>
+  <string name="error_mobile_network_available_but_disabled">Per favore consenti l\'accesso alla rete dalla schermata delle impostazioni</string>
   <!--AB menus-->
   <string name="ab_account_creation">Nuovo account</string>
   <string name="ab_action_chat">Messaggiare</string>
   <!--Left Drawer-->
   <!--Accessibility-->
+  <string name="drawer_open">Apri box navigazione</string>
+  <string name="drawer_close">Chiudi box navigazione</string>
   <!--Sections-->
   <string name="menu_item_home">Home</string>
-  <string name="menu_item_settings">Opzioni</string>
+  <string name="menu_item_accounts">Gestisci account</string>
+  <string name="menu_item_settings">Impostazioni</string>
+  <string name="menu_item_share">Condividi il mio contatto</string>
+  <string name="menu_item_about">Informazioni su Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Chiama un numero</string>
   <!--History Fragment-->
+  <string name="hist_replay_button">Replay</string>
   <string name="hist_replay_button_stop">Stop</string>
   <!--DetailsHistory Fragment-->
   <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="one">%d Conversazione</item>
+    <item quantity="other">%d Conversazioni</item>
+  </plurals>
+  <string name="home_transfering">Trasferisco %1$s a %1$s</string>
   <string name="home_transfer_complet">Trasferimento completato</string>
   <!--ContactList Fragment-->
-  <string name="no_contact_found">Nessun contatto</string>
+  <string name="no_contact_found">Nessun contatto trovato</string>
   <string name="starred_contacts_title">Preferiti</string>
   <string name="searchbar_hint">Digita un nome o un numero di telefono</string>
   <string name="choose_number">Scegli un numero</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
+  <string name="transfer_to_another_call">Trasferisci su un\'altra chiamata:</string>
+  <string name="transfer_no_other_call">Nessuna chiamata in attesa</string>
+  <string name="transfer_type_number">Digita il numero al quale trasferire:</string>
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">Chiamata persa da %1$s</string>
+  <string name="notif_missed_outgoing_call">Chiamata persa a %1$s</string>
+  <string name="notif_incoming_call_title">Chiamata in arrivo da %1$s</string>
   <string name="notif_incoming_call">Chiamata in ingresso</string>
+  <string name="notif_outgoing_call_title">Sto chiamando %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 corrente</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Tu:</string>
+  <string name="action_call_attended_transfer">Trasferimenti assistiti</string>
   <string name="action_call_conference">Conferenza</string>
+  <string name="action_call_hangup">Chiudi</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 in uscita di %1$s</string>
+  <string name="start_error_title">Non riesco ad avviare Ring !</string>
+  <string name="start_error_mic_required">Ring richiede l\'accesso al microfono per funzionare.</string>
+  <string name="action_call_accept">Rispondi</string>
+  <string name="action_call_decline">Rifiuta</string>
   <string name="ab_action_speakerphone">Attiva l\'audio</string>
   <string name="ab_action_contact_add">Aggiungi alla rubrica</string>
   <string name="ab_action_contact_add_question">Aggiungi alla rubrica?</string>
   <string name="ab_action_audio_call">Chiamata</string>
   <string name="ab_action_video_call">Videochiamata</string>
+  <string name="share_via">Condividi con</string>
   <string name="write_a_message">Scrivi un messaggio</string>
+  <string name="scan_qr">Leggi codice QR</string>
   <string name="ab_action_flipcamera">Cambia videocamera</string>
   <!--Text messages-->
   <string name="send_message">Invia messaggio</string>
+  <string name="message_sending">Sto inviando il messaggio...</string>
   <string name="time_just_now">Proprio ora</string>
+  <string name="permission_read_denied">La app non può leggere dalla memoria. Quindi non può funzionare correttamente. Se lo desideri, attiva questo permesso.</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permesso videocamera</string>
+  <string name="permission_dialog_camera_message">Le videochiamate hanno bisogna del permesso per accedere alla videocamera. Se lo desideri, attivalo.</string>
+  <string name="ringtone_error_title">Errore</string>
+  <string name="ringtone_error_format_not_supported">Questo formato non è supportato.</string>
+  <string name="ringtone_error_size_too_big">Il file è troppo grande. La dimensione massima è %1$ikB.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring richiede il permesso di \"accesso alla rubrica\" per usare questa funzionalità. Se lo desideri, attivalo.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring richiede il prrmesso di \"scrittura log chiamate\" per usare questa funzionalità. Se lo desideri, attivalo.</string>
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Scansiona il codice QR dell\'account che vuoi aggiungere.</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">Pulisco la cronologia?</string>
+  <string name="clear_history_dialog_message">Questa operazione non può essere annullata.</string>
+  <string name="clear_history_completed">La cronologia è stata cancellata.</string>
   <!--Conversation-->
+  <string name="conversation_action_delete_this">Cancella questa conversazione</string>
+  <string name="conversation_action_delete_this_title">Cancellare questa conversazione?</string>
+  <string name="conversation_action_delete_this_message">Questa operazione non può essere annullata.</string>
   <string name="conversation_action_copy_peer_number">Copia numero</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s copiato negli appunti</string>
   <string name="conversation_action_select_peer_number">Seleziona un numero</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Aggiungi %1$s ?</string>
+  <string name="prompt_new_password">Nuova password</string>
+  <string name="prompt_new_password_repeat">Ripeti nuova password</string>
+  <string name="account_create_title">Crea un account Ring</string>
+  <string name="prompt_new_username">Inserisci il nuovo nome utente</string>
+  <string name="help_password_choose">Scegli una password robusta che ti dovrai ricordare per proteggere il tuo account Ring</string>
+  <string name="help_password_enter">Inserisci la password del tuo account Ring principale</string>
+  <string name="help_pin_enter">Inserire il PIN da un altro account Ring configurato. Usa la funzione \"esporta account su Ring\" per ottenere il PIN.</string>
+  <string name="wizard_next">Prossimo</string>
+  <string name="account_device_updated_message">Hai aggiornato correttamente il tuo account Ring.</string>
   <!--MenuHeaderView-->
+  <string name="profile">Il mio profilo</string>
+  <string name="profile_message_warning">Questo è condiviso con i tuoi contatti</string>
+  <string name="open_the_gallery">Apri la galleria</string>
+  <string name="take_a_photo">Scatta una foto</string>
+  <string name="unknowm_if_empty">Sconosciuto se vuoto</string>
+  <string name="unknown">Sconosciuto</string>
   <!--Share fragment-->
+  <string name="share_message">Leggi questo codice QR con lo scanner integrato dell\'applicazione Ring che vuole comunicare con te.</string>
+  <string name="share_your_account_information">Condividi le mie informazioni di contatto</string>
+  <string name="generic_error_migration">Errore</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
index 2d1d42e..fcc5803 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
@@ -1,32 +1,154 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Cancella</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Hostname</string>
   <string name="prompt_username">Utente</string>
   <string name="prompt_password">Password</string>
+  <string name="action_create">Crea account</string>
+  <string name="action_create_short">Salva</string>
+  <string name="error_field_required">Questo dato è obbligatorio</string>
+  <string name="dialog_wait_create">Aggiungi account</string>
+  <string name="dialog_wait_create_details">Aspetta mentre aggiungo il tuo nuovo account...</string>
+  <string name="dialog_wait_update">Aggiorna account</string>
+  <string name="dialog_wait_update_details">Aspetta mentre aggiorno il tuo nuovo account...</string>
+  <string name="dialog_warn_ip2ip_account_title">Creo un account SIP vuoto?</string>
+  <string name="dialog_warn_ip2ip_account_message">Stai creando un account SIP senza un hostname valido.
+Potrai solo fare e ricevere chiamate dirette tramite indirizzo ip.
+Potrai modificare il tuo account successivamente</string>
+  <string name="help_ring">Un accout Ring ti permette di raggiungere le persone in modalità peer to peer tramite una rete completamente distribuita.</string>
+  <string name="help_sip_title">Aggiungi il tuo account SIP</string>
+  <string name="help_sip">Configura un account SIP esistente</string>
+  <string name="create_sip_account">Aggiungi</string>
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">Eliminare l\'account?</string>
+  <string name="account_delete_dialog_message">Questa operazione non può essere annullata.</string>
   <!--AccountManagementFragment-->
+  <string name="empty_account_list">Nessun account registrato</string>
+  <string name="normal_accounts_titles">Accounts</string>
+  <string name="normal_devices_titles">Dispositivi registrati su questo account Ring</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Generale</string>
+  <string name="account_basic_category">Impostazioni base</string>
+  <string name="account_alias_label">Nome account</string>
   <string name="account_hostname_label">Hostname</string>
   <string name="account_bootstrap_label">Avvio</string>
   <string name="account_username_label">Utente</string>
   <string name="account_password_label">Password</string>
+  <string name="account_optionnal_category">Impostazioni aggiuntive</string>
+  <string name="account_useragent_label">User Agent</string>
+  <string name="account_autoanswer_label">Risposta automatica</string>
+  <string name="account_upnp_label">Attiva UPnP</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
   <string name="account_audio_label">Audio</string>
+  <string name="account_preferences_media_tab">Media</string>
   <string name="account_ringtone_label">Suonerie</string>
+  <string name="account_ringtone_enabled_label">Attiva suonerie</string>
+  <string name="account_ringtone_path_label">Percorso suonerie</string>
+  <string name="account_ringtone_custom_label">Usa suoneria personalizzata</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
+  <string name="account_video_enable">Attiva Video</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Avanzato</string>
+  <string name="account_registration_exp_label">Scadenza registrazione</string>
+  <string name="account_local_interface_label">Interfaccia locale</string>
+  <string name="account_local_port_label">Porta locale</string>
+  <string name="account_stun_enable_label">Usa Stun</string>
+  <string name="account_stun_server_label">Server Stun</string>
   <string name="account_turn_enable_label">Utilizza TURN</string>
+  <string name="account_turn_server_label">Server TURN</string>
+  <string name="account_turn_username_label">Nome utente TURN</string>
+  <string name="account_turn_password_label">Password TURN</string>
+  <string name="account_published_same_as_local_label">Indirizzo pubblico uguale a quello locale</string>
+  <string name="account_published_port_label">Porta Pubblica</string>
+  <string name="account_published_address_label">Indirizzo Pubblico</string>
   <!--Security Details-->
+  <string name="account_credentials_label">Credenziali</string>
+  <string name="account_credentials_edit">Modifica credenziali</string>
+  <string name="account_credentials_add">Aggiungi credenziali</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Sicurezza</string>
   <!--SIP-->
   <!--TLS Details-->
+  <string name="account_tls_transport_switch_label">Usa trasporto TLS</string>
+  <string name="account_tls_port_label">Porta ricezione TLS</string>
+  <string name="account_tls_certificate_list_label">Autorità di Certificazione</string>
+  <string name="account_tls_certificate_file_label">File del Certificato</string>
+  <string name="account_tls_private_key_file_label">File della Chiave Privata</string>
+  <string name="account_tls_password_label">Password della Chiave Privata</string>
+  <string name="account_tls_method_label">Metodo TLS</string>
+  <string name="account_tls_ciphers_label">Cifratura TLS</string>
+  <string name="account_tls_server_name_label">Nome Server</string>
+  <string name="account_tls_verify_server_label">Verifica Server</string>
+  <string name="account_tls_verify_client_label">Verifica Client</string>
+  <string name="account_tls_negotiation_timeout_sec">Timeout negoziazione (sec)</string>
+  <string name="account_rtp_max_port">Massimo</string>
+  <string name="account_rtp_min_port">Minimo</string>
+  <string name="account_rtp_port_range">Intervallo porte audio RTP</string>
   <!--restore/backup-->
+  <string name="account_restore_account">Ripristina un account</string>
+  <string name="account_restore_message">Inserire la password per decriptare il file.</string>
+  <string name="account_restore_decryption_password">Password per decriptare</string>
+  <string name="account_new_device_password">Inserire la password principale per sbloccare l\'account</string>
+  <string name="restore_dialog_title">Ripristino</string>
+  <string name="restore_backup_wait">Prego attendere...</string>
+  <string name="error_password_char_count">Minimo 6 caratteri</string>
+  <string name="error_passwords_not_equals">Le password non corrispondono</string>
+  <string name="restore_failed_dialog_title">Ripristino non riuscito</string>
+  <string name="restore_failed_dialog_msg">C\'è stato un errore</string>
+  <string name="export_account_wait_title">Prego attendere...</string>
+  <string name="export_account_wait_message">Sto pubblicando le informazioni del nuovo account</string>
+  <string name="account_export_end_decryption_message">Impossibile sbloccare l\'account x la con la password inserita.</string>
+  <string name="account_export_end_network_title">Errore di rete</string>
+  <string name="account_export_end_network_message">Impossibile esportare l\'account sulla rete. Controlla la tua connettività.</string>
+  <string name="account_export_end_error_title">Errore</string>
+  <string name="account_export_end_error_message">Impossibile esportare l\'account. C\'è stato un errore sconosciuto.</string>
+  <string name="account_enter_password">Inserire password</string>
+  <string name="account_contact_me">Contattami su Ring !</string>
+  <string name="update_account">Aggiorna account</string>
+  <string name="ring_account">Account Ring</string>
+  <string name="account_migration_title_dialog">Migrazione account</string>
+  <string name="account_update_needed">Aggiornamento necessario</string>
+  <string name="account_creation_file_too_big">Il file è troppo grande</string>
+  <string name="account_cannot_read">Impossibile leggere %1$s</string>
+  <string name="account_cannot_be_found_title">Impossibile trovare l\'account</string>
+  <string name="account_cannot_be_found_message">Impossibile trovare l\'account nella rete Ring.\nAssicurati di averlo esportato da un account Ring esistente e di aver fornito le credenziali corrette.</string>
+  <string name="account_no_network_title">Impossibile collegarsi alla rete</string>
+  <string name="account_no_network_message">Impossibile aggiungere un account perchè Ring non riesce a collegarsi alla rete distribuita. Controllare la connettività.</string>
+  <string name="account_device_added_title">Il dispositivo è stato aggiunto</string>
+  <string name="account_device_added_message">Hai impostato correttamente il tuo account Ring su questo dispositivo.</string>
+  <string name="account_device_updated_title">Il dispositivo è stato aggiunto</string>
+  <string name="account_link_button">Collega questo dispositivo ad un account</string>
+  <string name="account_import_title">Collega ad un account esistente</string>
+  <string name="account_link_prompt_pin">Inserisci il PIN</string>
+  <string name="account_wizard_title">Benvenuto su</string>
+  <string name="account_new_button">Crea un account Ring</string>
+  <string name="account_link_export_button">Collega un altro dispositivo a questo account</string>
+  <string name="account_link_export_info">Per utilizzare questo account su altri dispositivi, devi prima renderlo visibile su Ring. Questo genererà un codice PIN che dovrai inserire nel nuovo dispositivo per impostare l\'account. Il pin è valido per 10 minuti. \n\nPer favore digita la tua password per cominciare:</string>
+  <string name="account_start_export_button">Genera Pin</string>
+  <string name="account_end_export_button">chiudi</string>
+  <string name="account_end_export_infos">Il tuo Pin è:\n\n%%\n\nPer completare la procedura, devi aprire Ring nel nuovo dispositivo. Crea un nuovo account con \"Collega questo dispositivo con un account\". Il tuo pin è valido per 10 minuti.</string>
   <!--Name registration-->
+  <string name="register_name_wrong_password">Non è possibile registrare questo nome: la password dell\'account è errata</string>
+  <string name="register_name_invalid">Non è possibile registrare il nome: nome non valido.</string>
+  <string name="register_name_already_taken">Non è possibile registrare il nome: nome già registrato.</string>
+  <string name="register_name_network_error">Non è possibile registrare il nome: errore di di rete o del server.</string>
+  <string name="error_username_empty">Inserire un nome utente</string>
+  <string name="no_registered_name_for_account">Nessun nome registrato è stato trovato per questo account</string>
+  <string name="register_name">Nome registrazione</string>
+  <string name="trying_to_register_name">Tentativo di registrazione del nome</string>
+  <string name="registered_username">Nome utente registrato</string>
+  <string name="register_username">Registra un nome utente pubblico (sperimentale)</string>
+  <string name="username_already_taken">Il nome utente è già utilizzato</string>
+  <string name="invalid_username">Nome utente non valido</string>
+  <string name="looking_for_username_availability">Controllo che il nome utente sia disponibile ...</string>
+  <string name="account_status_connecting">Collegamento</string>
+  <string name="account_status_unknown">Sconosciuto</string>
+  <!--Create account-->
+  <string name="account_creation_home">Benvenuto su Ring</string>
+  <string name="account_creation_profile">Crea il tuo profilo</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_call.xml b/ring-android/app/src/main/res/values-it-rIT/strings_call.xml
index e5ee478..aae5bc8 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_call.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_call.xml
@@ -21,5 +21,24 @@
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- SipCalls -->
+    <string name="call_human_state_incoming">Squilla</string>
+    <string name="call_human_state_connecting">Collegamento</string>
     <string name="call_human_state_ringing">Sta chiamando</string>
-    </resources>
\ No newline at end of file
+    <string name="call_human_state_current">Parla</string>
+    <string name="call_human_state_hungup">Riaggancia</string>
+    <string name="call_human_state_busy">Occupato</string>
+    <string name="call_human_state_failure">Errore</string>
+    <string name="call_human_state_hold">Pausa</string>
+    <string name="call_human_state_unhold">Riprendi</string>
+    <string name="call_human_state_over">Over</string>
+    <string name="call_human_state_none">Nessuno</string>
+    <!-- Conferences -->
+    <string name="conference_human_state_active_attached">Collegati</string>
+    <string name="conference_human_state_active_detached">Scollegati</string>
+    <string name="conference_human_state_active_attached_rec">Collegati con reg.</string>
+    <string name="conference_human_state_active_detached_rec">Scollegati con reg.</string>
+    <string name="conference_human_state_hold">Pausa</string>
+    <string name="conference_human_state_hold_rec">Pausa reg</string>
+    <string name="conference_human_state_default">Nessuno</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_content_description.xml b/ring-android/app/src/main/res/values-it-rIT/strings_content_description.xml
new file mode 100644
index 0000000..5d52ec7
--- /dev/null
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_content_description.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings for xml content description of images-->
+  <string name="contact_quick_call_description">Chiamata Rapida</string>
+  <string name="contact_picture_description">Immagine Contatto</string>
+  <string name="dial_numeric_pad">Tastierino numerico</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
index 470d41f..e6a0f55 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
@@ -1,4 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="pref_category_network">Rete</string>
   <string name="pref_category_contacts">Contatti</string>
+  <string name="pref_category_system">Sistema</string>
+  <string name="pref_category_privacy">Privacy</string>
+  <string name="pref_mobileData_title">Dati mobili</string>
+  <string name="pref_mobileData_summary">Consenti Ring su reti 3G/LTE oltre al Wi-Fi</string>
+  <string name="pref_systemContacts_title">Usa la rubrica</string>
+  <string name="pref_systemContacts_summary">Usa i contatti della rubrica per mostrare i dettagli del chiamante</string>
+  <string name="pref_systemDialer_title">Usa Ring per le chiamate</string>
+  <string name="pref_systemDialer_summary">Usa Ring per le chiamate quando possibile.</string>
+  <string name="pref_startOnBoot_title">Esegui Ring all\'avvio</string>
+  <string name="pref_startOnBoot_summary">Esegui Ring in background quando si avvia il sistema.</string>
+  <string name="pref_clearHistory_title">Elimina cronologia</string>
+  <string name="pref_clearHistory_summary">Elimina la cronologia delle conversazioni. Questa operazione non può essere annullata.</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
index 048d661..6bbde75 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -1,9 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">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="sponsor_section">Ring è un software libero sviluppato e supportato da</string>
+  <string name="copyright_section">Copyright</string>
+  <string name="contribute_section">Contribuisci</string>
   <string name="version_section">Versione</string>
   <string name="no_email_app_installed">Applicazione email non trovata, installane una per inviarci un rapporto</string>
   <string name="email_chooser_title">Mandaci un\'email usando...</string>
@@ -22,6 +21,7 @@
   <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_share">Condividi il mio contatto</string>
   <string name="menu_item_about">Info su Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Chiama un numero</string>
@@ -85,6 +85,8 @@
   <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>
   <string name="ringtone_error_title">Errore</string>
+  <string name="ringtone_error_format_not_supported">Questo formato non è supportato.</string>
+  <string name="ringtone_error_size_too_big">Il file è troppo grande. La dimensione massima è %1$ikB.</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-->
@@ -105,8 +107,23 @@
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Aggiungi %1$s ?</string>
   <string name="prompt_new_password">Nuovo password</string>
+  <string name="prompt_new_password_repeat">Ripeti la nuova password</string>
   <string name="account_create_title">Creare un account Ring</string>
+  <string name="prompt_new_username">Inserisci il nuovo nome utente</string>
+  <string name="help_password_choose">Scegli una password robusta che tu possa ricordare per proteggere il tuo account Ring.</string>
+  <string name="help_password_enter">Inserisci la password del tuo account principale di Ring</string>
+  <string name="help_pin_enter">Inserisci il PIN da un altro account Ring già configurato. Usa l\'opzione \"esporta account su Ring\" per ottenere un PIN.</string>
+  <string name="wizard_next">Seguente</string>
+  <string name="account_device_updated_message">Hai aggiornato con successo il tuo account Ring.</string>
   <!--MenuHeaderView-->
+  <string name="profile">Il mio profilo</string>
+  <string name="profile_message_warning">Questo è condiviso con i tuoi contatti</string>
+  <string name="open_the_gallery">Apri la galleria</string>
+  <string name="take_a_photo">Scatta una foto</string>
+  <string name="unknowm_if_empty">Sconosciuto se vuoto</string>
   <string name="unknown">Sconosciuto</string>
   <!--Share fragment-->
+  <string name="share_message">Scansiona questo QRCode con il scanner integrato nell\'applicazione Ring che vuole comunicare con te.</string>
+  <string name="share_your_account_information">Condividi le mie informazioni di contatto</string>
+  <string name="generic_error_migration">Errore</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-it/strings_account.xml b/ring-android/app/src/main/res/values-it/strings_account.xml
index 619517f..4efc756 100644
--- a/ring-android/app/src/main/res/values-it/strings_account.xml
+++ b/ring-android/app/src/main/res/values-it/strings_account.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Cancella</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Nome Host</string>
@@ -90,6 +92,10 @@
   <string name="error_passwords_not_equals">Le password no corrispondono</string>
   <string name="restore_failed_dialog_msg">C\'è stato un errore</string>
   <string name="account_export_end_error_title">Errore</string>
+  <string name="account_wizard_title">Benvenuto a</string>
   <string name="account_new_button">Creare un account Ring</string>
   <!--Name registration-->
+  <string name="account_status_connecting">Connessione in corso </string>
+  <string name="account_status_unknown">Sconosciuto</string>
+  <!--Create account-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ja/strings.xml b/ring-android/app/src/main/res/values-ja/strings.xml
new file mode 100644
index 0000000..0af97b1
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ja/strings.xml
@@ -0,0 +1,127 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <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_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_action_chat">テキストメッセージ</string>
+  <!--Left Drawer-->
+  <!--Accessibility-->
+  <string name="drawer_open">ナビゲーションドロワーを開く</string>
+  <string name="drawer_close">ナビゲーションドロワーを閉じる</string>
+  <!--Sections-->
+  <string name="menu_item_home">ホーム</string>
+  <string name="menu_item_accounts">アカウント管理</string>
+  <string name="menu_item_settings">設定</string>
+  <string name="menu_item_share">連絡先を共有</string>
+  <string name="menu_item_about">Ring について</string>
+  <!--Dialing Fragment-->
+  <string name="dial_number">電話番号を入力</string>
+  <!--History Fragment-->
+  <string name="hist_replay_button">再生</string>
+  <string name="hist_replay_button_stop">停止</string>
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="other">%d 会話</item>
+  </plurals>
+  <string name="home_transfering">%1$s から %1$s へ転送</string>
+  <string name="home_transfer_complet">転送完了</string>
+  <!--ContactList Fragment-->
+  <string name="no_contact_found">連作先が見つかりません</string>
+  <string name="starred_contacts_title">お気に入り</string>
+  <string name="searchbar_hint">相手の名前か電話番号を入力してください...</string>
+  <string name="choose_number">番号を選んでください</string>
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <string name="transfer_to_another_call">現在の通話を別に転送:</string>
+  <string name="transfer_no_other_call">他に保留中の通話はありません</string>
+  <string name="transfer_type_number">転送先の番号を入力してください:</string>
+  <!--Notifications-->
+  <string name="notif_missed_incoming_call">%1$s から不在着信</string>
+  <string name="notif_missed_outgoing_call">%1$s への不在着信</string>
+  <string name="notif_incoming_call_title">%1$s から着信</string>
+  <string name="notif_incoming_call">着信</string>
+  <string name="notif_outgoing_call_title">%1$s への発信</string>
+  <string name="notif_outgoing_call">発信</string>
+  <string name="notif_current_call_title">%1$s と現在の通話</string>
+  <string name="notif_current_call">現在の通話</string>
+  <!--Call Fragment-->
+  <string name="you_txt_prefix">あなた:</string>
+  <string name="action_call_attended_transfer">在席転送</string>
+  <string name="action_call_conference">グループ通話</string>
+  <string name="action_call_hangup">通話終了</string>
+  <string name="ongoing_call">通話中</string>
+  <string name="hist_in_call">%1$s の着信</string>
+  <string name="hist_out_call">%1$s の発信</string>
+  <string name="start_error_title">Ring を開始できません !</string>
+  <string name="start_error_mic_required">Ring を使用するには、マイクのアクセス許可が必要です。</string>
+  <string name="action_call_accept">電話を取る</string>
+  <string name="action_call_decline">辞退</string>
+  <string name="ab_action_speakerphone">スピーカーを有効にする</string>
+  <string name="ab_action_contact_add">連絡先に追加</string>
+  <string name="ab_action_contact_add_question">連絡先に追加しますか ?</string>
+  <string name="ab_action_audio_call">音声通話</string>
+  <string name="ab_action_video_call">ビデオ通話</string>
+  <string name="share_via">共有...</string>
+  <string name="write_a_message">メッセージを書く</string>
+  <string name="scan_qr">QR コードをスキャン</string>
+  <string name="ab_action_flipcamera">カメラを押す</string>
+  <!--Text messages-->
+  <string name="send_message">メッセージを送信</string>
+  <string name="message_sending">メッセージを送信中…</string>
+  <string name="time_just_now">ちょうど今</string>
+  <string name="permission_read_denied">アプリはストレージの読み取りが許可されていませんでした。 したがって、正しく機能することができません。 このアクセス許可を付与することを検討してください</string>
+  <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">カメラのアクセス許可</string>
+  <string name="permission_dialog_camera_message">ビデオ会話ではカメラが動作するためにアクセス許可が必要です。 有効にすることを検討してください。</string>
+  <string name="ringtone_error_title">エラー</string>
+  <string name="ringtone_error_format_not_supported">この形式はサポートされていません。</string>
+  <string name="ringtone_error_size_too_big">このファイルは大きすぎます。最大サイズは %1$ikB です。</string>
+  <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring は、この機能を有効にするために \"連絡先の読み取り\" アクセス許可が必要です。付与してください。</string>
+  <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring は、この機能を有効にするために \"通話ログの書き込み\" アクセス許可が必要です。付与してください。</string>
+  <!--QRCode Scan-->
+  <string name="scan_qr_account_message">追加したいアカウントの QR コートをスキャンしてください。</string>
+  <!--Settings-->
+  <string name="clear_history_dialog_title">履歴をクリアしますか ?</string>
+  <string name="clear_history_dialog_message">この操作は元に戻せません。</string>
+  <string name="clear_history_completed">履歴をクリアしました。</string>
+  <!--Conversation-->
+  <string name="conversation_action_delete_this">この会話を削除</string>
+  <string name="conversation_action_delete_this_title">この会話を削除しますか ?</string>
+  <string name="conversation_action_delete_this_message">この操作は元に戻せません。</string>
+  <string name="conversation_action_copy_peer_number">番号をコピー</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s をクリップボードにコピーしました</string>
+  <string name="conversation_action_select_peer_number">番号を選択</string>
+  <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">%1$s を追加しますか ?</string>
+  <string name="prompt_new_password">新しいパスワード</string>
+  <string name="prompt_new_password_repeat">新しいパスワードの繰り返し</string>
+  <string name="account_create_title">Ringアカウントを作成</string>
+  <string name="prompt_new_username">新しいユーザー名を入力してください</string>
+  <string name="help_password_choose">Ring のアカウントを保護するために覚えておく強力なパスワードを選択してください。</string>
+  <string name="help_password_enter">メインの Ring アカウントパスワードを入力してください</string>
+  <string name="help_pin_enter">設定済みの別のRingアカウントからPINを入力してください。 PINを取得するには、\"Ringのアカウントをエクスポート\" 機能を使用します。</string>
+  <string name="account_device_updated_message">Ringアカウントを正常に更新しました。</string>
+  <!--MenuHeaderView-->
+  <string name="profile">マイ プロフィール</string>
+  <string name="profile_message_warning">これは連絡先と共有されています</string>
+  <string name="open_the_gallery">ギャラリーを開く</string>
+  <string name="take_a_photo">写真を撮る</string>
+  <string name="unknowm_if_empty">空の場合は不明</string>
+  <string name="unknown">不明</string>
+  <!--Share fragment-->
+  <string name="share_message">あなたと通信したいRingアプリケーションの組み込みスキャナで、このQRコードをスキャンします。</string>
+  <string name="share_your_account_information">連絡先情報を共有</string>
+  <string name="generic_error_migration">エラー</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-ja/strings_account.xml b/ring-android/app/src/main/res/values-ja/strings_account.xml
new file mode 100644
index 0000000..610e36f
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ja/strings_account.xml
@@ -0,0 +1,151 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">削除</string>
+  <!--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_wait_create_details">新しいアカウントを追加しています。しばらくお待ちください...</string>
+  <string name="dialog_wait_update">アカウントの更新</string>
+  <string name="dialog_wait_update_details">アカウントを更新しています。しばらくお待ちください...</string>
+  <string name="dialog_warn_ip2ip_account_title">空のSIPアカウントを作成しますか?</string>
+  <string name="dialog_warn_ip2ip_account_message">正しいホスト名なしのSIPアカウントを作成しようとしています。
+これは、直接のIP呼び出しによる発着信しかできません。
+アカウントを後で編集してください。</string>
+  <string name="help_ring">Ringアカウントを使用すると、完全に分散されたネットワークを通じてピアツーピアで安全に人々にアクセスできます。</string>
+  <string name="help_sip_title">SIPアカウントを追加</string>
+  <string name="help_sip">既存のSIPアカウントを設定</string>
+  <string name="create_sip_account">追加</string>
+  <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">アカウントを削除しますか?</string>
+  <string name="account_delete_dialog_message">この操作は元に戻せません。</string>
+  <!--AccountManagementFragment-->
+  <string name="empty_account_list">アカウントが登録されていません</string>
+  <string name="normal_accounts_titles">アカウント</string>
+  <string name="normal_devices_titles">既知のデバイスがこのRingアカウントにリンクされています</string>
+  <!--Basic Details-->
+  <string name="account_preferences_basic_tab">全般</string>
+  <string name="account_basic_category">基本設定</string>
+  <string name="account_alias_label">アカウント名</string>
+  <string name="account_hostname_label">ホスト名</string>
+  <string name="account_bootstrap_label">ブートストラップ</string>
+  <string name="account_username_label">ユーザー名</string>
+  <string name="account_password_label">パスワード</string>
+  <string name="account_optionnal_category">任意の設定</string>
+  <string name="account_useragent_label">ユーザーエージェント</string>
+  <string name="account_autoanswer_label">自動応答</string>
+  <string name="account_upnp_label">UPnPを有効化</string>
+  <string name="account_proxy_field">プロキシ</string>
+  <!--Audio Details-->
+  <string name="account_audio_label">音声</string>
+  <string name="account_preferences_media_tab">メディア</string>
+  <string name="account_ringtone_label">着信音</string>
+  <string name="account_ringtone_enabled_label">着信音を使用</string>
+  <string name="account_ringtone_path_label">着信音のパス</string>
+  <string name="account_ringtone_custom_label">カスタム着信音を使用</string>
+  <!--Video Details-->
+  <string name="account_video_label">動画</string>
+  <string name="account_video_enable">動画を有効化</string>
+  <!--Advanced Details-->
+  <string name="account_preferences_advanced_tab">詳細</string>
+  <string name="account_registration_exp_label">登録の有効期限切れ</string>
+  <string name="account_local_interface_label">ローカルインターフェイス</string>
+  <string name="account_local_port_label">ローカルポート</string>
+  <string name="account_stun_enable_label">Stunを使用</string>
+  <string name="account_stun_server_label">Stunサーバー</string>
+  <string name="account_turn_enable_label">TURNを使用</string>
+  <string name="account_turn_server_label">TURNサーバー</string>
+  <string name="account_turn_username_label">TURNのユーザー名</string>
+  <string name="account_turn_password_label">TURNのパスワード</string>
+  <string name="account_published_same_as_local_label">ローカルと同じものを発行しました</string>
+  <string name="account_published_port_label">発行されたポート番号</string>
+  <string name="account_published_address_label">発行されたアドレス</string>
+  <!--Security Details-->
+  <string name="account_credentials_label">ログイン情報</string>
+  <string name="account_credentials_edit">ログイン情報を編集</string>
+  <string name="account_credentials_add">ログイン情報を追加</string>
+  <!--SRTP Details-->
+  <string name="account_preferences_security_tab">セキュリティ</string>
+  <!--SIP-->
+  <!--TLS Details-->
+  <string name="account_tls_transport_switch_label">TLS Transportを使用</string>
+  <string name="account_tls_port_label">TLSリスナーポート</string>
+  <string name="account_tls_certificate_list_label">認証局</string>
+  <string name="account_tls_certificate_file_label">証明書ファイル</string>
+  <string name="account_tls_private_key_file_label">秘密鍵ファイル</string>
+  <string name="account_tls_password_label">秘密鍵のパスワード</string>
+  <string name="account_tls_method_label">TLS方式</string>
+  <string name="account_tls_ciphers_label">TLS暗号</string>
+  <string name="account_tls_server_name_label">サーバー名</string>
+  <string name="account_tls_verify_server_label">検証サーバー</string>
+  <string name="account_tls_verify_client_label">検証クライアント</string>
+  <string name="account_tls_negotiation_timeout_sec">ネゴシエーションタイムアウト (秒)</string>
+  <string name="account_rtp_max_port">最大</string>
+  <string name="account_rtp_min_port">最小</string>
+  <string name="account_rtp_port_range">音声 RTP ポートの範囲</string>
+  <!--restore/backup-->
+  <string name="account_restore_account">アカウントを復元</string>
+  <string name="account_restore_message">ファイルを復号するためのパスワードを入力してください。</string>
+  <string name="account_restore_decryption_password">復号パスワード</string>
+  <string name="account_new_device_password">アカウントをロック解除するメインパスワードを入力してください</string>
+  <string name="restore_dialog_title">復元中</string>
+  <string name="restore_backup_wait">しばらくお待ちください…</string>
+  <string name="error_password_char_count">6文字以上</string>
+  <string name="error_passwords_not_equals">パスワードが一致しません</string>
+  <string name="restore_failed_dialog_title">復元に失敗しました</string>
+  <string name="restore_failed_dialog_msg">エラーが発生しました</string>
+  <string name="export_account_wait_title">しばらくお待ちください...</string>
+  <string name="export_account_wait_message">新しいアカウント情報を発行しています</string>
+  <string name="account_export_end_decryption_message">提供されたパスワードを使用してアカウントをロック解除できませんでした。</string>
+  <string name="account_export_end_network_title">ネットワークエラー</string>
+  <string name="account_export_end_network_message">ネットワーク上でアカウントをエクスポートできませんでした。 接続を確認してください。</string>
+  <string name="account_export_end_error_title">エラー</string>
+  <string name="account_export_end_error_message">アカウントをエクスポートできませんでした。 不明なエラーが発生しました。</string>
+  <string name="account_enter_password">パスワードを入力してください</string>
+  <string name="account_contact_me">Ring で私にご連絡ください !</string>
+  <string name="update_account">アカウントの更新</string>
+  <string name="ring_account">Ringアカウント</string>
+  <string name="account_migration_title_dialog">アカウントの移行</string>
+  <string name="account_update_needed">更新が必要です</string>
+  <string name="account_creation_file_too_big">ファイルが大きすぎます</string>
+  <string name="account_cannot_read">%1$s を読み込みできません</string>
+  <string name="account_cannot_be_found_title">アカウントが見つかりません</string>
+  <string name="account_cannot_be_found_message">Ringネットワーク上にアカウントが見つかりませんでした。\n既存の端末からRing上にエクスポートされていることと、提供された資格情報が正しいことを確認してください。</string>
+  <string name="account_no_network_title">ネットワークに接続できません</string>
+  <string name="account_no_network_message">Ringが分散ネットワークに接続できないため、アカウントを追加できませんでした。 デバイスの接続を確認してください。</string>
+  <string name="account_device_added_title">アカウント端末が追加されました</string>
+  <string name="account_device_added_message">この端末でRingアカウントを設定しました。</string>
+  <string name="account_device_updated_title">アカウント端末を更新しました</string>
+  <string name="account_link_button">この端末をアカウントへリンク</string>
+  <string name="account_import_title">既存のアカウントにリンク</string>
+  <string name="account_link_prompt_pin">PINを入力してください</string>
+  <string name="account_new_button">Ringアカウントを作成</string>
+  <string name="account_link_export_button">別のデバイスをこのアカウントへリンク</string>
+  <string name="account_link_export_info">他の端末でこのアカウントを使用するには、まずRing上に公開する必要があります。 これにより、アカウントを設定するために新しいデバイスに入力する必要があるPINコードが生成されます。 PINは10分間有効です。 \n\n開始するには、パスワードを入力してください:</string>
+  <string name="account_start_export_button">PINを生成</string>
+  <string name="account_end_export_button">閉じる</string>
+  <string name="account_end_export_infos">あなたのPINは:\n\n%%\n\nプロセスを完了するには、新しい端末でRingを開く必要があります。 「この端末をアカウントにリンク」で、新しいアカウントを作成します。 あなたのPINは10分間有効です。</string>
+  <!--Name registration-->
+  <string name="register_name_wrong_password">名前を登録できません: アカウントのパスワードが間違っています。</string>
+  <string name="register_name_invalid">名前を登録できません: 無効な名前です。</string>
+  <string name="register_name_already_taken">名前を登録できません: 名前はすでに取得されています。</string>
+  <string name="register_name_network_error">名前を登録できません: ネットワークまたはサーバーエラー。</string>
+  <string name="error_username_empty">ユーザー名を入力してください</string>
+  <string name="no_registered_name_for_account">このアカウントの登録名が見つかりません</string>
+  <string name="register_name">登録名</string>
+  <string name="trying_to_register_name">名前を登録しようとしています</string>
+  <string name="registered_username">登録された名前</string>
+  <string name="username_already_taken">名前はすでに取得されています</string>
+  <string name="invalid_username">無効なユーザー名</string>
+  <string name="looking_for_username_availability">ユーザー名が利用可能か検索しています ...</string>
+  <string name="account_status_connecting">接続中</string>
+  <string name="account_status_unknown">不明</string>
+  <!--Create account-->
+  <string name="account_creation_home">Ring へようこそ</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-ja/strings_call.xml b/ring-android/app/src/main/res/values-ja/strings_call.xml
new file mode 100644
index 0000000..6d9a48f
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ja/strings_call.xml
@@ -0,0 +1,44 @@
+<?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_ringing">発信中</string>
+    <string name="call_human_state_current">通話中</string>
+    <string name="call_human_state_hungup">通話終了</string>
+    <string name="call_human_state_busy">話中</string>
+    <string name="call_human_state_failure">失敗しました</string>
+    <string name="call_human_state_hold">保留</string>
+    <string name="call_human_state_unhold">保留解除</string>
+    <string name="call_human_state_over">通話終了</string>
+    <string name="call_human_state_none">なし</string>
+    <!-- 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">アクティブ参加 rec</string>
+    <string name="conference_human_state_active_detached_rec">アクティブ退出 rec</string>
+    <string name="conference_human_state_hold">保留</string>
+    <string name="conference_human_state_hold_rec">保留 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-ja/strings_content_description.xml b/ring-android/app/src/main/res/values-ja/strings_content_description.xml
new file mode 100644
index 0000000..7af3b4e
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ja/strings_content_description.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings for xml content description of images-->
+  <string name="contact_quick_call_description">クイック通話</string>
+  <string name="contact_picture_description">連絡先の写真</string>
+  <string name="dial_numeric_pad">数字ダイヤルパッド</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-ja/strings_preferences.xml b/ring-android/app/src/main/res/values-ja/strings_preferences.xml
new file mode 100644
index 0000000..b24894d
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ja/strings_preferences.xml
@@ -0,0 +1,17 @@
+<?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_mobileData_summary">Wi-Fiに加えて3G/LTEネットワークでRingを許可します</string>
+  <string name="pref_systemContacts_title">システムの連絡先を使用する</string>
+  <string name="pref_systemContacts_summary">システムの連絡先を使用して通話先の詳細を表示します。</string>
+  <string name="pref_systemDialer_title">Ringを使用してシステムの通話を行う</string>
+  <string name="pref_systemDialer_summary">可能であれば、Ringを使用してシステムの通話を行います。</string>
+  <string name="pref_startOnBoot_title">起動時にRingを開始する</string>
+  <string name="pref_startOnBoot_summary">システムの起動時にバックグラウンドでRingを実行します。</string>
+  <string name="pref_clearHistory_title">履歴をクリア</string>
+  <string name="pref_clearHistory_summary">会話の履歴をすべてクリアします。 この操作を元に戻すことはできません。</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 e0823db..d9ddaa4 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Licencija</string>
   <string name="sponsor_section">Ring yra laisva programinė įranga, kurią kuria ir palaiko</string>
   <string name="copyright_section">Autorių Teisės</string>
   <string name="contribute_section">Talkinti</string>
   <string name="version_section">Versija</string>
+  <string name="no_email_app_installed">Nerasta jokios el. pašto programėlės, įdiekite kurią nors, kad išsiųstumėte mums pranešimą</string>
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
   <string name="error_no_network">Nėra tinklo ryšio</string>
@@ -20,6 +20,7 @@
   <string name="menu_item_home">Pradžia</string>
   <string name="menu_item_accounts">Tvarkyti paskyras</string>
   <string name="menu_item_settings">Nustatymai</string>
+  <string name="menu_item_share">Bendrinti mano kontaktus</string>
   <string name="menu_item_about">Apie Ring</string>
   <!--Dialing Fragment-->
   <!--History Fragment-->
@@ -38,6 +39,7 @@
   <!--TransferDFragment-->
   <!--Notifications-->
   <string name="notif_missed_incoming_call">Praleistas skambutis nuo %1$s</string>
+  <string name="notif_missed_outgoing_call">Neatsilieptas skambutis naudotojui %1$s</string>
   <string name="notif_incoming_call_title">Gaunamasis skambutis nuo %1$s</string>
   <string name="notif_incoming_call">Gaunamasis skambutis</string>
   <string name="notif_outgoing_call_title">Išsiunčiamasis skambutis naudotojui %1$s</string>
@@ -68,6 +70,8 @@
   <string name="time_just_now">Ką tik</string>
   <!--MediaPreferenceFragment-->
   <string name="ringtone_error_title">Klaida</string>
+  <string name="ringtone_error_format_not_supported">Šis formatas yra nepalaikomas.</string>
+  <string name="ringtone_error_size_too_big">Šis failas yra per didelis. Didžiausias dydis yra %1$ikB.</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
@@ -85,8 +89,22 @@
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Pridėti %1$s ?</string>
   <string name="prompt_new_password">Naujas slaptažodis</string>
+  <string name="prompt_new_password_repeat">Pakartokite naują slaptažodį</string>
   <string name="account_create_title">Sukurti Ring paskyrą</string>
+  <string name="prompt_new_username">Įveskite naują naudotojo vardą</string>
+  <string name="help_password_choose">Pasirinkite stiprų slaptažodį, kurį prisiminsite, kad apsaugotumėte savo Ring paskyrą.</string>
+  <string name="help_password_enter">Įveskite savo pagrindinės Ring paskyros slaptažodį</string>
+  <string name="wizard_next">Kitas</string>
+  <string name="account_device_updated_message">Jūs sėkmingai atnaujinote savo Ring paskyrą.</string>
   <!--MenuHeaderView-->
+  <string name="profile">Mano profilis</string>
+  <string name="profile_message_warning">Tai yra bendrinama su jūsų kontaktais</string>
+  <string name="open_the_gallery">Atverti galeriją</string>
+  <string name="take_a_photo">Padaryti nuotrauką</string>
+  <string name="unknowm_if_empty">Jei tuščia, bus naudojama \"Nežinoma\"</string>
   <string name="unknown">Nežinomas</string>
   <!--Share fragment-->
+  <string name="share_message">Nuskenuokite šį QR kodą įtaisytu Ring programos, norinčios su jumis susisiekti, skeneriu.</string>
+  <string name="share_your_account_information">Bendrinti mano kontaktinę informaciją</string>
+  <string name="generic_error_migration">Klaida</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-lt/strings_account.xml b/ring-android/app/src/main/res/values-lt/strings_account.xml
index e2cce6a..fc4c83a 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
@@ -1,14 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Ištrinti</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Slapyvardis</string>
   <string name="prompt_hostname">Kompiuterio vardas</string>
   <string name="prompt_username">Naudotojo vardas</string>
   <string name="prompt_password">Slaptažodis</string>
+  <string name="action_create">Sukurti paskyrą</string>
   <string name="action_create_short">Registruoti</string>
   <string name="error_field_required">Šis laukas yra būtinas</string>
   <string name="dialog_wait_create">Pridedama paskyra</string>
   <string name="dialog_wait_create_details">Prašome palaukti, kol jūsų nauja paskyra yra pridedama</string>
+  <string name="dialog_wait_update">Atnaujinama paskyra</string>
+  <string name="dialog_wait_update_details">Prašome palaukti, kol jūsų naujoji paskyra yra atnaujinama...</string>
   <string name="dialog_warn_ip2ip_account_title">Sukurti tuščią SIP paskyrą ?</string>
   <string name="dialog_warn_ip2ip_account_message">Jūs ruošiatės sukurti SIP paskyrą, nenurodę teisingo kompiuterio vardo.
 Jūs galėsite atlikti ir priimti tik tiesioginius ip skambučius. 
@@ -22,6 +27,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nėra užregistruotų paskyrų</string>
   <string name="normal_accounts_titles">Paskyros</string>
+  <string name="normal_devices_titles">Žinomi, su šia Ring paskyra susieti, įrenginiai</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Bendra</string>
   <string name="account_basic_category">Pagrindiniai nustatymai</string>
@@ -41,6 +47,7 @@
   <string name="account_ringtone_label">Skambučio melodijos</string>
   <string name="account_ringtone_enabled_label">Aktyvuoti skambučių melodijas</string>
   <string name="account_ringtone_path_label">Skambučio melodijos kelias</string>
+  <string name="account_ringtone_custom_label">Naudoti tinkintą skambučio melodiją</string>
   <!--Video Details-->
   <string name="account_video_label">Vaizdas</string>
   <string name="account_video_enable">Įjungti vaizdą</string>
@@ -82,13 +89,48 @@
   <string name="account_rtp_min_port">Mažiausias</string>
   <string name="account_rtp_port_range">Garso RTP prievadų rėžis</string>
   <!--restore/backup-->
+  <string name="account_restore_account">Atkurti paskyrą</string>
   <string name="account_restore_message">Įrašykite slaptažodį, kad iššifruotumėte failą.</string>
   <string name="account_restore_decryption_password">Iššifravimo slaptažodis</string>
+  <string name="restore_dialog_title">Atkuriama</string>
   <string name="restore_backup_wait">Prašome palaukti...</string>
   <string name="error_password_char_count">Mažiausiai 6 simboliai</string>
   <string name="error_passwords_not_equals">Slaptažodžiai nesutampa</string>
+  <string name="restore_failed_dialog_title">Atkūrimas nepavyko</string>
   <string name="restore_failed_dialog_msg">Įvyko klaida</string>
+  <string name="export_account_wait_title">Prašome palaukti...</string>
+  <string name="account_export_end_decryption_message">Naudojant pateiktą slaptažodį, nepavyko atrakinti jūsų paskyros.</string>
+  <string name="account_export_end_network_title">Tinklo klaida</string>
   <string name="account_export_end_error_title">Klaida</string>
+  <string name="account_export_end_error_message">Nepavyko eksportuoti paskyros. Įvyko nežinoma klaida.</string>
+  <string name="account_contact_me">Susisiekite su manimi per Ring !</string>
+  <string name="ring_account">Ring paskyra</string>
+  <string name="account_migration_title_dialog">Paskyros perkėlimas</string>
+  <string name="account_update_needed">Reikalingas atnaujinimas</string>
+  <string name="account_creation_file_too_big">Failas per didelis</string>
+  <string name="account_cannot_be_found_title">Nepavyksta rasti paskyros</string>
+  <string name="account_no_network_title">Nepavyksta prisijungti prie tinklo</string>
+  <string name="account_device_added_title">Paskyros įrenginys pridėtas</string>
+  <string name="account_device_added_message">Jūs sėkmingai nusistatėte savo Ring paskyrą šiame įrenginyje.</string>
+  <string name="account_device_updated_title">Paskyros įrenginys atnaujintas</string>
+  <string name="account_link_button">Susieti šį įrenginį su paskyra</string>
+  <string name="account_import_title">Susieti su esama paskyra</string>
+  <string name="account_link_prompt_pin">Įveskite PIN</string>
+  <string name="account_wizard_title">Sveiki atvykę į </string>
   <string name="account_new_button">Sukurti Ring paskyrą</string>
+  <string name="account_link_export_button">Susieti kitą įrenginį su šia paskyra</string>
+  <string name="account_end_export_button">užverti</string>
   <!--Name registration-->
+  <string name="register_name_already_taken">Nepavyksta užregistruoti vardo: vardas jau užimtas.</string>
+  <string name="no_registered_name_for_account">Šiai paskyrai nerasta jokio registruoto vardo</string>
+  <string name="registered_username">Registruotas naudotojo vardas</string>
+  <string name="register_username">Registruoti viešąjį naudotojo vardą (eksperimentinis)</string>
+  <string name="username_already_taken">Naudotojo vardas jau užimtas</string>
+  <string name="invalid_username">Neteisingas naudotojo vardas</string>
+  <string name="looking_for_username_availability">Tikrinamas naudotojo vardo prieinamumas...</string>
+  <string name="account_status_connecting">Sujungiama</string>
+  <string name="account_status_unknown">Nežinomas</string>
+  <!--Create account-->
+  <string name="account_creation_home">Sveiki atvykę į Ring</string>
+  <string name="account_creation_profile">Susikurkite savo profilį</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ms/strings.xml b/ring-android/app/src/main/res/values-ms/strings.xml
new file mode 100644
index 0000000..0c8874b
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ms/strings.xml
@@ -0,0 +1,127 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="sponsor_section">Ring adalah aplikasi percuma yang dibangunkan dan disokong oleh</string>
+  <string name="copyright_section">Hakcipta</string>
+  <string name="contribute_section">Sumbangkan</string>
+  <string name="version_section">Versi</string>
+  <string name="no_email_app_installed">Tiada aplikasi emel ditemui, pasangkan satu untuk menghantar laporan kepada kami</string>
+  <string name="email_chooser_title">Hantar email menggunakan…</string>
+  <!--RingActivity-->
+  <string name="title_activity_sflphone_home">Ring</string>
+  <string name="error_no_network">Tiada sambungan rangkaian</string>
+  <string name="error_mobile_network_available_but_disabled">Sila berikan akses kepada rangkaian selular didalam skrin tetapan.</string>
+  <!--AB menus-->
+  <string name="ab_account_creation">Akaun baharu</string>
+  <string name="ab_action_chat">Pesanan teks</string>
+  <!--Left Drawer-->
+  <!--Accessibility-->
+  <string name="drawer_open">Buka laci navigasi</string>
+  <string name="drawer_close">Tutup laci navigasi</string>
+  <!--Sections-->
+  <string name="menu_item_home">Utama</string>
+  <string name="menu_item_accounts">Urus akaun</string>
+  <string name="menu_item_settings">Tetapan</string>
+  <string name="menu_item_share">Kongsikan profil saya</string>
+  <string name="menu_item_about">Mengenai Ring</string>
+  <!--Dialing Fragment-->
+  <string name="dial_number">Dail nombor</string>
+  <!--History Fragment-->
+  <string name="hist_replay_button">Main ulang</string>
+  <string name="hist_replay_button_stop">Berhenti</string>
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="other">%d Perbualan</item>
+  </plurals>
+  <string name="home_transfering">Memindahkan %1$s ke %1$s</string>
+  <string name="home_transfer_complet">Pemindahan berjaya</string>
+  <!--ContactList Fragment-->
+  <string name="no_contact_found">Tiada kenalan ditemui</string>
+  <string name="starred_contacts_title">Kegemaran</string>
+  <string name="searchbar_hint">Masukkan nama atau nombor telefon</string>
+  <string name="choose_number">Pilih nombor</string>
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <string name="transfer_to_another_call">Pindahkan ke panggilan lain yang sedang berlangsung:</string>
+  <string name="transfer_no_other_call">Tiada panggilan lain yang belum selesai</string>
+  <string name="transfer_type_number">Taipkan nombor untuk memindahkan:</string>
+  <!--Notifications-->
+  <string name="notif_missed_incoming_call">Panggilan tidak terjawab daripada %1$s</string>
+  <string name="notif_missed_outgoing_call">Panggilan tidak terjawab kepada %1$s</string>
+  <string name="notif_incoming_call_title">Panggilan masuk daripada %1$s</string>
+  <string name="notif_incoming_call">Panggilan masuk</string>
+  <string name="notif_outgoing_call_title">Panggilan keluar kepada %1$s</string>
+  <string name="notif_outgoing_call">Panggilan keluar</string>
+  <string name="notif_current_call_title">Panggilan sedang berlangsung dengan %1$s</string>
+  <string name="notif_current_call">Panggilan sedang berlangsung</string>
+  <!--Call Fragment-->
+  <string name="you_txt_prefix">Anda</string>
+  <string name="action_call_attended_transfer">Pemindahan panggilan yang disertai</string>
+  <string name="action_call_conference">Mesyuarat</string>
+  <string name="action_call_hangup">Putuskan</string>
+  <string name="ongoing_call">Panggilan sedang berlangsung</string>
+  <string name="hist_in_call">Panggilan masuk sebanyak %1$s</string>
+  <string name="hist_out_call">Panggilan keluar sebanyak %1$s</string>
+  <string name="start_error_title">Tidak dapat memulakan Ring !</string>
+  <string name="start_error_mic_required">Ring memerlukan kebenaran mengakses mikrofon untuk bekerja dengan sempurna</string>
+  <string name="action_call_accept">Terima panggilan</string>
+  <string name="action_call_decline">Bantah panggilan</string>
+  <string name="ab_action_speakerphone">Aktifkan pembesar suara</string>
+  <string name="ab_action_contact_add">Tambahkan sebagai kenalan</string>
+  <string name="ab_action_contact_add_question">Tambah sebagai kenalan ?</string>
+  <string name="ab_action_audio_call">Panggilan suara</string>
+  <string name="ab_action_video_call">Panggilan video</string>
+  <string name="share_via">Kongsikan melalui</string>
+  <string name="write_a_message">Tulis pesan</string>
+  <string name="scan_qr">Imbas kod QR</string>
+  <string name="ab_action_flipcamera">Tukar kamera</string>
+  <!--Text messages-->
+  <string name="send_message">Hantar pesan</string>
+  <string name="message_sending">Sedang menghantar pesan…</string>
+  <string name="time_just_now">Seketika yang lalu</string>
+  <string name="permission_read_denied">Aplikasi ini tidak dibenarkan untuk membaca memori dalaman anda. Oleh begitu, ia tidak dapat bekerja dengan sempurna. Sila pertimbangkan untuk membenarkan akses tersebut</string>
+  <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Akses kamera</string>
+  <string name="permission_dialog_camera_message">Perbualan video memerlukan akses kepada kamera untuk bekerja dengan sempurna. Sila pertimbangkan untuk membenarkan akses tersebut.</string>
+  <string name="ringtone_error_title">Gagal</string>
+  <string name="ringtone_error_format_not_supported">Format ini tidak disokong.</string>
+  <string name="ringtone_error_size_too_big">Saiz fail ini adalah terlalu besar. Had maksimum untuk saiz fail adalah %1$ikB.</string>
+  <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring memerlukan keizinan akses kepada kenalan untuk mengaktifkan fungsi ini. Sila pertimbangkan untuk membenarkan akses tersebut.</string>
+  <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring memerlukan keizinan akses kepada kenalan untuk mengaktifkan fungsi ini. Sila pertimbangkan untuk membenarkan akses tersebut.</string>
+  <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Imbas kod QR akaun yang ingin anda tambah.</string>
+  <!--Settings-->
+  <string name="clear_history_dialog_title">Padam sejarah ?</string>
+  <string name="clear_history_dialog_message">Aksi ini tidak akan dapat dibuat ulang.</string>
+  <string name="clear_history_completed">Sejarah telah dipadam.</string>
+  <!--Conversation-->
+  <string name="conversation_action_delete_this">Padamkan perbualan ini</string>
+  <string name="conversation_action_delete_this_title">Padamkan perbualan ini ?</string>
+  <string name="conversation_action_delete_this_message">Aksi ini tidak akan dapat dibuat ulang.</string>
+  <string name="conversation_action_copy_peer_number">Salin nombor</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s telah disalin</string>
+  <string name="conversation_action_select_peer_number">Pilih nombor</string>
+  <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Tambah %1$s ?</string>
+  <string name="prompt_new_password">Kata laluan baharu</string>
+  <string name="prompt_new_password_repeat">Ulang kata laluan baharu</string>
+  <string name="account_create_title">Cipta akaun Ring</string>
+  <string name="prompt_new_username">Masukkan nama pengguna baharu</string>
+  <string name="help_password_choose">Pilih kata laluan kukuh yang perlu anda ingat untuk menjaga akaun Ring anda.</string>
+  <string name="help_password_enter">Masukkan kata laluan akaun Ring anda</string>
+  <string name="help_pin_enter">Masukkan PIN daripada akaun Ring lain yang telah dijalankan. Gunakan fungsi \"eksport akaun ke Ring\" untuk mendapatkan PIN.</string>
+  <string name="account_device_updated_message">Anda telah berjaya mengemaskini akaun Ring anda.</string>
+  <!--MenuHeaderView-->
+  <string name="profile">Profil saya</string>
+  <string name="profile_message_warning">Ini akan dikongsikan dengan kenalan anda</string>
+  <string name="open_the_gallery">Buka galeri</string>
+  <string name="take_a_photo">Ambil gambar</string>
+  <string name="unknowm_if_empty">Tidak diketahui jika kosong</string>
+  <string name="unknown">Tidak diketahui</string>
+  <!--Share fragment-->
+  <string name="share_message">Imbas kod QR ini dengan pemgibas terbina dalam dari aplikasi Ring lain yang ingin berkomunikasi dengan anda.</string>
+  <string name="share_your_account_information">Sila pilih akaun untuk dikongsi</string>
+  <string name="generic_error_migration">Gagal</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-ms/strings_account.xml b/ring-android/app/src/main/res/values-ms/strings_account.xml
new file mode 100644
index 0000000..c151522
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ms/strings_account.xml
@@ -0,0 +1,150 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Hapus</string>
+  <!--Strings related to account creation-->
+  <string name="prompt_alias">Nama panggilan</string>
+  <string name="prompt_hostname">Alamat server</string>
+  <string name="prompt_username">Nama pengguna</string>
+  <string name="prompt_password">Kara laluan</string>
+  <string name="action_create">Cipta akaun</string>
+  <string name="action_create_short">Daftar</string>
+  <string name="error_field_required">Maklumat ini diperlukan</string>
+  <string name="dialog_wait_create">Mencipta akaun</string>
+  <string name="dialog_wait_create_details">Sila tunggu ketika akaun anda sedang dicipta…</string>
+  <string name="dialog_wait_update">Kemaskini akaun</string>
+  <string name="dialog_wait_update_details">Sila tunggu ketika akaun baharu anda sedang dikemaskini…</string>
+  <string name="dialog_warn_ip2ip_account_title">Cipta akaun SIP kosong ?</string>
+  <string name="dialog_warn_ip2ip_account_message">Anda sedang mencuba untuk mencipta akaun SIP tanpa alamat server yang sah.
+Anda hanya akan dapat menerima panggilan masuk secara terus sahaja.
+Anda masih akan dapat mengubah maklumat akaun anda pada masa hadapan</string>
+  <string name="help_ring">Akaun Ring membolehkan anda untuk menghubungi orang lain secara selamat dan sembunyi, melalui rangkaian teragih.</string>
+  <string name="help_sip_title">Tambah akaun SIP anda</string>
+  <string name="help_sip">Tetapkan maklumat akaun SIP yang telah sedia ada.</string>
+  <string name="create_sip_account">Tambah</string>
+  <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">Hapus akaun ?</string>
+  <string name="account_delete_dialog_message">Aksi ini tidak akan dapat dibuat ulang.</string>
+  <!--AccountManagementFragment-->
+  <string name="empty_account_list">Tiada akaun didaftarkan</string>
+  <string name="normal_accounts_titles">Akaun</string>
+  <string name="normal_devices_titles">Perangkat dikenali yang telah disambungkan dengan akaun Ring ini</string>
+  <!--Basic Details-->
+  <string name="account_preferences_basic_tab">Utama</string>
+  <string name="account_basic_category">Aturan Asas</string>
+  <string name="account_alias_label">Nama akaun</string>
+  <string name="account_hostname_label">Alamat server</string>
+  <string name="account_bootstrap_label">Bootstrap</string>
+  <string name="account_username_label">Nama pengguna</string>
+  <string name="account_password_label">Kara laluan</string>
+  <string name="account_optionnal_category">Aturan pilihan</string>
+  <string name="account_useragent_label">User Agent</string>
+  <string name="account_autoanswer_label">Jawab panggilan secara automatik</string>
+  <string name="account_upnp_label">Aktifkan UPnP</string>
+  <string name="account_proxy_field">Proksi</string>
+  <!--Audio Details-->
+  <string name="account_audio_label">Bunyi</string>
+  <string name="account_preferences_media_tab">Media</string>
+  <string name="account_ringtone_label">Nada dering</string>
+  <string name="account_ringtone_enabled_label">Aktifkan nada dering</string>
+  <string name="account_ringtone_path_label">Nada dering</string>
+  <string name="account_ringtone_custom_label">Gunakan nada dering yang lain</string>
+  <!--Video Details-->
+  <string name="account_video_label">Video</string>
+  <string name="account_video_enable">Aktifkan panggilan video</string>
+  <!--Advanced Details-->
+  <string name="account_preferences_advanced_tab">Lanjut</string>
+  <string name="account_registration_exp_label">Pendafataran luput</string>
+  <string name="account_local_interface_label">Antaramuka lokal</string>
+  <string name="account_local_port_label">Port lokal</string>
+  <string name="account_stun_enable_label">Guna Stun</string>
+  <string name="account_stun_server_label">Server Stun</string>
+  <string name="account_turn_enable_label">Guna TURN</string>
+  <string name="account_turn_server_label">Server TURN</string>
+  <string name="account_turn_username_label">Nama pengguna TURN</string>
+  <string name="account_turn_password_label">Kata laluan TURN</string>
+  <string name="account_published_same_as_local_label">Alamat pengagihan sama dengan lokal</string>
+  <string name="account_published_port_label">Port pengagihan</string>
+  <string name="account_published_address_label">Alamat server pengagihan</string>
+  <!--Security Details-->
+  <string name="account_credentials_label">Maklumat</string>
+  <string name="account_credentials_edit">Ubah maklumat</string>
+  <string name="account_credentials_add">Tambah maklumat</string>
+  <!--SRTP Details-->
+  <string name="account_preferences_security_tab">Penyulitan</string>
+  <!--SIP-->
+  <!--TLS Details-->
+  <string name="account_tls_transport_switch_label">Guna TLS Transport</string>
+  <string name="account_tls_port_label">Port TLS Listener</string>
+  <string name="account_tls_certificate_list_label">Certification Authorities</string>
+  <string name="account_tls_certificate_file_label">Fail Certificate</string>
+  <string name="account_tls_private_key_file_label">Fail Private Key</string>
+  <string name="account_tls_password_label">Kata laluan untuk fail Private Key</string>
+  <string name="account_tls_method_label">TLS Method</string>
+  <string name="account_tls_ciphers_label">TLS Ciphers</string>
+  <string name="account_tls_server_name_label">Nama Server</string>
+  <string name="account_tls_verify_server_label">Sahkan Server</string>
+  <string name="account_tls_verify_client_label">Sahkan Client</string>
+  <string name="account_tls_negotiation_timeout_sec">Tempoh luput rundingan penyambungan (saat)</string>
+  <string name="account_rtp_max_port">Maksimum</string>
+  <string name="account_rtp_min_port">Minimum</string>
+  <string name="account_rtp_port_range">Jarak Port Bunyi RTP</string>
+  <!--restore/backup-->
+  <string name="account_restore_account">Import akaun</string>
+  <string name="account_restore_message">Masukkan kata laluan untuk menyahsulitkan fail.</string>
+  <string name="account_restore_decryption_password">Kata laluan penyahsulit</string>
+  <string name="account_new_device_password">Masukkan kata laluan utama untuk menyahsulitkan akaun</string>
+  <string name="restore_dialog_title">Mengimport</string>
+  <string name="restore_backup_wait">Sila tunggu...</string>
+  <string name="error_password_char_count">Minimum 6 aksara</string>
+  <string name="error_passwords_not_equals">Kata laluan tidak sepadan</string>
+  <string name="restore_failed_dialog_title">Import gagal</string>
+  <string name="restore_failed_dialog_msg">Kegagalan telah terjadi</string>
+  <string name="export_account_wait_title">Sila tunggu...</string>
+  <string name="export_account_wait_message">Mengagihkan maklumat akaun baharu</string>
+  <string name="account_export_end_decryption_message">Tidak dapat menyahsulitkan akaun anda dengan kata laluan yang diberikan.</string>
+  <string name="account_export_end_network_title">Rangkaian gagal</string>
+  <string name="account_export_end_network_message">Tidak dapat mengeksport akaun anda kepada rangkaian agihan. Sila periksa jaringan rangkaian anda.</string>
+  <string name="account_export_end_error_title">Gagal</string>
+  <string name="account_export_end_error_message">Tidak dapat mengeksport akaun. Kegagalan yang tidak diketahui telah berlaku.</string>
+  <string name="account_enter_password">Masukkan kata laluan</string>
+  <string name="account_contact_me">Hubungi saya di Ring !</string>
+  <string name="update_account">Kemaskini akaun</string>
+  <string name="ring_account">Akaun Ring</string>
+  <string name="account_migration_title_dialog">Permindahan akaun</string>
+  <string name="account_update_needed">Kemaskini diperlukan</string>
+  <string name="account_creation_file_too_big">Saiz fail adalah terlalu besar</string>
+  <string name="account_cannot_read">Tidak dapt membaca %1$s</string>
+  <string name="account_cannot_be_found_title">Akaun tidak ditemui</string>
+  <string name="account_cannot_be_found_message">Akaun tidak ditemui pada rangkaian Ring.\nPastikan anda telah mengeksport akaun Ring daripada perangkat anda yang sedia ada, dan maklumat yang diberikan adalah tepat.</string>
+  <string name="account_no_network_title">Tidak dapat berhubung dengan rangkaian</string>
+  <string name="account_no_network_message">Tidak dapat menambah akaun kerana tidak dapat berhubung dengan rangkaian agihan. Sila periksa kesambungan rangkaian perangkat anda.</string>
+  <string name="account_device_added_title">Berjaya menambah perangkat akaun</string>
+  <string name="account_device_added_message">Anda telah berjaya menyambungkan akaun Ring anda dengan perangkat ini.</string>
+  <string name="account_device_updated_title">Akaun perangkat telah dikemaskinikan</string>
+  <string name="account_link_button">Sambungkan perangkat ini dengan akaun</string>
+  <string name="account_import_title">Sambung dengan akaun yang telah sedia ada</string>
+  <string name="account_link_prompt_pin">Masukkan PIN</string>
+  <string name="account_new_button">Cipta akaun Ring</string>
+  <string name="account_link_export_button">Sambungkan perangkat lain dengan akaun ini</string>
+  <string name="account_link_export_info">Untuk menggunakan akaun ini diperangkat lain, ada mestilah terlebih dahulu mengeksport akaun Ring kerangkaian agihan. Ini akan menciptakan kod PIN yang anda mesti masukkan pada perangkat tersebut. PIN tersebut sah selama 10 minit. \n\nSila berikan kata laluan utama akaun anda untuk memulakan:</string>
+  <string name="account_start_export_button">Ciptakan PIN</string>
+  <string name="account_end_export_button">tutup</string>
+  <string name="account_end_export_infos">PIN anda adalah:\n\n%%\n\nUntuk menyelesaikan proses menyambung, anda mestilah membuka aplikasi Ring pada perangkat baharu. Cipta akaun baharu dengan \\"Sambungkan perangkat ini dengan akaun yang telah sedia ada\\". PIN ini sah selama 10 minit.</string>
+  <!--Name registration-->
+  <string name="register_name_wrong_password">Tidak dapat mendaftar nama: kata laluan akaun salah.</string>
+  <string name="register_name_invalid">Tidak dapat mendaftar nama: nama tidak sah.</string>
+  <string name="register_name_already_taken">Tidak dapat mendaftar nama: nama telah digunakan pengguna lain.</string>
+  <string name="register_name_network_error">Tidak dapat mendaftar nama: rangkaian atau server gagal.</string>
+  <string name="error_username_empty">Masukkan nama pengguna</string>
+  <string name="no_registered_name_for_account">Tiada nama berdaftar dengan akaun ini ditemui</string>
+  <string name="register_name">Daftarkan nama</string>
+  <string name="trying_to_register_name">Sedang mencuba untuk mendaftarkan nama</string>
+  <string name="registered_username">Nama telah didaftarkan</string>
+  <string name="username_already_taken">Nama pengguna telah digunakan pengguna lain</string>
+  <string name="invalid_username">Nama pengguna tidak sah</string>
+  <string name="looking_for_username_availability">Sedang mencari status nama pengguna ...</string>
+  <string name="account_status_connecting">Menyambung</string>
+  <string name="account_status_unknown">Tidak diketahui</string>
+  <!--Create account-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-ms/strings_call.xml b/ring-android/app/src/main/res/values-ms/strings_call.xml
new file mode 100644
index 0000000..86cb127
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ms/strings_call.xml
@@ -0,0 +1,44 @@
+<?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">Berdering</string>
+    <string name="call_human_state_connecting">Menyambung</string>
+    <string name="call_human_state_ringing">Memanggil</string>
+    <string name="call_human_state_current">Bercakap</string>
+    <string name="call_human_state_hungup">Selesai</string>
+    <string name="call_human_state_busy">Sibuk</string>
+    <string name="call_human_state_failure">Gagal</string>
+    <string name="call_human_state_hold">Tangguh</string>
+    <string name="call_human_state_unhold">Nyahtangguh</string>
+    <string name="call_human_state_over">Selesai</string>
+    <string name="call_human_state_none">Tiada</string>
+    <!-- Conferences -->
+    <string name="conference_human_state_active_attached">Aktif tersambung</string>
+    <string name="conference_human_state_active_detached">Aktif terputus</string>
+    <string name="conference_human_state_active_attached_rec">Rakam aktif tersambung</string>
+    <string name="conference_human_state_active_detached_rec">Rakam aktif terputus</string>
+    <string name="conference_human_state_hold">Tangguh</string>
+    <string name="conference_human_state_hold_rec">Tangguh rakam</string>
+    <string name="conference_human_state_default">Tiada</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-ms/strings_content_description.xml b/ring-android/app/src/main/res/values-ms/strings_content_description.xml
new file mode 100644
index 0000000..200b0ad
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ms/strings_content_description.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings for xml content description of images-->
+  <string name="contact_quick_call_description">Panggilan Pantas</string>
+  <string name="contact_picture_description">Gambar Kenalan</string>
+  <string name="dial_numeric_pad">Pad dail bernombor</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-ms/strings_preferences.xml b/ring-android/app/src/main/res/values-ms/strings_preferences.xml
new file mode 100644
index 0000000..fcdab20
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ms/strings_preferences.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="pref_category_network">Rangkaian</string>
+  <string name="pref_category_contacts">Kenalan</string>
+  <string name="pref_category_system">Sistem</string>
+  <string name="pref_category_privacy">Privasi</string>
+  <string name="pref_mobileData_title">Jaringan data</string>
+  <string name="pref_mobileData_summary">Benarkan Ring pada jaringan 3G/LTE selain dari WI-Fi</string>
+  <string name="pref_systemContacts_title">Gunakan buku kenalan sistem</string>
+  <string name="pref_systemContacts_summary">Gunakan buku kenalan sistem untuk memaparkan maklumat pemanggil</string>
+  <string name="pref_systemDialer_title">Gunakan Ring untuk membuat panggilan dari sistem</string>
+  <string name="pref_systemDialer_summary">Gunakan Ring untuk membuat panggilan dari sistem apabila sesuai</string>
+  <string name="pref_startOnBoot_title">Jalankan Ring selepas perangkat dihidupkan</string>
+  <string name="pref_startOnBoot_summary">Jalankan Ring dibelakang secara automatik selepas perangkat dihidupkan</string>
+  <string name="pref_clearHistory_title">Padamkan sejarah</string>
+  <string name="pref_clearHistory_summary">Padamkan semua sejarah perbualan. Aksi ini tidak akan dapat dibuat ulang.</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-nb/strings.xml b/ring-android/app/src/main/res/values-nb/strings.xml
index 144f087..684bd96 100644
--- a/ring-android/app/src/main/res/values-nb/strings.xml
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Lisens</string>
   <string name="sponsor_section">Ring er fri programvare utviklet og støttet av</string>
   <string name="copyright_section">Opphavsrett</string>
   <string name="contribute_section">Bidra</string>
@@ -101,7 +100,9 @@
   <string name="add_call_contact_number_to_contacts">Legg til %1$s?</string>
   <string name="prompt_new_password">Nytt passord</string>
   <string name="account_create_title">Opprett en Ring-konto</string>
+  <string name="wizard_next">Neste</string>
   <!--MenuHeaderView-->
   <string name="unknown">Ukjent</string>
   <!--Share fragment-->
+  <string name="generic_error_migration">Feil</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nb/strings_account.xml b/ring-android/app/src/main/res/values-nb/strings_account.xml
index e7c9aa5..1325021 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
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Slett</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Vertsnavn</string>
@@ -89,4 +91,7 @@
   <string name="account_export_end_error_title">Feil</string>
   <string name="account_new_button">Opprett en Ring-konto</string>
   <!--Name registration-->
+  <string name="account_status_connecting">Kobler opp</string>
+  <string name="account_status_unknown">Ukjent</string>
+  <!--Create account-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings.xml b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
index 3c9ce9d..0681a9f 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,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">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>
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml b/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
index f902a3c..a6b062e 100644
--- a/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Verwijderen</string>
   <!--Strings related to account creation-->
   <string name="prompt_username">Gebruikersnaam</string>
   <string name="prompt_password">Wachtwoord</string>
@@ -33,4 +35,5 @@
   <!--TLS Details-->
   <!--restore/backup-->
   <!--Name registration-->
+  <!--Create account-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings.xml b/ring-android/app/src/main/res/values-nl/strings.xml
index 2686a49..c6af58b 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Licentie</string>
   <string name="sponsor_section">Ring is vrije software ontwikkeld en ondersteund door</string>
   <string name="copyright_section">Auteursrecht</string>
   <string name="contribute_section">Bijdragen</string>
@@ -81,7 +80,7 @@
   <string name="send_message">Bericht versturen</string>
   <string name="message_sending">Bericht wordt verstuurd...</string>
   <string name="time_just_now">Zojuist</string>
-  <string name="permission_read_denied">De applicatie heeft geen machtiging om je opslag te lezen en kan daardoor niet correct functioneren. Gelieve te overwegen deze machtiging alsnog toe te kennen</string>
+  <string name="permission_read_denied">De applicatie heeft geen machtiging om je opslag te lezen en kan daardoor niet correct functioneren. Gelieve te overwegen deze machtiging toch toe te kennen</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Cameramachtiging</string>
   <string name="permission_dialog_camera_message">Videogesprekken vereisen machtiging voor gebruik van de camera. Gelieve te overwegen deze machtiging alsnog toe te kennen.</string>
@@ -114,6 +113,7 @@
   <string name="help_password_choose">Kies een sterk wachtwoord om je Ring-account te beschermen.</string>
   <string name="help_password_enter">Voer hoofdwachtwoord van je Ring-account in</string>
   <string name="help_pin_enter">Voer de PIN-code van een andere geconfigureerde Ring-account in. Gebruik de \"account exporteren op Ring\"-functie om een PIN-code te verkrijgen.</string>
+  <string name="wizard_next">Volgende</string>
   <string name="account_device_updated_message">Je Ring-account is met succes bijgewerkt.</string>
   <!--MenuHeaderView-->
   <string name="profile">Mijn profiel</string>
@@ -125,4 +125,5 @@
   <!--Share fragment-->
   <string name="share_message">Scan deze QR-code met de ingebouwde scanner van de Ring-toepassing die met je wil communiceren.</string>
   <string name="share_your_account_information">Deel mijn contactinformatie</string>
+  <string name="generic_error_migration">Fout</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings_account.xml b/ring-android/app/src/main/res/values-nl/strings_account.xml
index 37f98fd..65189a9 100644
--- a/ring-android/app/src/main/res/values-nl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_account.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Verwijderen</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Hostnaam</string>
@@ -106,13 +108,10 @@
   <string name="account_export_end_error_title">Fout</string>
   <string name="account_export_end_error_message">Kon account niet exporteren. Er is een onbekende fout opgetreden.</string>
   <string name="account_enter_password">Voer wachtwoord in</string>
-  <string name="account_share_body">Contacteer mij met %1$s op Ring, het gedistribueerde communicatieplatform: http://ring.cx</string>
   <string name="account_contact_me">Contacteer mij op Ring!</string>
   <string name="update_account">Account bijwerken</string>
-  <string name="account_migration">Je Ring-account kan nu gedeeld worden tussen al je apparaten. Je hoeft enkel een wachtwoord op te geven.</string>
   <string name="ring_account">Ring-account</string>
   <string name="account_migration_title_dialog">Accountmigratie</string>
-  <string name="account_migration_message_dialog">Om je accounts op meerdere apparaten te gebruiken moeten ze bijgewerkt worden. Wil je naar het accountbeheerscherm gaan om deze handeling uit te voeren?</string>
   <string name="account_update_needed">Update vereist</string>
   <string name="account_creation_file_too_big">Bestand is te groot</string>
   <string name="account_cannot_read">Kan %1$s niet lezen</string>
@@ -126,7 +125,7 @@
   <string name="account_link_button">Dit apparaat aan een account koppelen</string>
   <string name="account_import_title">Koppelen aan een bestaande account</string>
   <string name="account_link_prompt_pin">Voer PIN-code in</string>
-  <string name="account_wizard_title">Ring-account</string>
+  <string name="account_wizard_title">Welkom bij</string>
   <string name="account_new_button">Een Ring-account aanmaken</string>
   <string name="account_link_export_button">Een ander apparaat aan deze account koppelen</string>
   <string name="account_link_export_info">Om deze account op andere apparaten te gebruiken moet je deze eerst op Ring blootstellen. Er zal een PIN-code gegenereerd worden die je op het nieuwe apparaat invoert om de account in te stellen. De PIN-code is 10 minuten geldig. \n\nVoer je wachtwoord in om te beginnen:</string>
@@ -143,7 +142,13 @@
   <string name="register_name">Naam registreren</string>
   <string name="trying_to_register_name">Naam wordt geregistreerd</string>
   <string name="registered_username">Geregistreerde gebruikersnaam</string>
+  <string name="register_username">Registreer een publieke gebruikersnaam (experimenteel)</string>
   <string name="username_already_taken">Gebruikersnaam reeds in gebruik</string>
   <string name="invalid_username">Ongeldige gebruikersnaam</string>
   <string name="looking_for_username_availability">Beschikbaarheid van gebruikersnaam wordt gecontroleerd...</string>
+  <string name="account_status_connecting">Verbinden</string>
+  <string name="account_status_unknown">Onbekend</string>
+  <!--Create account-->
+  <string name="account_creation_home">Welkom bij Ring</string>
+  <string name="account_creation_profile">Maak je profiel aan</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pl/strings.xml b/ring-android/app/src/main/res/values-pl/strings.xml
index 42c8a6f..278f4db 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Licencja</string>
   <string name="sponsor_section">Ring jest wolnym oprogramowaniem stworzonym przez</string>
   <string name="copyright_section">Prawa autorskie</string>
   <string name="contribute_section">Współpracuj</string>
@@ -107,7 +106,9 @@
   <string name="add_call_contact_number_to_contacts">Dodać %1$s ?</string>
   <string name="prompt_new_password">Nowe hasło</string>
   <string name="account_create_title">Stwórz konto Ring</string>
+  <string name="wizard_next">Następne</string>
   <!--MenuHeaderView-->
   <string name="unknown">Nieznane</string>
   <!--Share fragment-->
+  <string name="generic_error_migration">Błąd</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 52f816c..dc969b3 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
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Usuń</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Nazwa konta</string>
   <string name="prompt_hostname">Nazwa hosta</string>
@@ -92,4 +94,8 @@
   <string name="account_export_end_error_title">Błąd</string>
   <string name="account_new_button">Stwórz konto Ring</string>
   <!--Name registration-->
+  <string name="account_status_connecting">Łączenie</string>
+  <string name="account_status_unknown">Nieznane</string>
+  <!--Create account-->
+  <string name="account_creation_home">Witamy w Ring</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings.xml b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
index 28567d7..54d3baa 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
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Licença</string>
   <string name="sponsor_section">Ring é um software livre desenvolvido e mantido por</string>
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Contribua</string>
@@ -22,6 +21,7 @@
   <string name="menu_item_home">Início</string>
   <string name="menu_item_accounts">Gerenciar contas</string>
   <string name="menu_item_settings">Configurações</string>
+  <string name="menu_item_share">Compartilhar meu contato</string>
   <string name="menu_item_about">Sobre o Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Disque um número</string>
@@ -85,6 +85,8 @@
   <string name="permission_dialog_camera_title">Permissão de câmera</string>
   <string name="permission_dialog_camera_message">Conversas de vídeo requerem permissão para acesso à câmera. Considere habilitá-la.</string>
   <string name="ringtone_error_title">Erro</string>
+  <string name="ringtone_error_format_not_supported">Este formato não é suportado.</string>
+  <string name="ringtone_error_size_too_big">Este arquivo é muito grande. O tamanho máximo é %1$ikB.</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">O Ring precisa de permissão para \"Acessar contatos\" para habilitar esta função. Permita, por favor.</string>
   <!--Write call log permission-->
@@ -107,6 +109,11 @@
   <string name="prompt_new_password">Nova senha</string>
   <string name="prompt_new_password_repeat">Repita a nova senha</string>
   <string name="account_create_title">Criar uma conta no Ring</string>
+  <string name="prompt_new_username">Entre novo nome de usuário</string>
+  <string name="help_password_choose">Utilize uma senha segura de sua preferência para proteger sua conta Ring</string>
+  <string name="help_password_enter">Entre com a senha da sua conta Ring principal</string>
+  <string name="help_pin_enter">Entre com o PIN de uma outra conta Ring já configurada. Utilize a opção \"exportar conta no Ring\" para obter um novo PIN.</string>
+  <string name="wizard_next">Próximo</string>
   <string name="account_device_updated_message">Você atualizou sua conta Ring com sucesso.</string>
   <!--MenuHeaderView-->
   <string name="profile">Meu perfil</string>
@@ -116,4 +123,7 @@
   <string name="unknowm_if_empty">Desconhecido se vazio</string>
   <string name="unknown">Desconhecido</string>
   <!--Share fragment-->
+  <string name="share_message">Escaneie o QRCode com o escaner embutido da aplicação Ring que deseja se comunicar com você.</string>
+  <string name="share_your_account_information">Compartilhar meus dados de contato</string>
+  <string name="generic_error_migration">Erro</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
index e026229..b9067e4 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
@@ -1,10 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Deletar</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Apelido</string>
   <string name="prompt_hostname">Servidor</string>
   <string name="prompt_username">Nome de usuário</string>
   <string name="prompt_password">Senha</string>
+  <string name="action_create">Criar conta</string>
   <string name="action_create_short">Registrar</string>
   <string name="error_field_required">Este campo é obrigatório</string>
   <string name="dialog_wait_create">Adicionando conta</string>
@@ -45,6 +48,7 @@
   <string name="account_ringtone_label">Toque de chamada</string>
   <string name="account_ringtone_enabled_label">Ativar toques de chamada</string>
   <string name="account_ringtone_path_label">Caminho do toque de chamada</string>
+  <string name="account_ringtone_custom_label">Usar toque personalizado</string>
   <!--Video Details-->
   <string name="account_video_label">Vídeo</string>
   <string name="account_video_enable">Habilitar Vídeo</string>
@@ -86,11 +90,15 @@
   <string name="account_rtp_min_port">Mínimo</string>
   <string name="account_rtp_port_range">Variação de portas de audio RTP</string>
   <!--restore/backup-->
+  <string name="account_restore_account">Restaurar uma conta</string>
   <string name="account_restore_message">Digite a senha para descriptografar o arquivo.</string>
   <string name="account_restore_decryption_password">Senha de descriptografia</string>
+  <string name="account_new_device_password">Entre com a senha principal para desbloquear conta</string>
+  <string name="restore_dialog_title">Restaurando</string>
   <string name="restore_backup_wait">Por favor, aguarde...</string>
   <string name="error_password_char_count">Pelo menos 6 caracteres</string>
   <string name="error_passwords_not_equals">Senhas não correspondem</string>
+  <string name="restore_failed_dialog_title">Falha na restauração</string>
   <string name="restore_failed_dialog_msg">Um erro ocorreu</string>
   <string name="export_account_wait_title">Por favor, aguarde...</string>
   <string name="export_account_wait_message">Propagando informação da nova conta</string>
@@ -100,13 +108,10 @@
   <string name="account_export_end_error_title">Erro</string>
   <string name="account_export_end_error_message">Não foi possível exportar a conta. Um erro desconhecido ocorreu.</string>
   <string name="account_enter_password">Entre a senha</string>
-  <string name="account_share_body">Entre em contato comigo utilizando %1$s na plataforma Ring de comunicação distribuída: http://ring.cx</string>
   <string name="account_contact_me">Encontre-me no Ring !</string>
   <string name="update_account">Atualize a conta</string>
-  <string name="account_migration">Agora sua conta Ring pode ser compartilhada entre todos os seus dispositivos. Você só precisa fornecer uma senha.</string>
   <string name="ring_account">Conta Ring</string>
   <string name="account_migration_title_dialog">Migração de conta</string>
-  <string name="account_migration_message_dialog">Para ser utilizada em múltiplos dispositivos, suas contas precisam ser atualizadas. Você quer ir à tela de administração de conta para realizar esta operação?</string>
   <string name="account_update_needed">Atualização necessária</string>
   <string name="account_creation_file_too_big">Arquivo muito grande</string>
   <string name="account_cannot_read">Não foi possível ler %1$s</string>
@@ -117,7 +122,33 @@
   <string name="account_device_added_title">Dispositivo adicionado à conta</string>
   <string name="account_device_added_message">Você configurou sua conta Ring neste dispositivo com sucesso.</string>
   <string name="account_device_updated_title">Dispositivo da conta atualizado</string>
-  <string name="account_wizard_title">Conta Ring</string>
+  <string name="account_link_button">Associar este dispositivo a uma conta</string>
+  <string name="account_import_title">Associar à uma conta existente</string>
+  <string name="account_link_prompt_pin">Entre o PIN</string>
+  <string name="account_wizard_title">Bem Vindo a</string>
   <string name="account_new_button">Criar uma conta no Ring</string>
+  <string name="account_link_export_button">Associar outro dispositivo à esta conta.</string>
+  <string name="account_link_export_info">Para usar esta conta em outros dispositivos, você deve antes expô-la no Ring. Isso gerará um código PIN que você deverá entrar no novo dispositivo para configurar a conta. Este PIN é válido por 10 minutos. \n\n Por favor, forneça sua senha para iniciar:</string>
+  <string name="account_start_export_button">Gerar PIN</string>
+  <string name="account_end_export_button">fechar</string>
+  <string name="account_end_export_infos">Seu PIN é:\n\n%%\n\nPara completar o processo, você deve abrir o Ring no novo dispositivo. Crie uma nova conta com \"Associar este dispositivo à uma conta\". Seu PIN é válido por 10 minutos.</string>
   <!--Name registration-->
+  <string name="register_name_wrong_password">Não foi possível registrar nome: senha da conta errada.</string>
+  <string name="register_name_invalid">Não foi possível registrar nome: nome inválido.</string>
+  <string name="register_name_already_taken">Não foi possível registrar nome: nome já utilizado.</string>
+  <string name="register_name_network_error">Não foi possível registrar nome: erro de rede ou servidor.</string>
+  <string name="error_username_empty">Entre um nome de usuário</string>
+  <string name="no_registered_name_for_account">Nenhum nome registrado encontrado para esta conta</string>
+  <string name="register_name">Registrar nome</string>
+  <string name="trying_to_register_name">Tentando registrar nome</string>
+  <string name="registered_username">Nome de usuário registrado</string>
+  <string name="register_username">Registrar usuário público (experimental)</string>
+  <string name="username_already_taken">Nome de usuário já em uso</string>
+  <string name="invalid_username">Nome de usuário inválido</string>
+  <string name="looking_for_username_availability">Verificando disponibilidade de nome de usuário...</string>
+  <string name="account_status_connecting">Conectando</string>
+  <string name="account_status_unknown">Desconhecido</string>
+  <!--Create account-->
+  <string name="account_creation_home">Bem-vindo ao Ring</string>
+  <string name="account_creation_profile">Criar um Perfil</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt/strings.xml b/ring-android/app/src/main/res/values-pt/strings.xml
index 64481d9..7607ba4 100644
--- a/ring-android/app/src/main/res/values-pt/strings.xml
+++ b/ring-android/app/src/main/res/values-pt/strings.xml
@@ -1,30 +1,119 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="sponsor_section">Ring é um software livre desenvolvido e mantido por</string>
+  <string name="copyright_section">Direitos de autor</string>
+  <string name="contribute_section">Contribuir</string>
+  <string name="version_section">Versão</string>
+  <string name="no_email_app_installed">Nenhuma aplicação de email encontrada no dispositivo. Instale uma para que nos possa enviar um relatório.</string>
+  <string name="email_chooser_title">Enviar email utilizando...</string>
   <!--RingActivity-->
+  <string name="error_no_network">Sem conexão de rede</string>
+  <string name="error_mobile_network_available_but_disabled">Por favor, permita o acesso à rede móvel nas definições do dispositivo.</string>
   <!--AB menus-->
+  <string name="ab_account_creation">Criar conta</string>
+  <string name="ab_action_chat">Mensagem de texto</string>
   <!--Left Drawer-->
   <!--Accessibility-->
   <!--Sections-->
+  <string name="menu_item_home">Início</string>
+  <string name="menu_item_accounts">Gerir contas</string>
   <string name="menu_item_settings">Configurações</string>
+  <string name="menu_item_share">Partilhar o meu contacto</string>
+  <string name="menu_item_about">Sobre Ring</string>
   <!--Dialing Fragment-->
+  <string name="dial_number">Marcar um número</string>
   <!--History Fragment-->
+  <string name="hist_replay_button">Reproduzir novamente</string>
+  <string name="hist_replay_button_stop">Parar</string>
   <!--DetailsHistory Fragment-->
   <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="one">%d Conversa</item>
+    <item quantity="other">%d Conversas</item>
+  </plurals>
+  <string name="home_transfering">Transferindo %1$s para %1$s</string>
+  <string name="home_transfer_complet">Transferência completa</string>
   <!--ContactList Fragment-->
+  <string name="no_contact_found">Contacto não encontrado</string>
+  <string name="starred_contacts_title">Favoritos</string>
+  <string name="searchbar_hint">Introduza um nome ou número de telemóvel...</string>
+  <string name="choose_number">Escolha um número</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
+  <string name="transfer_to_another_call">Transferir para outra chamada em curso:</string>
+  <string name="transfer_no_other_call">Sem chamadas pendentes</string>
+  <string name="transfer_type_number">Insira o número para onde pretende transferir:</string>
   <!--Notifications-->
-  <string name="notif_incoming_call">Chamada entrante</string>
+  <string name="notif_missed_incoming_call">Chamada perdida de %1$s</string>
+  <string name="notif_missed_outgoing_call">Chamada perdida para %1$s</string>
+  <string name="notif_incoming_call_title">A receber chamada de %1$s</string>
+  <string name="notif_incoming_call">A receber chamada</string>
+  <string name="notif_current_call_title">Em chamada com %1$s</string>
+  <string name="notif_current_call">Chamada atual</string>
   <!--Call Fragment-->
-  <string name="ab_action_contact_add">Add to contacts</string>
+  <string name="you_txt_prefix">Tu:</string>
+  <string name="action_call_conference">Conferência</string>
+  <string name="action_call_hangup">Desligar</string>
+  <string name="ongoing_call">Chamada em curso</string>
+  <string name="hist_in_call">A receber chamada de %1$s</string>
+  <string name="start_error_title">Não foi possível iniciar o Ring !</string>
+  <string name="start_error_mic_required">Ring necessita da permissão de microfone para funcionar.</string>
+  <string name="action_call_accept">Atender chamada</string>
+  <string name="action_call_decline">Recusar</string>
+  <string name="ab_action_speakerphone">Ligar altifalante</string>
+  <string name="ab_action_contact_add">Adicionar aos contactos</string>
+  <string name="ab_action_contact_add_question">Adicionar aos contactos ?</string>
+  <string name="ab_action_audio_call">Chamada de áudio</string>
+  <string name="ab_action_video_call">Chamada de vídeo</string>
+  <string name="share_via">Partilhar via</string>
+  <string name="write_a_message">Escrever mensagem</string>
+  <string name="scan_qr">Digitalizar código QR</string>
+  <string name="ab_action_flipcamera">Alterar câmara</string>
   <!--Text messages-->
+  <string name="send_message">Enviar mensagem</string>
+  <string name="message_sending">Enviando a mensagem...</string>
+  <string name="time_just_now">Agora mesmo</string>
+  <string name="permission_read_denied">A aplicação não está autorizada a consultar o armazenamento do dispositivo, pelo que poderá não funcionar adequadamente. Por favor, considere garantir esta permissão.</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Permissão de câmara</string>
+  <string name="permission_dialog_camera_message">As conversações por vídeo requerem a permissão da câmara. Por favor, considere garanti-la. </string>
+  <string name="ringtone_error_title">Erro</string>
+  <string name="ringtone_error_format_not_supported">Este formato não é suportado.</string>
+  <string name="ringtone_error_size_too_big">Ficheiro demasiado grande. O tamanho máximo permitido é de %1$ikB.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring precisa da permissão \"Ler contactos\" para ativar esta funcionalidade. Por favor, garanta-a.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring precisa da permissão \"Escrever no registo de chamadas\" para ativar esta funcionalidade. Por favor, garanta-a.</string>
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Digitalize o código QR da conta que pretende adicionar.</string>
   <!--Settings-->
+  <string name="clear_history_dialog_title">Limpar histórico?</string>
+  <string name="clear_history_dialog_message">Esta ação não pode ser reposta.</string>
+  <string name="clear_history_completed">Histórico limpo.</string>
   <!--Conversation-->
+  <string name="conversation_action_delete_this">Eliminar conversa</string>
+  <string name="conversation_action_delete_this_title">Eliminar conversa ?</string>
+  <string name="conversation_action_delete_this_message">Esta ação não pode ser reposta.</string>
+  <string name="conversation_action_copy_peer_number">Copiar número</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s copiado para a área de transferência</string>
+  <string name="conversation_action_select_peer_number">Selecione um número</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Adicionar %1$s ?</string>
+  <string name="prompt_new_password">Nova password</string>
+  <string name="prompt_new_password_repeat">Repetir nova password</string>
+  <string name="account_create_title">Criar uma conta Ring</string>
+  <string name="prompt_new_username">Introduza um nome de utilizador</string>
+  <string name="help_password_choose">Escolha uma password forte para proteger a sua conta Ring.</string>
+  <string name="help_password_enter">Introduza a sua password principal do Ring</string>
+  <string name="wizard_next">Próximo</string>
+  <string name="account_device_updated_message">Conta Ring atualizada com sucesso.</string>
   <!--MenuHeaderView-->
+  <string name="profile">O meu perfil</string>
+  <string name="profile_message_warning">Isto é partilhado com os seus contactos</string>
+  <string name="open_the_gallery">Abrir galeria</string>
+  <string name="take_a_photo">Capturar fotografia</string>
+  <string name="unknown">Desconhecido</string>
   <!--Share fragment-->
+  <string name="share_your_account_information">Partilhar a minha informação de contacto</string>
+  <string name="generic_error_migration">Erro</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt/strings_account.xml b/ring-android/app/src/main/res/values-pt/strings_account.xml
index e2361a3..54314a1 100644
--- a/ring-android/app/src/main/res/values-pt/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt/strings_account.xml
@@ -1,11 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Eliminar</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Pseudônimo</string>
   <string name="prompt_hostname">Nome do host</string>
   <string name="prompt_username">Usuário</string>
   <string name="prompt_password">Senha</string>
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_message">Esta ação não pode ser reposta.</string>
   <!--AccountManagementFragment-->
   <string name="normal_accounts_titles">Contas</string>
   <!--Basic Details-->
@@ -30,5 +33,9 @@
   <!--SIP-->
   <!--TLS Details-->
   <!--restore/backup-->
+  <string name="account_export_end_error_title">Erro</string>
+  <string name="account_new_button">Criar uma conta Ring</string>
   <!--Name registration-->
+  <string name="account_status_unknown">Desconhecido</string>
+  <!--Create account-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ro/strings.xml b/ring-android/app/src/main/res/values-ro/strings.xml
new file mode 100644
index 0000000..0b7e355
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ro/strings.xml
@@ -0,0 +1,79 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="sponsor_section">Ring este un program tip freeware, dezvoltat si sustinut de catre</string>
+  <string name="copyright_section">Copyright</string>
+  <string name="contribute_section">Contribuie</string>
+  <string name="version_section">Versiune</string>
+  <string name="no_email_app_installed">Nu a fost gasita o aplicatie de email. Va rugam sa o instalati pentru a ne putea trimite un raport.</string>
+  <string name="email_chooser_title">Trimite email folosind...</string>
+  <!--RingActivity-->
+  <string name="title_activity_sflphone_home">Suna</string>
+  <string name="error_no_network">Nu exista conectivitate la retea</string>
+  <!--AB menus-->
+  <string name="ab_account_creation">Cont nou</string>
+  <!--Left Drawer-->
+  <!--Accessibility-->
+  <!--Sections-->
+  <string name="menu_item_home">Acasă</string>
+  <string name="menu_item_accounts">Gestionează conturile</string>
+  <string name="menu_item_settings">Setari</string>
+  <string name="menu_item_about">Despre Ring</string>
+  <!--Dialing Fragment-->
+  <!--History Fragment-->
+  <string name="hist_replay_button_stop">Stop</string>
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <string name="home_transfer_complet">Transfer Complet</string>
+  <!--ContactList Fragment-->
+  <string name="no_contact_found">Nici un  contact găsit</string>
+  <string name="starred_contacts_title">Favoriți</string>
+  <string name="searchbar_hint">Introdu numele sau numărul de telefon</string>
+  <string name="choose_number">Alege un număr</string>
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <!--Notifications-->
+  <string name="notif_missed_incoming_call">Apel pierdut de la %1$s</string>
+  <string name="notif_incoming_call_title">Apel pierdut de la %1$s</string>
+  <string name="notif_incoming_call">Apel de intrare</string>
+  <string name="notif_current_call_title">Apelul curent cu %1$s</string>
+  <string name="notif_current_call">Apelul curent</string>
+  <!--Call Fragment-->
+  <string name="you_txt_prefix">Tu:</string>
+  <string name="action_call_conference">Conferință</string>
+  <string name="action_call_hangup">Închide</string>
+  <string name="start_error_title">Ring nu a putut starta!</string>
+  <string name="action_call_decline">Refuză</string>
+  <string name="ab_action_contact_add">Adaugă la contacte</string>
+  <string name="ab_action_contact_add_question">Adaugă la contacte ?</string>
+  <string name="ab_action_audio_call">Apel audio</string>
+  <string name="ab_action_video_call">Apel video</string>
+  <string name="share_via">Distribuie prin</string>
+  <string name="write_a_message">Scrie un mesaj</string>
+  <string name="scan_qr">Scanați Codul QR</string>
+  <string name="ab_action_flipcamera">Întoarce camera</string>
+  <!--Text messages-->
+  <string name="send_message">Trimite messajul</string>
+  <string name="message_sending">Se transmite mesajul...</string>
+  <!--MediaPreferenceFragment-->
+  <string name="ringtone_error_title">Eroare</string>
+  <string name="ringtone_error_format_not_supported">Formatul acesta nu este suportat</string>
+  <string name="ringtone_error_size_too_big">Acest fișier este prea mare. Marimea maxima este %1$ikB.</string>
+  <!--Read contacts permission-->
+  <!--Write call log permission-->
+  <!--QRCode Scan-->
+  <!--Settings-->
+  <string name="clear_history_dialog_title">Ștergeți istoria ?</string>
+  <string name="clear_history_completed">Istoria a fost ștearsă</string>
+  <!--Conversation-->
+  <string name="conversation_action_delete_this">Ștergeți aceasta istorie</string>
+  <!--Contacts-->
+  <string name="prompt_new_password">Parolă nouă</string>
+  <string name="account_create_title">Creați un cont Ring</string>
+  <string name="prompt_new_username">Introdu un nume de utilizator</string>
+  <!--MenuHeaderView-->
+  <string name="profile">Profilul meu</string>
+  <string name="open_the_gallery">Deschide galeria</string>
+  <string name="unknown">Necunoscut</string>
+  <!--Share fragment-->
+  <string name="generic_error_migration">Eroare</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-ro/strings_account.xml b/ring-android/app/src/main/res/values-ro/strings_account.xml
new file mode 100644
index 0000000..2dd92f7
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ro/strings_account.xml
@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Șterge</string>
+  <!--Strings related to account creation-->
+  <string name="prompt_username">Nume de utilizator</string>
+  <string name="prompt_password">Parola</string>
+  <string name="action_create_short">Registrare</string>
+  <string name="dialog_wait_create_details">Vă rugăm așteptați în timp ce contul dumneavoastră este adăugat...</string>
+  <string name="dialog_wait_update">Actualizând contul</string>
+  <string name="dialog_wait_update_details">Vă rugăm așteptați în timp ce contul dumneavoastră este actualizat...</string>
+  <string name="create_sip_account">Adaugă</string>
+  <!--Strings related to account deletion-->
+  <!--AccountManagementFragment-->
+  <string name="normal_accounts_titles">Conturi</string>
+  <!--Basic Details-->
+  <string name="account_preferences_basic_tab">General</string>
+  <string name="account_alias_label">Nnumele contului</string>
+  <string name="account_username_label">Nume de utilizator</string>
+  <string name="account_password_label">Parola</string>
+  <string name="account_optionnal_category">Setari opționale</string>
+  <!--Audio Details-->
+  <string name="account_audio_label">Audio</string>
+  <string name="account_ringtone_label">Tonuri de apel</string>
+  <!--Video Details-->
+  <string name="account_video_label">Video</string>
+  <string name="account_video_enable">Activează video</string>
+  <!--Advanced Details-->
+  <string name="account_preferences_advanced_tab">Avansat</string>
+  <!--Security Details-->
+  <!--SRTP Details-->
+  <string name="account_preferences_security_tab">Seuritate</string>
+  <!--SIP-->
+  <!--TLS Details-->
+  <string name="account_rtp_max_port">Maximal</string>
+  <string name="account_rtp_min_port">Minimal</string>
+  <!--restore/backup-->
+  <string name="account_restore_account">Restabiliți contul</string>
+  <string name="restore_backup_wait">Așteptați vă rog...</string>
+  <string name="account_export_end_error_title">Eroare</string>
+  <string name="account_new_button">Creați un cont Ring</string>
+  <!--Name registration-->
+  <string name="account_status_unknown">Necunoscut</string>
+  <!--Create account-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings.xml b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
index e9a40bb..62629ee 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Лицензия</string>
   <string name="sponsor_section">Ring является свободным ПО, которое разрабатывается и поддерживается</string>
   <string name="copyright_section">Авторское право</string>
   <string name="contribute_section">Помочь проекту</string>
@@ -108,7 +107,9 @@
   <string name="add_call_contact_number_to_contacts">Добавить %1$s ?</string>
   <string name="prompt_new_password">Новый пароль</string>
   <string name="account_create_title">Создать Ring аккаунт</string>
+  <string name="wizard_next">Далее</string>
   <!--MenuHeaderView-->
   <string name="unknown">Неизвестно</string>
   <!--Share fragment-->
+  <string name="generic_error_migration">Ошибка</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml b/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
index 8fed27f..b4777ab 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Удалить</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Псевдоним</string>
   <string name="prompt_hostname">Узел</string>
@@ -87,6 +89,11 @@
   <string name="error_passwords_not_equals">Пароли не совпадают</string>
   <string name="restore_failed_dialog_msg">Произошла ошибка</string>
   <string name="account_export_end_error_title">Ошибка</string>
+  <string name="account_wizard_title">Добро пожаловать в</string>
   <string name="account_new_button">Создать Ring аккаунт</string>
   <!--Name registration-->
+  <string name="account_status_connecting">Подключение</string>
+  <string name="account_status_unknown">Неизвестно</string>
+  <!--Create account-->
+  <string name="account_creation_home">Добро пожаловать в Ring</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings.xml b/ring-android/app/src/main/res/values-ru/strings.xml
index 2605f71..d739602 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -1,12 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Лицензия</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_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_creation">Новый аккаунт</string>
   <string name="ab_action_chat">Сообщения</string>
   <!--Left Drawer-->
   <!--Accessibility-->
@@ -14,8 +19,9 @@
   <string name="drawer_close">Закрыть панель навигации</string>
   <!--Sections-->
   <string name="menu_item_home">Домой</string>
-  <string name="menu_item_accounts">Управление учётными записями</string>
+  <string name="menu_item_accounts">Управление аккаунтами</string>
   <string name="menu_item_settings">Настройки</string>
+  <string name="menu_item_share">Поделиться моим контактом</string>
   <string name="menu_item_about">О программе</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Набрать номер</string>
@@ -44,12 +50,12 @@
   <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>
+  <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_title">Текущий вызов с %1$s</string>
   <string name="notif_current_call">Текущий вызов</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Вы:</string>
@@ -60,34 +66,66 @@
   <string name="hist_in_call">Входящий звонок %1$s</string>
   <string name="hist_out_call">Исходящий звонок %1$s</string>
   <string name="start_error_title">Невозможно запустить Ring !</string>
-  <string name="start_error_mic_required">Приложению Ring необходимо разрешение на использование микрофона</string>
-  <string name="action_call_accept">Совершить звонок</string>
-  <string name="action_call_decline">Отказаться</string>
+  <string name="start_error_mic_required">Приложению Ring необходимо разрешение на использование микрофона.</string>
+  <string name="action_call_accept">Принять вызов</string>
+  <string name="action_call_decline">Отклонить</string>
   <string name="ab_action_speakerphone">Включить громкоговоритель</string>
   <string name="ab_action_contact_add">Добавить в контакты</string>
+  <string name="ab_action_contact_add_question">Добавить в контакты?</string>
   <string name="ab_action_audio_call">Голосовой вызов</string>
   <string name="ab_action_video_call">Видео звонок</string>
   <string name="share_via">Отправить с помощью</string>
-  <string name="write_a_message">Составить сообщение</string>
+  <string name="write_a_message">Написать сообщение</string>
   <string name="scan_qr">Сканировать QR код</string>
-  <string name="ab_action_flipcamera">Панель камеры</string>
+  <string name="ab_action_flipcamera">Перевернуть камеру</string>
   <!--Text messages-->
   <string name="send_message">Отправить сообщение</string>
   <string name="message_sending">Отправка сообщения...</string>
+  <string name="time_just_now">Только сейчас</string>
+  <string name="permission_read_denied">Приложению не было разрешено чтение данных из памяти. В связи с этим оно не может работать должным образом. Пожалуйста, рассмотрите возможность предоставления  ему этого разрешения.</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Разрешение на доступ к камере</string>
+  <string name="permission_dialog_camera_message">Видеосвязь требует для работы разрешения на доступ к камере. Пожалуйста, рассмотрите возможность его предоставления.</string>
   <string name="ringtone_error_title">Ошибка</string>
+  <string name="ringtone_error_format_not_supported">Этот формат не поддерживается</string>
+  <string name="ringtone_error_size_too_big">Файл слишком большой. Максимальный размер — %1$i кБ.</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Приложению требуется разрешение «Чтение контактов», чтобы включить эту функцию. Пожалуйста, предоставьте его.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Приложению требуется разрешение «Запись в журнал звонков», чтобы включить эту функцию. Пожалуйста, предоставьте его.</string>
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Отсканируйте QR код аккаунта, который вы хотите добавить.</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">Очистить историю ?</string>
+  <string name="clear_history_dialog_message">Это действие нельзя отменить.</string>
   <string name="clear_history_completed">История была очищена.</string>
   <!--Conversation-->
+  <string name="conversation_action_delete_this">Удалить этот разговор</string>
+  <string name="conversation_action_delete_this_title">Удалить этот разговор?</string>
+  <string name="conversation_action_delete_this_message">Это действие нельзя отменить.</string>
   <string name="conversation_action_copy_peer_number">Копировать номер</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s скопировано в буфер обмена</string>
   <string name="conversation_action_select_peer_number">Выбрать номер</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Добавить %1$s ?</string>
+  <string name="prompt_new_password">Новый пароль</string>
+  <string name="prompt_new_password_repeat">Повторите новый пароль</string>
+  <string name="account_create_title">Создать аккаунт Ring</string>
+  <string name="prompt_new_username">Введите новое имя пользователя</string>
+  <string name="help_password_choose">Выберите надёжный пароль, который вы запомните, чтобы защитить ваш аккаунт RIng.</string>
+  <string name="help_password_enter">Введите пароль от вашего основного аккаунта Ring</string>
+  <string name="help_pin_enter">Введите PIN от настроенного аккаунта Ring. Используйте функцию «экспортировать аккаунт в Ring», чтобы получить PIN.</string>
+  <string name="wizard_next">Далее</string>
+  <string name="account_device_updated_message">Вы успешно обновили ваш аккаунт Ring</string>
   <!--MenuHeaderView-->
+  <string name="profile">Мой профиль</string>
+  <string name="profile_message_warning">К этому имеют доступ ваши контакты</string>
+  <string name="open_the_gallery">Открыть галерею</string>
+  <string name="take_a_photo">Сделать фото</string>
+  <string name="unknowm_if_empty">Неизвестно если пусто</string>
   <string name="unknown">Неизвестно</string>
   <!--Share fragment-->
+  <string name="share_message">Отсканируйте этот QR код встроенным сканером приложения Ring, которое хочет с вами связаться.</string>
+  <string name="share_your_account_information">Поделиться моей контактной информацией</string>
+  <string name="generic_error_migration">Ошибка</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings_account.xml b/ring-android/app/src/main/res/values-ru/strings_account.xml
index 8e0f109..aa6b258 100644
--- a/ring-android/app/src/main/res/values-ru/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_account.xml
@@ -1,74 +1,154 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Удалить</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Псевдоним</string>
-  <string name="prompt_hostname">Адрес сервера</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_wait_create_details">Ожидайте создания вашей учётной записи</string>
-  <string name="help_sip">Настроить существующую учётную запись SIP</string>
+  <string name="dialog_wait_create">Добавление аккаунта</string>
+  <string name="dialog_wait_create_details">Пожалуйста, подождите, пока ваш новый аккаунт добавляется…</string>
+  <string name="dialog_wait_update">Обновление аккаунта</string>
+  <string name="dialog_wait_update_details">Пожалуйста, подождите, пока ваш новый аккаунт обновляется…</string>
+  <string name="dialog_warn_ip2ip_account_title">Создать пустой SIP аккаунт?</string>
+  <string name="dialog_warn_ip2ip_account_message">Вы собираетесь создать аккаунт SIP без допустимого имени сервера.
+Вы сможете совершать и принимать звонки только напрямую по IP.
+Вы можете изменить свой аккаунт позднее.</string>
+  <string name="help_ring">Аккаунт Ring позволяет безопасно связываться с людьми напрямую через полностью распределённую сеть.</string>
+  <string name="help_sip_title">Добавить ваш SIP аккаунт</string>
+  <string name="help_sip">Настроить существующий SIP аккаунт</string>
   <string name="create_sip_account">Добавить</string>
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">Удалить аккаунт?</string>
+  <string name="account_delete_dialog_message">Это действие нельзя отменить.</string>
   <!--AccountManagementFragment-->
-  <string name="empty_account_list">Нет зарегистрированных учётных записей</string>
-  <string name="normal_accounts_titles">Учётные записи</string>
+  <string name="empty_account_list">Нет зарегистрированных аккаунтов</string>
+  <string name="normal_accounts_titles">Аккаунты</string>
+  <string name="normal_devices_titles">Устройства, привязанные к этому аккаунту Ring</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Общее</string>
   <string name="account_basic_category">Основные настройки</string>
-  <string name="account_alias_label">Учётная запись</string>
-  <string name="account_hostname_label">Адрес сервера</string>
-  <string name="account_bootstrap_label">Начальная загрузка</string>
+  <string name="account_alias_label">Имя аккаунта</string>
+  <string name="account_hostname_label">Имя хоста</string>
+  <string name="account_bootstrap_label">Инициализация</string>
   <string name="account_username_label">Имя пользователя</string>
   <string name="account_password_label">Пароль</string>
   <string name="account_optionnal_category">Дополнительные настройки</string>
   <string name="account_useragent_label">User Agent</string>
   <string name="account_autoanswer_label">Автоответ</string>
+  <string name="account_upnp_label">Включить UPnP</string>
   <string name="account_proxy_field">Прокси</string>
   <!--Audio Details-->
   <string name="account_audio_label">Звук</string>
   <string name="account_preferences_media_tab">Медиа</string>
-  <string name="account_ringtone_label">Звуки</string>
-  <string name="account_ringtone_enabled_label">Активировать мелодии </string>
+  <string name="account_ringtone_label">Мелодии звонка</string>
+  <string name="account_ringtone_enabled_label">Активировать мелодии звонка</string>
   <string name="account_ringtone_path_label">Путь к мелодиям звонка</string>
+  <string name="account_ringtone_custom_label">Использовать другую мелодию звонка</string>
   <!--Video Details-->
   <string name="account_video_label">Видео</string>
-  <string name="account_video_enable">Включить видео</string>
+  <string name="account_video_enable">Включить Видео</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Дополнительно</string>
-  <string name="account_registration_exp_label">Срок регистрации истекает</string>
+  <string name="account_registration_exp_label">Срок Регистрации Истекает</string>
   <string name="account_local_interface_label">Локальный интерфейс</string>
-  <string name="account_local_port_label">Локальный порт</string>
+  <string name="account_local_port_label">Локальный Порт</string>
   <string name="account_stun_enable_label">Использовать STUN</string>
   <string name="account_stun_server_label">Сервер STUN</string>
   <string name="account_turn_enable_label">Использовать TURN </string>
-  <string name="account_published_same_as_local_label">Публиковать аналогичный локальному</string>
-  <string name="account_published_port_label">Публикуемый порт</string>
-  <string name="account_published_address_label">Опубликованный адрес</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>
+  <string name="account_published_same_as_local_label">Публикуемый аналогично локальному</string>
+  <string name="account_published_port_label">Публикуемый Порт</string>
+  <string name="account_published_address_label">Публикуемый Адрес</string>
   <!--Security Details-->
-  <string name="account_credentials_label">Полномочия</string>
+  <string name="account_credentials_label">Идентификационные данные</string>
+  <string name="account_credentials_edit">Изменить идентификационные данные</string>
+  <string name="account_credentials_add">Добавить идентификационные данные</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Безопасность</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Использовать TLS</string>
   <string name="account_tls_port_label">Прослушиваемый порт TLS</string>
-  <string name="account_tls_certificate_list_label">Одобренные сертификаты</string>
-  <string name="account_tls_certificate_file_label">Файл сертификата</string>
-  <string name="account_tls_private_key_file_label">Файл личного ключа</string>
-  <string name="account_tls_password_label">Пароль личного ключа</string>
+  <string name="account_tls_certificate_list_label">Центры Сертификации</string>
+  <string name="account_tls_certificate_file_label">Файл Сертификата</string>
+  <string name="account_tls_private_key_file_label">Файл Закрытого Ключа</string>
+  <string name="account_tls_password_label">Пароль Закрытого Ключа</string>
   <string name="account_tls_method_label">Метод TSL</string>
-  <string name="account_tls_ciphers_label">TLS шифрование</string>
-  <string name="account_tls_server_name_label">Имя сервера</string>
-  <string name="account_tls_verify_server_label">Проверка сервера</string>
-  <string name="account_tls_verify_client_label">Проверить клиент</string>
-  <string name="account_tls_negotiation_timeout_sec">Таймаут согласования (сек)</string>
+  <string name="account_tls_ciphers_label">TLS Шифрование</string>
+  <string name="account_tls_server_name_label">Имя Сервера</string>
+  <string name="account_tls_verify_server_label">Проверка Сервера</string>
+  <string name="account_tls_verify_client_label">Проверка Клиента</string>
+  <string name="account_tls_negotiation_timeout_sec">Таймаут Согласования (сек)</string>
   <string name="account_rtp_max_port">Максимум</string>
   <string name="account_rtp_min_port">Минимум</string>
-  <string name="account_rtp_port_range">Диапазон портов для RTP аудио</string>
+  <string name="account_rtp_port_range">Диапазон Портов для RTP Аудио</string>
   <!--restore/backup-->
+  <string name="account_restore_account">Восстановить аккаунт</string>
+  <string name="account_restore_message">Введите пароль для расшифровки файла.</string>
+  <string name="account_restore_decryption_password">Пароль расшифровки</string>
+  <string name="account_new_device_password">Введите основной пароль, чтобы разблокировать аккаунт</string>
+  <string name="restore_dialog_title">Восстановление</string>
+  <string name="restore_backup_wait">Пожалуйста, подождите…</string>
+  <string name="error_password_char_count">Минимум 6 символов</string>
+  <string name="error_passwords_not_equals">Пароли не совпадают</string>
+  <string name="restore_failed_dialog_title">Восстановление не удалось</string>
+  <string name="restore_failed_dialog_msg">Произошла ошибка</string>
+  <string name="export_account_wait_title">Пожалуйста, подождите…</string>
+  <string name="export_account_wait_message">Публикация информации о новом аккаунте</string>
+  <string name="account_export_end_decryption_message">Не удалось разблокировать ваш аккаунт указанным паролем.</string>
+  <string name="account_export_end_network_title">Ошибка сети</string>
+  <string name="account_export_end_network_message">Не удалось экспортировать аккаунт по сети. Проверьте ваше сетевое соединение.</string>
   <string name="account_export_end_error_title">Ошибка</string>
+  <string name="account_export_end_error_message">Не удалось экспортировать аккаунт. Произошла неизвестная ошибка.</string>
+  <string name="account_enter_password">Введите пароль</string>
+  <string name="account_contact_me">Свяжись со мной в Ring!</string>
+  <string name="update_account">Обновить аккаунт</string>
+  <string name="ring_account">Аккаунт Ring</string>
+  <string name="account_migration_title_dialog">Перенос аккаунта</string>
+  <string name="account_update_needed">Необходимо обновление</string>
+  <string name="account_creation_file_too_big">Файл слишком большой</string>
+  <string name="account_cannot_read">Не удалось прочитать %1$s</string>
+  <string name="account_cannot_be_found_title">Не удалось найти аккаунт</string>
+  <string name="account_cannot_be_found_message">Не удалось найти аккаунт в сети Ring.\nУдостоверьетсь, что он был экспортирован в сеть Ring с существующего устройства, и что предоставленные идентификационные данные верны.</string>
+  <string name="account_no_network_title">Не удалось подключиться к сети</string>
+  <string name="account_no_network_message">Не удалось добавить аккаунт, потому что Ring не смог подключиться к распределённой сети. Проверьте сетевое соединение вашего устройства.</string>
+  <string name="account_device_added_title">Устройство аккаунта добавлено</string>
+  <string name="account_device_added_message">Вы успешно создали аккаунт Ring на этом устройстве.</string>
+  <string name="account_device_updated_title">Устройство аккаунта обновлено</string>
+  <string name="account_link_button">Привязать это устройство к аккаунту</string>
+  <string name="account_import_title">Привязать к существующему аккаунту</string>
+  <string name="account_link_prompt_pin">Введите PIN</string>
+  <string name="account_wizard_title">Добро пожаловать в </string>
+  <string name="account_new_button">Создать аккаунт Ring</string>
+  <string name="account_link_export_button">Привязать другое устройство к этому аккаунту</string>
+  <string name="account_link_export_info">Для использования этого аккаунта на других устройствах вам нужно сначала выставить его в сеть Ring. Это сгенерирует PIN код, который вам потребуется ввести на новом устройстве для настройки аккаунта. PIN код действителен в течение 10 минут.\n\nПожалуйста, укажите ваш пароль, чтобы начать:</string>
+  <string name="account_start_export_button">Сгенерировать PIN</string>
+  <string name="account_end_export_button">закрыть</string>
+  <string name="account_end_export_infos">Ваш PIN:\n\n%%\n\nДля завершения процесса вам нужно открыть Ring на новом устройстве и выбрать \"Привязать это устройство к аккаунту\". Ваш PIN действителен в течение 10 минут.</string>
   <!--Name registration-->
+  <string name="register_name_wrong_password">Не удалось зарегистрировать имя: неверный пароль аккаунта.</string>
+  <string name="register_name_invalid">Не удалось зарегистрировать имя: недопустимое имя.</string>
+  <string name="register_name_already_taken">Не удалось зарегистрировать имя: имя уже занято.</string>
+  <string name="register_name_network_error">Не удалось зарегистрировать имя: ошибка сети или сервера.</string>
+  <string name="error_username_empty">Введите имя пользователя</string>
+  <string name="no_registered_name_for_account">Не найдено зарегистрированного имени для этого аккаунта</string>
+  <string name="register_name">Зарегистрировать имя</string>
+  <string name="trying_to_register_name">Попытка зарегистрировать имя</string>
+  <string name="registered_username">Зарегистрированное имя пользователя</string>
+  <string name="register_username">Зарегистрировать публичное имя (экспериментальная функция)</string>
+  <string name="username_already_taken">Имя пользователя уже занято</string>
+  <string name="invalid_username">Недопустимое имя пользователя</string>
+  <string name="looking_for_username_availability">Проверка доступности имени пользователя…</string>
+  <string name="account_status_connecting">Подключение</string>
+  <string name="account_status_unknown">Неизвестно</string>
+  <!--Create account-->
+  <string name="account_creation_home">Добро пожаловать в Ring</string>
+  <string name="account_creation_profile">Создайте свой профиль</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings_call.xml b/ring-android/app/src/main/res/values-ru/strings_call.xml
index 8255326..89f2794 100644
--- a/ring-android/app/src/main/res/values-ru/strings_call.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_call.xml
@@ -22,15 +22,23 @@
 -->
 <resources>
     <!-- SipCalls -->
-    <string name="call_human_state_incoming">Звоним</string>
+    <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_current">Разговор</string>
     <string name="call_human_state_hungup">Окончен</string>
-    <string name="call_human_state_busy">Занят</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_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-ru/strings_content_description.xml b/ring-android/app/src/main/res/values-ru/strings_content_description.xml
index 57127b2..4257d77 100644
--- a/ring-android/app/src/main/res/values-ru/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_content_description.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings for xml content description of images-->
-  <string name="contact_quick_call_description">Быстрый вызов</string>
-  <string name="contact_picture_description">Фото контакта</string>
+  <string name="contact_quick_call_description">Быстрый Вызов</string>
+  <string name="contact_picture_description">Фото Контакта</string>
   <string name="dial_numeric_pad">Цифровая клавиатура</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings_preferences.xml b/ring-android/app/src/main/res/values-ru/strings_preferences.xml
index 0c329ad..834f102 100644
--- a/ring-android/app/src/main/res/values-ru/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_preferences.xml
@@ -3,12 +3,15 @@
   <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_mobileData_summary">Разрешить Ring использовать 3G/LTE сети в дополнение к Wi-Fi</string>
   <string name="pref_systemContacts_title">Использовать контакты из адресной книги</string>
-  <string name="pref_systemContacts_summary">Использовать данные из адресной книги для отображения деталей абонента.</string>
-  <string name="pref_systemDialer_title">Совершать звонки, используя Ring.</string>
-  <string name="pref_systemDialer_summary">Совершать звонки, используя Ring тогда, когда это возможно.</string>
+  <string name="pref_systemContacts_summary">Использовать данные из адресной книги для отображения деталей звонящего.</string>
+  <string name="pref_systemDialer_title">Совершать системные звонки, используя Ring.</string>
+  <string name="pref_systemDialer_summary">Совершать системные звонки, используя Ring тогда, когда это возможно.</string>
   <string name="pref_startOnBoot_title">Запускать Ring при старте системы</string>
   <string name="pref_startOnBoot_summary">Запускать Ring в фоновом режиме во время старта системы.</string>
+  <string name="pref_clearHistory_title">Очистить историю</string>
+  <string name="pref_clearHistory_summary">Очистить всю историю разговоров. Это действие нельзя отменить.</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings.xml b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
new file mode 100644
index 0000000..11351ac
--- /dev/null
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
@@ -0,0 +1,56 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="version_section">Verzia</string>
+  <string name="no_email_app_installed">Nainštaluj emailovú aplikáciu, aby si nám poslal správu.</string>
+  <string name="email_chooser_title">Email </string>
+  <!--RingActivity-->
+  <string name="title_activity_sflphone_home">Ring</string>
+  <string name="error_no_network">Žiadne sieťové pripojenie</string>
+  <!--AB menus-->
+  <string name="ab_account_creation">Nový účet</string>
+  <string name="ab_action_chat">Textová správa</string>
+  <!--Left Drawer-->
+  <!--Accessibility-->
+  <!--Sections-->
+  <string name="menu_item_home">Domov</string>
+  <string name="menu_item_accounts">Nastavenie účtov</string>
+  <string name="menu_item_settings">Nastavenie</string>
+  <string name="menu_item_share">Zdieľaj moje kontakty</string>
+  <string name="menu_item_about">O programe Ring</string>
+  <!--Dialing Fragment-->
+  <string name="dial_number">Vytoč číslo</string>
+  <!--History Fragment-->
+  <string name="hist_replay_button_stop">Stop</string>
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <!--ContactList Fragment-->
+  <string name="starred_contacts_title">Obľubené</string>
+  <string name="choose_number">Vyberte číslo</string>
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <!--Notifications-->
+  <!--Call Fragment-->
+  <string name="action_call_hangup">Zlož</string>
+  <string name="action_call_accept">Zdvihni hovor</string>
+  <string name="ab_action_flipcamera">Otoč kameru</string>
+  <!--Text messages-->
+  <string name="send_message">Vyšli správu</string>
+  <!--MediaPreferenceFragment-->
+  <string name="ringtone_error_title">Chyba</string>
+  <string name="ringtone_error_format_not_supported">Tento formát nie je podporovaný.</string>
+  <!--Read contacts permission-->
+  <!--Write call log permission-->
+  <!--QRCode Scan-->
+  <!--Settings-->
+  <!--Conversation-->
+  <!--Contacts-->
+  <string name="wizard_next">Ďalej</string>
+  <!--MenuHeaderView-->
+  <string name="profile">Môj profil</string>
+  <string name="open_the_gallery">Otvor galériu</string>
+  <string name="take_a_photo">Sprav fotografiu</string>
+  <string name="unknown">Neznámy</string>
+  <!--Share fragment-->
+  <string name="share_your_account_information">Zdielaj </string>
+  <string name="generic_error_migration">Chyba</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml b/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml
new file mode 100644
index 0000000..a68f729
--- /dev/null
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Vymaž</string>
+  <!--Strings related to account creation-->
+  <string name="prompt_alias">Alias</string>
+  <!--Strings related to account deletion-->
+  <!--AccountManagementFragment-->
+  <string name="normal_accounts_titles">Účet</string>
+  <!--Basic Details-->
+  <string name="account_preferences_basic_tab">Všeobecné</string>
+  <!--Audio Details-->
+  <string name="account_audio_label">Zvuk</string>
+  <string name="account_ringtone_label">Vyzváňacie tóny</string>
+  <!--Video Details-->
+  <string name="account_video_label">Video</string>
+  <string name="account_video_enable">Zapnúť video</string>
+  <!--Advanced Details-->
+  <!--Security Details-->
+  <!--SRTP Details-->
+  <!--SIP-->
+  <!--TLS Details-->
+  <string name="account_tls_method_label">TLS Metóda</string>
+  <string name="account_tls_server_name_label">Názov servera</string>
+  <!--restore/backup-->
+  <string name="account_export_end_error_title">Chyba</string>
+  <!--Name registration-->
+  <string name="account_status_unknown">Neznámy</string>
+  <!--Create account-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_call.xml b/ring-android/app/src/main/res/values-sk-rSK/strings_call.xml
new file mode 100644
index 0000000..841b011
--- /dev/null
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings_call.xml
@@ -0,0 +1,27 @@
+<?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">Vyzváňanie</string>
+    <string name="call_human_state_busy">Zaneprazdnený</string>
+    </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_content_description.xml b/ring-android/app/src/main/res/values-sk-rSK/strings_content_description.xml
new file mode 100644
index 0000000..0376ab6
--- /dev/null
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings_content_description.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings for xml content description of images-->
+  <string name="contact_quick_call_description">Rýchly hovor</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml b/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml
new file mode 100644
index 0000000..c3a9b9a
--- /dev/null
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="pref_category_network">Sieť</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-sl/strings.xml b/ring-android/app/src/main/res/values-sl/strings.xml
index 94b6f4c..35d2194 100644
--- a/ring-android/app/src/main/res/values-sl/strings.xml
+++ b/ring-android/app/src/main/res/values-sl/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Licenca</string>
   <string name="sponsor_section">Ring je prosto programje, ki ga razvija in podpira</string>
   <string name="copyright_section">Avtorske pravice</string>
   <string name="contribute_section">Prispevaj</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings.xml b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
new file mode 100644
index 0000000..cc28078
--- /dev/null
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
@@ -0,0 +1,120 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="sponsor_section">Ring-u është software i lirë i zhvilluar dhe i mbuluar nga</string>
+  <string name="copyright_section">Të drejta kopjimi</string>
+  <string name="contribute_section">Kontribuoni</string>
+  <string name="version_section">Version</string>
+  <string name="no_email_app_installed">S’u gjet aplikacion email-esh, instaloni një të tillë që të na dërgoni një raport</string>
+  <string name="email_chooser_title">Dërgojeni mesazhi duke përdorur…</string>
+  <!--RingActivity-->
+  <string name="title_activity_sflphone_home">Ring</string>
+  <string name="error_no_network">Pa lidhje në rrjet</string>
+  <string name="error_mobile_network_available_but_disabled">Ju lutemi, akordojini hyrje rrjetit celular te skena e rregullimeve.</string>
+  <!--AB menus-->
+  <string name="ab_account_creation">Llogari e re</string>
+  <string name="ab_action_chat">Shkëmbim mesazhesh tekst</string>
+  <!--Left Drawer-->
+  <!--Accessibility-->
+  <string name="drawer_open">Hap sirtarin e lëvizjes</string>
+  <string name="drawer_close">Mbylle sirtarin e lëvizjes</string>
+  <!--Sections-->
+  <string name="menu_item_home">Kreu</string>
+  <string name="menu_item_accounts">Administroni llogari</string>
+  <string name="menu_item_settings">Rregullime</string>
+  <string name="menu_item_share">Ndaji kontaktet e mia me të tjerët</string>
+  <string name="menu_item_about">Mbi Ring-un</string>
+  <!--Dialing Fragment-->
+  <string name="dial_number">Thirrni një numër</string>
+  <!--History Fragment-->
+  <string name="hist_replay_button_stop">Ndale</string>
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="one">%d Bisedë</item>
+    <item quantity="other">%d Biseda</item>
+  </plurals>
+  <string name="home_transfering">Po shpërngulet %1$s te %1$s</string>
+  <string name="home_transfer_complet">Shpërngulje e plotësuar</string>
+  <!--ContactList Fragment-->
+  <string name="no_contact_found">S’u gjet kontakt</string>
+  <string name="starred_contacts_title">Të parapëlqyer</string>
+  <string name="searchbar_hint">Jepni një emër ose një numër telefoni…</string>
+  <string name="choose_number">Zgjidhni një numër</string>
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <string name="transfer_no_other_call">S’ka thirrje të tjera pezull</string>
+  <string name="transfer_type_number">Shtypni numrin te i cili të shpërngulet:</string>
+  <!--Notifications-->
+  <string name="notif_missed_incoming_call">Thirrje e humbur nga %1$s</string>
+  <string name="notif_missed_outgoing_call">Thirrje për %1$s e humbur</string>
+  <string name="notif_incoming_call_title">Thirrje ardhëse nga %1$s</string>
+  <string name="notif_incoming_call">Thirrje ardhëse</string>
+  <string name="notif_outgoing_call_title">Thirrje për %1$s</string>
+  <string name="notif_outgoing_call">Thirrje për</string>
+  <string name="notif_current_call_title">Thirrje e tanishme me %1$s</string>
+  <string name="notif_current_call">Thirrja e tanishme</string>
+  <!--Call Fragment-->
+  <string name="you_txt_prefix">Ju:</string>
+  <string name="action_call_conference">Konferencë</string>
+  <string name="ongoing_call">Thirrje në kryerje e sipër</string>
+  <string name="hist_in_call">Thirrje nga %1$s</string>
+  <string name="hist_out_call">Thirrje për %1$s</string>
+  <string name="start_error_title">S’niset dot Ring-u!</string>
+  <string name="start_error_mic_required">Që të funksionojë, Ring-u lyp leje për mikrofonin</string>
+  <string name="action_call_accept">Pranoje thirrjen</string>
+  <string name="action_call_decline">Hidhe tej</string>
+  <string name="ab_action_speakerphone">Aktivizoni altoparlantin</string>
+  <string name="ab_action_contact_add">Shtoje te kontaktet</string>
+  <string name="ab_action_contact_add_question">Të shtohet te kontaktet?</string>
+  <string name="ab_action_audio_call">Thirrje audio</string>
+  <string name="ab_action_video_call">Thirrje video</string>
+  <string name="share_via">Ndajeni përmes</string>
+  <string name="write_a_message">Shkruani një mesazh</string>
+  <string name="scan_qr">Skanoni Kodin QR</string>
+  <string name="ab_action_flipcamera">Rrotulloni kamerën</string>
+  <!--Text messages-->
+  <string name="send_message">Dërgoje mesazhin</string>
+  <string name="message_sending">Po dërgohet mesazhi…</string>
+  <string name="time_just_now">Mu tani</string>
+  <string name="permission_read_denied">Aplikacioni s’u lejua të lexonte te depozita juaj. Ndaj, s’mund të funksionojë si duhet. Ju lutemi, shihni mundësinë e akordimit për të kësaj lejeje</string>
+  <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Leje për kamerën</string>
+  <string name="permission_dialog_camera_message">Që të funksionojnë, bisedat me video lypin doemos leje për kamerën Ju lutemi, shihni mundësinë e akordimit të saj.</string>
+  <string name="ringtone_error_title">Gabim</string>
+  <string name="ringtone_error_format_not_supported">Ky format nuk mbulohet.</string>
+  <string name="ringtone_error_size_too_big">Kjo kartelë është shumë e madhe. Madhësia maksimum është %1$ikB.</string>
+  <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Ring-ut i duhet leja \"Lexo në kontakte\" që të aktivizojë këtë veçori. Ju lutemi, akordojani.</string>
+  <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Ring-ut i duhet leja \"Shkruaj në regjistër thirrjesh\" që të aktivizojë këtë veçori. Ju lutemi, akordojani.</string>
+  <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Skanoni kodin QR të llogarisë që doni të shtoni.</string>
+  <!--Settings-->
+  <string name="clear_history_dialog_title">Të pastrohet historiku?</string>
+  <string name="clear_history_dialog_message">Ky veprim s’mund të zhbëhet.</string>
+  <string name="clear_history_completed">Historiku u pastrua.</string>
+  <!--Conversation-->
+  <string name="conversation_action_delete_this">Fshije këtë bisedë</string>
+  <string name="conversation_action_delete_this_title">Të fshihet kjo bisedë?</string>
+  <string name="conversation_action_delete_this_message">Ky veprim s’mund të zhbëhet.</string>
+  <string name="conversation_action_copy_peer_number">Kopjoje numrin</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s u kopjua te e papastra</string>
+  <string name="conversation_action_select_peer_number">Përzgjidhni një numër</string>
+  <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Të shtohet %1$s ?</string>
+  <string name="prompt_new_password">Fjalëkalim i ri</string>
+  <string name="prompt_new_password_repeat">Përsëriteni fjalëkalimin e ri</string>
+  <string name="account_create_title">Krijoni një llogari Ring</string>
+  <string name="prompt_new_username">Jepni emër përdoruesi të ri</string>
+  <string name="help_password_enter">Jepni fjalëkalimin e llogarisë suaj kryesore Ring</string>
+  <!--MenuHeaderView-->
+  <string name="profile">Profili im</string>
+  <string name="profile_message_warning">Kjo u tregohet kontakteve tuaja</string>
+  <string name="open_the_gallery">Hape galerinë</string>
+  <string name="take_a_photo">Bëni një foto</string>
+  <string name="unknowm_if_empty">E panjohur, në u lëntë e zbrazët</string>
+  <string name="unknown">E panjohur</string>
+  <!--Share fragment-->
+  <string name="share_your_account_information">Ndaji me të tjerët të dhënat e mia të kontaktit</string>
+  <string name="generic_error_migration">Gabim</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
new file mode 100644
index 0000000..6c36ff4
--- /dev/null
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
@@ -0,0 +1,135 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Fshije</string>
+  <!--Strings related to account creation-->
+  <string name="prompt_alias">Alias</string>
+  <string name="prompt_hostname">Strehëemër</string>
+  <string name="prompt_username">Emër përdoruesi</string>
+  <string name="prompt_password">Fjalëkalim</string>
+  <string name="action_create">Krijoni llogari</string>
+  <string name="action_create_short">Regjistrohuni</string>
+  <string name="error_field_required">Kjo fushë është e domosdoshme</string>
+  <string name="dialog_wait_create">Po shtohet llogaria</string>
+  <string name="dialog_wait_create_details">Ju lutemi, pritni teksa shtohet llogaria juaj e re…</string>
+  <string name="dialog_wait_update">Po përditësohet llogaria</string>
+  <string name="dialog_wait_update_details">Ju lutemi, pritni teksa përditësohet llogaria juaj e re…</string>
+  <string name="dialog_warn_ip2ip_account_title">Të krijohet llogari SIP e zbrazët?</string>
+  <string name="dialog_warn_ip2ip_account_message">Ju ndan një hap nga krijimi i një llogarie SIP pa strehëemër të vlefshëm.
+        Do të jeni në gjendje vetëm të bëni dhe të merrni thirrje ip të drejtpërdrejta.
+        Llogarinë tuaj mund ta përpunoni më vonë</string>
+  <string name="help_ring">Një llogari Ring ju lejon të lidheni në mënyrë të sigurt me njerëz, sipas modelit tek për te, përmes një rrjeti tërësisht të shpërndarë.</string>
+  <string name="help_sip_title">Shtoni llogarinë tuaj SIP</string>
+  <string name="help_sip">Formësoni një llogari SIP ekzistuese.</string>
+  <string name="create_sip_account">Shtoje</string>
+  <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">Të fshihet llogaria?</string>
+  <string name="account_delete_dialog_message">Ky veprim s’mund të zhbëhet.</string>
+  <!--AccountManagementFragment-->
+  <string name="empty_account_list">S’ka llogari të regjistruar</string>
+  <string name="normal_accounts_titles">Llogari</string>
+  <string name="normal_devices_titles">Pajisje të njohura që lidhen te kjo llogari Ring</string>
+  <!--Basic Details-->
+  <string name="account_preferences_basic_tab">Të përgjithshme</string>
+  <string name="account_basic_category">Rregullime Bazë</string>
+  <string name="account_alias_label">Emër llogarie</string>
+  <string name="account_hostname_label">Strehëemër</string>
+  <string name="account_username_label">Emër përdoruesi</string>
+  <string name="account_password_label">Fjalëkalim</string>
+  <string name="account_optionnal_category">Rregullime Opsionale</string>
+  <string name="account_useragent_label">Agjent Përdoruesi</string>
+  <string name="account_upnp_label">Aktivizo UPnP</string>
+  <string name="account_proxy_field">Ndërmjetës</string>
+  <!--Audio Details-->
+  <string name="account_audio_label">Audio</string>
+  <string name="account_preferences_media_tab">Media</string>
+  <string name="account_ringtone_label">Zile</string>
+  <string name="account_ringtone_enabled_label">Aktivizo zilen</string>
+  <string name="account_ringtone_path_label">Shteg zileje</string>
+  <string name="account_ringtone_custom_label">Përdor zile vetjake</string>
+  <!--Video Details-->
+  <string name="account_video_label">Video</string>
+  <string name="account_video_enable">Aktivizo Video</string>
+  <!--Advanced Details-->
+  <string name="account_preferences_advanced_tab">Të mëtejshme</string>
+  <string name="account_registration_exp_label">Skadim Regjistrimi</string>
+  <string name="account_local_interface_label">Ndërfaqe Vendore</string>
+  <string name="account_local_port_label">Portë Vendore</string>
+  <string name="account_stun_enable_label">Përdor Stun</string>
+  <string name="account_stun_server_label">Shërbyes Stun</string>
+  <string name="account_turn_enable_label">Përdor TURN</string>
+  <string name="account_turn_server_label">Shërbyes TURN</string>
+  <string name="account_turn_username_label">Emër përdoruesi TURN</string>
+  <string name="account_turn_password_label">Fjalëkalim TURN</string>
+  <string name="account_published_address_label">Adresë e Publikuar</string>
+  <!--Security Details-->
+  <string name="account_credentials_label">Kredenciale</string>
+  <string name="account_credentials_edit">Përpunoni kredenciale</string>
+  <string name="account_credentials_add">Shtoni kredenciale</string>
+  <!--SRTP Details-->
+  <string name="account_preferences_security_tab">Siguri</string>
+  <!--SIP-->
+  <!--TLS Details-->
+  <string name="account_tls_transport_switch_label">Përdor Bartje TLS</string>
+  <string name="account_tls_port_label">Portë Përgjuesi TLS</string>
+  <string name="account_tls_certificate_list_label">Autoritete Dëshmish</string>
+  <string name="account_tls_certificate_file_label">Kartelë Dëshmie</string>
+  <string name="account_tls_private_key_file_label">Kartelë Kyçi Privat</string>
+  <string name="account_tls_password_label">Fjalëkalim Kyçi Privat</string>
+  <string name="account_tls_method_label">Metodë TLS</string>
+  <string name="account_tls_ciphers_label">Shifra TLS</string>
+  <string name="account_tls_server_name_label">Emër Shërbyesi</string>
+  <string name="account_tls_verify_server_label">Veirifkoni Shërbyes</string>
+  <string name="account_tls_verify_client_label">Verifikoni Klient</string>
+  <string name="account_tls_negotiation_timeout_sec">Skadim Tratative (s)</string>
+  <string name="account_rtp_max_port">Maksimum</string>
+  <string name="account_rtp_min_port">Minimum</string>
+  <!--restore/backup-->
+  <string name="account_restore_account">Riktheni një llogari</string>
+  <string name="account_restore_message">Jepni fjalëkalimin për çfshehtëzim kartele.</string>
+  <string name="account_restore_decryption_password">Fjalëkalim çfeshhtëzimesh</string>
+  <string name="restore_backup_wait">Ju lutemi, pritni…</string>
+  <string name="error_password_char_count">Minimumi 6 shenja</string>
+  <string name="error_passwords_not_equals">Fjalëkalimet nuk përputhen</string>
+  <string name="restore_failed_dialog_title">Rikthimi dështoi</string>
+  <string name="restore_failed_dialog_msg">Ndodhi një gabim</string>
+  <string name="export_account_wait_title">Ju lutemi, pritni…</string>
+  <string name="account_export_end_decryption_message">S’u zhbllokua dot llogaria juaj duke përdorur fjalëkalimin e dhënë.</string>
+  <string name="account_export_end_network_title">Gabim rrjeti</string>
+  <string name="account_export_end_network_message">S’u eksportua dot llogari te rrjeti. Kontrolloni lidhjen tuaj në rrjet.</string>
+  <string name="account_export_end_error_title">Gabim</string>
+  <string name="account_export_end_error_message">S’u eksportua dot llogaria. Ndodhi një gabim i panjohur.</string>
+  <string name="account_enter_password">Jepni fjalëkalimin</string>
+  <string name="account_contact_me">Lidhuni me mua në Ring!</string>
+  <string name="update_account">Përditësoje llogarinë</string>
+  <string name="ring_account">Llogari Ring</string>
+  <string name="account_migration_title_dialog">Migrim llogarie</string>
+  <string name="account_update_needed">Lypset përditësim</string>
+  <string name="account_creation_file_too_big">Kartela është shumë e madhe</string>
+  <string name="account_cannot_read">S’lexohet dot %1$s</string>
+  <string name="account_cannot_be_found_title">S’gjendet dot llogari</string>
+  <string name="account_no_network_title">S’lidhet dot te rrjeti</string>
+  <string name="account_device_added_message">E keni rregulluar me sukses llogarinë tuaj Ring në këtë pajisje.</string>
+  <string name="account_link_button">Lidheni këtë pajisje me një llogari</string>
+  <string name="account_import_title">Lidheni me një llogari ekzistuese</string>
+  <string name="account_link_prompt_pin">Jepni PIN-in</string>
+  <string name="account_new_button">Krijoni një llogari Ring</string>
+  <string name="account_link_export_button">Lidhni te kjo llogari një pajisje tjetër</string>
+  <string name="account_end_export_button">mbylle</string>
+  <!--Name registration-->
+  <string name="register_name_wrong_password">S’regjistrohet dot emri: fjalëkalim llogarie i gabuar.</string>
+  <string name="register_name_invalid">S’regjistrohet dot emri: emër i pavlefshëm.</string>
+  <string name="register_name_already_taken">S’regjistrohet dot emri: emër tashmë i zënë.</string>
+  <string name="register_name_network_error">S’regjistrohet dot emri: gabim rrjeti ose shërbyesi.</string>
+  <string name="error_username_empty">Jepni një emër përdoruesi</string>
+  <string name="no_registered_name_for_account">S’u gjet emër i regjistruar për këtë llogari</string>
+  <string name="register_name">Regjistroni emër</string>
+  <string name="trying_to_register_name">Po provohet të regjistrohet emri</string>
+  <string name="registered_username">Emër përdoruesi i regjistruar</string>
+  <string name="username_already_taken">Emër përdoruesi tashmë i zënë</string>
+  <string name="invalid_username">Emër përdoruesi i pavlefshëm</string>
+  <string name="account_status_unknown">E panjohur</string>
+  <!--Create account-->
+  <string name="account_creation_home">Mirë se vini te Ring</string>
+  <string name="account_creation_profile">Krijoni profilin tuaj</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_call.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_call.xml
new file mode 100644
index 0000000..6a42bd5
--- /dev/null
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_call.xml
@@ -0,0 +1,27 @@
+<?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_busy">I zënë</string>
+    <string name="call_human_state_none">Asnjë</string>
+    <string name="conference_human_state_default">Asnjë</string>
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_content_description.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_content_description.xml
new file mode 100644
index 0000000..6e1ac5a
--- /dev/null
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_content_description.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings for xml content description of images-->
+  <string name="contact_quick_call_description">Thirrje e Shpejtë</string>
+  <string name="contact_picture_description">Foto Kontakti</string>
+  <string name="dial_numeric_pad">Numërator me shifra</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
new file mode 100644
index 0000000..1a35fd2
--- /dev/null
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="pref_category_network">Rrjet</string>
+  <string name="pref_category_contacts">Kontakte</string>
+  <string name="pref_category_system">Sistem</string>
+  <string name="pref_category_privacy">Privatësi</string>
+  <string name="pref_mobileData_title">Të dhëna celulare</string>
+  <string name="pref_mobileData_summary">Lejojeni Ring-un edhe në rrjete 3G/LTE, përveç se te Wi-Fi</string>
+  <string name="pref_systemContacts_title">Përdor kontakte sistemi</string>
+  <string name="pref_systemContacts_summary">Për shfaqjen e hollësive të thirrësit përdor kontakte sistemi.</string>
+  <string name="pref_systemDialer_title">Kryej thirrje sistemi duke përdoru Ring-un</string>
+  <string name="pref_systemDialer_summary">Kur është e mundur, përdor Ring-un për të kryer thirrje sistemi.</string>
+  <string name="pref_startOnBoot_title">Nise Ring-un kur niset sistemi</string>
+  <string name="pref_startOnBoot_summary">Xhirojeni Ring-un në prapaskenë kur niset sistemi.</string>
+  <string name="pref_clearHistory_title">Pastroje historikun</string>
+  <string name="pref_clearHistory_summary">Pastroni krejt historikun e bisedave, Ky veprim nuk mund të zhbëhet.</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-sv/strings.xml b/ring-android/app/src/main/res/values-sv/strings.xml
index 2ad07e7..b126e49 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Licens</string>
   <string name="sponsor_section">Ring är fri mjukvara, utvecklad och understödd av</string>
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Bidra</string>
@@ -114,6 +113,7 @@
   <string name="help_password_choose">Ange ett starkt lösenord, som du kommer ihåg, för att skydda ditt Ring-konto.</string>
   <string name="help_password_enter">Ange ditt huvudsakliga Ring-kontos lösenord</string>
   <string name="help_pin_enter">Ange PIN-koden från ett annat konfigurerat Ring-konto. Använd \"Exportera konto på Ring\", för att få din PIN-kod.</string>
+  <string name="wizard_next">Nästa</string>
   <string name="account_device_updated_message">Du har lyckats uppdatera ditt Ring-konto.</string>
   <!--MenuHeaderView-->
   <string name="profile">Min profil</string>
@@ -125,4 +125,5 @@
   <!--Share fragment-->
   <string name="share_message">Skanna denna QR-kod med den inbyggda skanner som finns i det Ring-program som vill kommunicera med dig.</string>
   <string name="share_your_account_information">Dela min kontaktinformation</string>
+  <string name="generic_error_migration">Fel</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sv/strings_account.xml b/ring-android/app/src/main/res/values-sv/strings_account.xml
index 57dfd72..b09c90a 100644
--- a/ring-android/app/src/main/res/values-sv/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sv/strings_account.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Ta bort</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Värdnamn</string>
@@ -106,13 +108,10 @@
   <string name="account_export_end_error_title">Fel</string>
   <string name="account_export_end_error_message">Kunde inte exportera kontot. Ett okänt fel har inträffat.</string>
   <string name="account_enter_password">Ange lösenord</string>
-  <string name="account_share_body">Kontakta mig via %1$s på kommunikationsplattformen Ring: http://ring.cx</string>
   <string name="account_contact_me">Kontakta mig på Ring !</string>
   <string name="update_account">Uppdatera konto</string>
-  <string name="account_migration">Ditt Ring-konto kan nu delas mellan alla dina enheter. Allt du behöver göra, är att ange ett lösenord.</string>
   <string name="ring_account">Ring-konto</string>
   <string name="account_migration_title_dialog">Kontodelning</string>
-  <string name="account_migration_message_dialog">Ditt konto måste uppdateras för att kunna användas på flera enheter. Vill du gå till kontohanteringen för att utföra denna åtgärd?</string>
   <string name="account_update_needed">Uppdatering behövs</string>
   <string name="account_creation_file_too_big">Filen är för stor</string>
   <string name="account_cannot_read">Kan inte läsa %1$s</string>
@@ -126,7 +125,7 @@
   <string name="account_link_button">Koppla denna enhet till ett konto</string>
   <string name="account_import_title">Koppla ett befintligt konto</string>
   <string name="account_link_prompt_pin">Ange PIN-kod</string>
-  <string name="account_wizard_title">Ring-konto</string>
+  <string name="account_wizard_title">Välkommen till</string>
   <string name="account_new_button">Skapa ett Ring-konto</string>
   <string name="account_link_export_button">Koppla en annan enhet till detta konto</string>
   <string name="account_link_export_info">För att använda detta konto på en annan enhet, måste du först exponera det på Ring. Detta genererar en PIN-kod som du måste ange på den nya enheten för att öppna kontot. Pin-koden är giltig i 10 minuter.\n\nAnge ditt lösenord för att starta:</string>
@@ -143,8 +142,13 @@
   <string name="register_name">Registrera namn</string>
   <string name="trying_to_register_name">Försöker registrera namnet</string>
   <string name="registered_username">Registrerat namn</string>
-  <string name="register_username">Registrera namn offentligt (experimentellt)</string>
+  <string name="register_username">Registrera ett offentligt namn (experimentellt)</string>
   <string name="username_already_taken">Användarnamnet finns redan</string>
   <string name="invalid_username">Ogiltigt användarnamn</string>
   <string name="looking_for_username_availability">Kollar användarnamnets tillgänglighet...</string>
+  <string name="account_status_connecting">Ansluter</string>
+  <string name="account_status_unknown">Okänd</string>
+  <!--Create account-->
+  <string name="account_creation_home">Välkommen till ring</string>
+  <string name="account_creation_profile">Skapa din profil</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-tr/strings.xml b/ring-android/app/src/main/res/values-tr/strings.xml
index 9f2712d..748a55c 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Lisans</string>
   <string name="sponsor_section">Ring bir özgür yazılımdır ve şunun tarafından desteklenir</string>
   <string name="copyright_section">Telif Hakkı</string>
   <string name="contribute_section">Katkı Yap</string>
@@ -13,7 +12,7 @@
   <string name="error_mobile_network_available_but_disabled">Lütfen ayarlar ekranında hücre ağına erişim verin.</string>
   <!--AB menus-->
   <string name="ab_account_creation">Yeni hesap</string>
-  <string name="ab_action_chat">Metin mesajlaşma</string>
+  <string name="ab_action_chat">Metin ileti</string>
   <!--Left Drawer-->
   <!--Accessibility-->
   <string name="drawer_open">Gezinti çekmecesini aç</string>
@@ -22,6 +21,7 @@
   <string name="menu_item_home">Ev</string>
   <string name="menu_item_accounts">Hesapları yönet</string>
   <string name="menu_item_settings">Ayarlar</string>
+  <string name="menu_item_share">Bilgimi paylaş</string>
   <string name="menu_item_about">Ring Hakkında</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Bir numara çevir</string>
@@ -39,7 +39,7 @@
   <!--ContactList Fragment-->
   <string name="no_contact_found">Kişi bulunamadı</string>
   <string name="starred_contacts_title">Sık Kullanılanlar</string>
-  <string name="searchbar_hint">İsim ya da telefon numarası girin...</string>
+  <string name="searchbar_hint">Ad ya da telefon numarası girin...</string>
   <string name="choose_number">Numara seçin</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
@@ -47,17 +47,17 @@
   <string name="transfer_no_other_call">Bekleyen başka arama yok</string>
   <string name="transfer_type_number">Aktarılacak numarayı girin:</string>
   <!--Notifications-->
-  <string name="notif_missed_incoming_call">%1$s\'dan cevapsız arama</string>
-  <string name="notif_missed_outgoing_call">%1$s\'a cevapsız arama</string>
+  <string name="notif_missed_incoming_call">%1$s\'den yanıtsız arama</string>
+  <string name="notif_missed_outgoing_call">%1$s\'e yanıtsız arama</string>
   <string name="notif_incoming_call_title">%1$s\'dan gelen arama</string>
   <string name="notif_incoming_call">Gelen arama</string>
   <string name="notif_outgoing_call_title">%1$s\'a giden arama</string>
   <string name="notif_outgoing_call">Giden arama</string>
   <string name="notif_current_call_title">%1$s ile şimdiki arama</string>
-  <string name="notif_current_call">Şimdiki Arama</string>
+  <string name="notif_current_call">Şimdiki arama</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Sen:</string>
-  <string name="action_call_attended_transfer">katılınmış aktarma</string>
+  <string name="action_call_attended_transfer">Katılınmış Aktarma</string>
   <string name="action_call_conference">Toplantı</string>
   <string name="action_call_hangup">Kapat</string>
   <string name="ongoing_call">Giden arama</string>
@@ -65,7 +65,7 @@
   <string name="hist_out_call">%1$s giden arama</string>
   <string name="start_error_title">Ring başlatılamıyor !</string>
   <string name="start_error_mic_required">Ring çalışmak için mikrofon iznine ihtiyaç duyuyor.</string>
-  <string name="action_call_accept">Aramayı cevapla</string>
+  <string name="action_call_accept">Aramayı yanıtla</string>
   <string name="action_call_decline">Reddet</string>
   <string name="ab_action_speakerphone">Hoparlörü etkinleştir</string>
   <string name="ab_action_contact_add">Kişilere ekle</string>
@@ -83,8 +83,10 @@
   <string name="permission_read_denied">Uygulamaya deponuzu okuma izni verilmedi. Bu yüzden düzgün işleyemez. Lütfen bu izni vermeyi göz ardı etmeyin.</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera izni</string>
-  <string name="permission_dialog_camera_message">Görüntülü görüşme için kamera çalıştırma izni gereklidir.Lütfen etkinleştirmeyi gözden kaçırmayın.</string>
+  <string name="permission_dialog_camera_message">Görüntülü görüşmelerin çalışması için kamera izni gerekir. Lütfen etkinleştirmeyi göz ardı etmeyin.</string>
   <string name="ringtone_error_title">Hata</string>
+  <string name="ringtone_error_format_not_supported">Bu biçim desteklenmiyor.</string>
+  <string name="ringtone_error_size_too_big">Bu dosya çok büyük. En büyük boyut %1$ikB.</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring bu özelliği etkinleştirmek için \"Kişileri okuma\" iznine gereksiniyor. Lütfen verin.</string>
   <!--Write call log permission-->
@@ -94,7 +96,7 @@
   <!--Settings-->
   <string name="clear_history_dialog_title">Geçmişi temizle ?</string>
   <string name="clear_history_dialog_message">Bu eylem geri alınamaz.</string>
-  <string name="clear_history_completed">Geçmiş temizlenmiş</string>
+  <string name="clear_history_completed">Geçmiş temizlenmiş.</string>
   <!--Conversation-->
   <string name="conversation_action_delete_this">Bu konuşmayı sil</string>
   <string name="conversation_action_delete_this_title">Bu konuşmayı sil ?</string>
@@ -107,13 +109,21 @@
   <string name="prompt_new_password">Yeni parola</string>
   <string name="prompt_new_password_repeat">Yeni parola tekrar</string>
   <string name="account_create_title">Bir Ring hesabı oluştur</string>
+  <string name="prompt_new_username">Yeni kullanıcı adı gir</string>
+  <string name="help_password_choose">Ring hesabınızı korumak için anımsayacağınız güçlü bir parola seçin.</string>
+  <string name="help_password_enter">Ana Ring hesap parolanızı girin</string>
+  <string name="help_pin_enter">Başka yapılandırılmış Ring hesabından PIN\'i gir. PIN edinmek için \"Ring\'de hesabı dışa aktarma\" özelliğini kullan.</string>
+  <string name="wizard_next">İleri</string>
   <string name="account_device_updated_message">Ring hesabınızı başarıyla güncellediniz.</string>
   <!--MenuHeaderView-->
   <string name="profile">Profilim</string>
   <string name="profile_message_warning">Bu, kişileriniz ile paylaşıldı</string>
   <string name="open_the_gallery">Galeriyi aç</string>
-  <string name="take_a_photo">Fotograf çek</string>
+  <string name="take_a_photo">Fotoğraf çek</string>
   <string name="unknowm_if_empty">Boş ise bilinmiyor</string>
   <string name="unknown">Bilinmeyen</string>
   <!--Share fragment-->
+  <string name="share_message">Sizinle iletişime geçmek isteyenin Ring uygulamasının gömülü tarayıcısıyla bu QR kodu tarayın.</string>
+  <string name="share_your_account_information">İletişim bilgimi paylaş</string>
+  <string name="generic_error_migration">Hata</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-tr/strings_account.xml b/ring-android/app/src/main/res/values-tr/strings_account.xml
index 07da5d4..ca9aa16 100644
--- a/ring-android/app/src/main/res/values-tr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-tr/strings_account.xml
@@ -1,10 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Sil</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Takma ad</string>
   <string name="prompt_hostname">Sunucu adı</string>
   <string name="prompt_username">Kullanıcı adı</string>
   <string name="prompt_password">Parola</string>
+  <string name="action_create">Hesap oluştur</string>
   <string name="action_create_short">Kaydol</string>
   <string name="error_field_required">Bu alan gerekli</string>
   <string name="dialog_wait_create">Hesap ekleniyor</string>
@@ -13,11 +16,11 @@
   <string name="dialog_wait_update_details">Yeni hesabınız güncellenirken lütfen bekleyin...</string>
   <string name="dialog_warn_ip2ip_account_title">Boş SIP hesabı oluşturulsun mu?</string>
   <string name="dialog_warn_ip2ip_account_message">Bir SIP hesabı oluşturabilmeniz için makine adınız geçersiz.
-Sadece ip çağrıları alabilirsiniz.
+Yalnızca doğrudan ip çağrıları alabilirsiniz.
 Hesabınızı daha sonra düzenleyebilirsiniz</string>
-  <string name="help_ring">Bir Ring hesabı bütünüyle dağıtık ağ üzerinden insanlara uçtan uca güvenle ulaşmanızı sağlar.</string>
+  <string name="help_ring">Bir Ring hesabı tümüyle dağıtık ağ üzerinden insanlara uçtan uca güvenle ulaşmanızı sağlar.</string>
   <string name="help_sip_title">SIP hesabınızı ekleyin</string>
-  <string name="help_sip">Varolan SIP hesabını yapılandır</string>
+  <string name="help_sip">Var olan SIP hesabını yapılandır</string>
   <string name="create_sip_account">Ekle</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Hesabı silinsin mi ?</string>
@@ -25,7 +28,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Kayıtlı hesap yok</string>
   <string name="normal_accounts_titles">Hesaplar</string>
-  <string name="normal_devices_titles">Bu Ring hesabına bilinen aygıtlar bağlı</string>
+  <string name="normal_devices_titles">Bu Ring hesabına bağlı bilinen aygıtlar</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Genel</string>
   <string name="account_basic_category">Temel Ayarlar</string>
@@ -45,6 +48,7 @@
   <string name="account_ringtone_label">Zil sesleri</string>
   <string name="account_ringtone_enabled_label">Zil seslerini etkinleştir</string>
   <string name="account_ringtone_path_label">Zil sesi yolu</string>
+  <string name="account_ringtone_custom_label">Özel zil sesi kullan</string>
   <!--Video Details-->
   <string name="account_video_label">Görüntü</string>
   <string name="account_video_enable">Görüntüyü Etkinleştir</string>
@@ -70,7 +74,7 @@
   <string name="account_preferences_security_tab">Güvenlik</string>
   <!--SIP-->
   <!--TLS Details-->
-  <string name="account_tls_transport_switch_label">TLS taşıyıcı kullan</string>
+  <string name="account_tls_transport_switch_label">TLS Taşıyıcı kullan</string>
   <string name="account_tls_port_label">TLS Dinleyici Deliği</string>
   <string name="account_tls_certificate_list_label">Onay Kurumları</string>
   <string name="account_tls_certificate_file_label">Sertifika Dosyası</string>
@@ -86,35 +90,65 @@
   <string name="account_rtp_min_port">Asgari</string>
   <string name="account_rtp_port_range">Ses RTP Delik Aralığı</string>
   <!--restore/backup-->
+  <string name="account_restore_account">Hesabı geri yükle</string>
   <string name="account_restore_message">Dosya şifresini çözmek için parolayı girin.</string>
   <string name="account_restore_decryption_password">Şifre çözme parolası</string>
+  <string name="account_new_device_password">Hesabın kilidini açmak için ana parolayı gir</string>
+  <string name="restore_dialog_title">Geri yükleniyor</string>
   <string name="restore_backup_wait">Lütfen bekleyin...</string>
-  <string name="error_password_char_count">En az 6 harf</string>
+  <string name="error_password_char_count">En az 6 karakter</string>
   <string name="error_passwords_not_equals">Parolalar eşleşmedi</string>
+  <string name="restore_failed_dialog_title">Geri yükleme başarısız</string>
   <string name="restore_failed_dialog_msg">Bir hata oluştu</string>
   <string name="export_account_wait_title">Lütfen bekleyin...</string>
-  <string name="export_account_wait_message">Yeni hesap bilgisi yayınlanıyor</string>
-  <string name="account_export_end_decryption_message">Hesabınızın açılamıyor buradan aldığınız parolayı kullanın.</string>
+  <string name="export_account_wait_message">Yeni hesap bilgisi yayımlanıyor</string>
+  <string name="account_export_end_decryption_message">Sağlanan parola kullanılarak hesabınızın kilidi açılamıyor.</string>
   <string name="account_export_end_network_title">Ağ hatası</string>
-  <string name="account_export_end_network_message">Hesap ağdan dışarı aktarılamadı. Bağlanabilirliğinizi denetleyin.</string>
+  <string name="account_export_end_network_message">Hesap ağda dışa aktarılamadı. Bağlanabilirliğinizi denetleyin.</string>
   <string name="account_export_end_error_title">Hata</string>
-  <string name="account_export_end_error_message">Hesap dışa aktarılamadı.Bilinmeyen bir hata oluştu.</string>
-  <string name="account_enter_password">Parolayı girin</string>
+  <string name="account_export_end_error_message">Hesap dışa aktarılamadı. Bilinmeyen bir hata oluştu.</string>
+  <string name="account_enter_password">Parolayı gir</string>
   <string name="account_contact_me">Benimle Ring üzerinden iletişime geç</string>
   <string name="update_account">Hesabı güncelle</string>
-  <string name="account_migration">Hesabınız şimdi bütün aygıtlarınızda kullanılabilir. Bütün bunlar için parolanız olması yeterli.</string>
   <string name="ring_account">Ring Hesabı</string>
-  <string name="account_migration_title_dialog">Hesabın yerini değiştirme</string>
+  <string name="account_migration_title_dialog">Hesap taşıma</string>
   <string name="account_update_needed">Güncelleme gerekli</string>
   <string name="account_creation_file_too_big">Dosya çok büyük</string>
   <string name="account_cannot_read">%1$s okunamıyor</string>
   <string name="account_cannot_be_found_title">Hesap bulunamadı</string>
+  <string name="account_cannot_be_found_message">Hesap Ring ağı üzerinde bulunamadı.\nVar olan bir aygıttan Ring üzerinde dışa aktarıldığından ve sağladığı bilgilerin doğru olduğundan emin olun.</string>
   <string name="account_no_network_title">Ağa bağlanılamıyor</string>
-  <string name="account_no_network_message">Hesap eklenemiyor çünkü Ring ağ bağlantısından yararlanamıyor. Bağlanabilirliğinizi denetleyin.</string>
+  <string name="account_no_network_message">Hesap eklenemiyor çünkü Ring dağıtık ağa bağlanamıyor. Bağlanabilirliğinizi denetleyin.</string>
   <string name="account_device_added_title">Hesap aygıtı eklendi</string>
-  <string name="account_device_added_message">Bu aygıttaki Ring hesabı ayarlarını başarıyla tamamladınız.</string>
+  <string name="account_device_added_message">Bu aygıttaki Ring hesabınızı başarıyla kurdunuz.</string>
   <string name="account_device_updated_title">Hesap aygıtı güncellendi</string>
-  <string name="account_wizard_title">Ring Hesabı</string>
+  <string name="account_link_button">Bu aygıtı bir hesaba bağla</string>
+  <string name="account_import_title">Var olan bir hesaba bağla</string>
+  <string name="account_link_prompt_pin">PIN\'i gir</string>
+  <string name="account_wizard_title">Hoş geldiniz</string>
   <string name="account_new_button">Bir Ring hesabı oluştur</string>
+  <string name="account_link_export_button">Başka aygıtı bu hesaba bağla</string>
+  <string name="account_link_export_info">Bu hesabı başka aygıtlarda kullanmak için ilk olarak Ring\'de açığa çıkarmalısınız. Bu, hesabı kurmak için yeni aygıtta girmeniz gereken bir PIN kodu oluşturacak. PIN 10 dakikalığıa geçerlidir.\n\nLütfen başlamak için parolanızı sağlayın:</string>
+  <string name="account_start_export_button">Pin Oluştur</string>
+  <string name="account_end_export_button">kapat</string>
+  <string name="account_end_export_infos">Pin\'iniz:\n\n%%\n\nSüreci tamamlamak için yeni aygıtta Ring\'i açmanız gerekiyor. \"Bu aygıtı bir hesaba bağla\" ile yeni hesap oluşturun. Pin\'iniz 10 dakikalığına geçerlidir.</string>
   <!--Name registration-->
+  <string name="register_name_wrong_password">Ad kaydedilemiyor: yanlış hesap parolası.</string>
+  <string name="register_name_invalid">Ad kaydedilemiyor: geçersiz ad.</string>
+  <string name="register_name_already_taken">Ad kaydedilemiyor: ad önceden alınmış.</string>
+  <string name="register_name_network_error">Ad kaydedilemiyor: ağ ya da sunucu hatası.</string>
+  <string name="error_username_empty">Bir kullanıcı adı gir</string>
+  <string name="no_registered_name_for_account">Bu hesap için kaydedilmiş ad bulunamadı</string>
+  <string name="register_name">Adı kaydet</string>
+  <string name="trying_to_register_name">Ad kaydedilmeye çalışılıyor</string>
+  <string name="registered_username">Kaydedilen kullanıcı adı</string>
+  <string name="register_username">Halka açık kullanıcı adı kaydet (deneysel)</string>
+  <string name="username_already_taken">Kullanıcı adı önceden alınmış</string>
+  <string name="invalid_username">Geçersiz kullanıcı adı</string>
+  <string name="looking_for_username_availability">Kullanıcı adının uygunluğuna bakılıyor ...</string>
+  <string name="account_status_connecting">Bağlanılıyor</string>
+  <string name="account_status_unknown">Bilinmeyen</string>
+  <!--Create account-->
+  <string name="account_creation_home">Ring\'e Hoşgeldiniz</string>
+  <string name="account_creation_profile">Profilinizi oluşturun</string>
 </resources>
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 372d444..cdaf0bc 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">Ліцензія</string>
   <string name="sponsor_section">Ring є безкоштовним програмним забезпеченням, що розроблене та пдітримується</string>
   <string name="copyright_section">Авторське право</string>
   <string name="contribute_section">Співробітничати</string>
@@ -107,7 +106,9 @@
   <string name="add_call_contact_number_to_contacts">Додати %1$s ?</string>
   <string name="prompt_new_password">Новий пароль</string>
   <string name="account_create_title">Створити обліковий запис Ring</string>
+  <string name="wizard_next">Наступний</string>
   <!--MenuHeaderView-->
   <string name="unknown">Невідомий</string>
   <!--Share fragment-->
+  <string name="generic_error_migration">Помилка</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 b1e7aa7..1a6381c 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
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Видалити</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">Додаткове ім’я</string>
   <string name="prompt_hostname">Ім\'я хоста</string>
@@ -92,4 +94,8 @@
   <string name="account_export_end_error_title">Помилка</string>
   <string name="account_new_button">Створити обліковий запис Ring</string>
   <!--Name registration-->
+  <string name="account_status_connecting">З\'єднання</string>
+  <string name="account_status_unknown">Невідомий</string>
+  <!--Create account-->
+  <string name="account_creation_home">Вітаємо у Ring</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings.xml b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
index ab6d74c..17a40ba 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,30 +1,128 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <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_activity_sflphone_home">响铃</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_action_chat">文字消息</string>
   <!--Left Drawer-->
   <!--Accessibility-->
+  <string name="drawer_open">打开导航</string>
+  <string name="drawer_close">收起导航</string>
   <!--Sections-->
+  <string name="menu_item_home">主页</string>
+  <string name="menu_item_accounts">管理帐户</string>
+  <string name="menu_item_settings">设置</string>
+  <string name="menu_item_share">共享我的通讯录</string>
+  <string name="menu_item_about">关于Ring</string>
   <!--Dialing Fragment-->
+  <string name="dial_number">拨号</string>
   <!--History Fragment-->
+  <string name="hist_replay_button">重放</string>
+  <string name="hist_replay_button_stop">停止</string>
   <!--DetailsHistory Fragment-->
   <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="other">%d个会话</item>
+  </plurals>
+  <string name="home_transfering">将%1$s传输至%1$s</string>
+  <string name="home_transfer_complet">传输完成</string>
   <!--ContactList Fragment-->
+  <string name="no_contact_found">未找到联系人</string>
+  <string name="starred_contacts_title">收藏夹</string>
+  <string name="searchbar_hint">输入姓名或电话号码…</string>
+  <string name="choose_number">选择一个数字</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
+  <string name="transfer_to_another_call">切换至另一个当前通话</string>
+  <string name="transfer_no_other_call">无通话</string>
+  <string name="transfer_type_number">输入要切换至的号码:</string>
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">未接来电:%1$s</string>
+  <string name="notif_missed_outgoing_call">未接去电:%1$s</string>
+  <string name="notif_incoming_call_title">来电:%1$s</string>
+  <string name="notif_incoming_call">来电</string>
+  <string name="notif_outgoing_call_title">去电:%1$s</string>
+  <string name="notif_outgoing_call">去电</string>
+  <string name="notif_current_call_title">当前通话:%1$s</string>
+  <string name="notif_current_call">当前通话</string>
   <!--Call Fragment-->
+  <string name="you_txt_prefix">你:</string>
+  <string name="action_call_attended_transfer">转接</string>
+  <string name="action_call_conference">会议</string>
+  <string name="action_call_hangup">挂断</string>
+  <string name="ongoing_call">正在通话</string>
+  <string name="hist_in_call">来电:%1$s</string>
+  <string name="hist_out_call">去电:%1$s</string>
+  <string name="start_error_title">无法启动Ring!</string>
+  <string name="start_error_mic_required">Ring需要开启麦克风使用权限。</string>
+  <string name="action_call_accept">接听</string>
+  <string name="action_call_decline">拒接</string>
+  <string name="ab_action_speakerphone">开启扬声器</string>
+  <string name="ab_action_contact_add">加入通讯录</string>
+  <string name="ab_action_contact_add_question">添加至通讯录吗?</string>
+  <string name="ab_action_audio_call">语音通话</string>
+  <string name="ab_action_video_call">视频通话</string>
+  <string name="share_via">通过…共享</string>
+  <string name="write_a_message">写消息</string>
+  <string name="scan_qr">扫描二维码</string>
+  <string name="ab_action_flipcamera">翻转摄像头</string>
   <!--Text messages-->
+  <string name="send_message">发消息</string>
+  <string name="message_sending">正在发送消息…</string>
+  <string name="time_just_now">刚才</string>
+  <string name="permission_read_denied">该应用程序无法读取您的手机存储,无法正常工作。请设置相应权限。</string>
   <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">摄像头使用权限</string>
+  <string name="permission_dialog_camera_message">视频会话需要使用摄像头,请设置相应权限。</string>
+  <string name="ringtone_error_title">错误</string>
+  <string name="ringtone_error_format_not_supported">不支持的文件格式。</string>
+  <string name="ringtone_error_size_too_big">文件过大:上限为%1$ikB</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">要开启此功能,Ring需要能够读取您的通讯录,请设置相应权限。</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">要开启此功能,Ring需要能够写入您的通话记录,请设置相应权限。</string>
   <!--QRCode Scan-->
+  <string name="scan_qr_account_message">扫描您想添加帐户的二维码。</string>
   <!--Settings-->
+  <string name="clear_history_dialog_title">清除历史记录吗?</string>
+  <string name="clear_history_dialog_message">该操作不可撤销。</string>
+  <string name="clear_history_completed">已清除历史记录。</string>
   <!--Conversation-->
+  <string name="conversation_action_delete_this">删除该会话</string>
+  <string name="conversation_action_delete_this_title">删除该会话吗?</string>
+  <string name="conversation_action_delete_this_message">该操作不可撤销。</string>
+  <string name="conversation_action_copy_peer_number">复制号码</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s已复制至剪贴板</string>
+  <string name="conversation_action_select_peer_number">选择一个数字</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">添加%1$s吗?</string>
+  <string name="prompt_new_password">新密码</string>
+  <string name="prompt_new_password_repeat">确认新密码</string>
+  <string name="account_create_title">创建Ring帐户</string>
+  <string name="prompt_new_username">输入新用户名</string>
+  <string name="help_password_choose">为了保护您的Ring帐户,请使用一个强密码并牢记</string>
+  <string name="help_password_enter">输入您的Ring主帐户密码</string>
+  <string name="help_pin_enter">输入另一个Ring帐户的PIN(使用“导出Ring帐户”功能获取)。</string>
+  <string name="wizard_next">下一步</string>
+  <string name="account_device_updated_message">您的Ring帐户已更新。</string>
   <!--MenuHeaderView-->
+  <string name="profile">我的帐户资料</string>
+  <string name="profile_message_warning">已与您的通讯录共享</string>
+  <string name="open_the_gallery">打开照片库</string>
+  <string name="take_a_photo">拍照</string>
+  <string name="unknowm_if_empty">未知若为空</string>
+  <string name="unknown">未知</string>
   <!--Share fragment-->
+  <string name="share_message">使用Ring扫描此二维码以建立连接。</string>
+  <string name="share_your_account_information">共享我的通讯信息</string>
+  <string name="generic_error_migration">错误</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
new file mode 100644
index 0000000..1288847
--- /dev/null
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
@@ -0,0 +1,154 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">删除</string>
+  <!--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_wait_create_details">正在创建您的帐户,请稍等…</string>
+  <string name="dialog_wait_update">更新帐户</string>
+  <string name="dialog_wait_update_details">正在更新您的帐户,请稍等…</string>
+  <string name="dialog_warn_ip2ip_account_title">要创建空的SIP帐户吗?</string>
+  <string name="dialog_warn_ip2ip_account_message">您正在创建一个主机名非法的SIP帐户。
+该帐户拨出或接听通话将只能直接通过IP地址。
+您可以稍后修改该帐户。</string>
+  <string name="help_ring">Ring帐户使您在一个完全分布式的网络中,与他人进行安全的点对点通信。</string>
+  <string name="help_sip_title">添加您的SIP帐户</string>
+  <string name="help_sip">配置已有的SIP帐户。</string>
+  <string name="create_sip_account">添加</string>
+  <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">删除帐户吗?</string>
+  <string name="account_delete_dialog_message">该操作不可撤销。</string>
+  <!--AccountManagementFragment-->
+  <string name="empty_account_list">没有已注册账户</string>
+  <string name="normal_accounts_titles">帐户</string>
+  <string name="normal_devices_titles">与该Ring帐户连接的已知设备</string>
+  <!--Basic Details-->
+  <string name="account_preferences_basic_tab">通用</string>
+  <string name="account_basic_category">基本设置</string>
+  <string name="account_alias_label">帐户名称</string>
+  <string name="account_hostname_label">主机名</string>
+  <string name="account_bootstrap_label">初始服务器</string>
+  <string name="account_username_label">用户名</string>
+  <string name="account_password_label">密码</string>
+  <string name="account_optionnal_category">可选设置</string>
+  <string name="account_useragent_label">用户代理</string>
+  <string name="account_autoanswer_label">自动应答</string>
+  <string name="account_upnp_label">启用UPnP</string>
+  <string name="account_proxy_field">代理</string>
+  <!--Audio Details-->
+  <string name="account_audio_label">音频</string>
+  <string name="account_preferences_media_tab">媒体</string>
+  <string name="account_ringtone_label">铃声</string>
+  <string name="account_ringtone_enabled_label">启用铃声</string>
+  <string name="account_ringtone_path_label">铃声目录</string>
+  <string name="account_ringtone_custom_label">使用自定义铃声</string>
+  <!--Video Details-->
+  <string name="account_video_label">视频</string>
+  <string name="account_video_enable">启用视频</string>
+  <!--Advanced Details-->
+  <string name="account_preferences_advanced_tab">高级</string>
+  <string name="account_registration_exp_label">录音过期</string>
+  <string name="account_local_interface_label">本地接口</string>
+  <string name="account_local_port_label">本地端口</string>
+  <string name="account_stun_enable_label">使用STUN</string>
+  <string name="account_stun_server_label">STUN服务器</string>
+  <string name="account_turn_enable_label">使用TURN</string>
+  <string name="account_turn_server_label">TURN服务器</string>
+  <string name="account_turn_username_label">TURN用户名</string>
+  <string name="account_turn_password_label">TURN密码</string>
+  <string name="account_published_same_as_local_label">公开参数与本地相同</string>
+  <string name="account_published_port_label">公开端口</string>
+  <string name="account_published_address_label">公开地址</string>
+  <!--Security Details-->
+  <string name="account_credentials_label">密钥</string>
+  <string name="account_credentials_edit">编辑密钥</string>
+  <string name="account_credentials_add">添加密钥</string>
+  <!--SRTP Details-->
+  <string name="account_preferences_security_tab">安全</string>
+  <!--SIP-->
+  <!--TLS Details-->
+  <string name="account_tls_transport_switch_label">使用TLS通讯</string>
+  <string name="account_tls_port_label">TLS监听端口</string>
+  <string name="account_tls_certificate_list_label">证书颁发机构</string>
+  <string name="account_tls_certificate_file_label">证书文件</string>
+  <string name="account_tls_private_key_file_label">私钥文件</string>
+  <string name="account_tls_password_label">私钥密码</string>
+  <string name="account_tls_method_label">TLS方法</string>
+  <string name="account_tls_ciphers_label">TLS加密</string>
+  <string name="account_tls_server_name_label">服务器名</string>
+  <string name="account_tls_verify_server_label">TLS验证服务器</string>
+  <string name="account_tls_verify_client_label">TLS验证客户端</string>
+  <string name="account_tls_negotiation_timeout_sec">握手超时(秒)</string>
+  <string name="account_rtp_max_port">最大</string>
+  <string name="account_rtp_min_port">最小</string>
+  <string name="account_rtp_port_range">音频RTP端口范围</string>
+  <!--restore/backup-->
+  <string name="account_restore_account">恢复帐户</string>
+  <string name="account_restore_message">请输入密码以解密该文件。</string>
+  <string name="account_restore_decryption_password">解密密码</string>
+  <string name="account_new_device_password">输入主密码以解锁帐户</string>
+  <string name="restore_dialog_title">正在恢复</string>
+  <string name="restore_backup_wait">请稍等…</string>
+  <string name="error_password_char_count">最少6字符</string>
+  <string name="error_passwords_not_equals">密码不匹配</string>
+  <string name="restore_failed_dialog_title">恢复失败</string>
+  <string name="restore_failed_dialog_msg">发生错误</string>
+  <string name="export_account_wait_title">请稍等…</string>
+  <string name="export_account_wait_message">提交新帐户信息</string>
+  <string name="account_export_end_decryption_message">使用该密码无法解锁您的帐户。</string>
+  <string name="account_export_end_network_title">网络错误</string>
+  <string name="account_export_end_network_message">无法进行帐户在线导出。请检查您的网络连接。</string>
+  <string name="account_export_end_error_title">错误</string>
+  <string name="account_export_end_error_message">无法导出帐户,发生未知错误。</string>
+  <string name="account_enter_password">输入密码</string>
+  <string name="account_contact_me">在Ring上联系我!</string>
+  <string name="update_account">更新帐户</string>
+  <string name="ring_account">Ring帐户</string>
+  <string name="account_migration_title_dialog">帐户迁移</string>
+  <string name="account_update_needed">需要更新</string>
+  <string name="account_creation_file_too_big">文件过大</string>
+  <string name="account_cannot_read">无法读取%1$s</string>
+  <string name="account_cannot_be_found_title">无法找到帐户</string>
+  <string name="account_cannot_be_found_message">无法在Ring网络中找到帐户。\n请确认该帐户已从其他设备中导出,并且您提供了正确的认证信息。</string>
+  <string name="account_no_network_title">无法连接至网络</string>
+  <string name="account_no_network_message">无法添加帐户,因为Ring未连接到网络。请检查您的网络连接。</string>
+  <string name="account_device_added_title">帐户设备已添加</string>
+  <string name="account_device_added_message">已在这台设备成功设置了您的Ring帐户。</string>
+  <string name="account_device_updated_title">帐户设备已更新</string>
+  <string name="account_link_button">将这台设备与一个帐户进行连接</string>
+  <string name="account_import_title">与已有帐户进行连接</string>
+  <string name="account_link_prompt_pin">输入PIN</string>
+  <string name="account_wizard_title">欢迎来到</string>
+  <string name="account_new_button">创建Ring帐户</string>
+  <string name="account_link_export_button">将另一台设备与该帐户进行连接</string>
+  <string name="account_link_export_info">要在其他设备上使用该帐户,您需要将其连接至Ring,在此过程中您会得到一个PIN,在10分钟内有效。请将其输入您的新设备以设置该帐户。\n\n首先,请输入您的密码:</string>
+  <string name="account_start_export_button">生成PIN</string>
+  <string name="account_end_export_button">关闭</string>
+  <string name="account_end_export_infos">您的PIN是:\n\n%%\n\n要继续,请在新设备上打开Ring,点击“将这台设备与一个帐户进行连接”。您的PIN将在10分钟内有效。</string>
+  <!--Name registration-->
+  <string name="register_name_wrong_password">无法注册用户名:帐户密码错误。</string>
+  <string name="register_name_invalid">无法注册用户名:该用户名非法。</string>
+  <string name="register_name_already_taken">无法注册用户名:该名称已被占用。</string>
+  <string name="register_name_network_error">无法注册用户名:网络或服务器错误。</string>
+  <string name="error_username_empty">输入用户名</string>
+  <string name="no_registered_name_for_account">该帐户尚未注册用户名</string>
+  <string name="register_name">注册名称</string>
+  <string name="trying_to_register_name">正在尝试注册用户名</string>
+  <string name="registered_username">已注册的用户名</string>
+  <string name="register_username">注册公共用户名(试验性)</string>
+  <string name="username_already_taken">用户名已被占用</string>
+  <string name="invalid_username">非法用户名</string>
+  <string name="looking_for_username_availability">正在检测用户名是否可用…</string>
+  <string name="account_status_connecting">正在连接</string>
+  <string name="account_status_unknown">未知</string>
+  <!--Create account-->
+  <string name="account_creation_home">欢迎来到Ring</string>
+  <string name="account_creation_profile">创建您的帐户资料</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_call.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_call.xml
new file mode 100644
index 0000000..addfd00
--- /dev/null
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_call.xml
@@ -0,0 +1,44 @@
+<?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_ringing">正在通话</string>
+    <string name="call_human_state_current">正在通话</string>
+    <string name="call_human_state_hungup">结束</string>
+    <string name="call_human_state_busy">忙碌</string>
+    <string name="call_human_state_failure">失败</string>
+    <string name="call_human_state_hold">等待</string>
+    <string name="call_human_state_unhold">取消等待</string>
+    <string name="call_human_state_over">已结束</string>
+    <string name="call_human_state_none">无</string>
+    <!-- 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>
+    <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-rCN/strings_preferences.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
new file mode 100644
index 0000000..4eccd31
--- /dev/null
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
@@ -0,0 +1,17 @@
+<?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_mobileData_summary">允许Ring使用3G/LTE网络</string>
+  <string name="pref_systemContacts_title">使用系统通讯录</string>
+  <string name="pref_systemContacts_summary">使用系统通讯录显示呼叫者信息。</string>
+  <string name="pref_systemDialer_title">使用Ring拨打系统通话</string>
+  <string name="pref_systemDialer_summary">使用Ring作为拨打系统通话的首选方式。</string>
+  <string name="pref_startOnBoot_title">启动时运行Ring</string>
+  <string name="pref_startOnBoot_summary">系统启动时在后台启动Ring</string>
+  <string name="pref_clearHistory_title">清除历史记录</string>
+  <string name="pref_clearHistory_summary">清除所有会话历史记录。该操作无法撤销。</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings.xml b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
index 2e3ad0f..0db7ea5 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="section_license">許可證</string>
   <string name="sponsor_section">Ring 是一個自由軟體開發並支援由</string>
   <string name="copyright_section">版權</string>
   <string name="contribute_section">貢獻</string>
@@ -63,6 +62,7 @@
   <string name="message_sending">正在傳送訊息...</string>
   <string name="time_just_now">剛剛</string>
   <!--MediaPreferenceFragment-->
+  <string name="ringtone_error_title">錯誤</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
@@ -83,5 +83,7 @@
   <string name="prompt_new_password">新密碼</string>
   <string name="account_create_title">建立一個 Ring 帳號</string>
   <!--MenuHeaderView-->
+  <string name="unknown">未知</string>
   <!--Share fragment-->
+  <string name="generic_error_migration">錯誤</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
index cbc8dc6..933f9be 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
@@ -1,13 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">刪除</string>
   <!--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_wait_create_details">正在加入你的新帳號,請稍等...</string>
+  <string name="dialog_wait_update">正在更新帳號</string>
+  <string name="dialog_wait_update_details">正在更新你的新帳號,請稍等...</string>
   <string name="dialog_warn_ip2ip_account_title">建立空的 SIP 帳號嗎?</string>
   <string name="help_sip_title">加入你的 SIP 帳號</string>
   <string name="help_sip">配製一個存在的 SIP 帳號。</string>
@@ -18,6 +24,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">沒有註冊的帳號</string>
   <string name="normal_accounts_titles">帳號</string>
+  <string name="normal_devices_titles">連結到這個 Ring 帳號的已知裝置</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">一般</string>
   <string name="account_basic_category">基本設定</string>
@@ -34,6 +41,7 @@
   <string name="account_ringtone_label">鈴聲</string>
   <string name="account_ringtone_enabled_label">啟用鈴聲</string>
   <string name="account_ringtone_path_label">鈴聲路徑</string>
+  <string name="account_ringtone_custom_label">使用自訂鈴聲</string>
   <!--Video Details-->
   <string name="account_video_label">視訊</string>
   <string name="account_video_enable">啟用視訊</string>
@@ -55,12 +63,35 @@
   <string name="account_rtp_min_port">最小值</string>
   <string name="account_rtp_port_range">音訊 RTP 連接埠範圍</string>
   <!--restore/backup-->
+  <string name="account_restore_account">還原帳號</string>
   <string name="account_restore_message">輸入密碼來解密檔案。</string>
   <string name="account_restore_decryption_password">解密密碼</string>
+  <string name="restore_dialog_title">還原中...</string>
   <string name="restore_backup_wait">請等待...</string>
   <string name="error_password_char_count">最小6個字元</string>
   <string name="error_passwords_not_equals">密碼不相符</string>
+  <string name="restore_failed_dialog_title">還原失敗</string>
   <string name="restore_failed_dialog_msg">發生錯誤</string>
+  <string name="export_account_wait_title">請等待...</string>
+  <string name="account_export_end_network_title">網路錯誤</string>
+  <string name="account_export_end_error_title">錯誤</string>
+  <string name="account_enter_password">輸入密碼</string>
+  <string name="update_account">更新帳號</string>
+  <string name="ring_account">Ring 帳號</string>
+  <string name="account_update_needed">需要更新</string>
+  <string name="account_creation_file_too_big">檔案太大</string>
+  <string name="account_cannot_read">無法讀取 %1$s</string>
+  <string name="account_cannot_be_found_title">找不到帳號</string>
+  <string name="account_no_network_title">無法連接到網路</string>
+  <string name="account_device_added_message">你已經在這個裝置上成功設定你的 Ring 帳號。</string>
+  <string name="account_link_button">連結這個裝置到一個帳號</string>
+  <string name="account_import_title">連結到一個已存在的帳號</string>
   <string name="account_new_button">建立一個 Ring 帳號</string>
+  <string name="account_end_export_button">關閉</string>
   <!--Name registration-->
+  <string name="error_username_empty">輸入使用者名稱</string>
+  <string name="invalid_username">無效的使用者名稱</string>
+  <string name="account_status_connecting">連接中</string>
+  <string name="account_status_unknown">未知</string>
+  <!--Create account-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
index e32701f..dc2ad69 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
@@ -5,6 +5,7 @@
   <string name="pref_category_system">系統</string>
   <string name="pref_category_privacy">隱私</string>
   <string name="pref_mobileData_title">行動數據</string>
+  <string name="pref_mobileData_summary">除了 Wi-Fi 之外,允許 Ring 在 3G/LTE 網路上使用</string>
   <string name="pref_systemContacts_title">使用系統聯絡人</string>
   <string name="pref_startOnBoot_title">開機時啟動 Ring</string>
   <string name="pref_startOnBoot_summary">開機時在背景啟動 Ring</string>
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 36706bc..e5c3d9d 100644
--- a/ring-android/app/src/main/res/values-zh/strings.xml
+++ b/ring-android/app/src/main/res/values-zh/strings.xml
@@ -28,6 +28,7 @@
   <!--Conversation-->
   <string name="conversation_action_copy_peer_number">複製號碼</string>
   <!--Contacts-->
+  <string name="wizard_next">下一步</string>
   <!--MenuHeaderView-->
   <string name="unknown">未知</string>
   <!--Share fragment-->
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 e6235de..9011595 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
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">刪除</string>
   <!--Strings related to account creation-->
   <string name="prompt_alias">別名</string>
   <string name="prompt_hostname">主機名稱</string>
@@ -33,4 +35,7 @@
   <!--TLS Details-->
   <!--restore/backup-->
   <!--Name registration-->
+  <string name="account_status_unknown">未知</string>
+  <!--Create account-->
+  <string name="account_creation_home">歡迎使用Ring</string>
 </resources>