diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 988b7fa32..1060a1eab 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -17,6 +17,7 @@
   <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">اسم المستخدم</string>
+  <string name="phone_number">رقم الهاتف</string>
   <string name="display_name">الاسم المعروض</string>
   <string name="password">كلمة السر</string>
   <string name="confirm_password">تأكيد كلمة السر</string>
@@ -40,27 +41,24 @@
   <string name="connect">الاتصال</string>
   <string name="decline">رفض</string>
   <string name="conference">اجتماع</string>
+  <string name="no">لا</string>
+  <string name="ok">موافق</string>
+  <string name="yes">نعم</string>
   <!--Launch screen-->
   <string name="app_description">‫الزبون SIP <i>الحر</i>‬</string>
   <!--Assistant-->
   <string name="welcome">مرحبا</string>
   <string name="assistant">المرشد</string>
   <string name="assistant_create_account">إنشاء الحساب</string>
+  <string name="assistant_continue">استمرار</string>
   <string name="assistant_finish">أنهِ التهئية</string>
-  <string name="assistant_validate_account">لقد أُنشِيء حسابك. يُرجى الاطلاع على رسائل بريدك الإلكتروني لتأكيد حسابك. حالما تنتهي من ذلك، عُد إلى هنا واضغط على الزر.</string>
-  <string name="assistant_welcome_desc">سيمكنك هذا المرشد من إعداد حساب SIP لإجراء المكالمات.</string>
-  <string name="assistant_linphone_login_desc">أدخِل اسم المستخدم وكلمة السر لحساب لِنْفُونْ</string>
-  <string name="assistant_login_desc">‫أدخِل اسم المستخدم وكلمة السر الحساب مع نطاق SIP‬</string>
   <string name="assistant_remote_provisioning_desc">يٌرجى إدخال عنوان التهئية البعيدة</string>
   <string name="transport">النقل</string>
   <string name="assistant_login_linphone">استخدم حساب لِنْفُونْ</string>
   <string name="assistant_login_generic">استخدم حساب SIP</string>
   <string name="assistant_remote_provisioning">اجذب التهيئة البعيدة</string>
-  <string name="assistant_create_account_part_1">1/2</string>
-  <string name="assistant_create_account_part_2">2/2</string>
   <string name="assistant_display_name_optional">الاسم المعروض (اختياري)</string>
-  <string name="assistant_linphone_account">هيِّءْ حساب لِنْفُونْ</string>
-  <string name="assistant_generic_account">هيِّءْ حساب SIP</string>
+  <string name="assistant_generic_account">استخدم حساب SIP</string>
   <string name="assistant_remote_provisioning_title">اجذب التهيئة البعيدة</string>
   <string name="assistant_fetch_apply">اجذبْ وطبِّق</string>
   <string name="assistant_login">الولوج</string>
@@ -78,6 +76,8 @@
   <string name="wizard_passwords_unmatched">كلمتا السر غير متطابقتين.</string>
   <string name="setup_confirm_username">سيكون اسم المستخدم هو %s.\r\n\r\nقد يختلف عما أدخلته ليوافق المعايير.\r\nأتقبل ذلك ؟</string>
   <string name="first_launch_no_login_password">يُرجى إدخال اسم المستخدم وكلمة السر</string>
+  <!--Status-->
+  <!--In-app-->
   <!--Dailer-->
   <string name="address_bar_hint">أدخل رقما أو عنوانا</string>
   <!--History-->
@@ -92,7 +92,6 @@
   <string name="delete_contacts">أتود حذف جهات الاتصال المحددة ؟</string>
   <string name="delete_contact">أتود حذف جهة الاتصال المحددة ؟</string>
   <string name="sip_address">عنوان SIP</string>
-  <string name="phone_number">رقم الهاتف</string>
   <string name="contact_first_name">اﻹسم</string>
   <string name="contact_last_name">اللقب</string>
   <!--Chat-->
@@ -137,7 +136,6 @@
   <string name="call_stats_upload">صبيب الرفع :</string>
   <string name="call_stats_download">صبيب التنزيل :</string>
   <string name="call_stats_ice">توصيل ICE :</string>
-  <string name="call_stats_video_resolution">مقاس الفيديو :</string>
   <string name="call">المكالمة</string>
   <!--About-->
   <string name="menu_send_log">إرسال السجل</string>
@@ -238,8 +236,6 @@
   <string name="pref_video_codecs_title">المراميز</string>
   <!--Call settings-->
   <string name="pref_call_title">المكالمة</string>
-  <string name="pref_rfc2833_dtmf">إرسال RFC2833 DTMFs</string>
-  <string name="pref_sipinfo_dtmf">إرسال SIP INFO DTMFs</string>
   <string name="pref_voice_mail">عنوان العلبة الصوتية</string>
   <!--Chat settings-->
   <string name="pref_chat_title">المحادثة</string>
@@ -321,6 +317,7 @@
   <string name="content_description_message_status">حالة الرسالة</string>
   <string name="content_description_conference">اجتماع</string>
   <string name="content_description_username_field">حقل اسم المستخدم</string>
+  <string name="content_description_activation_code_field">حقل اسم المستخدم</string>
   <string name="content_description_display_field">اعرض حقل الاسم</string>
   <string name="content_description_domain_field">حقل النطاق</string>
   <string name="content_description_url_field">حقل التهيئة البعيدة</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1de2040ab..5ff051b21 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -16,11 +16,14 @@
   <string name="sync_account_name">Linphone-Kontakte</string>
   <string name="history_date_format">EEE, t MMM</string>
   <string name="history_detail_date_format">jjjj/MM/tt - HH:mm - </string>
+  <string name="inapp_popup_date_format">jjjj/MM/tt</string>
+  <string name="inapp_popup_date_day">tt</string>
   <string name="messages_date_format">tt/MM, HH:mm</string>
   <string name="messages_list_date_format">tt/MM</string>
   <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">Benutzername</string>
+  <string name="phone_number">Telefonnummer</string>
   <string name="display_name">Anzeigename</string>
   <string name="password">Passwort</string>
   <string name="confirm_password">Passwortbestätigung</string>
@@ -44,33 +47,38 @@
   <string name="connect">Verbindung</string>
   <string name="decline">Ablehnen</string>
   <string name="conference">Konferenz</string>
+  <string name="link">Link</string>
+  <string name="maybe_later">Vielleicht später</string>
+  <string name="later">Später</string>
+  <string name="no">Nein</string>
+  <string name="ok">OK</string>
+  <string name="yes">Ja</string>
+  <string name="link_account">Verknüpfen Sie Ihr Konto</string>
   <!--Launch screen-->
   <string name="app_description">der <i>freie</i> SIP-Client</string>
   <!--Assistant-->
   <string name="welcome">Willkommen</string>
   <string name="assistant">Assistent</string>
   <string name="assistant_create_account">Konto erstellen</string>
+  <string name="assistant_link_account">Konto verknüpfen</string>
+  <string name="assistant_continue">Fortsetzen</string>
+  <string name="assistant_activate">Aktivieren Sie Ihr Konto</string>
   <string name="assistant_finish">Konfiguration fertigstellen</string>
-  <string name="assistant_validate_account">Ihr Konto ist erstellt. Bitte überprüfen Sie Ihre E-Mails, um Ihr Konto zu bestätigen. Sobald das gemacht ist, kommen Sie hierher zurück und klicken Sie auf die Schaltfläche.</string>
-  <string name="assistant_welcome_desc">Dieser Assistent wird Ihnen dabei helfen, ein SIP-Konto für Ihre Anrufe zu verwenden.</string>
-  <string name="assistant_linphone_login_desc">Geben Sie Ihren Benutzernamen und Passwort des Linphone-Kontos ein</string>
-  <string name="assistant_login_desc">Geben Sie Ihren Benutzernamen und Passwort mit Ihrer SIP-Domäne ein</string>
   <string name="assistant_remote_provisioning_desc">Bitte geben Sie eine Bereitstellungs-URL an</string>
   <string name="transport">Transport</string>
+  <string name="assistant_create_account_phone_number_address">Ihre SIP-Adresse ist</string>
   <string name="assistant_login_linphone">Linphone-Konto verwenden</string>
   <string name="assistant_login_generic">SIP-Konto verwenden</string>
   <string name="assistant_remote_provisioning">Fernkonfiguration abrufen</string>
-  <string name="assistant_create_account_part_1">1/2</string>
-  <string name="assistant_create_account_part_2">2/2</string>
   <string name="assistant_display_name_optional">Anzeigename (optional)</string>
-  <string name="assistant_linphone_account">Linphone-Konto konfigurieren</string>
-  <string name="assistant_generic_account">SIP-Konto konfigurieren</string>
+  <string name="assistant_generic_account">SIP-Konto verwenden</string>
   <string name="assistant_remote_provisioning_title">Fernkonfiguration abrufen</string>
   <string name="assistant_fetch_apply">Abrufen und anwenden</string>
   <string name="assistant_login">Anmelden</string>
   <string name="assistant_ec_calibration">Echounterdrückungskalibrierung läuft</string>
   <string name="assistant_remote_provisioning_login">Geben Sie Ihre Anmeldung ein</string>
   <string name="assistant_account_not_validated">Ihr Konto wurde noch nicht überprüft.</string>
+  <string name="assistant_error_confirmation_code">Der Bestätigungscode ist ungültig.\r\nBitte überprüfen Sie Ihre SMS und versuchen Sie es erneut.</string>
   <string name="assistant_account_validated">Ihr Konto wurde überprüft.</string>
   <string name="assistant_error_bad_credentials">Falscher Benutzername oder Passwort</string>
   <string name="assistant_codec_down_question">Sind Sie mit dem Herunterladen des OpenH264-Videocodecs, bereitgestellt von Cisco Systems, Inc., einverstanden?</string>
@@ -80,12 +88,39 @@
   <string name="wizard_server_unavailable">Server nicht erreichbar, überprüfen Sie Ihre Netzwerkverbindung.</string>
   <string name="wizard_username_unavailable">Der Benutzername wird bereits verwendet.</string>
   <string name="wizard_username_incorrect">Ihr Benutzername ist ungültig.</string>
+  <string name="assistant_phone_number_incorrect">Ihre Telefonnummer ist ungültig.</string>
   <string name="wizard_email_incorrect">Ihre E-Mail-Adresse ist ungültig.</string>
   <string name="wizard_password_incorrect">Ihr Passwort ist ungültig.</string>
   <string name="wizard_passwords_unmatched">Passwörter stimmen nicht überein.</string>
   <string name="setup_confirm_username">Ihr Benutzername wird %s sein.\r\n\r\nIt kann von Ihrer Eingabe abweichen, um Anforderungen zu entsprechen.\r\nNehmen Sie an?</string>
   <string name="first_launch_no_login_password">Bitte geben Sie Ihren Benutzername und Ihr Passwort ein</string>
   <string name="forgot_password">Passwort vergessen?</string>
+  <string name="assistant_choose_country">Wählen Sie ein Land aus</string>
+  <string name="select_your_country">Wählen Sie Ihr Land aus</string>
+  <string name="country_code">(%s)</string>
+  <string name="use_email_for_validation">E-Mail-Adresse für Kontobestätigung verwenden</string>
+  <string name="phone_number_info_title">Wozu wird meine Telefonnummer verwendet?</string>
+  <!--Status-->
+  <string name="invalid_email">Ungültige E-Mail-Adresse</string>
+  <string name="account_already_exist">Konto bereits vorhanden</string>
+  <string name="phone_number_not_exist">Dieses Konto ist nicht vorhanden</string>
+  <string name="invalid_username">Ungültiger Benutzername</string>
+  <string name="invalid_domain">Ungültige Domain</string>
+  <string name="invalid_route">Ungültige Route</string>
+  <string name="invalid_display_name">Ungültiger Anzeigename</string>
+  <string name="username_too_short">Benutzername zu kurz</string>
+  <string name="username_too_long">Benutzername zu lang</string>
+  <string name="username_invalid_size">Benutzernamenlänge ungültig</string>
+  <string name="phone_number_too_long">Telefonnummer zu lang</string>
+  <string name="phone_number_too_short">Telefonnummer zu kurz</string>
+  <string name="phone_number_invalid">Ungültige Telefonnummer</string>
+  <string name="password_too_short">Passwort zu kurz</string>
+  <string name="password_too_long">Passwort zu lang</string>
+  <string name="transport_unsupported">Nicht unterstützter Transport</string>
+  <string name="country_code_invalid">Landesvorwahl ungültig</string>
+  <!--In-app-->
+  <string name="inapp">In-App</string>
+  <string name="inapp_notification_title">In-App-Kauf</string>
   <!--Dailer-->
   <string name="address_bar_hint">Geben Sie eine Nummer oder eine Adresse ein</string>
   <!--History-->
@@ -100,7 +135,6 @@
   <string name="delete_contacts">Möchten Sie die ausgewählten Kontakte löschen?</string>
   <string name="delete_contact">Möchten Sie den ausgewählten Kontakt löschen?</string>
   <string name="sip_address">SIP-Adresse</string>
-  <string name="phone_number">Telefonnummer</string>
   <string name="contact_first_name">Vorname</string>
   <string name="contact_last_name">Nachname</string>
   <string name="contact_organization">Organisation</string>
@@ -143,10 +177,16 @@
   <string name="call_stats_audio">Audio</string>
   <string name="call_stats_video">Video</string>
   <string name="call_stats_codec">Codec:</string>
+  <string name="call_stats_ip">Afinet:</string>
   <string name="call_stats_upload">Upload-Bandbreite:</string>
   <string name="call_stats_download">Download-Bandbreite:</string>
   <string name="call_stats_ice">ICE-Konnektivität:</string>
-  <string name="call_stats_video_resolution">Videogröße:</string>
+  <string name="call_stats_video_resolution_sent">Gesendete Videoauflösung:</string>
+  <string name="call_stats_video_resolution_received">Empfangene Videoauflösung:</string>
+  <string name="call_stats_sender_loss_rate">Senderverlustrate:</string>
+  <string name="call_stats_receiver_loss_rate">Empfängerverlustrate:</string>
+  <string name="call_stats_encoder_name">Kodierer:</string>
+  <string name="call_stats_decoder_name">Dekodierer:</string>
   <string name="call">Anruf</string>
   <!--About-->
   <string name="menu_send_log">Protokoll senden</string>
@@ -157,12 +197,15 @@
   <string name="incall_notif_video">Video-Anruf fortsetzen</string>
   <string name="notification_started">begonnen</string>
   <string name="unread_messages">%i ungelesene Nachrichten</string>
+  <string name="missed_calls_notif_title">Verpasster Anruf</string>
+  <string name="missed_calls_notif_body">%i verpasste Anrufe</string>
   <!--Errors-->
   <string name="skipable_error_service_not_ready">Warnung: Dienst ist nicht bereit</string>
   <string name="error">Fehler</string>
   <string name="warning_wrong_destination_address">Kann Zieladresse aus %s nicht bauen</string>
   <string name="error_unknown">Unbekannter Fehler</string>
   <string name="error_call_declined">Anruf abgelehnt</string>
+  <string name="error_user_busy">Benutzer beschäftigt</string>
   <string name="error_user_not_found">Benutzer nicht gefunden</string>
   <string name="error_incompatible_media">Inkompatible Medienparameter</string>
   <string name="error_low_bandwidth">Ihr Partner hat eine niedrige Bandbreite, Video kann nicht gestartet werden</string>
@@ -193,6 +236,7 @@
   <string name="pref_avpf_rr_interval"> AVPF Standard RTCP Interval in Sekunden (zwischen 1 und 5)</string>
   <string name="pref_escape_plus">Ersetzen + durch 00</string>
   <string name="pref_friendlist_subscribe">Freundesliste abonnieren</string>
+  <string name="pref_link_account">Verknüpfen Sie Ihr Konto</string>
   <string name="pref_auth_userid">Authentifizierungs-Benutzerkennung</string>
   <string name="pref_help_auth_userid">Authentifizierungs-Benutzerkennung eingeben (optional)</string>
   <string name="pref_display_name">Anzeigename</string>
@@ -227,6 +271,7 @@
   <string name="pref_echo_cancellation">Echounterdrückung</string>
   <string name="pref_echo_cancellation_summary">Entfernt das Echo, das am anderen Ende gehört wird</string>
   <string name="pref_echo_canceller_calibration">Echounterdrückungskalibrierung</string>
+  <string name="pref_echo_tester">Echo testen</string>
   <string name="ec_calibrating">Kalibrierung...</string>
   <string name="ec_calibrated">Kalibriert in %s ms</string>
   <string name="no_echo">Kein Echo</string>
@@ -252,8 +297,6 @@
   <string name="pref_call_title">Anruf</string>
   <string name="pref_device_ringtone">Geräteklingelton verwenden</string>
   <string name="pref_auto_answer">Eingehende Anrufe automatisch beantworten</string>
-  <string name="pref_rfc2833_dtmf">RFC2833 DTMFs senden</string>
-  <string name="pref_sipinfo_dtmf">SIP INFO DTMFs senden</string>
   <string name="pref_voice_mail">Sprachnachricht-URI</string>
   <!--Chat settings-->
   <string name="pref_chat_title">Nachrichten</string>
@@ -266,8 +309,11 @@
   <!--Network settings-->
   <string name="pref_network_title">Netzwerk</string>
   <string name="pref_wifi_only">Nur WiFi verwenden</string>
+  <string name="pref_stun_server">STUN / TURN-Server</string>
   <string name="pref_ice_enable">ICE aktivieren</string>
   <string name="pref_turn_enable">TURN aktivieren</string>
+  <string name="pref_turn_username_title">STUN / TURN-Benutzername (optional)</string>
+  <string name="pref_turn_passwd_title">STUN / TURN-Passwort (optional)</string>
   <string name="pref_upnp_enable">UPNP aktivieren</string>
   <string name="pref_transport_use_random_ports">Zufällige Ports verwenden</string>
   <string name="pref_sip_port_title">Zu benutzender SIP-Port</string>
@@ -324,6 +370,7 @@
   <string name="content_description_new_discussion">Neue Diskussion</string>
   <string name="content_description_search">Suchen</string>
   <string name="content_description_search_contact">Kontakt suchen</string>
+  <string name="content_description_search_country">Land suchen</string>
   <string name="content_description_all_contacts">Alle Kontakte</string>
   <string name="content_description_linphone_contacts">Linphone-Kontakte</string>
   <string name="content_description_call_direction">Anrufrichtung</string>
@@ -343,6 +390,8 @@
   <string name="content_description_message_status">Nachrichtenstatus</string>
   <string name="content_description_conference">Konferenz</string>
   <string name="content_description_username_field">Benutzernamenfeld</string>
+  <string name="content_description_activation_code_field">Benutzernamenfeld</string>
+  <string name="content_description_phone_number_field">Telefonnummernfeld</string>
   <string name="content_description_display_field">Anzeigenamenfeld</string>
   <string name="content_description_domain_field">Domänenfeld</string>
   <string name="content_description_url_field">Fernbereitstellungsfeld</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a0da56384..534b9272f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -11,6 +11,7 @@
   <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">Nombre de usuario</string>
+  <string name="phone_number">Número de teléfono</string>
   <string name="display_name">Nombre a mostrar</string>
   <string name="password">Contraseña</string>
   <string name="delete">Borrar</string>
@@ -25,15 +26,20 @@
   <string name="settings">Configuración</string>
   <string name="decline">Declinar</string>
   <string name="conference">Conferencia</string>
+  <string name="no">No</string>
+  <string name="ok">Ok</string>
+  <string name="yes">Si</string>
   <!--Launch screen-->
   <!--Assistant-->
-  <string name="assistant_welcome_desc">Este asistente te ayudará a usar una cuanta SIP para tus llamadas.</string>
+  <string name="assistant_continue">Continuar</string>
   <string name="transport">Transporte</string>
   <string name="assistant_account_not_validated">Su cuenta aún no ha sido verificada.</string>
   <string name="assistant_account_validated">Su cuenta ha sido verificada.</string>
   <string name="wizard_failed">Ha ocurrido un error, pruebe más tarde.</string>
   <string name="wizard_username_unavailable">Este nombre de usuario está en uso.</string>
   <string name="first_launch_no_login_password">Por favor, introduzca su usuario y contraseña</string>
+  <!--Status-->
+  <!--In-app-->
   <!--Dailer-->
   <!--History-->
   <string name="today">Hoy</string>
@@ -42,7 +48,6 @@
   <string name="no_contact">No hay contactos en su agenda de contactos.</string>
   <string name="no_sip_contact">No hay contactos SIP en su agenda de contactos.</string>
   <string name="sip_address">Dirección SIP</string>
-  <string name="phone_number">Número de teléfono</string>
   <string name="contact_first_name">Nombre</string>
   <string name="contact_last_name">Apellido</string>
   <!--Chat-->
@@ -71,7 +76,6 @@
   <string name="call_stats_upload">Ancho de banda de subida:</string>
   <string name="call_stats_download">Ancho de banda de bajada:</string>
   <string name="call_stats_ice">Conectividad ICE</string>
-  <string name="call_stats_video_resolution">Tamaño de vídeo:</string>
   <string name="call">Llamar</string>
   <!--About-->
   <string name="menu_send_log">Enviar registro</string>
@@ -145,7 +149,6 @@
   <string name="pref_video_codecs_title">Codecs</string>
   <!--Call settings-->
   <string name="pref_call_title">Llamar</string>
-  <string name="pref_rfc2833_dtmf">Enviar DTMS RFC2833</string>
   <!--Chat settings-->
   <string name="pref_chat_title">Chat</string>
   <!--Network settings-->
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 69c54a224..3738405b2 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -17,6 +17,7 @@
   <string name="today_date_format">TT:mm esim. 11:11</string>
   <!--Common-->
   <string name="username">Käyttäjätunnus</string>
+  <string name="phone_number">Puhelin numero</string>
   <string name="display_name">Näytä nimi</string>
   <string name="password">Salasana</string>
   <string name="confirm_password">Salasanan vahvistus</string>
@@ -40,25 +41,22 @@
   <string name="connect">Yhteys</string>
   <string name="decline">Hylkää</string>
   <string name="conference">Kokous</string>
+  <string name="no">Ei</string>
+  <string name="ok">Ok</string>
+  <string name="yes">Kyllä</string>
   <!--Launch screen-->
   <!--Assistant-->
   <string name="welcome">Tervetuloa</string>
   <string name="assistant">Avustaja</string>
   <string name="assistant_create_account">Luo tili</string>
-  <string name="assistant_validate_account">Antamaasi osoitteeseen on lähetetty sähköposti. Avaa viestiss oleva linkki aktivoidaksesi tilin. Kun olet valmis, palaa ja paina painiketta.</string>
-  <string name="assistant_welcome_desc">Tämä avustaja auttaa sinua käyttämään SIP tiliä puheluissasi.</string>
-  <string name="assistant_linphone_login_desc">Anna linphone.org tilisi käyttäjätunnus ja salasana</string>
-  <string name="assistant_login_desc">Anna sinun käyttäjätunnus ja salasana ja SIP verkkotunnus eli domain</string>
+  <string name="assistant_continue">Jatka</string>
   <string name="assistant_remote_provisioning_desc">Anna puhelun yhteyden luomistietojen url-osoite</string>
   <string name="transport">Siirrä</string>
   <string name="assistant_login_linphone">Käytä Linphone tiliä</string>
   <string name="assistant_login_generic">Käytä SIP tiliä</string>
   <string name="assistant_remote_provisioning">Hae etäsäädöt</string>
-  <string name="assistant_create_account_part_1">1/2</string>
-  <string name="assistant_create_account_part_2">2/2</string>
   <string name="assistant_display_name_optional">Näyttö nimi (vainnainen)</string>
-  <string name="assistant_linphone_account">Muokkaa Linphone tiliä</string>
-  <string name="assistant_generic_account">Muokkaa SIP tiliä</string>
+  <string name="assistant_generic_account">Käytä SIP tiliä</string>
   <string name="assistant_remote_provisioning_title">Hae etäsäädöt</string>
   <string name="assistant_fetch_apply">Hae ja käytä</string>
   <string name="assistant_login">Kirjaudu sisään</string>
@@ -75,6 +73,8 @@
   <string name="wizard_passwords_unmatched">Antamasi salasanat ovat erillaiset.</string>
   <string name="setup_confirm_username">Sinun käyttäjätunnus tulee olemaan %s.\r\n\r\nIt voiden muuttua, jotta vaatiukset täyttyisivät .\r\nHyväksytkö?</string>
   <string name="first_launch_no_login_password">Anna käyttäjätunnus ja salasana</string>
+  <!--Status-->
+  <!--In-app-->
   <!--Dailer-->
   <string name="address_bar_hint">Anna numero tai osoite</string>
   <!--History-->
@@ -89,7 +89,6 @@
   <string name="delete_contacts">Haluatko poistaa valitun yhteystiedon?</string>
   <string name="delete_contact">Haluatko poistaa valitun yhteystiedon?</string>
   <string name="sip_address">SIP osoite</string>
-  <string name="phone_number">Puhelin numero</string>
   <string name="contact_first_name">Etunimi</string>
   <string name="contact_last_name">Sukunimi</string>
   <!--Chat-->
@@ -134,7 +133,6 @@
   <string name="call_stats_upload">Lähetyskaistanleveys:</string>
   <string name="call_stats_download">Latauskaistanleveys:</string>
   <string name="call_stats_ice">ICE yhdistettävyys:</string>
-  <string name="call_stats_video_resolution">Videon koko:</string>
   <string name="call">Puhelu</string>
   <!--About-->
   <string name="menu_send_log">Lähetä loki</string>
@@ -235,8 +233,6 @@
   <string name="pref_video_codecs_title">Kodekit</string>
   <!--Call settings-->
   <string name="pref_call_title">Puhelu</string>
-  <string name="pref_rfc2833_dtmf">Lähetä RFC2833 DTMFs</string>
-  <string name="pref_sipinfo_dtmf">Lähetä SIP INFO DTMFs</string>
   <string name="pref_voice_mail">Ääni postin URI-osoite</string>
   <!--Chat settings-->
   <string name="pref_chat_title">Keskustelu</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3a797a69f..3cd3d3238 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -16,11 +16,14 @@
   <string name="sync_account_name">contacts linphone</string>
   <string name="history_date_format">EEE, d MMM</string>
   <string name="history_detail_date_format">dd/MM/yyy - HH:mm -</string>
+  <string name="inapp_popup_date_format">yyyy/MM/dd</string>
+  <string name="inapp_popup_date_day">dd</string>
   <string name="messages_date_format">dd/MM, HH:mm</string>
   <string name="messages_list_date_format">dd/MM</string>
   <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">Nom d\'utilisateur</string>
+  <string name="phone_number">Numéro de téléphone</string>
   <string name="display_name">Nom d\'affichage</string>
   <string name="password">Mot de passe</string>
   <string name="confirm_password">Confirmation du mot de passe</string>
@@ -44,28 +47,38 @@
   <string name="connect">Connexion</string>
   <string name="decline">Refuser</string>
   <string name="conference">Conférence</string>
+  <string name="link">Associer</string>
+  <string name="maybe_later">Plus tard</string>
+  <string name="later">Plus tard</string>
+  <string name="no">Non</string>
+  <string name="ok">Ok</string>
+  <string name="yes">Oui</string>
+  <string name="link_account">Associer votre compte</string>
   <!--Launch screen-->
   <string name="app_description">le client SIP <i>libre</i></string>
   <!--Assistant-->
   <string name="welcome">Bienvenue</string>
   <string name="assistant">Assistant</string>
   <string name="assistant_create_account">Créer un compte</string>
-  <string name="assistant_link_account">Associer un compte</string>
+  <string name="assistant_link_account">Associer votre compte</string>
+  <string name="assistant_continue">Continuer</string>
+  <string name="assistant_activate">Activer votre compte</string>
   <string name="assistant_finish">Terminer la configuration</string>
-  <string name="assistant_validate_account_1">Votre compte a été créé. Vérifiez vos emails pour valider votre compte:</string>
-  <string name="assistant_validate_account_2">Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
-  <string name="assistant_welcome_desc">Cet assistant va vous guider pour réaliser des appels à l\'aide d\'un compte SIP.</string>
-  <string name="assistant_linphone_login_desc">Entrez le nom d\'utilisateur et mot de passe de votre compte Linphone.</string>
-  <string name="assistant_login_desc">Entrer votre nom d\'utilisateur et mot de passe ainsi que votre domaine SIP</string>
+  <string name="assistant_validate_account_1">Nous avons envoyé un mail avec un code d\'activation au mail :</string>
+  <string name="assistant_validate_account_2">Pour valider votre compte veuillez suivre les instructions du mail et cliquez sur le bouton.</string>
+  <string name="assistant_welcome_desc">Cet assistant va vous aider à configurer et utiliser votre compte SIP.</string>
+  <string name="assistant_linphone_login_desc">Veuillez saisir votre nom d\'utilisateur et votre mot de passe de votre compte Linphone</string>
+  <string name="assistant_login_desc">Veuillez saisir votre nom d\'utilisateur et votre mot de passe avec le domaine SIP</string>
   <string name="assistant_remote_provisioning_desc">Veuillez fournir votre URL de configuration.</string>
   <string name="transport">Transport</string>
-  <string name="assistant_create_account_phone_number_address">Votre address SIP est</string>
+  <string name="assistant_create_account_phone_number_address">Votre adresse SIP sera</string>
   <string name="assistant_login_linphone">Utiliser un compte Linphone</string>
   <string name="assistant_login_generic">Utiliser un compte SIP</string>
   <string name="assistant_remote_provisioning">Télécharger la configuration</string>
-  <string name="assistant_create_account_part_1">Merci de confirmer votre code de pays et de rentrer votre numéro de téléphone</string>
-  <string name="assistant_create_account_part_2">Nous vous avons envoyé un SMS avec un code de validation au numéro :</string>
-  <string name="assistant_create_account_part_3">Pour complèter la vérification de votre numéro de téléphone, veuillez entrer les 4 chiffres du code en dessous:\n</string>
+  <string name="assistant_create_account_part_1">Confirmez l\'indicatif téléphonique de votre pays et saisissez votre numéro de téléphone</string>
+  <string name="assistant_create_account_part_2">Nous avons envoyé un SMS avec un code d\'activation au numéro :</string>
+  <string name="assistant_create_account_part_3">Pour valider votre numéro veuillez enter le code à 4 chiffres ci-dessous :</string>
+  <string name="assistant_create_account_part_email">Veuillez saisir un nom d\'utilisateur, un mail et un mot de passe pour votre compte Linphone</string>
   <string name="assistant_display_name_optional">Nom d\'affichage (optionnel)</string>
   <string name="assistant_linphone_account">Utiliser un compte Linphone</string>
   <string name="assistant_generic_account">Utiliser un compte SIP</string>
@@ -75,6 +88,7 @@
   <string name="assistant_ec_calibration">Calibration de l\'annulateur d\'écho en cours</string>
   <string name="assistant_remote_provisioning_login">Entrez vos identifiants</string>
   <string name="assistant_account_not_validated">Votre compte n\'a pas encore été validé.</string>
+  <string name="assistant_error_confirmation_code">Le code d\'activation est invalide.\r\nVeuillez vérifier vos SMS et réessayer.</string>
   <string name="assistant_account_validated">Votre compte à été validé.</string>
   <string name="assistant_error_bad_credentials">Nom d\'utilisateur ou mot de passe invalide</string>
   <string name="assistant_codec_down_question">Voulez-vous télécharger le codec vidéo OpenH264 fourni par Cisco Systems, Inc. ? </string>
@@ -83,13 +97,45 @@
   <string name="wizard_failed">Une erreur est survenue, réessayez plus tard.</string>
   <string name="wizard_server_unavailable">Serveur indisponible, veuillez vérifier votre connexion réseau.</string>
   <string name="wizard_username_unavailable">Ce nom d\'utilisateur est déjà pris.</string>
+  <string name="assistant_phone_number_unavailable">Ce numéro de téléphone est déjà utilisé.\r\nVeuillez saisir un autre numéro.\r\nVous pouvez supprimer le compte existant si vous voulez réutiliser votre numéro de téléphone.</string>
   <string name="wizard_username_incorrect">Votre nom d\'utilisateur est invalide.</string>
+  <string name="assistant_phone_number_incorrect">Votre numéro de téléphone est invalide.</string>
   <string name="wizard_email_incorrect">Votre email est invalide.</string>
   <string name="wizard_password_incorrect">Votre mot de passe n\'est pas valide.</string>
   <string name="wizard_passwords_unmatched">Les mots de passes ne correspondent pas.</string>
   <string name="setup_confirm_username">Votre nom d\'utilisateur sera %s.\r\n\r\nIl peut différer de votre saisie.\r\nContinuer ?</string>
   <string name="first_launch_no_login_password">Entrez votre nom d\'utilisateur et votre mot de passe</string>
   <string name="forgot_password">Mot de passe oublié ?</string>
+  <string name="assistant_choose_country">Choisir un pays</string>
+  <string name="select_your_country">Choisissez votre pays</string>
+  <string name="use_username_instead_or_phone_number">Utiliser un nom d\'utilisateur (optionnel)</string>
+  <string name="use_email_for_validation">Utiliser une adresse mail pour créer un compte</string>
+  <string name="login_with_username">Utiliser votre nom d\'utilisateur et votre mot de passe plutôt que votre numéro</string>
+  <string name="phone_number_info_title">Comment mon numéro de téléphone sera-t-il utilisé ?</string>
+  <string name="phone_number_info_content">
+Vos amis pourront vous joindre plus facilement si vous associez votre compte à votre numéro de téléphone\n\nVous verrez dans votre carnet d\'adresses les contacts qui utilisent Linphone et vos amis sauront qu\'ils peuvent vous contacter.\n</string>
+  <string name="phone_number_link_info_content">
+Vos amis pourront vous joindre plus facilement si vous associez votre compte à votre numéro de téléphone\n\nVous verrez dans votre carnet d\'adresses les contacts qui utilisent Linphone et vos amis sauront qu\'ils peuvent vous contacter.\n</string>
+  <string name="phone_number_link_info_content_already_account">Vous ne pouvez associer votre numéro qu\'à un seul compte Linphone.\n\nSi vous avez déjà associé votre numéro à un autre compte mais préférez utiliser ce compte-ci, suivez la procédure d\'association et votre numéro sera automatiquement transféré à ce compte.</string>
+  <!--Status-->
+  <string name="invalid_email">Mail non valide</string>
+  <string name="account_already_exist">Ce compte existe déjà</string>
+  <string name="phone_number_not_exist">Ce compte n\'existe pas</string>
+  <string name="invalid_username">Nom d\'utilisateur non valide</string>
+  <string name="invalid_domain">Domaine non valide</string>
+  <string name="invalid_display_name">Nom d\'affichage non valide</string>
+  <string name="username_too_short">Nom d\'utilisateur trop court</string>
+  <string name="username_too_long">Nom d\'utilisateur trop long</string>
+  <string name="username_invalid_size">Taille du nom d\'utilisateur non valide</string>
+  <string name="phone_number_too_long">Numéro de téléphone trop long</string>
+  <string name="phone_number_too_short">Numéro de téléphone trop court</string>
+  <string name="phone_number_invalid">Numéro de téléphone non valide</string>
+  <string name="password_too_short">Mot de passe trop court</string>
+  <string name="password_too_long">Mot de passe trop long</string>
+  <string name="request_failed">Erreur de communication avec le serveur. Veuillez réessayer plus tard.</string>
+  <string name="transport_unsupported">Transport non supporté</string>
+  <string name="country_code_invalid">Indicatif de pays non valide</string>
+  <!--In-app-->
   <!--Dailer-->
   <string name="address_bar_hint">Entrez un numéro ou une adresse</string>
   <!--History-->
@@ -104,7 +150,6 @@
   <string name="delete_contacts">Voulez-vous supprimer les contacts sélectionnés ?</string>
   <string name="delete_contact">Voulez-vous supprimer le contact sélectionné ?</string>
   <string name="sip_address">Adresse SIP</string>
-  <string name="phone_number">Numéro de téléphone</string>
   <string name="contact_first_name">Prénom</string>
   <string name="contact_last_name">Nom</string>
   <string name="contact_organization">Société</string>
@@ -150,7 +195,8 @@
   <string name="call_stats_upload">Bande passante envoi :</string>
   <string name="call_stats_download">Bande passante réception :</string>
   <string name="call_stats_ice">Connexion ICE :</string>
-  <string name="call_stats_video_resolution">Taille vidéo:</string>
+  <string name="call_stats_encoder_name">Encodeur :</string>
+  <string name="call_stats_decoder_name">Décodeur :</string>
   <string name="call">Appel</string>
   <!--About-->
   <string name="menu_send_log">Envoyer les logs</string>
@@ -169,6 +215,7 @@
   <string name="warning_wrong_destination_address">Impossible d\'utiliser l\'adresse %s</string>
   <string name="error_unknown">Erreur inconnue</string>
   <string name="error_call_declined">Appel rejeté</string>
+  <string name="error_user_busy">Utilisateur occupé</string>
   <string name="error_user_not_found">Utilisateur non trouvé</string>
   <string name="error_incompatible_media">Paramètres média incompatibles</string>
   <string name="error_low_bandwidth">Votre correspondant a une bande passante limitée, la vidéo ne peut pas être rajoutée</string>
@@ -199,6 +246,7 @@
   <string name="pref_avpf_rr_interval">Intervalle AVPF RTCP régulier en secondes (entre 1 et 5) </string>
   <string name="pref_escape_plus">Remplacer + par 00</string>
   <string name="pref_friendlist_subscribe">Souscrire à la liste d\'amis</string>
+  <string name="pref_link_account">Associer votre compte</string>
   <string name="pref_auth_userid">Identifiant d\'authentification</string>
   <string name="pref_help_auth_userid">Entrez l\'userid d\'authentification (optionnel)</string>
   <string name="pref_display_name">Nom d\'affichage</string>
@@ -260,8 +308,6 @@
   <string name="pref_call_title">Appel</string>
   <string name="pref_device_ringtone">Utiliser la sonnerie du téléphone</string>
   <string name="pref_auto_answer">Décrocher automatiquement appels entrants</string>
-  <string name="pref_rfc2833_dtmf">Envoyer les DTMFs in-band (RFC2833)</string>
-  <string name="pref_sipinfo_dtmf">Envoyer les DTMFs out-band DTMFs(SIP INFO)</string>
   <string name="pref_voice_mail">URI de boîte vocale</string>
   <!--Chat settings-->
   <string name="pref_chat_title">Chat</string>
@@ -335,6 +381,7 @@
   <string name="content_description_new_discussion">Nouvelle discussion</string>
   <string name="content_description_search">Rechercher</string>
   <string name="content_description_search_contact">Recherche d\'un contact</string>
+  <string name="content_description_search_country">Rechercher</string>
   <string name="content_description_all_contacts">Tous les contacts</string>
   <string name="content_description_linphone_contacts">Contacts Linphone</string>
   <string name="content_description_call_direction">Direction d\'appel</string>
@@ -354,6 +401,8 @@
   <string name="content_description_message_status">Status de message</string>
   <string name="content_description_conference">Conférence</string>
   <string name="content_description_username_field">Champ nom d\'utilisateur</string>
+  <string name="content_description_activation_code_field">Champ nom d\'utilisateur</string>
+  <string name="content_description_phone_number_field">Numéro de téléphone</string>
   <string name="content_description_display_field">Champ nom d\'affichage</string>
   <string name="content_description_domain_field">Champ domaine</string>
   <string name="content_description_url_field">Champ de configuration distante</string>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index 7092176ea..1e63057db 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -14,9 +14,14 @@
   <string name="settings">הגדרות</string>
   <string name="decline">דחה</string>
   <string name="conference">ועידה</string>
+  <string name="no">לא</string>
+  <string name="yes">כן</string>
   <!--Launch screen-->
   <!--Assistant-->
+  <string name="assistant_continue">המשך</string>
   <string name="transport">טרנספורט</string>
+  <!--Status-->
+  <!--In-app-->
   <!--Dailer-->
   <!--History-->
   <string name="today">היום</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f58665a85..31d4abfb2 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -21,6 +21,7 @@
   <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">ユーザー名</string>
+  <string name="phone_number">電話番号</string>
   <string name="display_name">表示する名前</string>
   <string name="password">パスワード</string>
   <string name="confirm_password">パスワードを再入力</string>
@@ -44,27 +45,24 @@
   <string name="connect">接続する</string>
   <string name="decline">接続しない</string>
   <string name="conference">会談</string>
+  <string name="no">いいえ</string>
+  <string name="ok">OK</string>
+  <string name="yes">はい</string>
   <!--Launch screen-->
   <string name="app_description">the <i>libre</i> SIP client</string>
   <!--Assistant-->
   <string name="welcome">ようこそ</string>
   <string name="assistant">アシスタント</string>
   <string name="assistant_create_account">アカウントを作成する</string>
+  <string name="assistant_continue">続行</string>
   <string name="assistant_finish">完了しました</string>
-  <string name="assistant_validate_account">アカウントを作成しました。あなたのメールを確認し、アカウントを認証してください。その後このボタンを押して再開してください。</string>
-  <string name="assistant_welcome_desc">SIPアカウントの設定を行います。</string>
-  <string name="assistant_linphone_login_desc">Linphoneのユーザー名とパスワードを入力してください</string>
-  <string name="assistant_login_desc">SIPドメインのユーザー名とパスワードを入力してください</string>
   <string name="assistant_remote_provisioning_desc">プロビショニングURLを入力してください</string>
   <string name="transport">トランスポート</string>
   <string name="assistant_login_linphone">Linphoneのアカウントで使う</string>
   <string name="assistant_login_generic">SIPアカウントで使う</string>
   <string name="assistant_remote_provisioning">リモート設定</string>
-  <string name="assistant_create_account_part_1">1/2</string>
-  <string name="assistant_create_account_part_2">2/2</string>
   <string name="assistant_display_name_optional">表示する名前(任意)</string>
-  <string name="assistant_linphone_account">Linphoneアカウントを登録する</string>
-  <string name="assistant_generic_account">SIPアカウントを登録する</string>
+  <string name="assistant_generic_account">SIPアカウントで使う</string>
   <string name="assistant_remote_provisioning_title">リモート設定</string>
   <string name="assistant_login">ログイン</string>
   <string name="assistant_ec_calibration">エコーキャンセルを設定しています</string>
@@ -80,6 +78,8 @@
   <string name="wizard_passwords_unmatched">パスワードが一致しません</string>
   <string name="first_launch_no_login_password">ユーザー名とパスワードを入力してください</string>
   <string name="forgot_password">パスワードを忘れましたか？</string>
+  <!--Status-->
+  <!--In-app-->
   <!--Dailer-->
   <string name="address_bar_hint">番号もしくはアドレスを入力してください</string>
   <!--History-->
@@ -94,7 +94,6 @@
   <string name="delete_contacts">本当に選択した連絡先を削除しますか？</string>
   <string name="delete_contact">本当に選択した連絡先を削除しますか？</string>
   <string name="sip_address">SIPアドレス</string>
-  <string name="phone_number">電話番号</string>
   <string name="contact_first_name">名前</string>
   <string name="contact_last_name">名字</string>
   <!--Chat-->
@@ -135,7 +134,6 @@
   <string name="call_stats_upload">アップロード幅:</string>
   <string name="call_stats_download">ダウンロード幅:</string>
   <string name="call_stats_ice">ICE 接続:</string>
-  <string name="call_stats_video_resolution">ビデオ解像度:</string>
   <string name="call">発信</string>
   <!--About-->
   <string name="menu_send_log">ログを送信する</string>
@@ -233,8 +231,6 @@
   <string name="pref_video_codecs_title">コーデック</string>
   <!--Call settings-->
   <string name="pref_call_title">発信</string>
-  <string name="pref_rfc2833_dtmf">DTMFをRFC2833で送信する</string>
-  <string name="pref_sipinfo_dtmf">DTMFをSIP情報で送信する</string>
   <string name="pref_voice_mail">音声メールのURI</string>
   <!--Chat settings-->
   <string name="pref_chat_title">チャット</string>
@@ -317,6 +313,7 @@
   <string name="content_description_message_status">メッセージ状態</string>
   <string name="content_description_conference">会談</string>
   <string name="content_description_username_field">ユーザー名</string>
+  <string name="content_description_activation_code_field">ユーザー名</string>
   <string name="content_description_display_field">表示名</string>
   <string name="content_description_domain_field">ドメイン</string>
   <string name="content_description_confirm_password_field">パスワードの再入力</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9551dd30f..5da86973f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -6,33 +6,56 @@
   <string name="addressbook_label">Linphone</string>
   <string name="notification_title">Linphone</string>
   <string name="wait_dialog_text">Bezig met opstarten</string>
+  <string name="notification_registered">%s geregistreerd</string>
+  <string name="notification_register_failure">%s registratie mislukt</string>
   <string name="tunnel_host"></string>
+  <string name="about_version">Linphone Android %s</string>
+  <string name="about_liblinphone_version">Linphone Core %s</string>
   <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">Gebruikersnaam</string>
+  <string name="phone_number">Telefoonnummer</string>
   <string name="display_name">Weergavenaam</string>
   <string name="password">Wachtwoord</string>
+  <string name="confirm_password">Bevestig wachtwoord</string>
+  <string name="domain">Domein</string>
+  <string name="remote_provisioning_url">URL</string>
+  <string name="email">Email</string>
+  <string name="delete_text">Weet u zeker dat u de selectie wilt verwijderen?</string>
   <string name="delete">Verwijderen</string>
+  <string name="retry">Probeer opnieuw</string>
   <string name="cancel">Annuleren</string>
   <string name="accept">Accepteren</string>
+  <string name="continue_text">Ga door</string>
   <string name="about">Over</string>
   <string name="deny">Weigeren</string>
+  <string name="no_account">Geen account geconfigureerd</string>
+  <string name="search">Zoeken</string>
   <string name="outgoing">Uitgaande</string>
   <string name="incoming">Inkomende</string>
-  <string name="missed">Gemist</string>
+  <string name="missed">Gemiste</string>
   <string name="settings">Instellingen</string>
+  <string name="connect">Connectie</string>
   <string name="decline">Weigeren</string>
+  <string name="conference">Conference</string>
+  <string name="no">Nee</string>
+  <string name="yes">Ja</string>
   <!--Launch screen-->
   <!--Assistant-->
-  <string name="assistant_welcome_desc">Deze wizard zal u helpen bij het gebruiken van een SIP-account voor uw oproepen.</string>
+  <string name="welcome">Welkom</string>
+  <string name="assistant">Assistent</string>
+  <string name="assistant_create_account">Creëer account</string>
+  <string name="assistant_continue">Ga door</string>
+  <string name="assistant_finish">Beëindig configuratie</string>
   <string name="transport">Transport</string>
+  <!--Status-->
+  <!--In-app-->
   <!--Dailer-->
   <!--History-->
   <string name="today">Vandaag</string>
   <string name="yesterday">Gisteren</string>
   <!--Contacts-->
   <string name="sip_address">SIP-adres</string>
-  <string name="phone_number">Telefoonnummer</string>
   <string name="contact_first_name">Voornaam</string>
   <string name="contact_last_name">Achternaam</string>
   <!--Chat-->
@@ -42,6 +65,7 @@
   <!--Status Bar-->
   <string name="status_connected">Geregistreerd</string>
   <!--Side Menu-->
+  <string name="menu_assistant">Assistent</string>
   <string name="menu_settings">Instellingen</string>
   <string name="menu_about">Over</string>
   <!--Call-->
@@ -51,7 +75,6 @@
   <string name="call_stats_codec">Codec:</string>
   <string name="call_stats_upload">Uploadbandbreedte:</string>
   <string name="call_stats_download">Downloadbandbreedte:</string>
-  <string name="call_stats_video_resolution">Videogrootte:</string>
   <string name="call">Oproep</string>
   <!--About-->
   <string name="menu_send_log">Log versturen</string>
@@ -125,7 +148,9 @@
   <string name="content_description_chat">Chat</string>
   <string name="content_description_delete">Verwijderen</string>
   <string name="content_description_add">Oproep toevoegen</string>
+  <string name="content_description_search">Zoeken</string>
   <string name="content_description_add_call">Oproep toevoegen</string>
+  <string name="content_description_conference">Conference</string>
   <string name="content_description_default_account">Standaard account</string>
   <string name="content_description_contact_first_name">Voornaam</string>
   <string name="content_description_contact_last_name">Achternaam</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 22df3c20a..f75acd497 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1,9 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Custom-->
+  <string name="app_name">Linphone</string>
+  <string name="service_name">Linphone Service</string>
+  <string name="addressbook_label">Linphone</string>
+  <string name="notification_title">Linphone</string>
   <string name="wait_dialog_text">Uruchamianie</string>
   <string name="notification_registered">%s zarejestrowany</string>
   <string name="notification_register_failure">%s nie udało się zarejestrować</string>
+  <string name="tunnel_host"></string>
+  <string name="about_version">Linphone Android %s</string>
+  <string name="about_liblinphone_version">Linphone Core %s</string>
   <string name="about_text">GNU General Public License V2\n © 2010-2016 Belledonne Communications</string>
   <string name="about_link">www.linphone.org</string>
   <string name="sync_account_name">kontakt linphone</string>
@@ -14,6 +21,7 @@
   <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">Nazwa użytkownika</string>
+  <string name="phone_number">Numer telefonu</string>
   <string name="display_name">Nazwa wyświetlana</string>
   <string name="password">Hasło</string>
   <string name="confirm_password">Potwierdź hasło</string>
@@ -43,19 +51,15 @@
   <string name="welcome">Witam</string>
   <string name="assistant">Asystent</string>
   <string name="assistant_create_account">Stwórz konto</string>
+  <string name="assistant_continue">Kontynuuj </string>
   <string name="assistant_finish">Zakończ konfigurację</string>
-  <string name="assistant_validate_account">Konto zostało utworzone. Proszę sprawdzić pocztę, aby zweryfikować konto. Po weryfikacji proszę wrócić tutaj i kliknąć przycisk.</string>
-  <string name="assistant_welcome_desc">Ten asystent pomoże Ci używać konta połączeń SIP.</string>
-  <string name="assistant_linphone_login_desc">Wprowadź swoją nazwę użytkownika i hasło konta Linphone</string>
-  <string name="assistant_login_desc">Wprowadź swoją nazwę użytkownika i hasło w domenie SIP</string>
   <string name="assistant_remote_provisioning_desc">Proszę podać swoje zastrzeganie URL</string>
   <string name="transport">Transport</string>
   <string name="assistant_login_linphone">Użyj konta Linphone</string>
   <string name="assistant_login_generic">Użyj konta SIP</string>
   <string name="assistant_remote_provisioning">Pobierz zdalną konfigurację</string>
   <string name="assistant_display_name_optional">Wyświetl nazwę (opcjonalnie)</string>
-  <string name="assistant_linphone_account">Skonfiguruj konto Linphone</string>
-  <string name="assistant_generic_account">Skonfiguruj konto SIP</string>
+  <string name="assistant_generic_account">Użyj konta SIP</string>
   <string name="assistant_remote_provisioning_title">Pobierz zdalną konfigurację </string>
   <string name="assistant_fetch_apply">Pobierz i zastosuj</string>
   <string name="assistant_login">Login</string>
@@ -77,6 +81,8 @@
   <string name="setup_confirm_username">Twoja nazwa użytkownika będzie %s.\r\n\r\nIt  może różnić się od danych wejściowych w celu dopasowania wymagań. \ Czy akceptujesz?</string>
   <string name="first_launch_no_login_password">Podaj swój login i hasło</string>
   <string name="forgot_password">Zapomniałeś hasła ?</string>
+  <!--Status-->
+  <!--In-app-->
   <!--Dailer-->
   <string name="address_bar_hint">Wprowadź numer lub adres</string>
   <!--History-->
@@ -91,7 +97,6 @@
   <string name="delete_contacts">Czy chcesz usunąć wybrane kontakty?</string>
   <string name="delete_contact">Czy chcesz usunąć wybrany kontakt?</string>
   <string name="sip_address">Adres SIP</string>
-  <string name="phone_number">Numer telefonu</string>
   <string name="contact_first_name">Imię</string>
   <string name="contact_last_name">Nazwisko</string>
   <string name="contact_organization">Organizacja</string>
@@ -137,7 +142,6 @@
   <string name="call_stats_upload">Prześlij przepustowość:</string>
   <string name="call_stats_download">Pobierz przepustowość:</string>
   <string name="call_stats_ice">Łączność ICE:</string>
-  <string name="call_stats_video_resolution">Rozmiar filmu:</string>
   <string name="call">Połączenie</string>
   <!--About-->
   <string name="menu_send_log">Wyślij rejestr</string>
@@ -239,8 +243,6 @@ Wpisz wyświetlaną nazwę (opcjonalnie)</string>
   <string name="pref_call_title">Połączenie </string>
   <string name="pref_device_ringtone">Zastosowanie urządzenia dzwonka</string>
   <string name="pref_auto_answer">Auto odbieranie przychodzących połączeń</string>
-  <string name="pref_rfc2833_dtmf">Wyślij  RFC2833 DTMFs </string>
-  <string name="pref_sipinfo_dtmf">Wyślij SIP INFO DTMFs</string>
   <string name="pref_voice_mail">Poczta głosowa URI</string>
   <!--Chat settings-->
   <string name="pref_chat_title">Czat</string>
@@ -330,6 +332,7 @@ Wpisz wyświetlaną nazwę (opcjonalnie)</string>
   <string name="content_description_message_status">Stan wiadomości</string>
   <string name="content_description_conference">Konferencja</string>
   <string name="content_description_username_field">Nazwa pola</string>
+  <string name="content_description_activation_code_field">Nazwa pola</string>
   <string name="content_description_display_field">Wyświetlana nazwa pola</string>
   <string name="content_description_domain_field">Pole domeny</string>
   <string name="content_description_url_field">Pole zdalnego zastrzegania</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 42295bebe..751d7ea23 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1,11 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Custom-->
+  <string name="app_name">Linphone</string>
+  <string name="service_name">Linphone Service</string>
+  <string name="addressbook_label">Linphone</string>
+  <string name="notification_title">Linphone</string>
+  <string name="wait_dialog_text">Começando</string>
+  <string name="notification_registered">%s registrado</string>
+  <string name="notification_register_failure">%s falhou ao registrar</string>
   <string name="tunnel_host"></string>
+  <string name="about_version">Linphone Android %s</string>
+  <string name="about_liblinphone_version">Linphone Core %s</string>
+  <string name="about_text">GNU General Public License V2\n © 2010-2016 Belledonne Communications</string>
+  <string name="about_link">www.linphone.org</string>
+  <string name="sync_account_name">Linphone Contatos</string>
+  <string name="history_date_format">EEE, d MMM</string>
+  <string name="history_detail_date_format">dd/MM/yyyy - HH:mm -</string>
+  <string name="messages_date_format">dd/MM, HH:mm</string>
+  <string name="messages_list_date_format">dd/MM</string>
+  <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">Usuário</string>
+  <string name="phone_number">Número do telefone</string>
   <string name="display_name">Exibir nome</string>
   <string name="password">Senha</string>
+  <string name="confirm_password">Senha de confirmação</string>
+  <string name="domain">Domínio</string>
+  <string name="remote_provisioning_url">URL</string>
+  <string name="email">Email</string>
+  <string name="delete_text">Tem certeza de que deseja excluir sua seleção?</string>
   <string name="delete">Apagar</string>
   <string name="retry">Repetir</string>
   <string name="cancel">Annuler</string>
@@ -13,33 +36,76 @@
   <string name="continue_text">Continuar</string>
   <string name="about">Sobre</string>
   <string name="deny">Recusar</string>
+  <string name="no_account">Nenhuma conta configurada</string>
   <string name="search">Pesquisar</string>
   <string name="outgoing">Efetuadas</string>
   <string name="incoming">Recebidas</string>
   <string name="missed">Perdidas</string>
   <string name="settings">Configurações</string>
+  <string name="connect">Conexão</string>
   <string name="decline">Rejeitar</string>
   <string name="conference">Conferência</string>
+  <string name="no">Não</string>
+  <string name="ok">Ok</string>
+  <string name="yes">Sim</string>
   <!--Launch screen-->
   <!--Assistant-->
+  <string name="welcome">Bem-vindo</string>
+  <string name="assistant">Assistente</string>
+  <string name="assistant_create_account">Criar Conta</string>
+  <string name="assistant_continue">Continuar</string>
+  <string name="assistant_finish">Finalizar configuração</string>
+  <string name="assistant_remote_provisioning_desc">Por favor forneça sua URL de provisionamento </string>
   <string name="transport">Protocolo</string>
+  <string name="assistant_login_linphone">Use conta Linphone.</string>
+  <string name="assistant_login_generic">Use conta SIP</string>
+  <string name="assistant_remote_provisioning">Buscar configuração remota</string>
+  <string name="assistant_display_name_optional">Mostar nome(opicional)</string>
+  <string name="assistant_generic_account">Use conta SIP</string>
+  <string name="assistant_remote_provisioning_title">Buscar configuração remota.</string>
+  <string name="assistant_fetch_apply">Buscar e aplicar</string>
+  <string name="assistant_login">Entrar</string>
+  <string name="assistant_ec_calibration">Eco cancelar  calibragem</string>
+  <string name="assistant_remote_provisioning_login">Digite seu login</string>
   <string name="assistant_account_not_validated">Sua conta ainda não foi validada.</string>
   <string name="assistant_account_validated">Sua conta foi validada.</string>
+  <string name="assistant_error_bad_credentials">Usuário ou senha incorretos</string>
+  <string name="assistant_codec_down_question">Você concorda com download OpenH264 Video Codec fornecido por Cisco Systems, Inc?</string>
+  <string name="assistant_codec_downloading">Baixando OpenH264 Video Codec fornecido por Cisco Systems, Inc</string>
+  <string name="assistant_codec_downloaded">OpenH264 Video Codec fornecido por Cisco Systems, Inc. baixado.</string>
   <string name="wizard_failed">Ocorreu um erro, tente novamente mais tarde.</string>
+  <string name="wizard_server_unavailable">Servido inacessível, verifique sua conexão de rede.</string>
   <string name="wizard_username_unavailable">Este nome de usuário já está em uso.</string>
+  <string name="wizard_username_incorrect">Seu nome de usuário é inválido.</string>
+  <string name="wizard_email_incorrect">Seu email é inválido</string>
+  <string name="wizard_password_incorrect">Sua senha é inválido</string>
+  <string name="wizard_passwords_unmatched">Senha incorreta</string>
+  <string name="setup_confirm_username">Seu usuário será  %s.\r\n\r\nIt , pode não ser o mesmo que você digitou.\r\nVocê aceita?</string>
   <string name="first_launch_no_login_password">Por favor, digite seu usuário e senha</string>
+  <string name="forgot_password">Esqueceu a senha?</string>
+  <!--Status-->
+  <!--In-app-->
   <!--Dailer-->
+  <string name="address_bar_hint">Digite um número ou endereço.</string>
   <!--History-->
+  <string name="no_call_history">Nenhuma chamada no seu histórico</string>
+  <string name="no_missed_call_history">Nenhuma chamada perdida no seu histórico.</string>
+  <string name="delete_history_log">Deseja apagar as chamadas selecionadas?</string>
   <string name="today">Hoje</string>
   <string name="yesterday">Ontem</string>
   <!--Contacts-->
   <string name="no_contact">Nenhum contato em seus contatos.</string>
   <string name="no_sip_contact">Nenhum contato SIP em seus contatos.</string>
+  <string name="delete_contacts">Você deseja excluir contatos selecionados?</string>
+  <string name="delete_contact">Deseja apagar o contato selecionado?</string>
   <string name="sip_address">Endereço SIP</string>
-  <string name="phone_number">Número do telefone</string>
   <string name="contact_first_name">Nome</string>
   <string name="contact_last_name">Sobrenome</string>
+  <string name="contact_organization">Organização</string>
   <!--Chat-->
+  <string name="no_chat_history">Não há conversas</string>
+  <string name="delete_conversation">Deseja apagar a conversa selecionadas?</string>
+  <string name="delete_message">Deseja apagar a mensagem selecionada?</string>
   <string name="remote_composing">Seu contato está digitando...</string>
   <string name="share_picture_size_small">Pequeno</string>
   <string name="share_picture_size_medium">Médio</string>
@@ -54,21 +120,30 @@
   <string name="processing_image">Processando imagem, pode levar alguns segundos, dependendo do tamanho do arquivo</string>
   <!--Status Bar-->
   <string name="status_connected">Registrado</string>
+  <string name="status_not_connected">Não registrado</string>
   <string name="status_in_progress">Registro em andamento</string>
   <string name="status_error">Registro falhou</string>
   <string name="voicemail_unread"> mensagens não lidas</string>
   <!--Side Menu-->
+  <string name="menu_assistant">Assistente.</string>
   <string name="menu_settings">Configurações</string>
   <string name="menu_about">Sobre</string>
+  <string name="quit">Sair</string>
   <!--Call-->
-  <string name="unknown_incoming_call_name">Unknown</string>
+  <string name="incoming_call">Chamada recebida</string>
+  <string name="outgoing_call">Chamadas efetuadas</string>
+  <string name="add_video_dialog">Seu contato gostaria de adicionar vídeo a chamada atual.</string>
+  <string name="no_current_call">Nova Chamada</string>
+  <string name="call_paused_by_remote">Seu contato gostaria de adicionar vídeo a chamada atual</string>
+  <string name="couldnt_accept_call">Ocorreu um erro ao aceitar a chamada</string>
+  <string name="zrtp_dialog">ZRTP token is %s\nVocê só deve aceitar se você tiver o mesmo TOKEN (acima) que seu contato</string>
+  <string name="unknown_incoming_call_name">Erro desconhecido</string>
   <string name="call_stats_audio">Audio</string>
   <string name="call_stats_video">Video</string>
   <string name="call_stats_codec">Codec:</string>
   <string name="call_stats_upload">Velocidade de Upload</string>
   <string name="call_stats_download">Velocidade de Download:</string>
   <string name="call_stats_ice">Conectividade ICE:</string>
-  <string name="call_stats_video_resolution">Tamanho de video:</string>
   <string name="call">Ligar</string>
   <!--About-->
   <string name="menu_send_log">Enviar log</string>
@@ -79,19 +154,25 @@
   <string name="incall_notif_video">Chamada de vídeo captura em curso</string>
   <string name="notification_started">iniciado</string>
   <string name="unread_messages">%i mensagens não lidas</string>
+  <string name="missed_calls_notif_title">Chamada perdida.</string>
+  <string name="missed_calls_notif_body">%i  Chamadas Perdidas</string>
   <!--Errors-->
   <string name="skipable_error_service_not_ready">Aviso: O serviço não está pronto</string>
   <string name="error">Erro</string>
+  <string name="warning_wrong_destination_address">Não é possível convidar endereço de destino %s</string>
   <string name="error_unknown">Erro desconhecido</string>
   <string name="error_call_declined">Chamada recusada</string>
   <string name="error_user_not_found">Usuário não encontrado</string>
   <string name="error_incompatible_media">Parâmetros de mídia incompatíveis</string>
+  <string name="error_low_bandwidth">Seu contato gostaria de adicionar vídeo a chamada atual.</string>
   <string name="error_network_unreachable">Rede inacessível</string>
   <string name="error_bad_credentials">Credenciais erradas</string>
   <string name="error_unauthorized">Não autorizado</string>
   <string name="error_io_error">Erro de rede</string>
+  <string name="download_image_failed">Download Falhou. Por favor verifique sua conexão de rede ou tente mais tarde.</string>
   <string name="remote_provisioning_failure">Falha ao transferir ou aplicar perfil de aprovisionamento remoto...</string>
   <string name="remote_provisioning_again_title">Provisionamento remoto</string>
+  <string name="remote_provisioning_again_message">Deseja mudar o provisionamento de URI?</string>
   <!--Account Settings-->
   <string name="pref_sipaccount">Conta SIP</string>
   <string name="pref_manage_title">Gerenciar</string>
@@ -111,7 +192,9 @@
   <string name="pref_avpf_rr_interval"> AVPF intervalos regulares RTCP em segundos (entre 1 e 5)</string>
   <string name="pref_escape_plus">Substitua + por 00</string>
   <string name="pref_auth_userid">ID de autenticação</string>
-  <string name="pref_display_name">Exibir nome</string>
+  <string name="pref_help_auth_userid">Digite ID de usuário de autenticação (opcional)</string>
+  <string name="pref_display_name">Mostrar nome</string>
+  <string name="pref_help_display_name">Digite o nome de exibição (opcional)</string>
   <string name="pref_prefix">Prefixo</string>
   <string name="pref_transport">Protocolo</string>
   <string name="pref_transport_udp">UDP</string>
@@ -123,6 +206,7 @@
   <string name="pref_sipaccounts">Contas SIP</string>
   <string name="default_account_flag">Conta padrão</string>
   <string name="pref_add_account">Adicionar Conta</string>
+  <string name="pref_in_app_store">In-app Store</string>
   <string name="pref_tunnel">Túnel</string>
   <string name="pref_tunnel_host">Hostname</string>
   <string name="pref_tunnel_port">Porta</string>
@@ -141,7 +225,10 @@
   <string name="pref_audio_title">Audio</string>
   <string name="pref_echo_cancellation">Cancelamento de eco</string>
   <string name="pref_echo_cancellation_summary">Remove o eco ouvido pela outra extremidade</string>
+  <string name="pref_echo_canceller_calibration">Eco cancelar calibragem</string>
+  <string name="pref_echo_tester">Teste eco.</string>
   <string name="ec_calibrating">Calibrando…</string>
+  <string name="ec_calibrated">Calibrado em %s ms</string>
   <string name="no_echo">Sem echo</string>
   <string name="failed">falhou</string>
   <string name="pref_adaptive_rate_control">Controle de taxa adaptável</string>
@@ -149,24 +236,39 @@
   <string name="pref_codecs">Codecs</string>
   <!--Video settings-->
   <string name="pref_video_title">Video</string>
+  <string name="pref_overlay">Sobreposição de vídeo</string>
+  <string name="pref_overlay_summary">Mostrar chamada de video quando estiver fora do aplicativo.</string>
   <string name="pref_video_use_front_camera_title">Usar câmera frontal</string>
   <string name="pref_video_initiate_call_with_video_title">Iniciar chamadas de vídeo</string>
   <string name="pref_video_initiate_call_with_video">Sempre enviar solicitações de vídeo</string>
   <string name="pref_video_automatically_accept_video_title">Aceitar solicitações de entrada de vídeo</string>
   <string name="pref_video_automatically_accept_video">Sempre aceitar solicitações de vídeo</string>
+  <string name="pref_video_preset">Tamanho de vídeo:</string>
   <string name="pref_preferred_video_size">Tamanho preferido do vídeo</string>
+  <string name="pref_preferred_fps">FPS preferida</string>
   <string name="pref_bandwidth_limit">Limitar banda em kbits/s</string>
   <string name="pref_video_codecs_title">Codecs</string>
   <!--Call settings-->
   <string name="pref_call_title">Ligar</string>
-  <string name="pref_rfc2833_dtmf">Enviar RFC2833 DTMFs</string>
-  <string name="pref_sipinfo_dtmf">Enviar SIP INFO DTMFs</string>
+  <string name="pref_device_ringtone">Use ringtone do dispositivo</string>
+  <string name="pref_auto_answer">Atendimento automático de chamadas recebidas</string>
+  <string name="pref_voice_mail">Correio de voz URI</string>
   <!--Chat settings-->
   <string name="pref_chat_title">Chat</string>
   <string name="pref_image_sharing_server_title">Servidor de compartilhamento</string>
+  <string name="pref_image_sharing_server_desc">Por favor não edite a menos que você saiba o que está fazendo!</string>
+  <string name="pref_use_lime_encryption">Utilizar  criptografia LIME</string>
+  <string name="lime_encryption_entry_disabled">Desativado</string>
+  <string name="lime_encryption_entry_mandatory">Obrigatório</string>
+  <string name="lime_encryption_entry_preferred">Preferências</string>
   <!--Network settings-->
-  <string name="pref_network_title">Network</string>
+  <string name="pref_network_title">Rede</string>
+  <string name="pref_wifi_only">Apenas para utilização WiFi</string>
+  <string name="pref_stun_server">STUN / TURN server</string>
   <string name="pref_ice_enable">Habilitar ICE</string>
+  <string name="pref_turn_enable">Habilitar TURN</string>
+  <string name="pref_turn_username_title">STUN / TURN Nome de usuário(opicional)</string>
+  <string name="pref_turn_passwd_title">STUN / TURN  senha(opicional)</string>
   <string name="pref_upnp_enable">Habilitar UPNP</string>
   <string name="pref_transport_use_random_ports">Use portas aleatórias</string>
   <string name="pref_sip_port_title">Porta SIP para usar</string>
@@ -176,13 +278,17 @@
   <string name="pref_audio_port_description">Porta ou intervalo de portas de áudio (minport-maxport)</string>
   <string name="pref_media_encryption">Criptografia de mídia</string>
   <string name="pref_push_notification">Ativar notificações de envio</string>
+  <string name="pref_ipv6_title">Permitir IPv6</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">Avançado</string>
   <string name="pref_debug">Depurar</string>
   <string name="pref_background_mode">Em segundo plano</string>
   <string name="pref_animation_enable_title">Ativar Animações</string>
+  <string name="pref_service_notification">Ativar notificação de serviço</string>
   <string name="pref_autostart">Iniciar na inicialização</string>
+  <string name="pref_incoming_call_timeout_title">Chamadas recebidas (em segundos)</string>
   <string name="pref_remote_provisioning_title">Provisionamento remoto</string>
+  <string name="pref_android_app_settings_title">configurações de aplicativos para Android</string>
   <string name="pref_primary_account_title">Conta primária</string>
   <string name="pref_display_name_title">Mostrar nome</string>
   <string name="pref_user_name_title">Usuário</string>
@@ -195,24 +301,30 @@
   <!--Content description-->
   <string name="content_description_back">Voltar</string>
   <string name="content_description_dialer">Discador</string>
+  <string name="content_description_menu">Menu</string>
   <string name="content_description_toggle_micro">Alterar micro</string>
   <string name="content_description_toggle_speaker">Alterar auto-falante</string>
   <string name="content_description_decline">Rejeitar</string>
   <string name="content_description_hang_up">Terminar</string>
   <string name="content_description_accept">Aceitar</string>
   <string name="content_description_edit">Editar</string>
+  <string name="content_description_edit_list">Editar lista</string>
+  <string name="content_description_valid">Válido</string>
   <string name="content_description_add_contact">Adicionar aos Contatos</string>
   <string name="content_description_new_contact">Novo Contato</string>
   <string name="content_description_call">Ligar</string>
   <string name="content_description_backspace">Retorno</string>
   <string name="content_description_chat">Chat</string>
   <string name="content_description_dial_back">Discar de volta</string>
+  <string name="content_description_dialer_back">Voltar ao dialer</string>
   <string name="content_description_contact_picture">Foto do Contato</string>
   <string name="content_description_send_message">Enviar Mensagem</string>
+  <string name="content_description_detail">Detalhes</string>
   <string name="content_description_delete">Excluir esse contato selecionado?</string>
   <string name="content_description_add">Adicionar chamada</string>
   <string name="content_description_new_discussion">Nova Discussão</string>
   <string name="content_description_search">Pesquisar</string>
+  <string name="content_description_search_contact">Pesquisa contato</string>
   <string name="content_description_all_contacts">Todos os Contatos</string>
   <string name="content_description_linphone_contacts">Via Fone Contatos</string>
   <string name="content_description_call_direction">Direção da Chamada</string>
@@ -231,9 +343,28 @@
   <string name="content_description_cancel_button">Botão Cancelar</string>
   <string name="content_description_message_status">Status da Mensagem</string>
   <string name="content_description_conference">Conferência</string>
+  <string name="content_description_username_field">Usuário</string>
+  <string name="content_description_activation_code_field">Usuário</string>
+  <string name="content_description_display_field">Mostrar nome</string>
+  <string name="content_description_domain_field">Domínio</string>
+  <string name="content_description_url_field">Provisionamento remoto</string>
+  <string name="content_description_confirm_password_field">Confirme sua senha</string>
+  <string name="content_description_email_field">Email</string>
   <string name="content_description_default_account">Conta padrão</string>
+  <string name="content_description_deselect_all">Desmarcar todos</string>
+  <string name="content_description_select_all">Selecionar todos</string>
+  <string name="content_description_delete_selection">Apagar selecionado</string>
   <string name="content_description_contact_first_name">Nome</string>
   <string name="content_description_contact_last_name">Sobrenome</string>
+  <string name="content_description_contact_organization">Organização.</string>
+  <string name="content_description_back_call">Voltar a chamar</string>
+  <string name="content_description_send_file">Enviar um arquivo</string>
+  <string name="content_description_message">Mensagem</string>
+  <string name="content_description_unread_chat_message"> mensagens não lidas</string>
   <string name="content_description_transfer">Transferir</string>
+  <string name="content_description_earpiece">Receptor</string>
   <string name="content_description_bluetooth">Bluetooth</string>
+  <string name="content_description_call_options">Opcões de chamadas</string>
+  <string name="content_description_audio_route">Route de áudio</string>
+  <string name="content_description_exit_conference">Sair da conferência</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 53fe03310..97c78be16 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -11,6 +11,7 @@
   <string name="tunnel_host"></string>
   <!--Common-->
   <string name="username">Имя пользователя</string>
+  <string name="phone_number">Номер телефона</string>
   <string name="display_name">Отображаемое имя</string>
   <string name="password">Пароль</string>
   <string name="confirm_password">Подтверждение пароля</string>
@@ -34,26 +35,22 @@
   <string name="connect">Подключение</string>
   <string name="decline">Отклонить</string>
   <string name="conference">Конференция</string>
+  <string name="no">Нет</string>
+  <string name="yes">Да</string>
   <!--Launch screen-->
   <!--Assistant-->
   <string name="welcome">Добро пожаловать</string>
   <string name="assistant">Ассистент</string>
   <string name="assistant_create_account">Создать аккаунт</string>
+  <string name="assistant_continue">Продолжить</string>
   <string name="assistant_finish">Завершить настройку</string>
-  <string name="assistant_validate_account">Ваш аккаунт создан. Пожалуйста, проверьте электронную почту, чтобы подтвердить свой аккаунт. Как только это будет сделано, вернитесь сюда и нажмите на кнопку.</string>
-  <string name="assistant_welcome_desc">Этот ассистент поможет настроить SIP-аккаунт для звонков.</string>
-  <string name="assistant_linphone_login_desc">Введите имя пользователя и пароль от аккаунта Linphone</string>
-  <string name="assistant_login_desc">Введите имя пользователя и пароль с доменом SIP</string>
   <string name="assistant_remote_provisioning_desc">Пожалуйста, введите URL конфигурирования</string>
   <string name="transport">Транспорт</string>
   <string name="assistant_login_linphone">Исп. аккаунт Linphone</string>
   <string name="assistant_login_generic">Исп. SIP-аккаунт</string>
   <string name="assistant_remote_provisioning">Удалённое конфигурирование</string>
-  <string name="assistant_create_account_part_1">1/2</string>
-  <string name="assistant_create_account_part_2">2/2</string>
   <string name="assistant_display_name_optional">Отображаемое имя (необязательно)</string>
-  <string name="assistant_linphone_account">Настройка аккаунта Linphone</string>
-  <string name="assistant_generic_account">Настройка SIP-аккаунта</string>
+  <string name="assistant_generic_account">Исп. SIP-аккаунт</string>
   <string name="assistant_remote_provisioning_title">Удалённое конфигурирование</string>
   <string name="assistant_fetch_apply">Извлечь и применить</string>
   <string name="assistant_login">Логин</string>
@@ -71,6 +68,8 @@
   <string name="wizard_passwords_unmatched">Пароли не совпадают.</string>
   <string name="setup_confirm_username">Ваше имя пользователя будет %s.\r\n\r\nОно может отличаться от введённого для соответствия требованиям.\r\nВы согласны?</string>
   <string name="first_launch_no_login_password">Пожалуйста, введите имя пользователя и пароль</string>
+  <!--Status-->
+  <!--In-app-->
   <!--Dailer-->
   <string name="address_bar_hint">Введите номер или адрес</string>
   <!--History-->
@@ -85,7 +84,6 @@
   <string name="delete_contacts">Вы действительно хотите удалить выбранные контакты?</string>
   <string name="delete_contact">Вы действительно хотите удалить выбранный контакт?</string>
   <string name="sip_address">Адрес SIP</string>
-  <string name="phone_number">Номер телефона</string>
   <string name="contact_first_name">Имя</string>
   <string name="contact_last_name">Фамилия</string>
   <!--Chat-->
@@ -130,7 +128,6 @@
   <string name="call_stats_upload">Полоса пропускания загрузки:</string>
   <string name="call_stats_download">Полоса пропускания скачивания:</string>
   <string name="call_stats_ice">Подключение ICE:</string>
-  <string name="call_stats_video_resolution">Размер видео:</string>
   <string name="call">Вызов</string>
   <!--About-->
   <string name="menu_send_log">Отправить журнал</string>
@@ -231,8 +228,6 @@
   <string name="pref_video_codecs_title">Кодеки</string>
   <!--Call settings-->
   <string name="pref_call_title">Вызов</string>
-  <string name="pref_rfc2833_dtmf">Отправлять RFC2833 DTMFs</string>
-  <string name="pref_sipinfo_dtmf">Отправлять SIP INFO DTMFs</string>
   <string name="pref_voice_mail">URI голосовой почты</string>
   <!--Chat settings-->
   <string name="pref_chat_title">Чат</string>
@@ -311,6 +306,7 @@
   <string name="content_description_message_status">Статус сообщения</string>
   <string name="content_description_conference">Конференция</string>
   <string name="content_description_username_field">Поле имени пользователя</string>
+  <string name="content_description_activation_code_field">Поле имени пользователя</string>
   <string name="content_description_display_field">Поле отображаемого имени</string>
   <string name="content_description_domain_field">Поле домена</string>
   <string name="content_description_url_field">Поле удалённого конфигурирования</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index f8115080d..82510f589 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -11,6 +11,7 @@
   <string name="today_date_format">ЧЧ:мм</string>
   <!--Common-->
   <string name="username">Корисничко име</string>
+  <string name="phone_number">Број телефона</string>
   <string name="display_name">Приказано име</string>
   <string name="password">Лозинка</string>
   <string name="delete">Обриши</string>
@@ -27,15 +28,20 @@
   <string name="settings">Подешавања</string>
   <string name="decline">Одбаци</string>
   <string name="conference">Конференција</string>
+  <string name="no">Не</string>
+  <string name="ok">У реду</string>
+  <string name="yes">Да</string>
   <!--Launch screen-->
   <!--Assistant-->
-  <string name="assistant_welcome_desc">Овај помоћник ће вам помоћи да користите СИП налог за ваше позиве.</string>
+  <string name="assistant_continue">Настави</string>
   <string name="transport">Пренос</string>
   <string name="assistant_account_not_validated">Ваш налог још није потврђен.</string>
   <string name="assistant_account_validated">Ваш налог је потврђен.</string>
   <string name="wizard_failed">Дошло је до грепке, пробајте опет касније.</string>
   <string name="wizard_username_unavailable">Ово корисничко име је већ у употреби.</string>
   <string name="first_launch_no_login_password">Упишите вашу пријаву и лозинку</string>
+  <!--Status-->
+  <!--In-app-->
   <!--Dailer-->
   <!--History-->
   <string name="today">Данас</string>
@@ -44,7 +50,6 @@
   <string name="no_contact">Нема контакта у вашем адресару.</string>
   <string name="no_sip_contact">Нема СИП контакта у вашем адресару.</string>
   <string name="sip_address">СИП адреса</string>
-  <string name="phone_number">Број телефона</string>
   <string name="contact_first_name">Име</string>
   <string name="contact_last_name">Презиме</string>
   <!--Chat-->
@@ -76,7 +81,6 @@
   <string name="call_stats_upload">Пропусни опсег отпремања:</string>
   <string name="call_stats_download">Пропусни опсег преузимања:</string>
   <string name="call_stats_ice">ИЦЕ повезивост:</string>
-  <string name="call_stats_video_resolution">Величина видеа:</string>
   <string name="call">Позови</string>
   <!--About-->
   <string name="menu_send_log">Пошаљи дневник</string>
@@ -167,8 +171,6 @@
   <string name="pref_video_codecs_title">Кодеци</string>
   <!--Call settings-->
   <string name="pref_call_title">Позови</string>
-  <string name="pref_rfc2833_dtmf">Пошаљи РФЦ2833 ДТМФ-е</string>
-  <string name="pref_sipinfo_dtmf">Пошаљи СИП ИНФО ДТФ-е</string>
   <!--Chat settings-->
   <string name="pref_chat_title">Ћаскање</string>
   <string name="pref_image_sharing_server_title">Сервер дељења</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 393af657d..68637d9ad 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -10,6 +10,7 @@
   <string name="sync_account_name">linphone-kontakter</string>
   <!--Common-->
   <string name="username">Användarnamn</string>
+  <string name="phone_number">Telefonnummer</string>
   <string name="display_name">Visningsnamn</string>
   <string name="password">Lösenord</string>
   <string name="delete">Ta bort</string>
@@ -26,10 +27,16 @@
   <string name="settings">Inställningar</string>
   <string name="decline">Avvisa</string>
   <string name="conference">Konferens</string>
+  <string name="no">Nej</string>
+  <string name="ok">Ok</string>
+  <string name="yes">Ja</string>
   <!--Launch screen-->
   <!--Assistant-->
+  <string name="assistant_continue">Fortsätt</string>
   <string name="wizard_username_unavailable">Detta användarnamn används redan.</string>
   <string name="first_launch_no_login_password">Ange din inloggning och lösenord</string>
+  <!--Status-->
+  <!--In-app-->
   <!--Dailer-->
   <!--History-->
   <string name="today">Idag</string>
@@ -38,7 +45,6 @@
   <string name="no_contact">Inga kontakter i din adressbok.</string>
   <string name="no_sip_contact">Inga SIP-kontakter i din adressbok.</string>
   <string name="sip_address">SIP-adress</string>
-  <string name="phone_number">Telefonnummer</string>
   <string name="contact_first_name">Förnamn</string>
   <string name="contact_last_name">Efternamn</string>
   <!--Chat-->
@@ -66,7 +72,6 @@
   <string name="call_stats_upload">Uppladdningsbandbredd:</string>
   <string name="call_stats_download">Nerladdningsbandbredd:</string>
   <string name="call_stats_ice">ICE-anslutning:</string>
-  <string name="call_stats_video_resolution">Video-storlek:</string>
   <string name="call">Ring</string>
   <!--About-->
   <string name="menu_send_log">Skicka logg</string>
@@ -132,7 +137,6 @@
   <string name="pref_bandwidth_limit">Bandbreddsgräns i kbit/s</string>
   <!--Call settings-->
   <string name="pref_call_title">Ring</string>
-  <string name="pref_rfc2833_dtmf">Skicka RFC2833 DTMF</string>
   <!--Chat settings-->
   <string name="pref_chat_title">Chatt</string>
   <string name="pref_image_sharing_server_title">Delar server</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 7fb62494e..cee7c6892 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -9,10 +9,18 @@
   <string name="notification_registered">%s kayıtlı</string>
   <string name="notification_register_failure">%s kaydedilemedi</string>
   <string name="tunnel_host"></string>
+  <string name="about_version">Linphone Android %s</string>
+  <string name="about_liblinphone_version">Linphone Core %s</string>
+  <string name="about_text">GNU Genel Kamu Lisansı V2\n © 2010-2016 Belledonne Communications</string>
+  <string name="about_link">www.linphone.org</string>
   <string name="sync_account_name">Linphone bağlantıları</string>
+  <string name="history_detail_date_format">yyyy/AA/gg - SS:dd -</string>
+  <string name="messages_date_format">gg/AA, SS:dd</string>
+  <string name="messages_list_date_format">gg/AA</string>
   <string name="today_date_format">SS:dd</string>
   <!--Common-->
   <string name="username">Kullanıcı adı</string>
+  <string name="phone_number">Telefon numarası</string>
   <string name="display_name">Görünen ad</string>
   <string name="password">Parola</string>
   <string name="confirm_password">Parola doğrulama</string>
@@ -36,27 +44,24 @@
   <string name="connect">Bağlantı</string>
   <string name="decline">Reddet</string>
   <string name="conference">Çoklu görüşme</string>
+  <string name="no">Hayır</string>
+  <string name="ok">Tamam</string>
+  <string name="yes">Evet</string>
   <!--Launch screen-->
   <string name="app_description"><i>özgür</i> SIP istemcisi</string>
   <!--Assistant-->
   <string name="welcome">Hoş geldiniz</string>
   <string name="assistant">Yardımcı</string>
   <string name="assistant_create_account">Hesap Oluştur</string>
+  <string name="assistant_continue">Sürdür</string>
   <string name="assistant_finish">Yapılandırmayı bitir</string>
-  <string name="assistant_validate_account">Hesabınız oluşturuldu.Hesabınız için geçerli posta adresinize bakın lütfen.Onu yapınca geri dön ve düğmeyi tıkla.</string>
-  <string name="assistant_welcome_desc">Bu yardımcı, aramalarınız için bir SİP hesabı kullanmanıza yardım edecek.</string>
-  <string name="assistant_linphone_login_desc">Linphone hesabınızın kullanıcı adı ve parolasını girin</string>
-  <string name="assistant_login_desc">SIP alan adı ile kullanıcı adınız ve parolanızı girin</string>
   <string name="assistant_remote_provisioning_desc">Lütfen yetkilendirme adresinizi girin</string>
   <string name="transport">Taşıma</string>
   <string name="assistant_login_linphone">Linphone hesabı kullan</string>
   <string name="assistant_login_generic">SIP hesabı kullan</string>
   <string name="assistant_remote_provisioning">Uzaktan yapılandırma al</string>
-  <string name="assistant_create_account_part_1">1/2</string>
-  <string name="assistant_create_account_part_2">2/2</string>
   <string name="assistant_display_name_optional">Görünen ad (isteğe bağlı)</string>
-  <string name="assistant_linphone_account">Linphone hesabı yapılandır</string>
-  <string name="assistant_generic_account">SIP hesabı yapılandır</string>
+  <string name="assistant_generic_account">SIP hesabı kullan</string>
   <string name="assistant_remote_provisioning_title">Uzaktan yapılandırma al</string>
   <string name="assistant_fetch_apply">Al ve uygula</string>
   <string name="assistant_login">Giriş</string>
@@ -65,6 +70,9 @@
   <string name="assistant_account_not_validated">Hesabınız henüz onaylanmadı.</string>
   <string name="assistant_account_validated">Hesabınız onaylandı.</string>
   <string name="assistant_error_bad_credentials">Geçersiz kullanıcı adı ve parola</string>
+  <string name="assistant_codec_down_question">Cisco Systems, Inc. tarafından sağlanan OpenH264 Video çözücüsünü indirmeyi kabul ediyor musunuz?</string>
+  <string name="assistant_codec_downloading">Cisco Systems, Inc. tarafından sağlanan OpenH264 Video çözücüsü indiriliyor.</string>
+  <string name="assistant_codec_downloaded">Cisco Systems, Inc. tarafından sağlanan OpenH264 Video çözücüsü indirildi.</string>
   <string name="wizard_failed">Bir hata oluştu,daha sonra tekrar deneyin.</string>
   <string name="wizard_server_unavailable">Sunucuya ulaşılamıyor,ağ bağlantınızı kontrol edin.</string>
   <string name="wizard_username_unavailable">Bu kullanıcı adı zaten kullanılıyor.</string>
@@ -74,6 +82,9 @@
   <string name="wizard_passwords_unmatched">Parolalar eşleşmiyor.</string>
   <string name="setup_confirm_username">Kullanıcı adınız %s olacak.\r\n\r\nGereklilikleri sağlaması için sizin girdiğinizden farklı olabilir.\r\nKabul ediyor musunuz?</string>
   <string name="first_launch_no_login_password">Lütfen giriş adınızı ve parolanızı girin</string>
+  <string name="forgot_password">Parolayı mı unuttunuz?</string>
+  <!--Status-->
+  <!--In-app-->
   <!--Dailer-->
   <string name="address_bar_hint">Numara veya adres girin</string>
   <!--History-->
@@ -88,9 +99,9 @@
   <string name="delete_contacts">Seçilen bağlantıları silmek ister misiniz?</string>
   <string name="delete_contact">Seçilen bağlantıyı silmek ister misiniz?</string>
   <string name="sip_address">SİP adresi</string>
-  <string name="phone_number">Telefon numarası</string>
   <string name="contact_first_name">Ad</string>
   <string name="contact_last_name">Soyadı</string>
+  <string name="contact_organization">Kuruluş</string>
   <!--Chat-->
   <string name="no_chat_history">görüşme yok</string>
   <string name="delete_conversation">Seçilen görüşmeyi silmek ister misiniz?</string>
@@ -133,7 +144,6 @@
   <string name="call_stats_upload">Karşıya yükleme hızı:</string>
   <string name="call_stats_download">İndirme hızı:</string>
   <string name="call_stats_ice">İCE bağlanılabilirliği:</string>
-  <string name="call_stats_video_resolution">Görüntü boyutu:</string>
   <string name="call">Çağrı</string>
   <!--About-->
   <string name="menu_send_log">Günlük gönder</string>
@@ -144,6 +154,8 @@
   <string name="incall_notif_video">Görüntülü görüşme sürüyor</string>
   <string name="notification_started">Başladı</string>
   <string name="unread_messages">%i okunmamış iletiler</string>
+  <string name="missed_calls_notif_title">Yanıtsız çağrı</string>
+  <string name="missed_calls_notif_body">%i yanıtsız çağrı</string>
   <!--Errors-->
   <string name="skipable_error_service_not_ready">Uyarı: hizmet hazır değil</string>
   <string name="error">Hata</string>
@@ -194,6 +206,7 @@
   <string name="pref_sipaccounts">SİP Hesabı</string>
   <string name="default_account_flag">Öntanımlı hesap</string>
   <string name="pref_add_account">Hesap ekle</string>
+  <string name="pref_in_app_store">Uygulama İçi Mağaza</string>
   <string name="pref_tunnel">Tünel</string>
   <string name="pref_tunnel_host">Makine Adı</string>
   <string name="pref_tunnel_port">Bağlanma Noktası</string>
@@ -213,6 +226,7 @@
   <string name="pref_echo_cancellation">Yankı giderme</string>
   <string name="pref_echo_cancellation_summary">Karşıdan gelen yankılı sesi kaldır</string>
   <string name="pref_echo_canceller_calibration">Yankı giderme ayarı</string>
+  <string name="pref_echo_tester">Yankıyı sına</string>
   <string name="ec_calibrating">Ayarlama...</string>
   <string name="ec_calibrated">%s ms\'de ayarlandı</string>
   <string name="no_echo">Yankı yok</string>
@@ -222,6 +236,8 @@
   <string name="pref_codecs">Çözücüler</string>
   <!--Video settings-->
   <string name="pref_video_title">Görüntü</string>
+  <string name="pref_overlay">Video örten katmanı</string>
+  <string name="pref_overlay_summary">Uygulamanın dışındayken çağrı videosunu örten tabakada göster</string>
   <string name="pref_video_use_front_camera_title">Ön kamerayı kullan</string>
   <string name="pref_video_initiate_call_with_video_title">Görüntülü arama başlat</string>
   <string name="pref_video_initiate_call_with_video">Görüntü isteğini her zaman gönder</string>
@@ -234,16 +250,25 @@
   <string name="pref_video_codecs_title">Çözücüler</string>
   <!--Call settings-->
   <string name="pref_call_title">Çağrı</string>
-  <string name="pref_rfc2833_dtmf">RFC2833 DTMF\'yi gönder</string>
-  <string name="pref_sipinfo_dtmf">SIP INFO DTMF\'yi gönder</string>
+  <string name="pref_device_ringtone">Aygıt zil sesini kullan</string>
+  <string name="pref_auto_answer">Gelen çağrıları kendiliğinden cevapla</string>
   <string name="pref_voice_mail">Sesli posta adresi</string>
   <!--Chat settings-->
   <string name="pref_chat_title">Sohbet</string>
   <string name="pref_image_sharing_server_title">Sunucu paylaşımı</string>
+  <string name="pref_image_sharing_server_desc">Ne yaptığınızı bilmiyorsanız değiştirmeyin!</string>
+  <string name="pref_use_lime_encryption">LIME şifrelemeyi kullan</string>
+  <string name="lime_encryption_entry_disabled">Devre dışı</string>
+  <string name="lime_encryption_entry_mandatory">Zorunlu</string>
+  <string name="lime_encryption_entry_preferred">Yeğlenen</string>
   <!--Network settings-->
   <string name="pref_network_title">Ağ</string>
   <string name="pref_wifi_only">Sadece WİFİ kullan</string>
-  <string name="pref_ice_enable">İCE Etkin</string>
+  <string name="pref_stun_server">STUN / TURN sunucusu</string>
+  <string name="pref_ice_enable">ICE etkin</string>
+  <string name="pref_turn_enable">TURN etkin</string>
+  <string name="pref_turn_username_title">STUN / TURN kullanıcı adı (isteğe bağlı)</string>
+  <string name="pref_turn_passwd_title">STUN / TURN parolası (isteğe bağlı)</string>
   <string name="pref_upnp_enable">UPNP Etkin</string>
   <string name="pref_transport_use_random_ports">Rastgele bağlanma noktası kullan</string>
   <string name="pref_sip_port_title">Kullanılacak SİP bağlanma noktası</string>
@@ -259,9 +284,11 @@
   <string name="pref_debug">Hata ayıklama</string>
   <string name="pref_background_mode">Artalan kipi</string>
   <string name="pref_animation_enable_title">Animasyonlar etkin</string>
+  <string name="pref_service_notification">Hizmet bildirimi etkin</string>
   <string name="pref_autostart">Başlangıçta çalıştır</string>
   <string name="pref_incoming_call_timeout_title">Gelen çağrı kapandı (anında)</string>
   <string name="pref_remote_provisioning_title">Uzaktan yetkilendirme</string>
+  <string name="pref_android_app_settings_title">Android uygulama ayarları</string>
   <string name="pref_primary_account_title">Ana hesap</string>
   <string name="pref_display_name_title">Görünen ad</string>
   <string name="pref_user_name_title">Kullanıcı adı</string>
@@ -317,6 +344,7 @@
   <string name="content_description_message_status">İleti durumu</string>
   <string name="content_description_conference">Çoklu görüşme</string>
   <string name="content_description_username_field">Kullanıcı adı alanı</string>
+  <string name="content_description_activation_code_field">Kullanıcı adı alanı</string>
   <string name="content_description_display_field">Görünen ad alanı</string>
   <string name="content_description_domain_field">Alan adı alanı</string>
   <string name="content_description_url_field">Uzaktan yetkilendirme alanı</string>
@@ -328,6 +356,7 @@
   <string name="content_description_delete_selection">Şeçimi Sil</string>
   <string name="content_description_contact_first_name">Ad</string>
   <string name="content_description_contact_last_name">Soyadı</string>
+  <string name="content_description_contact_organization">Kuruluş</string>
   <string name="content_description_back_call">Aramaya dön</string>
   <string name="content_description_send_file">Bir dosya gönder</string>
   <string name="content_description_message">İleti</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b6a58fedb..5b9af0cea 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -15,6 +15,7 @@
   <string name="sync_account_name">Linphone 聯絡人</string>
   <!--Common-->
   <string name="username">使用者名稱</string>
+  <string name="phone_number">電話號碼</string>
   <string name="display_name">顯示名稱</string>
   <string name="password">密碼</string>
   <string name="confirm_password">密碼確認</string>
@@ -37,24 +38,22 @@
   <string name="connect">連接</string>
   <string name="decline">拒絕</string>
   <string name="conference">會議</string>
+  <string name="no">否</string>
+  <string name="ok">確定</string>
+  <string name="yes">是</string>
   <!--Launch screen-->
   <string name="app_description"><i>自由的</i> SIP 客戶端</string>
   <!--Assistant-->
   <string name="welcome">歡迎</string>
   <string name="assistant">助理</string>
   <string name="assistant_create_account">建立帳號</string>
+  <string name="assistant_continue">繼續</string>
   <string name="assistant_finish">完成設定</string>
-  <string name="assistant_validate_account">你的帳號已經建立。請檢查你的郵件來驗證你的帳號。完成時，回到這裡並點擊按鈕。</string>
-  <string name="assistant_welcome_desc">這個助理將幫助你使用一個 SIP 帳號來通話。</string>
-  <string name="assistant_linphone_login_desc">輸入你 Linphone 帳號的使用者名稱和密碼</string>
   <string name="transport">傳輸</string>
   <string name="assistant_login_linphone">使用 Linphone 帳號</string>
   <string name="assistant_login_generic">使用 SIP 帳號</string>
-  <string name="assistant_create_account_part_1">1/2</string>
-  <string name="assistant_create_account_part_2">2/2</string>
   <string name="assistant_display_name_optional">顯示名稱(選擇性)</string>
-  <string name="assistant_linphone_account">設定 Linphone 帳號</string>
-  <string name="assistant_generic_account">設定 SIP 帳號</string>
+  <string name="assistant_generic_account">使用 SIP 帳號</string>
   <string name="assistant_login">登入</string>
   <string name="assistant_ec_calibration">正在進行回音消除器校正</string>
   <string name="assistant_remote_provisioning_login">輸入你的使用者名稱和密碼</string>
@@ -71,6 +70,8 @@
   <string name="setup_confirm_username">你的使用者名稱將會是 %s。\r\n\r\n它可能與你輸入的不同來符合需求。\r\n你接受嗎？</string>
   <string name="first_launch_no_login_password">請輸入你的使用者名稱和密碼</string>
   <string name="forgot_password">忘記密碼？</string>
+  <!--Status-->
+  <!--In-app-->
   <!--Dailer-->
   <string name="address_bar_hint">輸入號碼或位址</string>
   <!--History-->
@@ -85,7 +86,6 @@
   <string name="delete_contacts">你想要刪除選取的聯絡人嗎？</string>
   <string name="delete_contact">你想要刪除選取的聯絡人嗎？</string>
   <string name="sip_address">SIP 位址</string>
-  <string name="phone_number">電話號碼</string>
   <string name="contact_first_name">名字</string>
   <string name="contact_last_name">姓氏</string>
   <!--Chat-->
@@ -126,7 +126,6 @@
   <string name="call_stats_codec">編解碼器：</string>
   <string name="call_stats_upload">上傳頻寬：</string>
   <string name="call_stats_download">下載頻寬：</string>
-  <string name="call_stats_video_resolution">視訊大小：</string>
   <string name="call">通話</string>
   <!--About-->
   <string name="menu_send_log">傳送記錄</string>
@@ -274,6 +273,7 @@
   <string name="content_description_message_status">訊息狀態</string>
   <string name="content_description_conference">會議</string>
   <string name="content_description_username_field">使用者名稱欄位</string>
+  <string name="content_description_activation_code_field">使用者名稱欄位</string>
   <string name="content_description_display_field">顯示名稱欄位</string>
   <string name="content_description_domain_field">網域欄位</string>
   <string name="content_description_confirm_password_field">確認密碼欄位</string>
diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
index c63f102b7..0b40c1385 100644
--- a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
+++ b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
@@ -79,7 +79,7 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin
 		}
 
 		phonenumber = (TextView) view.findViewById(R.id.send_phone_number);
-		phonenumber.setText(phone);
+		phonenumber.setText(dialcode + phone);
 
 		code = (EditText) view.findViewById(R.id.assistant_code);
 		code.addTextChangedListener(new TextWatcher() {