diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 8bdff422b..6d9035ed2 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -9,9 +9,15 @@
   <string name="notification_registered">‫%s مُسجَّل‬</string>
   <string name="notification_register_failure">‫فشل %s في التسجيل‬</string>
   <string name="tunnel_host"></string>
+  <string name="about_version">لِنْفُونْ أندرويد %s</string>
+  <string name="about_liblinphone_version">Linphone Core %s</string>
+  <string name="about_text">رخصة جْنُو العمومية الإصدار 2\n © 2010-2016 Belledonne Communications</string>
+  <string name="about_link">www.linphone.org</string>
+  <string name="sync_account_name">جهات اتصال Linphone</string>
+  <string name="today_date_format">HH:mm</string>
   <!--Common-->
-  <string name="username">إسم المستخدم</string>
-  <string name="display_name">الإسم المعروض</string>
+  <string name="username">اسم المستخدم</string>
+  <string name="display_name">الاسم المعروض</string>
   <string name="password">كلمة السر</string>
   <string name="confirm_password">تأكيد كلمة السر</string>
   <string name="domain">النطاق</string>
@@ -42,20 +48,20 @@
   <string name="assistant_create_account">إنشاء الحساب</string>
   <string name="assistant_finish">أنهِ التهئية</string>
   <string name="assistant_validate_account">لقد أُنشِيء حسابك. يُرجى الاطلاع على رسائل بريدك الإلكتروني لتأكيد حسابك. حالما تنتهي من ذلك، عُد إلى هنا واضغط على الزر.</string>
-  <string name="assistant_welcome_desc">سيمكنك هذا المرشد من إعداد حسابك SIP لإجراء المكالمات.</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_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_remote_provisioning_title">اجذب التهئية البعيدة</string>
+  <string name="assistant_remote_provisioning_title">اجذب التهيئة البعيدة</string>
   <string name="assistant_fetch_apply">اجذبْ وطبِّق</string>
   <string name="assistant_login">الولوج</string>
   <string name="assistant_ec_calibration">معايرة مزيل الصدى في طور الإنجاز</string>
@@ -71,7 +77,7 @@
   <string name="wizard_password_incorrect">كلمة السر غير صحيحة.</string>
   <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>
+  <string name="first_launch_no_login_password">يُرجى إدخال اسم المستخدم وكلمة السر</string>
   <!--Dailer-->
   <string name="address_bar_hint">أدخل رقما أو عنوانا</string>
   <!--History-->
@@ -132,7 +138,7 @@
   <string name="call_stats_download">صبيب التنزيل :</string>
   <string name="call_stats_ice">توصيل ICE :</string>
   <string name="call_stats_video_resolution">مقاس الفيديو :</string>
-  <string name="call">مكالمة</string>
+  <string name="call">المكالمة</string>
   <!--About-->
   <string name="menu_send_log">إرسال السجل</string>
   <string name="menu_reset_log">إعادة تعيين السجل</string>
@@ -212,6 +218,7 @@
   <string name="pref_echo_cancellation_summary">إزالة الصدى المسموع من الطرف الآخر</string>
   <string name="pref_echo_canceller_calibration">معايرة مزيل الصدى</string>
   <string name="ec_calibrating">يُعايِر...</string>
+  <string name="ec_calibrated">‫جرت المعايرة بـ ‪%s ms‬‬</string>
   <string name="no_echo">لا وجود لصدى</string>
   <string name="failed">فشِل</string>
   <string name="pref_adaptive_rate_control">التحكم في ملائمة الصبيب</string>
@@ -224,15 +231,19 @@
   <string name="pref_video_initiate_call_with_video">أرسِل دائما طلبات الفيديو</string>
   <string name="pref_video_automatically_accept_video_title">قبول طلبات الفيديو الواردة</string>
   <string name="pref_video_automatically_accept_video">قبول طلبات الفيديو دائما</string>
+  <string name="pref_video_preset">إعداد الفيديو المسبق</string>
   <string name="pref_preferred_video_size">حجم الفيديو المفضل</string>
   <string name="pref_preferred_fps">معدل الإطارات المفضل</string>
   <string name="pref_bandwidth_limit">حد سعة القناة بـ ك.بِتْ/ثانية</string>
   <string name="pref_video_codecs_title">المراميز</string>
   <!--Call settings-->
-  <string name="pref_call_title">مكالمة</string>
+  <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>
+  <string name="pref_image_sharing_server_title">خادم المشاركة</string>
   <!--Network settings-->
   <string name="pref_network_title">الشبكة</string>
   <string name="pref_wifi_only">استخدم WiFi فقط</string>
@@ -255,7 +266,6 @@
   <string name="pref_animation_enable_title">تشغيل التحريكات</string>
   <string name="pref_autostart">البدء خلال الإقلاع</string>
   <string name="pref_incoming_call_timeout_title">مهلة الانتظار قبل رفض المكالمة (بالثواني)</string>
-  <string name="pref_image_sharing_server_title">خادم المشاركة</string>
   <string name="pref_remote_provisioning_title">التهيئة عن بعد</string>
   <string name="pref_primary_account_title">الحساب اﻷوَّلي</string>
   <string name="pref_display_name_title">الإسم المعروض</string>
@@ -269,18 +279,22 @@
   <!--Content description-->
   <string name="content_description_back">الرجوع</string>
   <string name="content_description_dialer">لوحة المفاتيح</string>
+  <string name="content_description_menu">القائمة</string>
   <string name="content_description_toggle_micro">تبديل الميكروفون</string>
   <string name="content_description_toggle_speaker">تبديل مكبر الصوت</string>
   <string name="content_description_decline">رفض</string>
   <string name="content_description_hang_up">ضع السماعة</string>
   <string name="content_description_accept">قبول</string>
   <string name="content_description_edit">تحرير</string>
+  <string name="content_description_edit_list">حرر القائمة</string>
+  <string name="content_description_valid">صحيح</string>
   <string name="content_description_add_contact">إضافة إلى جهات الاتصال</string>
   <string name="content_description_new_contact">جهة اتصال جديدة</string>
-  <string name="content_description_call">مكالمة</string>
+  <string name="content_description_call">المكالمة</string>
   <string name="content_description_backspace">مسافة</string>
   <string name="content_description_chat">المحادثة</string>
   <string name="content_description_dial_back">إعادة الاتصال</string>
+  <string name="content_description_dialer_back">الرجوع إلى لوحة المفاتيح</string>
   <string name="content_description_contact_picture">صورة جهة الاتصال</string>
   <string name="content_description_send_message">إرسال رسالة</string>
   <string name="content_description_detail">التفاصيل</string>
@@ -288,6 +302,7 @@
   <string name="content_description_add">إضافة مكالمة</string>
   <string name="content_description_new_discussion">محادثة جديدة</string>
   <string name="content_description_search">بحث</string>
+  <string name="content_description_search_contact">ابحث عن جهة الاتصال</string>
   <string name="content_description_all_contacts">كل جهات الاتصال</string>
   <string name="content_description_linphone_contacts">جهات اتصال Linphone</string>
   <string name="content_description_call_direction">اتجاه الاتصال</string>
@@ -306,9 +321,26 @@
   <string name="content_description_cancel_button">زر الإلغاء</string>
   <string name="content_description_message_status">حالة الرسالة</string>
   <string name="content_description_conference">اجتماع</string>
+  <string name="content_description_username_field">حقل اسم المستخدم</string>
+  <string name="content_description_display_field">اعرض حقل الاسم</string>
+  <string name="content_description_domain_field">حقل النطاق</string>
+  <string name="content_description_url_field">حقل التهيئة البعيدة</string>
+  <string name="content_description_confirm_password_field">حقل تأكيد كلمة السر</string>
+  <string name="content_description_email_field">حقل البريد الإلكتروني</string>
   <string name="content_description_default_account">الحساب الافتراضي</string>
+  <string name="content_description_deselect_all">أزل تحديد الكل</string>
+  <string name="content_description_select_all">حدد الكل</string>
+  <string name="content_description_delete_selection">احذف التحديد</string>
   <string name="content_description_contact_first_name">اﻹسم</string>
   <string name="content_description_contact_last_name">اللقب</string>
+  <string name="content_description_back_call">ارجع إلى المكالمة</string>
+  <string name="content_description_send_file">أرسل ملفا</string>
+  <string name="content_description_message">رسالة</string>
+  <string name="content_description_unread_chat_message">الرسائل غير المقروءة</string>
   <string name="content_description_transfer">تحويل</string>
+  <string name="content_description_earpiece">سماعة الأذن</string>
   <string name="content_description_bluetooth">بلوتوث</string>
+  <string name="content_description_call_options">خيارات المكالمة</string>
+  <string name="content_description_audio_route">توجيه الصوت</string>
+  <string name="content_description_exit_conference">مغادرة الاجتماع</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b9a9e73a3..bb698323b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -6,11 +6,28 @@
   <string name="addressbook_label">Linphone</string>
   <string name="notification_title">Linphone</string>
   <string name="wait_dialog_text">Startvorgang</string>
+  <string name="notification_registered">%s registriert</string>
+  <string name="notification_register_failure">%s konnte nicht registrieren</string>
   <string name="tunnel_host"></string>
+  <string name="about_version">Linphone Android %s</string>
+  <string name="about_liblinphone_version">Linphone-Kern %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-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="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="display_name">Anzeigename</string>
   <string name="password">Passwort</string>
+  <string name="confirm_password">Passwortbestätigung</string>
+  <string name="domain">Domain</string>
+  <string name="remote_provisioning_url">URL</string>
+  <string name="email">E-Mail</string>
+  <string name="delete_text">Sind Sie sicher, dass Sie Ihre Auswahl löschen möchten?</string>
   <string name="delete">Löschen</string>
   <string name="retry">Erneut versuchen</string>
   <string name="cancel">Abbrechen</string>
@@ -18,34 +35,75 @@
   <string name="continue_text">Fortsetzen</string>
   <string name="about">Über</string>
   <string name="deny">Verweigern</string>
+  <string name="no_account">Kein Konto konfiguriert</string>
   <string name="search">Suchen</string>
   <string name="outgoing">Ausgehend</string>
   <string name="incoming">Eingehend</string>
   <string name="missed">Verpasst</string>
   <string name="settings">Einstellungen</string>
+  <string name="connect">Verbindung</string>
   <string name="decline">Ablehnen</string>
   <string name="conference">Konferenz</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_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_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_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_account_validated">Ihr Konto wurde überprüft.</string>
+  <string name="assistant_error_bad_credentials">Falscher Benutzername oder Passwort</string>
   <string name="wizard_failed">Es ist ein Fehler aufgetreten, versuchen Sie es später nochmal</string>
+  <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="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>
   <!--Dailer-->
+  <string name="address_bar_hint">Geben Sie eine Nummer oder eine Adresse ein</string>
   <!--History-->
+  <string name="no_call_history">Kein Anruf in Ihrer Chronik</string>
+  <string name="no_missed_call_history">Kein verpasster Anruf in Ihrer Chronik</string>
+  <string name="delete_history_log">Möchten Sie das ausgewählte Anrufprotokoll löschen?</string>
   <string name="today">Heute</string>
   <string name="yesterday">Gestern</string>
   <!--Contacts-->
   <string name="no_contact">Kein Kontakt in Ihrem Adressbuch.</string>
   <string name="no_sip_contact">Kein SIP-Kontakt in Ihrem Adressbuch.</string>
+  <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>
   <!--Chat-->
+  <string name="no_chat_history">Keine Gespräche</string>
+  <string name="delete_conversation">Möchten Sie das ausgewählte Gespräch löschen?</string>
+  <string name="delete_message">Möchten Sie die ausgewählte Nachricht löschen?</string>
   <string name="remote_composing">Partner schreibt...</string>
   <string name="share_picture_size_small">Klein</string>
   <string name="share_picture_size_medium">Mittel</string>
@@ -60,13 +118,23 @@
   <string name="processing_image">Bild wird verarbeitet. Je nach Größe der Datei kann dies mehrere Sekunden in Anspruch nehmen</string>
   <!--Status Bar-->
   <string name="status_connected">Registriert</string>
+  <string name="status_not_connected">Nicht registriert</string>
   <string name="status_in_progress">Registrierung in Arbeit</string>
   <string name="status_error">Registierung fehlgeschlagen</string>
   <string name="voicemail_unread">ungelesene Nachrichten</string>
   <!--Side Menu-->
+  <string name="menu_assistant">Assistent</string>
   <string name="menu_settings">Einstellungen</string>
   <string name="menu_about">Über</string>
+  <string name="quit">Schließen</string>
   <!--Call-->
+  <string name="incoming_call">eingehender Anruf</string>
+  <string name="outgoing_call">ausgehender Anruf</string>
+  <string name="add_video_dialog">Ihr Partner möchte Video einschalten</string>
+  <string name="no_current_call">Kein aktiver Anruf</string>
+  <string name="call_paused_by_remote">Ihr Partner hat den Anruf pausiert</string>
+  <string name="couldnt_accept_call">Beim Annehmen des Anrufs ist ein Fehler aufgetreten</string>
+  <string name="zrtp_dialog">ZRTP-Token ist %s\nSie sollten nur annehmen, wenn Sie den gleichen Token wie Ihr Partner haben</string>
   <string name="unknown_incoming_call_name">Unbekannt</string>
   <string name="call_stats_audio">Audio</string>
   <string name="call_stats_video">Video</string>
@@ -88,16 +156,20 @@
   <!--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_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>
   <string name="error_network_unreachable">Netzwerk ist nicht erreichbar</string>
   <string name="error_bad_credentials">Falsche Anmeldedaten</string>
   <string name="error_unauthorized">Unzulässig</string>
   <string name="error_io_error">Netzwerkfehler</string>
+  <string name="download_image_failed">Herunterladen fehlgeschlagen. Bitte überprüfen Sie Ihre Netzwerkverbindung oder versuchen Sie es später erneut.</string>
   <string name="remote_provisioning_failure">Fehler beim Herunterladen oder Anwenden des Fernbereitstellungsprofils...</string>
   <string name="remote_provisioning_again_title">Fernbereitstellung</string>
+  <string name="remote_provisioning_again_message">Möchten Sie die Bereitstellungs-URI ändern?</string>
   <!--Account Settings-->
   <string name="pref_sipaccount">SIP-Konto</string>
   <string name="pref_manage_title">Verwalten</string>
@@ -111,13 +183,16 @@
   <string name="pref_help_outbound_proxy">Alle Anrufe üder einen SIP Proxy leiten</string>
   <string name="pref_help_username">Beispiel: John, wenn ihr Konto john@sip.example.org ist</string>
   <string name="pref_help_domain">sip.example.org, wenn Ihr Konto john@sip.example.org ist</string>
-  <string name="pref_help_password">Sie müssen Ihr Passwort erneut eingeben, wenn Sie Ihren Benutzernamen und/oder Domain ändern</string>
+  <string name="pref_help_password">Sie müssen Ihr Passwort erneut eingeben, wenn Sie Ihren Benutzernamen und/oder Domain bearbeiten</string>
   <string name="pref_expire_title">Ablaufen</string>
   <string name="pref_avpf">AVPF</string>
   <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_auth_userid">Authentifizierungs-Benutzerkennung</string>
+  <string name="pref_help_auth_userid">Authentifizierungs-Benutzerkennung eingeben (optional)</string>
   <string name="pref_display_name">Anzeigename</string>
+  <string name="pref_help_display_name">Anzeigename eingeben (optional)</string>
   <string name="pref_prefix">Präfix</string>
   <string name="pref_transport">Transport</string>
   <string name="pref_transport_udp">UDP</string>
@@ -147,7 +222,9 @@
   <string name="pref_audio_title">Audio</string>
   <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="ec_calibrating">Kalibrierung...</string>
+  <string name="ec_calibrated">Kalibriert in %s ms</string>
   <string name="no_echo">Kein Echo</string>
   <string name="failed">fehlgeschlagen</string>
   <string name="pref_adaptive_rate_control">Adaptive Ratenregelung</string>
@@ -155,20 +232,34 @@
   <string name="pref_codecs">Codecs</string>
   <!--Video settings-->
   <string name="pref_video_title">Video</string>
+  <string name="pref_overlay">Videoeinblendung</string>
+  <string name="pref_overlay_summary">Anrufvideo in Einblendung anzeigen, wenn Sie außerhalb der Anwendung sind</string>
   <string name="pref_video_use_front_camera_title">Frontkamera benutzen</string>
   <string name="pref_video_initiate_call_with_video_title">Videoanrufe starten</string>
   <string name="pref_video_initiate_call_with_video">Immer Videoanfragen senden</string>
   <string name="pref_video_automatically_accept_video_title">Eingehende Videoanfragen annehmen</string>
   <string name="pref_video_automatically_accept_video">Videoanfragen immer annehmen</string>
+  <string name="pref_video_preset">Videovoreinstellung</string>
   <string name="pref_preferred_video_size">Bevorzugte Videogröße</string>
+  <string name="pref_preferred_fps">Bevorzugte FPS</string>
   <string name="pref_bandwidth_limit">Bandbreitenbegrenzung in kbits/s</string>
   <string name="pref_video_codecs_title">Codecs</string>
   <!--Call settings-->
   <string name="pref_call_title">Anruf</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>
+  <string name="pref_image_sharing_server_title">Gemeinsamer Server</string>
+  <string name="pref_image_sharing_server_desc">Nicht bearbeiten, außer Sie wissen, was Sie tun!</string>
+  <string name="pref_use_lime_encryption">LIME-Verschlüsselung verwenden</string>
+  <string name="lime_encryption_entry_disabled">Deaktiviert</string>
+  <string name="lime_encryption_entry_mandatory">Obligatorisch</string>
+  <string name="lime_encryption_entry_preferred">Bevorzugt</string>
   <!--Network settings-->
   <string name="pref_network_title">Netzwerk</string>
+  <string name="pref_wifi_only">Nur WiFi verwenden</string>
   <string name="pref_stun_server">Stun-Server</string>
   <string name="pref_ice_enable">ICE aktivieren</string>
   <string name="pref_upnp_enable">UPNP aktivieren</string>
@@ -180,12 +271,15 @@
   <string name="pref_audio_port_description">Audioport oder Portbereich (Min.Port-Max.Port)</string>
   <string name="pref_media_encryption">Medienverschlüsselung</string>
   <string name="pref_push_notification">Push-Benachrichtigungen aktivieren</string>
+  <string name="pref_ipv6_title">IPv6 erlauben</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">Erweitert</string>
   <string name="pref_debug">Debug</string>
   <string name="pref_background_mode">Hintergrundmodus</string>
   <string name="pref_animation_enable_title">Animationen aktivieren</string>
+  <string name="pref_service_notification">Dienstbenachrichtigung aktivieren</string>
   <string name="pref_autostart">Beim Einschalten starten</string>
+  <string name="pref_incoming_call_timeout_title">Auflegen bei eingehendem Anruf (in Sekunden)</string>
   <string name="pref_remote_provisioning_title">Fernbereitstellung</string>
   <string name="pref_primary_account_title">Primäres Konto</string>
   <string name="pref_display_name_title">Anzeigename</string>
@@ -199,24 +293,30 @@
   <!--Content description-->
   <string name="content_description_back">Zurück</string>
   <string name="content_description_dialer">Wählgerät</string>
+  <string name="content_description_menu">Menü</string>
   <string name="content_description_toggle_micro">Mikrofon umschalten</string>
   <string name="content_description_toggle_speaker">Lautsprecher umschalten</string>
   <string name="content_description_decline">Ablehnen</string>
   <string name="content_description_hang_up">Auflegen</string>
   <string name="content_description_accept">Annehmen</string>
-  <string name="content_description_edit">Ändern</string>
+  <string name="content_description_edit">Bearbeiten</string>
+  <string name="content_description_edit_list">Liste bearbeiten</string>
+  <string name="content_description_valid">Gültig</string>
   <string name="content_description_add_contact">Zu Kontakten hinzufügen</string>
   <string name="content_description_new_contact">Neuer Kontakt</string>
   <string name="content_description_call">Call</string>
   <string name="content_description_backspace">Zurückschalten</string>
   <string name="content_description_chat">Nachrichten</string>
   <string name="content_description_dial_back">Zurückrufen</string>
+  <string name="content_description_dialer_back">Zurück zum Anrufer</string>
   <string name="content_description_contact_picture">Kontaktbild</string>
   <string name="content_description_send_message">Nachricht senden</string>
+  <string name="content_description_detail">Details</string>
   <string name="content_description_delete">Löschen</string>
   <string name="content_description_add">Anruf hinzufügen</string>
   <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_all_contacts">Alle Kontakte</string>
   <string name="content_description_linphone_contacts">Linphone-Kontakte</string>
   <string name="content_description_call_direction">Anrufrichtung</string>
@@ -235,9 +335,26 @@
   <string name="content_description_cancel_button">Schaltfläche Abbrechen</string>
   <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_display_field">Anzeigenamenfeld</string>
+  <string name="content_description_domain_field">Domänenfeld</string>
+  <string name="content_description_url_field">Fernbereitstellungsfeld</string>
+  <string name="content_description_confirm_password_field">Passwortbestätigungsfeld</string>
+  <string name="content_description_email_field">E-Mail-Feld</string>
   <string name="content_description_default_account">Standardkonto</string>
+  <string name="content_description_deselect_all">Alle abwählen</string>
+  <string name="content_description_select_all">Alle auswählen</string>
+  <string name="content_description_delete_selection">Auswahl löschen</string>
   <string name="content_description_contact_first_name">Vorname</string>
   <string name="content_description_contact_last_name">Nachname</string>
+  <string name="content_description_back_call">Zurück zum Anruf</string>
+  <string name="content_description_send_file">Datei senden</string>
+  <string name="content_description_message">Nachricht</string>
+  <string name="content_description_unread_chat_message">Ungelesene Chatnachricht</string>
   <string name="content_description_transfer">Weiterleiten</string>
+  <string name="content_description_earpiece">Ohrhörer</string>
   <string name="content_description_bluetooth">Bluetooth</string>
+  <string name="content_description_call_options">Anrufoptionen</string>
+  <string name="content_description_audio_route">Audioroute</string>
+  <string name="content_description_exit_conference">Konferenz beenden</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index bff343ed5..f0b79081c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -7,6 +7,8 @@
   <string name="notification_title">Linphone</string>
   <string name="wait_dialog_text">Iniciando</string>
   <string name="tunnel_host"></string>
+  <string name="sync_account_name">contactos linphone</string>
+  <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">Nombre de usuario</string>
   <string name="display_name">Nombre a mostrar</string>
@@ -144,6 +146,8 @@
   <!--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-->
   <string name="pref_network_title">Red</string>
   <string name="pref_stun_server">Servidor STUN</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 0462a2b48..cef47c494 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -9,6 +9,12 @@
   <string name="notification_registered">Rekisteröity kohteeseen %s</string>
   <string name="notification_register_failure">Epäonnistui rekisteröidä kohteeseen %s</string>
   <string name="tunnel_host"></string>
+  <string name="sync_account_name">linphone yhteystiedot</string>
+  <string name="history_date_format">VVV, p KKK esim. Maanantai, 1 Tam</string>
+  <string name="history_detail_date_format">vvvv/KK/dd - TT:mm - esim 2012/11/22 - 12:34</string>
+  <string name="messages_date_format">pp/KK, TT:mm esim 22/11, 12:34</string>
+  <string name="messages_list_date_format">pp/KK esim 22/11</string>
+  <string name="today_date_format">TT:mm esim. 11:11</string>
   <!--Common-->
   <string name="username">Käyttäjätunnus</string>
   <string name="display_name">Näytä nimi</string>
@@ -232,6 +238,9 @@
   <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>
+  <string name="pref_image_sharing_server_title">Jaa palvelin</string>
   <!--Network settings-->
   <string name="pref_network_title">Verkko</string>
   <string name="pref_wifi_only">Käytä vain wifiä</string>
@@ -254,7 +263,6 @@
   <string name="pref_animation_enable_title">Salli animaatiot</string>
   <string name="pref_autostart">Käynnistä laitteen käynnistyessä</string>
   <string name="pref_incoming_call_timeout_title">Saapuva puhelu aikakatkaisu (sekunneissa)</string>
-  <string name="pref_image_sharing_server_title">Jaa palvelin</string>
   <string name="pref_remote_provisioning_title">Vastapuoli hakee asetuksia</string>
   <string name="pref_primary_account_title">Pääasiallinen tili</string>
   <string name="pref_display_name_title">Näytä nimi</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a87292af8..4dc80e8ca 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -9,6 +9,16 @@
   <string name="notification_registered">%s enregistré</string>
   <string name="notification_register_failure">%s n\'a pas pu s\'enregistrer</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">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="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="display_name">Nom d\'affichage</string>
@@ -35,6 +45,7 @@
   <string name="decline">Refuser</string>
   <string name="conference">Conférence</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>
@@ -72,6 +83,7 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</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>
   <!--Dailer-->
   <string name="address_bar_hint">Entrez un numéro ou une adresse</string>
   <!--History-->
@@ -177,6 +189,7 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <string name="pref_avpf">AVPF</string>
   <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_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>
@@ -192,6 +205,7 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <string name="pref_sipaccounts">Comptes SIP</string>
   <string name="default_account_flag">Compte par défaut</string>
   <string name="pref_add_account">Ajouter un compte</string>
+  <string name="pref_in_app_store">Magasin</string>
   <string name="pref_tunnel">Tunnel</string>
   <string name="pref_tunnel_host">Hôte</string>
   <string name="pref_tunnel_port">Port</string>
@@ -220,6 +234,8 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <string name="pref_codecs">Codecs</string>
   <!--Video settings-->
   <string name="pref_video_title">Vidéo</string>
+  <string name="pref_overlay">Vidéo détachable</string>
+  <string name="pref_overlay_summary">Affiche la video d\'un appel en dehors de l\'application</string>
   <string name="pref_video_use_front_camera_title">Utiliser la caméra en façade</string>
   <string name="pref_video_initiate_call_with_video_title">Initier les appels en vidéo</string>
   <string name="pref_video_initiate_call_with_video">Toujours envoyer des demandes d\'appels vidéo</string>
@@ -232,9 +248,19 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <string name="pref_video_codecs_title">Codecs</string>
   <!--Call settings-->
   <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 RFC2833</string>
   <string name="pref_sipinfo_dtmf">Envoyer les DTMFs en SIP INFO</string>
   <string name="pref_voice_mail">URI de boîte vocale</string>
+  <!--Chat settings-->
+  <string name="pref_chat_title">Chat</string>
+  <string name="pref_image_sharing_server_title">Serveur de partage</string>
+  <string name="pref_image_sharing_server_desc">Ne changez pas cette valeur sans savoir ce que vous faites !</string>
+  <string name="pref_use_lime_encryption">Encrypter avec LIME</string>
+  <string name="lime_encryption_entry_disabled">Désactivé</string>
+  <string name="lime_encryption_entry_mandatory">Obligatoire</string>
+  <string name="lime_encryption_entry_preferred">Préferré</string>
   <!--Network settings-->
   <string name="pref_network_title">Réseau</string>
   <string name="pref_wifi_only">Utiliser WiFi uniquement</string>
@@ -255,9 +281,9 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <string name="pref_debug">Activer les traces de débogage</string>
   <string name="pref_background_mode">Actif en arrière plan</string>
   <string name="pref_animation_enable_title">Activer les animations</string>
+  <string name="pref_service_notification">Notification de service</string>
   <string name="pref_autostart">Démarrer au lancement du téléphone</string>
   <string name="pref_incoming_call_timeout_title">Ignorer les appels entrants après (en secondes)</string>
-  <string name="pref_image_sharing_server_title">Serveur de partage</string>
   <string name="pref_remote_provisioning_title">Configuration distante</string>
   <string name="pref_primary_account_title">Compte principal</string>
   <string name="pref_display_name_title">Nom d\'affichage</string>
@@ -271,6 +297,7 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <!--Content description-->
   <string name="content_description_back">Retour</string>
   <string name="content_description_dialer">Dialer</string>
+  <string name="content_description_menu">Menu</string>
   <string name="content_description_toggle_micro">Basculer micro</string>
   <string name="content_description_toggle_speaker">Basculer haut-parleur</string>
   <string name="content_description_decline">Refuser</string>
@@ -315,11 +342,13 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <string name="content_description_username_field">Champ nom d\'utilisateur</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>
   <string name="content_description_confirm_password_field">Champ confirmation du mot de passe</string>
   <string name="content_description_email_field">Champ email</string>
   <string name="content_description_default_account">Compte par défaut</string>
   <string name="content_description_deselect_all">Tout déselectionner</string>
   <string name="content_description_select_all">Tout sélectionner</string>
+  <string name="content_description_delete_selection">Supprimer la sélection</string>
   <string name="content_description_contact_first_name">Prénom</string>
   <string name="content_description_contact_last_name">Nom</string>
   <string name="content_description_back_call">Retour à l\'appel</string>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index 76345d7ff..e5cd6517f 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -67,6 +67,8 @@
   <string name="pref_video_title">וידאו</string>
   <!--Call settings-->
   <string name="pref_call_title">קריאה</string>
+  <!--Chat settings-->
+  <string name="pref_chat_title">שיחה</string>
   <!--Network settings-->
   <string name="pref_network_title">רשת</string>
   <string name="pref_stun_server">שרת Stun</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c9226fa3e..112d9524b 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -9,6 +9,16 @@
   <string name="notification_registered">%sを登録しました</string>
   <string name="notification_register_failure">%sの登録に失敗しました</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 ライセンス V2\n © 2010-2016 Belledonne Communications</string>
+  <string name="about_link">www.linphone.org</string>
+  <string name="sync_account_name">linphoneにたずねる</string>
+  <string name="history_date_format">EEE, d MMM</string>
+  <string name="history_detail_date_format">yyyy/MM/dd - 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">ユーザー名</string>
   <string name="display_name">表示する名前</string>
@@ -64,19 +74,33 @@
   <string name="assistant_error_bad_credentials">ユーザー名かパスワードが異なります</string>
   <string name="wizard_failed">エラーが発生しました。のちほど再試行してください。</string>
   <string name="wizard_username_unavailable">このユーザー名はすでに使われています。</string>
+  <string name="wizard_username_incorrect">不適切なユーザー名です</string>
+  <string name="wizard_email_incorrect">不適切なメールアドレスです</string>
+  <string name="wizard_password_incorrect">不適切なパスワードです</string>
+  <string name="wizard_passwords_unmatched">パスワードが一致しません</string>
   <string name="first_launch_no_login_password">ユーザー名とパスワードを入力してください</string>
+  <string name="forgot_password">パスワードを忘れましたか？</string>
   <!--Dailer-->
+  <string name="address_bar_hint">番号もしくはアドレスを入力してください</string>
   <!--History-->
+  <string name="no_call_history">発信履歴がありません</string>
+  <string name="no_missed_call_history">発信ミス履歴がありません</string>
+  <string name="delete_history_log">本当に選択した通話履歴を削除しますか？</string>
   <string name="today">今日</string>
   <string name="yesterday">昨日</string>
   <!--Contacts-->
   <string name="no_contact">電話帳に連絡先がありません</string>
   <string name="no_sip_contact">電話帳にSIPの連絡先がありません</string>
+  <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-->
+  <string name="no_chat_history">新しい会話はありません</string>
+  <string name="delete_conversation">本当に選択した会話を削除しますか？</string>
+  <string name="delete_message">本当に選択したメッセージを削除しますか？</string>
   <string name="remote_composing">リモート先が入力中...</string>
   <string name="share_picture_size_small">小さい</string>
   <string name="share_picture_size_medium">中くらい</string>
@@ -103,6 +127,7 @@
   <!--Call-->
   <string name="incoming_call">着信</string>
   <string name="outgoing_call">発信</string>
+  <string name="no_current_call">有効な発信はありません</string>
   <string name="unknown_incoming_call_name">不明</string>
   <string name="call_stats_audio">オーディオ</string>
   <string name="call_stats_video">ビデオ</string>
@@ -132,6 +157,7 @@
   <string name="error_bad_credentials">不正な証明書です</string>
   <string name="error_unauthorized">無断</string>
   <string name="error_io_error">ネットワークエラー</string>
+  <string name="download_image_failed">ダウンロードに失敗しました。ネットワークを確認して再度操作してください。</string>
   <string name="remote_provisioning_failure">ダウンロードした、リモートプロビジョニング設定を適用できませんでした...</string>
   <string name="remote_provisioning_again_title">遠隔準備</string>
   <!--Account Settings-->
@@ -154,6 +180,7 @@
   <string name="pref_escape_plus">00 で置き換える</string>
   <string name="pref_auth_userid">ユーザーIDを認証</string>
   <string name="pref_display_name">表示名</string>
+  <string name="pref_help_display_name">表示する名前(任意)</string>
   <string name="pref_prefix">プレフィックス</string>
   <string name="pref_transport">トランスポート</string>
   <string name="pref_transport_udp">UDP</string>
@@ -165,6 +192,7 @@
   <string name="pref_sipaccounts">SIPアカウント</string>
   <string name="default_account_flag">デフォルトのアカウント</string>
   <string name="pref_add_account">アカウントを追加する</string>
+  <string name="pref_in_app_store">アプリストアで</string>
   <string name="pref_tunnel">トンネル</string>
   <string name="pref_tunnel_host">ホスト名</string>
   <string name="pref_tunnel_port">ポート</string>
@@ -183,6 +211,7 @@
   <string name="pref_audio_title">オーディオ</string>
   <string name="pref_echo_cancellation">エコーキャンセル</string>
   <string name="pref_echo_cancellation_summary">相手が聞こえるエコーを削除する</string>
+  <string name="pref_echo_canceller_calibration">エコーキャンセラーの調整</string>
   <string name="ec_calibrating">調整中...</string>
   <string name="ec_calibrated">%s msで調整しました</string>
   <string name="no_echo">エコーなし</string>
@@ -207,6 +236,10 @@
   <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>
+  <string name="pref_image_sharing_server_title">共有サーバー</string>
+  <string name="lime_encryption_entry_disabled">無効にする</string>
   <!--Network settings-->
   <string name="pref_network_title">ネットワーク</string>
   <string name="pref_wifi_only">WiFiのみ</string>
@@ -227,8 +260,8 @@
   <string name="pref_debug">デバッグ</string>
   <string name="pref_background_mode">バックグラウンド動作</string>
   <string name="pref_animation_enable_title">アニメーションを有効にする</string>
+  <string name="pref_service_notification">サービス通知を有効にする</string>
   <string name="pref_autostart">起動時に開始する</string>
-  <string name="pref_image_sharing_server_title">共有サーバー</string>
   <string name="pref_remote_provisioning_title">遠隔準備</string>
   <string name="pref_primary_account_title">優先アカウント</string>
   <string name="pref_display_name_title">表示名</string>
@@ -242,18 +275,22 @@
   <!--Content description-->
   <string name="content_description_back">戻る</string>
   <string name="content_description_dialer">ダイヤラー</string>
+  <string name="content_description_menu">メニュー</string>
   <string name="content_description_toggle_micro">マイク切り替えトグル</string>
   <string name="content_description_toggle_speaker">スピーカー切り替えトグル</string>
   <string name="content_description_decline">拒否</string>
   <string name="content_description_hang_up">ハングアップ</string>
   <string name="content_description_accept">受理する</string>
   <string name="content_description_edit">編集</string>
+  <string name="content_description_edit_list">編集リスト</string>
+  <string name="content_description_valid">適正</string>
   <string name="content_description_add_contact">連絡先に追加</string>
   <string name="content_description_new_contact">新しい連絡先</string>
   <string name="content_description_call">発信</string>
   <string name="content_description_backspace">バックスペース</string>
   <string name="content_description_chat">チャット</string>
   <string name="content_description_dial_back">コールバック</string>
+  <string name="content_description_dialer_back">ダイヤル画面に戻る</string>
   <string name="content_description_contact_picture">連絡相手の画像</string>
   <string name="content_description_send_message">送信メッセージ</string>
   <string name="content_description_detail">詳細</string>
@@ -261,6 +298,7 @@
   <string name="content_description_add">追加発信</string>
   <string name="content_description_new_discussion">新しいやりとりを行う</string>
   <string name="content_description_search">検索</string>
+  <string name="content_description_search_contact">連絡先を検索する</string>
   <string name="content_description_all_contacts">すべての連絡先</string>
   <string name="content_description_linphone_contacts">Linphoneでの連絡先</string>
   <string name="content_description_call_direction">宛先を指定</string>
@@ -279,9 +317,22 @@
   <string name="content_description_cancel_button">キャンセルボタン</string>
   <string name="content_description_message_status">メッセージ状態</string>
   <string name="content_description_conference">会談</string>
+  <string name="content_description_username_field">ユーザー名</string>
+  <string name="content_description_display_field">表示名</string>
+  <string name="content_description_domain_field">ドメイン</string>
+  <string name="content_description_confirm_password_field">パスワードの再入力</string>
+  <string name="content_description_email_field">メールアドレス</string>
   <string name="content_description_default_account">デフォルトのアカウント</string>
+  <string name="content_description_deselect_all">全ての選択を外す</string>
+  <string name="content_description_select_all">全てを選択する</string>
   <string name="content_description_contact_first_name">名前</string>
   <string name="content_description_contact_last_name">名字</string>
+  <string name="content_description_back_call">発信に戻る</string>
+  <string name="content_description_send_file">ファイルを送信する</string>
+  <string name="content_description_message">メッセージ</string>
+  <string name="content_description_unread_chat_message">未読件数</string>
   <string name="content_description_transfer">転送</string>
   <string name="content_description_bluetooth">Bluetooth</string>
+  <string name="content_description_call_options">発信オプション</string>
+  <string name="content_description_exit_conference">会議を終了する</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b900a4041..d113654d2 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -7,6 +7,7 @@
   <string name="notification_title">Linphone</string>
   <string name="wait_dialog_text">Bezig met opstarten</string>
   <string name="tunnel_host"></string>
+  <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">Gebruikersnaam</string>
   <string name="display_name">Weergavenaam</string>
@@ -94,6 +95,8 @@
   <string name="pref_video_codecs_title">Codecs</string>
   <!--Call settings-->
   <string name="pref_call_title">Oproep</string>
+  <!--Chat settings-->
+  <string name="pref_chat_title">Chat</string>
   <!--Network settings-->
   <string name="pref_network_title">Netwerk</string>
   <string name="pref_stun_server">Stun-server</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index cf0359110..6445c8332 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -161,6 +161,9 @@
   <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>
+  <!--Chat settings-->
+  <string name="pref_chat_title">Chat</string>
+  <string name="pref_image_sharing_server_title">Servidor de compartilhamento</string>
   <!--Network settings-->
   <string name="pref_network_title">Network</string>
   <string name="pref_stun_server">Servidor Stun</string>
@@ -180,7 +183,6 @@
   <string name="pref_background_mode">Em segundo plano</string>
   <string name="pref_animation_enable_title">Ativar Animações</string>
   <string name="pref_autostart">Iniciar na inicialização</string>
-  <string name="pref_image_sharing_server_title">Servidor de compartilhamento</string>
   <string name="pref_remote_provisioning_title">Provisionamento remoto</string>
   <string name="pref_primary_account_title">Conta primária</string>
   <string name="pref_display_name_title">Mostrar nome</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 50ecb988f..96a0910d8 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2,49 +2,97 @@
 <resources>
   <!--Custom-->
   <string name="app_name">Linphone</string>
+  <string name="service_name">Служба Linphone</string>
   <string name="addressbook_label">Linphone</string>
   <string name="notification_title">Linphone</string>
   <string name="wait_dialog_text">Загружается</string>
+  <string name="notification_registered">%s зарегистрирован</string>
+  <string name="notification_register_failure">%s зарегистрировать не удалось</string>
   <string name="tunnel_host"></string>
   <!--Common-->
   <string name="username">Имя пользователя</string>
-  <string name="display_name">Display name</string>
+  <string name="display_name">Отображаемое имя</string>
   <string name="password">Пароль</string>
+  <string name="confirm_password">Подтверждение пароля</string>
+  <string name="domain">Домен</string>
+  <string name="remote_provisioning_url">URL</string>
+  <string name="email">Электронная почта</string>
+  <string name="delete_text">Вы уверены, что хотите удалить выбранное?</string>
   <string name="delete">Удалить</string>
-  <string name="retry">Retry</string>
+  <string name="retry">Повторить</string>
   <string name="cancel">Отменить</string>
   <string name="accept">Принять</string>
   <string name="continue_text">Продолжить</string>
   <string name="about">О программе</string>
-  <string name="deny">Deny</string>
+  <string name="deny">Отклонить</string>
+  <string name="no_account">Нет настроенных аккаунтов</string>
+  <string name="search">Поиск</string>
   <string name="outgoing">Исходящий</string>
   <string name="incoming">Входящий</string>
   <string name="missed">Пропущенный</string>
   <string name="settings">Настройки</string>
+  <string name="connect">Подключение</string>
   <string name="decline">Отклонить</string>
   <string name="conference">Конференция</string>
   <!--Launch screen-->
   <!--Assistant-->
-  <string name="assistant_welcome_desc">Этот помощник поможет Вам настроить учётную запись SIP для звонков.</string>
+  <string name="welcome">Добро пожаловать</string>
+  <string name="assistant">Ассистент</string>
+  <string name="assistant_create_account">Создать аккаунт</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_remote_provisioning_title">Удалённое конфигурирование</string>
+  <string name="assistant_fetch_apply">Извлечь и применить</string>
+  <string name="assistant_login">Логин</string>
+  <string name="assistant_ec_calibration">Выполняется калибровка эхоподавления</string>
+  <string name="assistant_remote_provisioning_login">Введите логин</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>
+  <string name="assistant_error_bad_credentials">Неверное имя пользователя или пароль</string>
+  <string name="wizard_failed">Произошла ошибка, повторите попытку позже.</string>
+  <string name="wizard_server_unavailable">Сервер недоступен, проверьте подключение к сети.</string>
+  <string name="wizard_username_unavailable">Это имя пользователя уже используется.</string>
+  <string name="wizard_username_incorrect">Неверное имя пользователя.</string>
+  <string name="wizard_email_incorrect">Неверный адрес эл. почты.</string>
+  <string name="wizard_password_incorrect">Неверный пароль</string>
+  <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>
   <!--Dailer-->
+  <string name="address_bar_hint">Введите номер или адрес</string>
   <!--History-->
+  <string name="no_call_history">В журнале нет вызовов</string>
+  <string name="no_missed_call_history">В журнале нет пропущенных вызовов</string>
+  <string name="delete_history_log">Вы действительно хотите удалить выбранный журнал вызовов?</string>
   <string name="today">Сегодня</string>
   <string name="yesterday">Вчера</string>
   <!--Contacts-->
-  <string name="no_contact">Нет контакта в Вашей адресной книге.</string>
-  <string name="no_sip_contact">Нет SIP контакта в Вашей адресной книге.</string>
-  <string name="sip_address">адрес SIP</string>
+  <string name="no_contact">В адресной книге нет контактов.</string>
+  <string name="no_sip_contact">В адресной книге нет SIP контактов.</string>
+  <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-->
-  <string name="remote_composing">Remote is writing...</string>
+  <string name="no_chat_history">Нет разговоров</string>
+  <string name="delete_conversation">Вы действительно хотите удалить выбранный разговор?</string>
+  <string name="delete_message">Вы действительно хотите удалить выбранные сообщения?</string>
+  <string name="remote_composing">Собеседник пишет...</string>
   <string name="share_picture_size_small">Маленький</string>
   <string name="share_picture_size_medium">Средний</string>
   <string name="share_picture_size_large">Большой</string>
@@ -54,69 +102,95 @@
   <string name="image_picker_title">Выбрать источник</string>
   <string name="image_saved">Картинка сохранена</string>
   <string name="image_not_saved">Ошибка, картинка не сохранена</string>
-  <string name="wait">Please wait...</string>
+  <string name="wait">Пожалуйста, подождите...</string>
+  <string name="processing_image">Обработка изображения может занять несколько секунд в зависимости от размера файла</string>
   <!--Status Bar-->
   <string name="status_connected">Зарегистрирован</string>
+  <string name="status_not_connected">Не зарегистрирован</string>
   <string name="status_in_progress">В процессе регистрации</string>
   <string name="status_error">Ошибка регистрации</string>
+  <string name="voicemail_unread"> непрочитанных сообщений</string>
   <!--Side Menu-->
+  <string name="menu_assistant">Ассистент</string>
   <string name="menu_settings">Настройки</string>
   <string name="menu_about">О программе</string>
+  <string name="quit">Выход</string>
   <!--Call-->
-  <string name="unknown_incoming_call_name">Неизвестнвй</string>
+  <string name="incoming_call">входящий вызов</string>
+  <string name="outgoing_call">исходящий вызов</string>
+  <string name="add_video_dialog">Ваш собеседник хотел бы включить видео</string>
+  <string name="no_current_call">Нет активного вызова</string>
+  <string name="call_paused_by_remote">Ваш собеседник поставил звонок на паузу</string>
+  <string name="couldnt_accept_call">Произошла ошибка во время принятия вызова</string>
+  <string name="zrtp_dialog">ZRTP токен %s\nВы должны принять только если у вас тот же токен, как у вашего собеседника</string>
+  <string name="unknown_incoming_call_name">Неизвестный</string>
   <string name="call_stats_audio">Аудио</string>
   <string name="call_stats_video">Видео</string>
   <string name="call_stats_codec">Кодек:</string>
   <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">Video size:</string>
-  <string name="call">Звонок</string>
+  <string name="call_stats_video_resolution">Размер видео:</string>
+  <string name="call">Вызов</string>
   <!--About-->
+  <string name="menu_send_log">Отправить журнал</string>
+  <string name="menu_reset_log">Сброс журнала</string>
   <!--Service-->
-  <string name="incall_notif_active">Идёт Аудио звонок</string>
-  <string name="incall_notif_paused">Звонок на Паузе</string>
-  <string name="incall_notif_video">Идёт Видео звонок</string>
+  <string name="incall_notif_active">Идёт аудиозвонок</string>
+  <string name="incall_notif_paused">Звонок на паузе</string>
+  <string name="incall_notif_video">Идёт видеозвонок</string>
   <string name="notification_started">начат</string>
-  <string name="unread_messages">%i unread messages</string>
+  <string name="unread_messages">%i непрочитанных сообщений</string>
   <!--Errors-->
-  <string name="skipable_error_service_not_ready">Внимание : сервис не готов</string>
+  <string name="skipable_error_service_not_ready">Внимание: сервис не готов</string>
   <string name="error">Ошибка</string>
-  <string name="error_call_declined">Звонок сброшен</string>
+  <string name="warning_wrong_destination_address">Невозможно установить адрес назначения из %s</string>
+  <string name="error_unknown">Неизвестная ошибка</string>
+  <string name="error_call_declined">Вызов сброшен</string>
   <string name="error_user_not_found">Пользователь не найден</string>
   <string name="error_incompatible_media">Несовместимые параметры потока</string>
+  <string name="error_low_bandwidth">У вашего собеседника низкая пропускная способность, видео не может быть запущено</string>
   <string name="error_network_unreachable">Сеть недоступна</string>
-  <string name="remote_provisioning_failure">Failed to download or apply remote provisioning profile...</string>
-  <string name="remote_provisioning_again_title">Remote provisioning</string>
+  <string name="error_bad_credentials">Неверные учетные данные</string>
+  <string name="error_unauthorized">Неавторизован</string>
+  <string name="error_io_error">Ошибка сети</string>
+  <string name="download_image_failed">Скачать не удалось. Пожалуйста, проверьте сетевое подключение или повторите попытку позже.</string>
+  <string name="remote_provisioning_failure">Не удалось скачать или применить профиль удалённого конфигурирования...</string>
+  <string name="remote_provisioning_again_title">Удаленное конфигурирование</string>
+  <string name="remote_provisioning_again_message">Вы действительно хотите изменить URI конфигурирования?</string>
   <!--Account Settings-->
-  <string name="pref_sipaccount">Имя SIP</string>
-  <string name="pref_manage_title">Manage</string>
-  <string name="pref_disable_account">Деактивировать</string>
+  <string name="pref_sipaccount">SIP-аккаунт</string>
+  <string name="pref_manage_title">Управление</string>
+  <string name="pref_disable_account">Отключить</string>
   <string name="pref_proxy">Прокси</string>
-  <string name="pref_domain">Сервер*</string>
+  <string name="pref_domain">Домен*</string>
   <string name="pref_passwd">Пароль*</string>
   <string name="pref_username">Имя пользователя*</string>
   <string name="pref_enable_outbound_proxy">Исходящий прокси</string>
-  <string name="pref_help_proxy">Имя сервера SIP прокси или адрес ip (необязательно)</string>
-  <string name="pref_help_outbound_proxy">Отправить все звонки через SIP прокси</string>
-  <string name="pref_help_username">Например: john если Ваш адрес john@sip.example.org</string>
-  <string name="pref_help_domain">sip.example.org если Ваш адрес john@sip.example.org</string>
-  <string name="pref_help_password">You have to re-enter your password if you edit the username and/or the domain</string>
+  <string name="pref_help_proxy">Имя сервера SIP прокси или ip адрес (необязательно)</string>
+  <string name="pref_help_outbound_proxy">Отправлять все вызовы через SIP прокси</string>
+  <string name="pref_help_username">Например: john если ваш адрес john@sip.example.org</string>
+  <string name="pref_help_domain">sip.example.org если ваш адрес john@sip.example.org</string>
+  <string name="pref_help_password">Вы должны повторно ввести ваш пароль, если вы измените имя пользователя и/или домен</string>
   <string name="pref_expire_title">Истекает</string>
+  <string name="pref_avpf">AVPF</string>
+  <string name="pref_avpf_rr_interval"> AVPF регулярный интервал RTCP в секундах (от 1 до 5)</string>
   <string name="pref_escape_plus">Заменить + на 00</string>
-  <string name="pref_auth_userid">Auth userid</string>
-  <string name="pref_display_name">Display name</string>
+  <string name="pref_auth_userid">Имя для аутентификации</string>
+  <string name="pref_help_auth_userid">Введите имя для аутентификации (необязательно)</string>
+  <string name="pref_display_name">Отображаемое имя</string>
+  <string name="pref_help_display_name">Введите отображаемое имя (необязательно)</string>
   <string name="pref_prefix">Префикс</string>
   <string name="pref_transport">Транспорт</string>
   <string name="pref_transport_udp">UDP</string>
   <string name="pref_transport_tcp">TCP</string>
   <string name="pref_transport_tls">TLS</string>
-  <string name="pref_delete_account">Удалить учётную запись</string>
-  <string name="pref_default_account">Использовать как основную</string>
+  <string name="pref_delete_account">Удалить аккаунт</string>
+  <string name="pref_default_account">Использовать по умолчанию</string>
   <!--Settings-->
-  <string name="pref_sipaccounts">Учётные записи SIP</string>
-  <string name="default_account_flag">Default account</string>
-  <string name="pref_add_account">Добавить учётную запись</string>
+  <string name="pref_sipaccounts">SIP-аккаунты</string>
+  <string name="default_account_flag">Аккаунт по умолчанию</string>
+  <string name="pref_add_account">Добавить аккаунт</string>
   <string name="pref_tunnel">Туннель</string>
   <string name="pref_tunnel_host">Сервер</string>
   <string name="pref_tunnel_port">Порт</string>
@@ -128,35 +202,47 @@
     <item>всегда</item>
     <item>авто</item>
   </string-array>
-  <string name="pref_none">Отсутствует</string>
+  <string name="pref_none">Нет</string>
   <string name="pref_preferences_title">Настройки</string>
-  <string name="pref_video_enable_title">Разрешить видео</string>
+  <string name="pref_video_enable_title">Включить видео</string>
   <!--Audio settings-->
   <string name="pref_audio_title">Аудио</string>
-  <string name="pref_echo_cancellation">Шумоподавление</string>
-  <string name="pref_echo_cancellation_summary">Удаляет эхо, слышимое другой стороной</string>
-  <string name="ec_calibrating">Настраиваем…</string>
+  <string name="pref_echo_cancellation">Эхоподавление</string>
+  <string name="pref_echo_cancellation_summary">Устраняет эхо, слышимое другой стороной</string>
+  <string name="pref_echo_canceller_calibration">Калибровка эхоподавления</string>
+  <string name="ec_calibrating">Калибровка…</string>
+  <string name="ec_calibrated">Откалибровано в %s мс</string>
   <string name="no_echo">Нет эха</string>
-  <string name="failed">неудавшийся</string>
+  <string name="failed">не удалось</string>
+  <string name="pref_adaptive_rate_control">Адаптивное управление скорость</string>
+  <string name="pref_codec_bitrate_limit">Ограничение битрейта кодека</string>
   <string name="pref_codecs">Кодеки</string>
   <!--Video settings-->
   <string name="pref_video_title">Видео</string>
   <string name="pref_video_use_front_camera_title">Использовать фронтальную камеру</string>
-  <string name="pref_video_initiate_call_with_video_title">Начинать видео звонки</string>
+  <string name="pref_video_initiate_call_with_video_title">Начинать видеозвонки</string>
   <string name="pref_video_initiate_call_with_video">Всегда посылать видео запросы</string>
-  <string name="pref_video_automatically_accept_video_title">Принимать входящие видео звонки</string>
+  <string name="pref_video_automatically_accept_video_title">Принимать входящие видеозвонки</string>
   <string name="pref_video_automatically_accept_video">Всегда принимать видео запросы</string>
-  <string name="pref_preferred_video_size">Preferred video size</string>
+  <string name="pref_video_preset">Предустановка видео</string>
+  <string name="pref_preferred_video_size">Предпочтительный размер видео</string>
+  <string name="pref_preferred_fps">Предпочтительный FPS</string>
+  <string name="pref_bandwidth_limit">Ограничение пропускной способности в Кбит/с</string>
   <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_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>
+  <string name="pref_image_sharing_server_title">Сервер обмена</string>
   <!--Network settings-->
   <string name="pref_network_title">Сеть</string>
+  <string name="pref_wifi_only">Использовать только WiFi</string>
   <string name="pref_stun_server">Сервер Stun</string>
-  <string name="pref_ice_enable">Разрешить ICE</string>
-  <string name="pref_upnp_enable">Enable UPNP</string>
+  <string name="pref_ice_enable">Включить ICE</string>
+  <string name="pref_upnp_enable">Включить UPNP</string>
   <string name="pref_transport_use_random_ports">Использовать случайный порт</string>
   <string name="pref_sip_port_title">SIP порт занят</string>
   <string name="pref_video_port_title">Видео порт или диапазон портов</string>
@@ -164,16 +250,17 @@
   <string name="pref_video_port_description">Видео порт или диапазон портов (минимум-максимум)</string>
   <string name="pref_audio_port_description">Аудио порт или диапазон портов (минимум-максимум)</string>
   <string name="pref_media_encryption">Шифрование потока</string>
-  <string name="pref_push_notification">Разрешить серверные уведомления</string>
+  <string name="pref_push_notification">Включить push-уведомления</string>
+  <string name="pref_ipv6_title">Разрешить IPv6</string>
   <!--Advanced settings-->
-  <string name="pref_advanced_title">Продвинутые</string>
+  <string name="pref_advanced_title">Дополнительно</string>
   <string name="pref_debug">Отладка</string>
   <string name="pref_background_mode">Фоновый режим</string>
-  <string name="pref_animation_enable_title">Разрешить анимацию</string>
-  <string name="pref_autostart">Запускаться с системой</string>
-  <string name="pref_image_sharing_server_title">Общий сервер</string>
-  <string name="pref_remote_provisioning_title">Удалённое резервирование</string>
-  <string name="pref_primary_account_title">Основная учётная запись</string>
+  <string name="pref_animation_enable_title">Включить анимацию</string>
+  <string name="pref_autostart">Запуск при загрузке</string>
+  <string name="pref_incoming_call_timeout_title">Отклонение входящего вызова (в секундах)</string>
+  <string name="pref_remote_provisioning_title">Удалённое конфигурирование</string>
+  <string name="pref_primary_account_title">Основной аккаунт</string>
   <string name="pref_display_name_title">Отображаемое имя</string>
   <string name="pref_user_name_title">Имя пользователя</string>
   <!--Audio hack settings-->
@@ -184,22 +271,65 @@
   <string name="pref_audio_hacks_use_galaxys_hack_title">Использовать аудио хак Galaxy S</string>
   <!--Content description-->
   <string name="content_description_back">Назад</string>
-  <string name="content_description_dialer">Клавиатура</string>
+  <string name="content_description_dialer">Номеронабиратель</string>
+  <string name="content_description_menu">Меню</string>
+  <string name="content_description_toggle_micro">Переключить микрофон</string>
+  <string name="content_description_toggle_speaker">Переключить динамик</string>
   <string name="content_description_decline">Отклонить</string>
   <string name="content_description_hang_up">Положить трубку</string>
-  <string name="content_description_accept">Accept</string>
+  <string name="content_description_accept">Принять</string>
   <string name="content_description_edit">Редактировать</string>
-  <string name="content_description_add_contact">Кнопка добавить к контактам</string>
+  <string name="content_description_edit_list">Редактировать список</string>
+  <string name="content_description_add_contact">Добавить в контакты</string>
   <string name="content_description_new_contact">Новый контакт</string>
-  <string name="content_description_call">Звонок</string>
+  <string name="content_description_call">Вызов</string>
   <string name="content_description_chat">Чат</string>
+  <string name="content_description_dialer_back">Вернуться к номеронабирателю</string>
+  <string name="content_description_contact_picture">Изображение контакта</string>
+  <string name="content_description_send_message">Отправить сообщение</string>
+  <string name="content_description_detail">Подробнее</string>
   <string name="content_description_delete">Удалить</string>
-  <string name="content_description_add">Добавить звонок</string>
-  <string name="content_description_add_call">Добавить звонок</string>
+  <string name="content_description_add">Добавить вызов</string>
+  <string name="content_description_new_discussion">Новая дискуссия</string>
+  <string name="content_description_search">Поиск</string>
+  <string name="content_description_search_contact">Поиск контакта</string>
+  <string name="content_description_all_contacts">Все контакты</string>
+  <string name="content_description_linphone_contacts">Контакты Linphone</string>
+  <string name="content_description_call_direction">Направление вызова</string>
+  <string name="content_description_all_calls">Все вызовы</string>
+  <string name="content_description_missed_calls">Пропущенные вызовы</string>
+  <string name="content_description_switch_video">Переключить видео</string>
+  <string name="content_description_add_call">Добавить вызов</string>
+  <string name="content_description_pause">Пауза</string>
+  <string name="content_description_numpad">Цифровая клавиатура</string>
+  <string name="content_description_history">Кнопка истории</string>
+  <string name="content_description_chat_button">Кнопка чата</string>
+  <string name="content_description_contacts">Кнопка контактов</string>
+  <string name="content_description_call_quality">Качество вызова</string>
+  <string name="content_description_encryption">Шифрование</string>
+  <string name="content_description_switch_camera">Переключить камеру</string>
+  <string name="content_description_cancel_button">Кнопка отмены</string>
+  <string name="content_description_message_status">Статус сообщения</string>
   <string name="content_description_conference">Конференция</string>
-  <string name="content_description_default_account">Default account</string>
+  <string name="content_description_username_field">Поле имени пользователя</string>
+  <string name="content_description_display_field">Поле отображаемого имени</string>
+  <string name="content_description_domain_field">Поле домена</string>
+  <string name="content_description_url_field">Поле удалённого конфигурирования</string>
+  <string name="content_description_confirm_password_field">Поле подтверждения пароля</string>
+  <string name="content_description_email_field">Поле электронной почты</string>
+  <string name="content_description_default_account">Аккаунт по умолчанию</string>
+  <string name="content_description_deselect_all">Отменить выбор</string>
+  <string name="content_description_select_all">Выбрать всё</string>
+  <string name="content_description_delete_selection">Удалить выбранное</string>
   <string name="content_description_contact_first_name">Имя</string>
   <string name="content_description_contact_last_name">Фамилия</string>
+  <string name="content_description_back_call">Вернуться к вызову</string>
+  <string name="content_description_send_file">Отправить файл</string>
+  <string name="content_description_message">Сообщение</string>
+  <string name="content_description_unread_chat_message">Непрочитанное сообщение чата</string>
   <string name="content_description_transfer">Перевести</string>
+  <string name="content_description_earpiece">Наушник</string>
   <string name="content_description_bluetooth">Bluetooth</string>
+  <string name="content_description_call_options">Параметры вызова</string>
+  <string name="content_description_exit_conference">Выйти из конференции</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 16090a149..6da76c63d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -7,6 +7,8 @@
   <string name="notification_title">Линфон</string>
   <string name="wait_dialog_text">Покрећем се</string>
   <string name="tunnel_host"></string>
+  <string name="sync_account_name">контакти линфона</string>
+  <string name="today_date_format">ЧЧ:мм</string>
   <!--Common-->
   <string name="username">Корисничко име</string>
   <string name="display_name">Приказано име</string>
@@ -167,6 +169,9 @@
   <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>
   <!--Network settings-->
   <string name="pref_network_title">Мрежа</string>
   <string name="pref_stun_server">Стун сервер</string>
@@ -186,7 +191,6 @@
   <string name="pref_background_mode">Режим позадине</string>
   <string name="pref_animation_enable_title">Укључи анимације</string>
   <string name="pref_autostart">Покрени се приликом подизања система</string>
-  <string name="pref_image_sharing_server_title">Сервер дељења</string>
   <string name="pref_remote_provisioning_title">Прибављање удаљеног</string>
   <string name="pref_primary_account_title">Главни налог</string>
   <string name="pref_display_name_title">Приказано име</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 700f548ce..340d48e6e 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -7,6 +7,7 @@
   <string name="notification_title">Linphone</string>
   <string name="wait_dialog_text">Startar upp</string>
   <string name="tunnel_host"></string>
+  <string name="sync_account_name">linphone-kontakter</string>
   <!--Common-->
   <string name="username">Användarnamn</string>
   <string name="display_name">Visningsnamn</string>
@@ -132,6 +133,9 @@
   <!--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>
   <!--Network settings-->
   <string name="pref_network_title">Nätverk</string>
   <string name="pref_stun_server">Stun-server</string>
@@ -145,7 +149,6 @@
   <string name="pref_background_mode">Bakgrundsläge</string>
   <string name="pref_animation_enable_title">Aktivera animeringar</string>
   <string name="pref_autostart">Starta vid uppstart</string>
-  <string name="pref_image_sharing_server_title">Delar server</string>
   <string name="pref_primary_account_title">Primärt konto</string>
   <string name="pref_display_name_title">Visningsnamn</string>
   <string name="pref_user_name_title">Användarnamn</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 253027cef..d709cec2c 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -6,46 +6,95 @@
   <string name="addressbook_label">Linphone</string>
   <string name="notification_title">Linphone</string>
   <string name="wait_dialog_text">Başlatılıyor</string>
+  <string name="notification_registered">%s kayıtlı</string>
+  <string name="notification_register_failure">%s kaydedilemedi</string>
   <string name="tunnel_host"></string>
+  <string name="sync_account_name">Linphone bağlantıları</string>
+  <string name="today_date_format">SS:dd</string>
   <!--Common-->
   <string name="username">Kullanıcı adı</string>
   <string name="display_name">Görünen ad</string>
   <string name="password">Parola</string>
+  <string name="confirm_password">Parola doğrulama</string>
+  <string name="domain">Alan adı</string>
+  <string name="remote_provisioning_url">URL</string>
+  <string name="email">Eposta</string>
+  <string name="delete_text">Seçimlerinizi silmek istediğinizden emin misiniz?</string>
   <string name="delete">Sil</string>
   <string name="retry">Yeniden dene</string>
   <string name="cancel">İptal</string>
   <string name="accept">Kabul et</string>
-  <string name="continue_text">Sürdürmek</string>
+  <string name="continue_text">Sürdür</string>
   <string name="about">Hakkında</string>
   <string name="deny">Yoksay</string>
+  <string name="no_account">Yapılandırılmış hesap yok</string>
   <string name="search">Arama</string>
   <string name="outgoing">Giden</string>
   <string name="incoming">Gelen</string>
   <string name="missed">Yanıtsız</string>
   <string name="settings">Ayarlar</string>
+  <string name="connect">Bağlantı</string>
   <string name="decline">Reddet</string>
   <string name="conference">Çoklu görüşme</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_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_remote_provisioning_title">Uzaktan yapılandırma al</string>
+  <string name="assistant_fetch_apply">Al ve uygula</string>
+  <string name="assistant_login">Giriş</string>
+  <string name="assistant_ec_calibration">Yankı giderme ayarlaması sürüyor</string>
+  <string name="assistant_remote_provisioning_login">Giriş bilgilerinizi girin</string>
   <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="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>
+  <string name="wizard_username_incorrect">Kullanıcı adınız geçersiz.</string>
+  <string name="wizard_email_incorrect">Epostanız geçersiz.</string>
+  <string name="wizard_password_incorrect">Parolanız geçersiz.</string>
+  <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>
   <!--Dailer-->
+  <string name="address_bar_hint">Numara veya adres girin</string>
   <!--History-->
+  <string name="no_call_history">Çağrı geçmişiniz boş</string>
+  <string name="no_missed_call_history">Geçmişinizde yanıtsız çağrı yok</string>
+  <string name="delete_history_log">Seçilmiş çağrı kayıtlarını silmek ister misin?</string>
   <string name="today">Bugün</string>
   <string name="yesterday">Dün</string>
   <!--Contacts-->
   <string name="no_contact">Adres defterinizde kimse yok</string>
   <string name="no_sip_contact">Adres defterinizde SİP bağlantısı yok</string>
+  <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>
   <!--Chat-->
+  <string name="no_chat_history">görüşme yok</string>
+  <string name="delete_conversation">Seçilen görüşmeyi silmek ister misiniz?</string>
+  <string name="delete_message">Seçilen iletiyi silmek ister misiniz?</string>
   <string name="remote_composing">Karşıdan yazılıyor...</string>
   <string name="share_picture_size_small">Küçük</string>
   <string name="share_picture_size_medium">Orta</string>
@@ -57,15 +106,26 @@
   <string name="image_saved">Resim kaydedildi</string>
   <string name="image_not_saved">Hata,resim kaydedilmedi</string>
   <string name="wait">Lütfen bekleyin...</string>
+  <string name="processing_image">Görüntü işleniyor, dosyanın boyutuna bağlı olarak bir kaç saniye sürebilir</string>
   <!--Status Bar-->
   <string name="status_connected">Kayıtlı</string>
+  <string name="status_not_connected">Kayıtsız</string>
   <string name="status_in_progress">Kayıt sürüyor</string>
   <string name="status_error">Kayıt başarısız</string>
   <string name="voicemail_unread">okunmamış iletiler</string>
   <!--Side Menu-->
+  <string name="menu_assistant">Yardımcı</string>
   <string name="menu_settings">Ayarlar</string>
   <string name="menu_about">Hakkında</string>
+  <string name="quit">Çık</string>
   <!--Call-->
+  <string name="incoming_call">Gelen çağrı</string>
+  <string name="outgoing_call">Giden çağrı</string>
+  <string name="add_video_dialog">Görüştüğünüz kişi görüntüyü açmak istiyor</string>
+  <string name="no_current_call">Etkin arama yok</string>
+  <string name="call_paused_by_remote">Görüştüğünüz kişi aramayı duraklattı</string>
+  <string name="couldnt_accept_call">Gelen aramanın kabulünde bir hata oluştu</string>
+  <string name="zrtp_dialog">ZRTP fişiniz %s\nBunu sadece görüştüğünüz kişinin fişiyle aynıysa kabul etmelisiniz</string>
   <string name="unknown_incoming_call_name">Bilinmeyen</string>
   <string name="call_stats_audio">Ses</string>
   <string name="call_stats_video">Görüntü</string>
@@ -87,15 +147,20 @@
   <!--Errors-->
   <string name="skipable_error_service_not_ready">Uyarı: hizmet hazır değil</string>
   <string name="error">Hata</string>
+  <string name="warning_wrong_destination_address">%s dan gidilecek adres inşa edilemiyor</string>
   <string name="error_unknown">Tanımlanmayan hata</string>
   <string name="error_call_declined">Reddedilen çağrı</string>
   <string name="error_user_not_found">Kullanıcı bulunamadı</string>
   <string name="error_incompatible_media">Uyumsuz ortam değişkenleri</string>
+  <string name="error_low_bandwidth">Görüştüğünüz kişinin bant genişliği düşük, görüntü başlatılamaz.</string>
   <string name="error_network_unreachable">Ağa erişim yok</string>
   <string name="error_bad_credentials">Referansı kötü</string>
   <string name="error_unauthorized">Kimlik doğrulanmadı</string>
   <string name="error_io_error">Ağ hatası</string>
+  <string name="download_image_failed">İndirme başarısız. Lütfen ağ bağlantınızı gözden geçirin ya da daha sonra tekrar deneyin.</string>
+  <string name="remote_provisioning_failure">Uzaktan yetkilendirme profili indirilirmesi ya da uygulanması başarısız...</string>
   <string name="remote_provisioning_again_title">Uzaktan yetkilendirme</string>
+  <string name="remote_provisioning_again_message">Uzaktan yetkilendirme adresinizi değiştirmek istiyor musunuz?</string>
   <!--Account Settings-->
   <string name="pref_sipaccount">SİP Hesabı</string>
   <string name="pref_manage_title">Yönetme</string>
@@ -108,11 +173,16 @@
   <string name="pref_help_proxy">SİP vekil sunucu makine adı veya ip adresi (isteğe bağlı)</string>
   <string name="pref_help_outbound_proxy">Bütün çağrıları SİP vekil sunucuya yönlendir</string>
   <string name="pref_help_username">Örneğin: John  eğer sizin hesabınız john@sip.example.org ise</string>
+  <string name="pref_help_domain">eğer hesabınız john@sip.example.org ise sip.example.org</string>
   <string name="pref_help_password">Kullanıcı adı veya alan adı oluşturduysanız parolanızı tekrar girmeniz gerekir</string>
   <string name="pref_expire_title">Süresi dolmak</string>
   <string name="pref_avpf">AVPF</string>
+  <string name="pref_avpf_rr_interval">AVPF düzenli RTCP aralığında ( 1 ile 5 saniye arasında)</string>
+  <string name="pref_escape_plus">+\'yı 00 ile değiştir</string>
   <string name="pref_auth_userid">Kullanıcı kimliği yetkisi</string>
+  <string name="pref_help_auth_userid">Kullanıcı kimliği doğrulumayı girin (isteğe bağlı)</string>
   <string name="pref_display_name">Görünen ad</string>
+  <string name="pref_help_display_name">Görünen adı girin (isteğe bağlı)</string>
   <string name="pref_prefix">Önek</string>
   <string name="pref_transport">Taşıma</string>
   <string name="pref_transport_udp">UDP</string>
@@ -142,8 +212,10 @@
   <string name="pref_audio_title">Ses</string>
   <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="ec_calibrating">Ayarlama...</string>
-  <string name="no_echo">Eko yok</string>
+  <string name="ec_calibrated">%s ms\'de ayarlandı</string>
+  <string name="no_echo">Yankı yok</string>
   <string name="failed">başarısız</string>
   <string name="pref_adaptive_rate_control">Uyarlanabilir oran denetimi</string>
   <string name="pref_codec_bitrate_limit">Çözücü bitrate sınırı</string>
@@ -155,15 +227,22 @@
   <string name="pref_video_initiate_call_with_video">Görüntü isteğini her zaman gönder</string>
   <string name="pref_video_automatically_accept_video_title">Gelen görüntü isteklerini kabul et</string>
   <string name="pref_video_automatically_accept_video">Görüntü isteklerini her zaman kabul et</string>
+  <string name="pref_video_preset">Görüntü ön ayarı</string>
   <string name="pref_preferred_video_size">Yeğlenen görüntü boyutu</string>
+  <string name="pref_preferred_fps">Yeğlenen FPS</string>
   <string name="pref_bandwidth_limit">kbits/s olarak bant genişliği</string>
   <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_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>
   <!--Network settings-->
   <string name="pref_network_title">Ağ</string>
+  <string name="pref_wifi_only">Sadece WİFİ kullan</string>
   <string name="pref_stun_server">Stun sunucusu</string>
   <string name="pref_ice_enable">İCE Etkin</string>
   <string name="pref_upnp_enable">UPNP Etkin</string>
@@ -175,13 +254,14 @@
   <string name="pref_audio_port_description">Ses bağlantı noktası veya bağlantı noktası aralığı (minport-maxport)</string>
   <string name="pref_media_encryption">Ortam şifreleme</string>
   <string name="pref_push_notification">Anlık bildirim etkin</string>
+  <string name="pref_ipv6_title">IPv6 ya izin ver</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">Gelişmiş</string>
   <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_autostart">Başlangıçta çalıştır</string>
-  <string name="pref_image_sharing_server_title">Sunucu paylaşımı</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_primary_account_title">Ana hesap</string>
   <string name="pref_display_name_title">Görünen ad</string>
@@ -189,28 +269,36 @@
   <!--Audio hack settings-->
   <string name="pref_audio_hacks_title">Ses kesme</string>
   <string name="pref_audio_use_specific_mode_title">Özgün kesme kipi kullan</string>
+  <string name="pref_audio_use_specific_mode_summary">0=NORMAL_KİP (öntanımlı), 2=GELEN_ÇAĞRI_KİPİ</string>
+  <string name="pref_audio_hacks_use_routing_api_title">API hack yönlendirmesini kullanın</string>
   <string name="pref_audio_hacks_use_galaxys_hack_title">Galaxy S ses kesmeyi kullan</string>
   <!--Content description-->
   <string name="content_description_back">Geri</string>
   <string name="content_description_dialer">Telefon numarası çevirici</string>
+  <string name="content_description_menu">Menü</string>
   <string name="content_description_toggle_micro">Mikrofon düğmesi</string>
   <string name="content_description_toggle_speaker">Hoparlör düğmesi</string>
   <string name="content_description_decline">Reddet</string>
   <string name="content_description_hang_up">Telefonu kapat</string>
   <string name="content_description_accept">Kabul et</string>
   <string name="content_description_edit">Düzenle</string>
+  <string name="content_description_edit_list">Liste Düzenle</string>
+  <string name="content_description_valid">Geçerli</string>
   <string name="content_description_add_contact">Bağlantılara ekle</string>
   <string name="content_description_new_contact">Yeni bağlantı</string>
   <string name="content_description_call">Çağrı</string>
   <string name="content_description_backspace">Geri alma</string>
   <string name="content_description_chat">Sohbet</string>
   <string name="content_description_dial_back">Geri aramalı</string>
+  <string name="content_description_dialer_back">Çeviriciye dön</string>
   <string name="content_description_contact_picture">Kayıtlı kişinin resmi</string>
   <string name="content_description_send_message">İleti gönder</string>
+  <string name="content_description_detail">Ayrıntılar</string>
   <string name="content_description_delete">Sil</string>
   <string name="content_description_add">Arama ekle</string>
   <string name="content_description_new_discussion">Yeni tartışma</string>
   <string name="content_description_search">Arama</string>
+  <string name="content_description_search_contact">Bağlantı ara</string>
   <string name="content_description_all_contacts">Tüm bağlantılar</string>
   <string name="content_description_linphone_contacts">Linphone bağlantıları</string>
   <string name="content_description_call_direction">Çağrı yönlendirme</string>
@@ -229,9 +317,26 @@
   <string name="content_description_cancel_button">İptal düğmesi</string>
   <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_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>
+  <string name="content_description_confirm_password_field">Parola onaylama alanı</string>
+  <string name="content_description_email_field">Eposta alanı</string>
   <string name="content_description_default_account">Öntanımlı hesap</string>
+  <string name="content_description_deselect_all">Tüm seçilenleri iptal et</string>
+  <string name="content_description_select_all">Tümünü seç</string>
+  <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_back_call">Aramaya dön</string>
+  <string name="content_description_send_file">Bir dosya gönder</string>
+  <string name="content_description_message">İleti</string>
+  <string name="content_description_unread_chat_message">Okunmamış sohbet iletisi</string>
   <string name="content_description_transfer">Aktarma</string>
+  <string name="content_description_earpiece">Kulaklık</string>
   <string name="content_description_bluetooth">Bluetooth</string>
+  <string name="content_description_call_options">Çağrı seçenekleri</string>
+  <string name="content_description_audio_route">Ses yolu</string>
+  <string name="content_description_exit_conference">Görüşmeden çık</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index df11179da..8f70ad4a9 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1,11 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Custom-->
+  <string name="app_name">Linphone</string>
+  <string name="service_name">Linphone 服務</string>
+  <string name="addressbook_label">Linphone</string>
+  <string name="notification_title">Linphone</string>
+  <string name="wait_dialog_text">啟動中</string>
+  <string name="notification_registered">%s 已註冊</string>
+  <string name="notification_register_failure">%s 無法註冊</string>
   <string name="tunnel_host"></string>
   <!--Common-->
   <string name="username">使用者名稱</string>
   <string name="display_name">顯示名稱</string>
   <string name="password">密碼</string>
+  <string name="confirm_password">密碼確認</string>
+  <string name="domain">網域</string>
+  <string name="remote_provisioning_url">網址</string>
+  <string name="email">電子郵件</string>
+  <string name="delete_text">你確定要刪除選取的項目嗎？</string>
   <string name="delete">刪除</string>
   <string name="retry">重試</string>
   <string name="cancel">取消</string>
@@ -14,28 +26,65 @@
   <string name="about">關於</string>
   <string name="deny">拒絕</string>
   <string name="search">搜尋</string>
+  <string name="outgoing">撥出</string>
+  <string name="incoming">來電</string>
   <string name="missed">未接來電</string>
   <string name="settings">設定</string>
+  <string name="connect">連接</string>
   <string name="decline">拒絕</string>
   <string name="conference">會議</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_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_login">登入</string>
+  <string name="assistant_ec_calibration">正在進行回音消除器校正</string>
   <string name="assistant_account_not_validated">你的帳號還沒被驗證。</string>
   <string name="assistant_account_validated">你的帳號已經被驗證。</string>
+  <string name="assistant_error_bad_credentials">不正確的使用者名稱或密碼</string>
   <string name="wizard_failed">發生錯誤，請稍候再試。</string>
+  <string name="wizard_server_unavailable">無法連接到伺服器，請確認你的網路連接。</string>
   <string name="wizard_username_unavailable">這個使用者名稱已經被使用。</string>
+  <string name="wizard_username_incorrect">你的使用者名稱無效。</string>
+  <string name="wizard_email_incorrect">你的電子郵件無效。</string>
+  <string name="wizard_password_incorrect">你的密碼無效。</string>
+  <string name="wizard_passwords_unmatched">密碼不相符</string>
   <!--Dailer-->
+  <string name="address_bar_hint">輸入號碼或位址</string>
   <!--History-->
+  <string name="no_call_history">歷史中沒有通話</string>
+  <string name="no_missed_call_history">歷史中沒有未接來電</string>
+  <string name="delete_history_log">你想要刪除選取的通話紀錄嗎？</string>
   <string name="today">今天</string>
   <string name="yesterday">昨天</string>
   <!--Contacts-->
   <string name="no_contact">通訊錄中沒有連絡人。</string>
   <string name="no_sip_contact">通訊錄中沒有 SIP 連絡人。</string>
+  <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-->
+  <string name="no_chat_history">沒有對話</string>
+  <string name="delete_conversation">你想要刪除選取的對話嗎？</string>
+  <string name="delete_message">你想要刪除選取的訊息嗎？</string>
+  <string name="remote_composing">對方正在輸入...</string>
   <string name="share_picture_size_small">小</string>
   <string name="share_picture_size_medium">中</string>
   <string name="share_picture_size_large">大</string>
@@ -48,13 +97,21 @@
   <string name="wait">請稍候...</string>
   <!--Status Bar-->
   <string name="status_connected">已註冊</string>
+  <string name="status_not_connected">未註冊</string>
   <string name="status_in_progress">正在註冊</string>
   <string name="status_error">註冊失敗</string>
   <string name="voicemail_unread">未讀訊息</string>
   <!--Side Menu-->
+  <string name="menu_assistant">助理</string>
   <string name="menu_settings">設定</string>
   <string name="menu_about">關於</string>
+  <string name="quit">退出</string>
   <!--Call-->
+  <string name="incoming_call">來電</string>
+  <string name="outgoing_call">撥出電話</string>
+  <string name="add_video_dialog">對方想要啟用視訊</string>
+  <string name="call_paused_by_remote">對方暫停了通話</string>
+  <string name="couldnt_accept_call">接電話時發生錯誤</string>
   <string name="unknown_incoming_call_name">未知</string>
   <string name="call_stats_audio">音訊</string>
   <string name="call_stats_video">視訊</string>
@@ -64,15 +121,20 @@
   <string name="call_stats_video_resolution">視訊大小：</string>
   <string name="call">通話</string>
   <!--About-->
+  <string name="menu_send_log">傳送記錄</string>
+  <string name="menu_reset_log">重設記錄</string>
   <!--Service-->
+  <string name="notification_started">已啟動</string>
   <string name="unread_messages">%i 未讀訊息</string>
   <!--Errors-->
   <string name="skipable_error_service_not_ready">關閉</string>
   <string name="error">錯誤</string>
   <string name="error_unknown">未知錯誤</string>
   <string name="error_user_not_found">找不到使用者</string>
+  <string name="error_low_bandwidth">對方的頻寬過低，視訊無法啟動</string>
   <string name="error_network_unreachable">無法連接網路</string>
   <string name="error_io_error">網路錯誤</string>
+  <string name="download_image_failed">下載失敗。請檢查你的網路連接或稍候再試。</string>
   <!--Account Settings-->
   <string name="pref_sipaccount">SIP 帳號</string>
   <string name="pref_manage_title">管理</string>
@@ -82,11 +144,14 @@
   <string name="pref_username">使用者名稱*</string>
   <string name="pref_escape_plus">以 00 取代 +</string>
   <string name="pref_display_name">顯示名稱</string>
+  <string name="pref_help_display_name">輸入顯示名稱(選擇性)</string>
+  <string name="pref_prefix">前綴</string>
   <string name="pref_transport">傳輸</string>
   <string name="pref_transport_udp">UDP</string>
   <string name="pref_transport_tcp">TCP</string>
   <string name="pref_transport_tls">TLS</string>
   <string name="pref_delete_account">刪除這個帳號</string>
+  <string name="pref_default_account">設為預設值</string>
   <!--Settings-->
   <string name="pref_sipaccounts">SIP 帳號</string>
   <string name="default_account_flag">預設帳號</string>
@@ -109,22 +174,30 @@
   <string name="pref_audio_title">音訊</string>
   <string name="pref_echo_cancellation">回音消除</string>
   <string name="pref_echo_cancellation_summary">移除另一端聽到的回音</string>
+  <string name="pref_echo_canceller_calibration">回音消除器校正</string>
   <string name="ec_calibrating">校正中...</string>
+  <string name="no_echo">沒有回音</string>
   <string name="failed">失敗</string>
   <string name="pref_codec_bitrate_limit">編碼位元率限制</string>
   <string name="pref_codecs">編碼</string>
   <!--Video settings-->
   <string name="pref_video_title">視訊</string>
   <string name="pref_video_use_front_camera_title">使用前攝影機</string>
-  <string name="pref_video_initiate_call_with_video_title">開始視訊通話</string>
+  <string name="pref_video_initiate_call_with_video_title">發起視訊通話</string>
   <string name="pref_video_initiate_call_with_video">總是傳送視訊要求</string>
+  <string name="pref_video_automatically_accept_video_title">接受來電視訊要求</string>
   <string name="pref_video_automatically_accept_video">總是接受視訊要求</string>
+  <string name="pref_video_preset">視訊預設</string>
   <string name="pref_preferred_video_size">偏好的視訊大小</string>
+  <string name="pref_preferred_fps">偏好的 FPS</string>
   <string name="pref_video_codecs_title">編碼</string>
   <!--Call settings-->
   <string name="pref_call_title">通話</string>
+  <!--Chat settings-->
+  <string name="pref_chat_title">聊天</string>
   <!--Network settings-->
   <string name="pref_network_title">網路</string>
+  <string name="pref_wifi_only">只使用 WiFi</string>
   <string name="pref_stun_server"> Stun 伺服器</string>
   <string name="pref_ice_enable">啟用 ICE</string>
   <string name="pref_upnp_enable">啟用 UPNP</string>
@@ -135,6 +208,8 @@
   <string name="pref_video_port_description">視訊連接埠或連接埠範圍(最小連接埠-最大連接埠)</string>
   <string name="pref_audio_port_description">音訊連接埠或連接埠範圍(最小連接埠-最大連接埠)</string>
   <string name="pref_media_encryption">媒體加密</string>
+  <string name="pref_push_notification">啟用推播通知</string>
+  <string name="pref_ipv6_title">允許 IPv6</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">進階</string>
   <string name="pref_debug">除錯</string>
@@ -148,20 +223,26 @@
   <!--Content description-->
   <string name="content_description_back">返回</string>
   <string name="content_description_dialer">撥號器</string>
+  <string name="content_description_menu">功能表</string>
   <string name="content_description_decline">拒絕</string>
   <string name="content_description_hang_up">掛斷</string>
   <string name="content_description_accept">接受</string>
   <string name="content_description_edit">編輯</string>
+  <string name="content_description_edit_list">編輯清單</string>
+  <string name="content_description_valid">有效</string>
   <string name="content_description_add_contact">加入到連絡人</string>
   <string name="content_description_new_contact">新增聯絡人</string>
   <string name="content_description_call">通話</string>
   <string name="content_description_backspace">Backspace</string>
   <string name="content_description_chat">聊天</string>
   <string name="content_description_dial_back">回播</string>
+  <string name="content_description_dialer_back">回到撥號器</string>
   <string name="content_description_contact_picture">連絡人圖片</string>
   <string name="content_description_send_message">傳送訊息</string>
+  <string name="content_description_detail">詳細資料</string>
   <string name="content_description_delete">刪除</string>
   <string name="content_description_search">搜尋</string>
+  <string name="content_description_search_contact">搜尋聯絡人</string>
   <string name="content_description_all_contacts">所有聯絡人</string>
   <string name="content_description_linphone_contacts">Linphone 聯絡人</string>
   <string name="content_description_call_direction">通話方向</string>
@@ -169,6 +250,7 @@
   <string name="content_description_missed_calls">未接來電</string>
   <string name="content_description_switch_video">切換視訊</string>
   <string name="content_description_pause">暫停</string>
+  <string name="content_description_numpad">數字鍵盤</string>
   <string name="content_description_history">歷史按鈕</string>
   <string name="content_description_chat_button">聊天按鈕</string>
   <string name="content_description_contacts">聯絡人按鈕</string>
@@ -178,9 +260,22 @@
   <string name="content_description_cancel_button">取消按鈕</string>
   <string name="content_description_message_status">訊息狀態</string>
   <string name="content_description_conference">會議</string>
+  <string name="content_description_username_field">使用者名稱欄位</string>
+  <string name="content_description_display_field">顯示名稱欄位</string>
+  <string name="content_description_domain_field">網域欄位</string>
+  <string name="content_description_confirm_password_field">確認密碼欄位</string>
+  <string name="content_description_email_field">電子郵件欄位</string>
   <string name="content_description_default_account">預設帳號</string>
+  <string name="content_description_deselect_all">取消全選</string>
+  <string name="content_description_select_all">全選</string>
+  <string name="content_description_delete_selection">刪除選取項目</string>
   <string name="content_description_contact_first_name">名字</string>
   <string name="content_description_contact_last_name">姓氏</string>
+  <string name="content_description_back_call">回到通話</string>
+  <string name="content_description_send_file">傳送檔案</string>
+  <string name="content_description_message">訊息</string>
+  <string name="content_description_unread_chat_message">未讀聊天訊息</string>
   <string name="content_description_transfer">轉接</string>
   <string name="content_description_bluetooth">藍牙</string>
+  <string name="content_description_call_options">通話選項</string>
 </resources>
diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index e8ee2b22a..8be70bf34 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -478,7 +478,13 @@ public class SettingsFragment extends PreferencesListFragment {
 		setListPreferenceValues(pref, entries, values);
 
 		LinphoneLimeState lime = mPrefs.getLimeEncryption();
-		pref.setSummary(lime.toString());
+		if (lime == LinphoneLimeState.Disabled) {
+			pref.setSummary(getString(R.string.lime_encryption_entry_disabled));
+		} else if (lime == LinphoneLimeState.Mandatory) {
+			pref.setSummary(getString(R.string.lime_encryption_entry_mandatory));
+		} else if (lime == LinphoneLimeState.Preferred) {
+			pref.setSummary(getString(R.string.lime_encryption_entry_preferred));
+		}
 		pref.setValue(lime.toString());
 	}