From d3f7bb7a83cf2958fb1bb1bb0c422f1af932b031 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Thu, 2 Feb 2017 15:02:20 +0100
Subject: [PATCH] Update transifex

---
 res/values-ar/strings.xml     |  96 +++++++-
 res/values-de/strings.xml     |  10 +-
 res/values-fi/strings.xml     |   1 -
 res/values-fr/strings.xml     |   9 +-
 res/values-ja/strings.xml     | 155 ++++++++++--
 res/values-ka/strings.xml     | 440 ++++++++++++++++++++++++++++++++++
 res/values-pl/strings.xml     |  98 +++++++-
 res/values-pt-rBR/strings.xml |   7 +-
 res/values-ru/strings.xml     |   1 -
 res/values-tr/strings.xml     |   9 +-
 res/values-zh-rTW/strings.xml |  23 +-
 res/values/strings.xml        |   8 +-
 12 files changed, 814 insertions(+), 43 deletions(-)
 create mode 100644 res/values-ka/strings.xml

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1060a1eab..4a6de7166 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -11,9 +11,14 @@
   <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="history_date_format">EEE, d MMM</string>
+  <string name="history_detail_date_format">yyyy/MM/dd - HH:mm - </string>
+  <string name="inapp_popup_date_format">yyyy/MM/dd</string>
+  <string name="inapp_popup_date_day">dd</string>
+  <string name="messages_date_format">dd/MM, HH:mm</string>
+  <string name="messages_list_date_format">dd/MM</string>
   <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">اسم المستخدم</string>
@@ -41,23 +46,41 @@
   <string name="connect">الاتصال</string>
   <string name="decline">رفض</string>
   <string name="conference">اجتماع</string>
+  <string name="link">الرابط</string>
+  <string name="link_account_popup">أتريد ربط الحساب %s برقم هاتفك ؟</string>
+  <string name="maybe_later">ربما لاحقا</string>
+  <string name="later">لاحقا</string>
   <string name="no">لا</string>
   <string name="ok">موافق</string>
   <string name="yes">نعم</string>
+  <string name="link_account">اربط حسابك</string>
   <!--Launch screen-->
   <string name="app_description">‫الزبون SIP <i>الحر</i>‬</string>
   <!--Assistant-->
   <string name="welcome">مرحبا</string>
   <string name="assistant">المرشد</string>
   <string name="assistant_create_account">إنشاء الحساب</string>
+  <string name="assistant_link_account">ربط الحساب</string>
   <string name="assistant_continue">استمرار</string>
+  <string name="assistant_activate">فعِّل حسابك</string>
   <string name="assistant_finish">أنهِ التهئية</string>
+  <string name="assistant_validate_account_1">لقد أُنشِيء حسابك. يُرجى الاطلاع على رسائل بريدك الإلكتروني لتأكيد حسابك :</string>
+  <string name="assistant_validate_account_2">حالما تنتهي من ذلك، عُد إلى هنا واضغط على الزر.</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_create_account_phone_number_address">عنوان SIP هو</string>
   <string name="assistant_login_linphone">استخدم حساب لِنْفُونْ</string>
   <string name="assistant_login_generic">استخدم حساب SIP</string>
   <string name="assistant_remote_provisioning">اجذب التهيئة البعيدة</string>
+  <string name="assistant_create_account_part_1">يٌرجى تأكيد رمزك الدولي ثم أدخل رقم هاتفك</string>
+  <string name="assistant_create_account_part_2">لقد أرسلنا رسالة قصيرة تحمل رمز التأكيد إلى رقم هاتفك :</string>
+  <string name="assistant_create_account_part_3">لإتمام التحقق من رقم هاتفك، يُرجى إدخال الأرقام الأربعة أسفله :\n</string>
+  <string name="assistant_create_account_part_email">يُرجى إدخال اسم المستخدم والعنوان البريد الإلكتروني وكلمة سر حساب لِنْفُونْ.</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_fetch_apply">اجذبْ وطبِّق</string>
@@ -65,19 +88,57 @@
   <string name="assistant_ec_calibration">معايرة مزيل الصدى في طور الإنجاز</string>
   <string name="assistant_remote_provisioning_login">أدخل اسم الولوج</string>
   <string name="assistant_account_not_validated">لم يتم تأكيد حسابك بعد.</string>
+  <string name="assistant_error_confirmation_code">رمز التأكيد غير صحيح.\r\nيُرجى محاولة مرة أخرى.</string>
   <string name="assistant_account_validated">تم تأكيد حسابك.</string>
   <string name="assistant_error_bad_credentials">اسم المسخدم أو كلمة السر غير صحيحة</string>
+  <string name="assistant_codec_down_question">أأنت موافق على تنزيل مرماز الفيديو OpenH264 المُقدَّم من طرف شركة Cisco Systems, Inc. ؟</string>
+  <string name="assistant_codec_downloading">يجري تنزيل مرماز الفيديو OpenH264 المُقدَّم من طرف شركة Cisco Systems, Inc.</string>
+  <string name="assistant_codec_downloaded">انتهى تنزيل مرماز الفيديو OpenH264 المُقدَّم من طرف شركة Cisco Systems, Inc.</string>
   <string name="wizard_failed">حدث خطأ، حاول لاحقا.</string>
   <string name="wizard_server_unavailable">انعدام الوصول للخادم، تأكد من اتصالك بالشبكة.</string>
   <string name="wizard_username_unavailable">إن إسم المستخدم هذا مُستعمَل.</string>
+  <string name="assistant_phone_number_unavailable">رقم الهاتف هذا مستخدَم مسبقا.\r\nيُرجى إدخال رقم آخر.\r\nيمكنك حذف الحساب الحالي إن شئت إعادة استخدام رقم هاتفك.</string>
   <string name="wizard_username_incorrect">اسم المستخدم غير صحيح.</string>
+  <string name="assistant_phone_number_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>
+  <string name="forgot_password">أنسيت كلمة سرك ؟</string>
+  <string name="assistant_choose_country">اختر البلد</string>
+  <string name="select_your_country">حدِّد بلادك</string>
+  <string name="country_code">(%s)</string>
+  <string name="use_username_instead_or_phone_number">استعمل اسم المستخدم (اختياري)</string>
+  <string name="use_email_for_validation">استخدم عنوان البريد الإلكتروني لتأكيد الحساب</string>
+  <string name="login_with_username">استعمل اسم المستخدم وكلمة السر عوضا عن رقم هاتفك</string>
+  <string name="phone_number_info_title">لأي غرض سيجري استخدام رقم هاتفي ؟</string>
+  <string name="phone_number_info_content">
+\nبفضل رقم هاتفك، سيجدك أصدقاؤك بسهولة.\n\nسوف تجد في دفتر عناوينك من يستخدم لِنْفُونْ وسيتمكن أصدقاؤك من الوصول إليك بواسطة لِنْفُونْ كذلك.لِنْفُونْ.\n</string>
+  <string name="phone_number_link_info_content">
+\nسيجدك أصدقاؤك بسهولة إن ربطت حسابك برقم هاتفك\\n\nسوف تجد في دفتر عناوينك من يستخدم لِنْفُونْ وسيتمكن أصدقاؤك من الوصول إليك بواسطة لِنْفُونْ كذلك.لِنْفُونْ.\n</string>
+  <string name="phone_number_link_info_content_already_account">يمكنك استخدام رقم هاتفي واحد مع حساب لنفون واحد.\n\nإن ربطت رقم هاتفك مع حساب آخر لكنك تود استخدام هذا الحساب، يمكنك ببساطة ربطه مع رقم هاتفك تلقائيا وسيُنقَل هذا الأخير إلى هذا الحساب.</string>
   <!--Status-->
+  <string name="invalid_email">البريد الإلكتروني غير صحيح</string>
+  <string name="account_already_exist">الحساب موجود مسبقا</string>
+  <string name="phone_number_not_exist">لا وجود لهذا الحساب</string>
+  <string name="invalid_username">اسم المستخدم غير صحيح</string>
+  <string name="invalid_domain">نطاق غير صحيح</string>
+  <string name="invalid_route">طريق غير صحيحة</string>
+  <string name="invalid_display_name">اسم العرض غير صحيح</string>
+  <string name="username_too_short">اسم المستخدم قصير جدا</string>
+  <string name="username_too_long">اسم المستخدم طويل جدا</string>
+  <string name="username_invalid_size">طول اسم المستخدك غير صحيح</string>
+  <string name="phone_number_too_long">رقم الهاتف طويل جدا</string>
+  <string name="phone_number_too_short">رقم الهاتف قصير جدا</string>
+  <string name="phone_number_invalid">رقم الهاتف غير صحيح</string>
+  <string name="password_too_short">كلمة السر قصيرة جدا</string>
+  <string name="password_too_long">كلمة السر طويلة جدا</string>
+  <string name="request_failed">فشل في استعلام الخادم. يُرجى إعادة المحاولة لاحقا.</string>
+  <string name="transport_unsupported">النقل غير مدعوم</string>
+  <string name="country_code_invalid">رمز البلد غير صحيح</string>
   <!--In-app-->
+  <string name="inapp_notification_account_expire">سوف تنتهي صلاحية الاشتراك في %s</string>
   <!--Dailer-->
   <string name="address_bar_hint">أدخل رقما أو عنوانا</string>
   <!--History-->
@@ -94,6 +155,7 @@
   <string name="sip_address">عنوان SIP</string>
   <string name="contact_first_name">اﻹسم</string>
   <string name="contact_last_name">اللقب</string>
+  <string name="contact_organization">المنظمة</string>
   <!--Chat-->
   <string name="no_chat_history">لا وجود لأي محادثة</string>
   <string name="delete_conversation">أتود حذف المحادثات المحددة ؟</string>
@@ -128,14 +190,20 @@
   <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_ip">صنف IP :</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_sent">دقة الفيديو المُرسَل :</string>
+  <string name="call_stats_video_resolution_received">دقة الفيديو المُستلَم :</string>
+  <string name="call_stats_sender_loss_rate">معدل ضياع المُرسِل :</string>
+  <string name="call_stats_receiver_loss_rate">معدل ضياع المتلقي :</string>
+  <string name="call_stats_encoder_name">مُرمِّز :</string>
+  <string name="call_stats_decoder_name">مفك الترميز :</string>
   <string name="call">المكالمة</string>
   <!--About-->
   <string name="menu_send_log">إرسال السجل</string>
@@ -146,12 +214,15 @@
   <string name="incall_notif_video">المكالمة المرئية الجارية</string>
   <string name="notification_started">بدَأ</string>
   <string name="unread_messages">%i رسائل غير مقروءة</string>
+  <string name="missed_calls_notif_title">المكالمة الفائتة</string>
+  <string name="missed_calls_notif_body">%i المكالمات الفائتة</string>
   <!--Errors-->
   <string name="skipable_error_service_not_ready">تحذير : الخدمة غير جاهزة</string>
   <string name="error">خطأ</string>
   <string name="warning_wrong_destination_address">لا يمكن تركيب عنوان الوجهة انطلاقا من %s</string>
   <string name="error_unknown">خطأ مجهول</string>
   <string name="error_call_declined">مكالمة مرفوضة</string>
+  <string name="error_user_busy">المستخدم مشغول</string>
   <string name="error_user_not_found">لم يعثر على المستخدم</string>
   <string name="error_incompatible_media">مُعامِلات الوسائط غير متوافقة</string>
   <string name="error_low_bandwidth">لمخاطبك سعة قناة ضيقة، لا يمكن إذن بدء الفيديو</string>
@@ -181,6 +252,8 @@
   <string name="pref_avpf">AVPF</string>
   <string name="pref_avpf_rr_interval">نطاق RTCP الاعتيادي لـ AVPF بالثواني (ما بين 1 و 5)</string>
   <string name="pref_escape_plus">استبدال + بـ 00</string>
+  <string name="pref_friendlist_subscribe">الاشتراك في قائمة الأصدقاء</string>
+  <string name="pref_link_account">اربط حسابك</string>
   <string name="pref_auth_userid">مُعرِّف استيثاق المستخدم</string>
   <string name="pref_help_auth_userid">ادخل مُعرِّف استيثاق المستخدم (اختياري)</string>
   <string name="pref_display_name">الإسم المعروض</string>
@@ -191,7 +264,9 @@
   <string name="pref_transport_tcp">TCP</string>
   <string name="pref_transport_tls">TLS</string>
   <string name="pref_delete_account">حذف هذا الحساب</string>
+  <string name="pref_change_password">عدِّل كلمة السر</string>
   <string name="pref_default_account">استخدام كافتراضي</string>
+  <string name="pref_password_changed">عُدِّلت كلمة السر</string>
   <!--Settings-->
   <string name="pref_sipaccounts">حسابات SIP</string>
   <string name="default_account_flag">الحساب الافتراضي</string>
@@ -215,6 +290,7 @@
   <string name="pref_echo_cancellation">إزالة الصدى</string>
   <string name="pref_echo_cancellation_summary">إزالة الصدى المسموع من الطرف الآخر</string>
   <string name="pref_echo_canceller_calibration">معايرة مزيل الصدى</string>
+  <string name="pref_echo_tester">اختبار الصدى</string>
   <string name="ec_calibrating">يُعايِر...</string>
   <string name="ec_calibrated">‫جرت المعايرة بـ ‪%s ms‬‬</string>
   <string name="no_echo">لا وجود لصدى</string>
@@ -236,14 +312,25 @@
   <string name="pref_video_codecs_title">المراميز</string>
   <!--Call settings-->
   <string name="pref_call_title">المكالمة</string>
+  <string name="pref_device_ringtone">استخدم رنة الجهاز</string>
+  <string name="pref_auto_answer">رد تلقائيا على المكالمات الواردة</string>
   <string name="pref_voice_mail">عنوان العلبة الصوتية</string>
   <!--Chat settings-->
   <string name="pref_chat_title">المحادثة</string>
   <string name="pref_image_sharing_server_title">خادم المشاركة</string>
+  <string name="pref_image_sharing_server_desc">لا تقم بالتحرير إلا إذا كنت متيقنا مما تفعل !</string>
+  <string name="pref_use_lime_encryption">استخدم تعمية LIME</string>
+  <string name="lime_encryption_entry_disabled">غير مفعلة</string>
+  <string name="lime_encryption_entry_mandatory">واجبة</string>
+  <string name="lime_encryption_entry_preferred">مفضلة</string>
   <!--Network settings-->
   <string name="pref_network_title">الشبكة</string>
   <string name="pref_wifi_only">استخدم WiFi فقط</string>
+  <string name="pref_stun_server">خادم STUN / TURN</string>
   <string name="pref_ice_enable">تشغيل ICE</string>
+  <string name="pref_turn_enable">فعِّل TURN</string>
+  <string name="pref_turn_username_title">اسم مستخدم STUN / TURN (اختياري)</string>
+  <string name="pref_turn_passwd_title">كلمة سر STUN / TURN (اختياري)</string>
   <string name="pref_upnp_enable">تشغيل UPnP</string>
   <string name="pref_transport_use_random_ports">استخدم منافذ عشوائية</string>
   <string name="pref_sip_port_title">منفذ SIP المُراد استخدامه</string>
@@ -259,9 +346,11 @@
   <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_incoming_call_timeout_title">مهلة الانتظار قبل رفض المكالمة (بالثواني)</string>
   <string name="pref_remote_provisioning_title">التهيئة عن بعد</string>
+  <string name="pref_android_app_settings_title">إعدادات تطبيق أندرويد</string>
   <string name="pref_primary_account_title">الحساب اﻷوَّلي</string>
   <string name="pref_display_name_title">الإسم المعروض</string>
   <string name="pref_user_name_title">إسم المستخدم</string>
@@ -298,6 +387,7 @@
   <string name="content_description_new_discussion">محادثة جديدة</string>
   <string name="content_description_search">بحث</string>
   <string name="content_description_search_contact">ابحث عن جهة الاتصال</string>
+  <string name="content_description_search_country">ابحث عن البلد</string>
   <string name="content_description_all_contacts">كل جهات الاتصال</string>
   <string name="content_description_linphone_contacts">جهات اتصال Linphone</string>
   <string name="content_description_call_direction">اتجاه الاتصال</string>
@@ -318,6 +408,7 @@
   <string name="content_description_conference">اجتماع</string>
   <string name="content_description_username_field">حقل اسم المستخدم</string>
   <string name="content_description_activation_code_field">حقل اسم المستخدم</string>
+  <string name="content_description_phone_number_field">حقل رقم الهاتف</string>
   <string name="content_description_display_field">اعرض حقل الاسم</string>
   <string name="content_description_domain_field">حقل النطاق</string>
   <string name="content_description_url_field">حقل التهيئة البعيدة</string>
@@ -329,6 +420,7 @@
   <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_contact_organization">المنظمة</string>
   <string name="content_description_back_call">ارجع إلى المكالمة</string>
   <string name="content_description_send_file">أرسل ملفا</string>
   <string name="content_description_message">رسالة</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 94350dbcf..14a5df584 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -11,9 +11,15 @@
   <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="inapp_popup_date_format">jjjj/MM/tt</string>
+  <string name="inapp_popup_date_day">tt</string>
+  <string name="messages_date_format">tt/MM, HH:mm</string>
+  <string name="messages_list_date_format">tt/MM</string>
+  <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">Benutzername</string>
   <string name="phone_number">Telefonnummer</string>
@@ -82,6 +88,7 @@
   <string name="assistant_ec_calibration">Echounterdrückungskalibrierung läuft</string>
   <string name="assistant_remote_provisioning_login">Geben Sie Ihre Anmeldung ein</string>
   <string name="assistant_account_not_validated">Ihr Konto wurde noch nicht überprüft.</string>
+  <string name="assistant_error_confirmation_code">Der Bestätigungscode ist ungültig.\r\nBitte versuchen Sie es erneut.</string>
   <string name="assistant_account_validated">Ihr Konto wurde überprüft.</string>
   <string name="assistant_error_bad_credentials">Falscher Benutzername oder Passwort</string>
   <string name="assistant_codec_down_question">Sind Sie mit dem Herunterladen des OpenH264-Videocodecs, bereitgestellt von Cisco Systems, Inc., einverstanden?</string>
@@ -181,7 +188,6 @@
   <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>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 2e2ce5996..69fc21620 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -120,7 +120,6 @@
   <string name="no_current_call">Ei aktiivisia puheluita</string>
   <string name="call_paused_by_remote">Vastapuoli laittoi puhelun tauolle</string>
   <string name="couldnt_accept_call">Virhe puhelua ottaessa</string>
-  <string name="zrtp_dialog">ZRTP avain on %s\nSinun pitää vain hyväksyä jos haluat saman avaimen kuin vastapuoli</string>
   <string name="unknown_incoming_call_name">Tuntematon</string>
   <string name="call_stats_audio">Ääni</string>
   <string name="call_stats_video">Video</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 80a1cf7d9..f4ed9e88a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -11,9 +11,15 @@
   <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="inapp_popup_date_format">yyyy/MM/dd</string>
+  <string name="inapp_popup_date_day">dd</string>
+  <string name="messages_date_format">dd/MM, HH:mm</string>
+  <string name="messages_list_date_format">dd/MM</string>
+  <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">Nom d\'utilisateur</string>
   <string name="phone_number">Numéro de téléphone</string>
@@ -187,7 +193,6 @@ Vos amis pourront vous joindre plus facilement si vous associez votre compte à
   <string name="no_current_call">Aucun appel en cours</string>
   <string name="call_paused_by_remote">Votre correspondant a pausé l\'appel</string>
   <string name="couldnt_accept_call">Une erreur est survenue pendant l\'acceptation de l\'appel</string>
-  <string name="zrtp_dialog">Le jeton ZRTP est %s\nAcceptez uniquement s\'il est identique à celui de votre correspondant </string>
   <string name="unknown_incoming_call_name">Inconnu</string>
   <string name="call_stats_audio">Audio</string>
   <string name="call_stats_video">Vidéo</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 42622eb28..b27b2685e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2,28 +2,34 @@
 <resources>
   <!--Custom-->
   <string name="app_name">Linphone</string>
-  <string name="service_name">Linphone サービス</string>
+  <string name="service_name">サービス</string>
   <string name="addressbook_label">Linphone</string>
   <string name="notification_title">Linphone</string>
-  <string name="wait_dialog_text">はじめます</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>
   <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="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="inapp_popup_date_format">yyyy/MM/dd</string>
+  <string name="inapp_popup_date_day">dd</string>
+  <string name="messages_date_format">dd/MM, HH:mm</string>
+  <string name="messages_list_date_format">dd/MM</string>
+  <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">ユーザー名</string>
   <string name="phone_number">電話番号</string>
-  <string 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_text">本当に削除しますか？</string>
   <string name="delete">削除する</string>
   <string name="retry">再送する</string>
   <string name="cancel">キャンセル</string>
@@ -31,7 +37,7 @@
   <string name="continue_text">続行</string>
   <string name="about">概要</string>
   <string name="deny">拒否する</string>
-  <string name="no_account">アカウントがありません</string>
+  <string name="no_account">アカウントなし</string>
   <string name="search">検索</string>
   <string name="outgoing">発信</string>
   <string name="incoming">着信</string>
@@ -40,41 +46,102 @@
   <string name="connect">接続する</string>
   <string name="decline">接続しない</string>
   <string name="conference">会談</string>
+  <string name="link">リンク</string>
+  <string name="link_account_popup">アカウント%sと電話番号をリンクしますか？</string>
+  <string name="maybe_later">また今度</string>
+  <string name="later">そのうち</string>
   <string name="no">いいえ</string>
   <string name="ok">OK</string>
   <string name="yes">はい</string>
+  <string name="link_account">アカウントをリンクする</string>
   <!--Launch screen-->
-  <string name="app_description">the <i>libre</i> SIP client</string>
+  <string name="app_description"><i>自由な</i>クライアント</string>
   <!--Assistant-->
   <string name="welcome">ようこそ</string>
   <string name="assistant">アシスタント</string>
   <string name="assistant_create_account">アカウントを作成する</string>
+  <string name="assistant_link_account">アカウントをリンクする</string>
   <string name="assistant_continue">続行</string>
+  <string name="assistant_activate">アカウントを認証する</string>
   <string name="assistant_finish">完了しました</string>
+  <string name="assistant_validate_account_1">アカウントが作成されました。メールを確認してください：</string>
+  <string name="assistant_validate_account_2">完了したら戻ってボタンを押してください。</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_create_account_phone_number_address">あなたのSIPアドレス</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">あなたの国コードを確認し、電話番号を入力してください</string>
+  <string name="assistant_create_account_part_2">電話番号に確認コードを記載したSMSを送りました：</string>
+  <string name="assistant_create_account_part_3">電話番号の確認を完了するには、4桁のコードを入力してください：\n</string>
+  <string name="assistant_create_account_part_email">Linphoneアカウントのユーザ名、電子メール、パスワードを入力してください</string>
   <string name="assistant_display_name_optional">表示する名前(任意)</string>
-  <string name="assistant_generic_account">SIPアカウントで使う</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_error_confirmation_code">無効な確認コードです。\r\nやり直してください。</string>
   <string name="assistant_account_validated">確認済みのアカウントです。</string>
   <string name="assistant_error_bad_credentials">ユーザー名かパスワードが異なります</string>
+  <string name="assistant_codec_down_question">Cisco Systems,Incが提供するOpenH264ビデオコーデックをダウンロードしますか？</string>
+  <string name="assistant_codec_downloading">Cisco Systems,Incが提供するOpenH264ビデオコーデックをダウンロードします。</string>
+  <string name="assistant_codec_downloaded">Cisco Systems,Incが提供するOpenH264ビデオコーデックがダウンロードされました。</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="assistant_phone_number_unavailable">電話番号は使用中です。\r\n別の番号を入力してください。電話番号を再利用する場合は、既存のアカウントを削除してください。</string>
+  <string name="wizard_username_incorrect">不正なユーザー名です</string>
+  <string name="assistant_phone_number_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>
   <string name="forgot_password">パスワードを忘れましたか？</string>
+  <string name="assistant_choose_country">国を選択してください</string>
+  <string name="select_your_country">国を選択してください</string>
+  <string name="country_code">(%s)</string>
+  <string name="use_username_instead_or_phone_number">ユーザー名を使う(任意)</string>
+  <string name="use_email_for_validation">アカウント認証にメールアドレスを使う</string>
+  <string name="login_with_username">電話番号の代わりにユーザー名とパスワードを使う</string>
+  <string name="phone_number_info_title">私の電話番号は何のために使われますか？</string>
+  <string name="phone_number_info_content">
+\nあなたの電話番号のおかげで、あなたの友人はあなたをより簡単に見つけるでしょう。 \n\nLinphoneを使用しているあなたのアドレス帳にあなたが表示され、あなたの友人はLinphoneでもあなたを呼び出せる事を知ります。\n</string>
+  <string name="phone_number_link_info_content">
+\nLinphoneを使用しているあなたのアドレス帳に\nあなたが表示され、あなたの友人は\nLinphoneでもあなたに連絡できることを把握します。</string>
+  <string name="phone_number_link_info_content_already_account">アカウントを自分の電話番号にリンクすると、友人があなたをより簡単に見つけることができます。\n\n電話番号は、1つのLinphoneアカウントでのみ使用できます。\n\n既にあなたの番号を他のアカウントにリンクしていたが、\n\nこの番号を使用したい場合は、今すぐリンクする事で番号が自動的にこのアカウントに移動されます。</string>
   <!--Status-->
+  <string name="invalid_email">無効なメールアドレスです</string>
+  <string name="account_already_exist">既に存在しているアカウントです</string>
+  <string name="phone_number_not_exist">このアカウントは存在しません</string>
+  <string name="invalid_username">無効なユーザー名です</string>
+  <string name="invalid_domain">無効なドメインです</string>
+  <string name="invalid_route">無効なルートです</string>
+  <string name="invalid_display_name">無効な表示名です</string>
+  <string name="username_too_short">ユーザー名が短すぎます</string>
+  <string name="username_too_long">ユーザー名が長すぎます</string>
+  <string name="username_invalid_size">ユーザー名の文字数が不正です</string>
+  <string name="phone_number_too_long">電話番号が長すぎます</string>
+  <string name="phone_number_too_short">電話番号が短すぎます</string>
+  <string name="phone_number_invalid">不正な電話番号です</string>
+  <string name="password_too_short">パスワードが短すぎます</string>
+  <string name="password_too_long">パスワードが長すぎます</string>
+  <string name="request_failed">サーバーが使えません。再度やり直してください。</string>
+  <string name="transport_unsupported">サポートできない方式です</string>
+  <string name="country_code_invalid">不正な国番号です</string>
   <!--In-app-->
+  <string name="inapp">アプリ内で</string>
+  <string name="inapp_notification_title">アプリ内購入</string>
+  <string name="inapp_notification_trial_expire">試用期間 %s</string>
+  <string name="inapp_notification_account_expire">使用期間  %s</string>
   <!--Dailer-->
   <string name="address_bar_hint">番号もしくはアドレスを入力してください</string>
   <!--History-->
@@ -91,6 +158,7 @@
   <string name="sip_address">SIPアドレス</string>
   <string name="contact_first_name">名前</string>
   <string name="contact_last_name">名字</string>
+  <string name="contact_organization">組織</string>
   <!--Chat-->
   <string name="no_chat_history">新しい会話はありません</string>
   <string name="delete_conversation">本当に選択した会話を削除しますか？</string>
@@ -117,18 +185,28 @@
   <string name="menu_assistant">アシスタント</string>
   <string name="menu_settings">設定</string>
   <string name="menu_about">概要</string>
-  <string name="quit">退出</string>
+  <string name="quit">終了</string>
   <!--Call-->
   <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="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_ip">IP：</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_sent">送信ビデオ解像度：</string>
+  <string name="call_stats_video_resolution_received">受信ビデオ解像度：</string>
+  <string name="call_stats_sender_loss_rate">送信ロス：</string>
+  <string name="call_stats_receiver_loss_rate">受信ロス：</string>
+  <string name="call_stats_encoder_name">エンコーダー：</string>
+  <string name="call_stats_decoder_name">デコーダー：</string>
   <string name="call">発信</string>
   <!--About-->
   <string name="menu_send_log">ログを送信する</string>
@@ -139,13 +217,18 @@
   <string name="incall_notif_video">ビデオキャプチャーコール進行中</string>
   <string name="notification_started">はじめます</string>
   <string name="unread_messages">%i 未読メッセージ</string>
+  <string name="missed_calls_notif_title">不在着信</string>
+  <string name="missed_calls_notif_body">不在着信 %i 件</string>
   <!--Errors-->
   <string name="skipable_error_service_not_ready">警告：未提供のサービスです</string>
   <string name="error">エラー</string>
+  <string name="warning_wrong_destination_address">%sからのアドレスを構築できません</string>
   <string name="error_unknown">不明なエラー</string>
   <string name="error_call_declined">呼び出しが拒否されました</string>
+  <string name="error_user_busy">ビジーです</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="error_bad_credentials">不正な証明書です</string>
   <string name="error_unauthorized">無断</string>
@@ -153,6 +236,7 @@
   <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">管理</string>
@@ -171,7 +255,10 @@
   <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_friendlist_subscribe">フレンドの購読</string>
+  <string name="pref_link_account">アカウントをリンクする</string>
   <string name="pref_auth_userid">ユーザーIDを認証</string>
+  <string name="pref_help_auth_userid">認証用のID(任意)</string>
   <string name="pref_display_name">表示名</string>
   <string name="pref_help_display_name">表示する名前(任意)</string>
   <string name="pref_prefix">プレフィックス</string>
@@ -180,7 +267,9 @@
   <string name="pref_transport_tcp">TCP</string>
   <string name="pref_transport_tls">TLS</string>
   <string name="pref_delete_account">このアカウントを削除する</string>
+  <string name="pref_change_password">パスワードを変更する</string>
   <string name="pref_default_account">デフォルトで使用する</string>
+  <string name="pref_password_changed">パスワードを変更しました</string>
   <!--Settings-->
   <string name="pref_sipaccounts">SIPアカウント</string>
   <string name="default_account_flag">デフォルトのアカウント</string>
@@ -205,6 +294,7 @@
   <string name="pref_echo_cancellation">エコーキャンセル</string>
   <string name="pref_echo_cancellation_summary">相手が聞こえるエコーを削除する</string>
   <string name="pref_echo_canceller_calibration">エコーキャンセラーの調整</string>
+  <string name="pref_echo_tester">エコーテスト</string>
   <string name="ec_calibrating">調整中...</string>
   <string name="ec_calibrated">%s msで調整しました</string>
   <string name="no_echo">エコーなし</string>
@@ -214,6 +304,8 @@
   <string name="pref_codecs">Codecs</string>
   <!--Video settings-->
   <string name="pref_video_title">ビデオ</string>
+  <string name="pref_overlay">ビデオのオーバーレイ</string>
+  <string name="pref_overlay_summary">画面上でビデオコールを表示する</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">ビデオ表示の要請を常に送信</string>
@@ -226,15 +318,27 @@
   <string name="pref_video_codecs_title">コーデック</string>
   <!--Call settings-->
   <string name="pref_call_title">発信</string>
+  <string name="pref_device_ringtone">設定してある着信音を使用する</string>
+  <string name="pref_auto_answer">着信に自動で応答する</string>
+  <string name="pref_rfc2833_dtmf">DTMFをインバンド(RFC2833)で送信する</string>
+  <string name="pref_sipinfo_dtmf">DTMFをSIP(情報)で送信する</string>
   <string name="pref_voice_mail">音声メールのURI</string>
   <!--Chat settings-->
   <string name="pref_chat_title">チャット</string>
   <string name="pref_image_sharing_server_title">共有サーバー</string>
+  <string name="pref_image_sharing_server_desc">分からない場合は編集しないでください！</string>
+  <string name="pref_use_lime_encryption">LIMEの暗号化を使用する</string>
   <string name="lime_encryption_entry_disabled">無効にする</string>
+  <string name="lime_encryption_entry_mandatory">必須</string>
+  <string name="lime_encryption_entry_preferred">好ましい</string>
   <!--Network settings-->
   <string name="pref_network_title">ネットワーク</string>
   <string name="pref_wifi_only">WiFiのみ</string>
+  <string name="pref_stun_server">STUN / TURN サーバー</string>
   <string name="pref_ice_enable">ICEを有効にする</string>
+  <string name="pref_turn_enable">TURNを使う</string>
+  <string name="pref_turn_username_title">STUN / TURN ユーザー名 (任意)</string>
+  <string name="pref_turn_passwd_title">STUN / TURN パスワード (任意)</string>
   <string name="pref_upnp_enable">UPNPを使う</string>
   <string name="pref_transport_use_random_ports">ランダムポートを使用する</string>
   <string name="pref_sip_port_title">SIPポートを使用する</string>
@@ -246,13 +350,15 @@
   <string name="pref_push_notification">プッシュ通知を有効にする</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_service_notification">サービス通知を有効にする</string>
   <string name="pref_autostart">起動時に開始する</string>
-  <string name="pref_remote_provisioning_title">遠隔準備</string>
+  <string name="pref_incoming_call_timeout_title">呼び出し時間のタイムアウト(秒)</string>
+  <string name="pref_remote_provisioning_title">プロビショニング準備</string>
+  <string name="pref_android_app_settings_title">Androidでの設定</string>
   <string name="pref_primary_account_title">優先アカウント</string>
   <string name="pref_display_name_title">表示名</string>
   <string name="pref_user_name_title">ユーザー名</string>
@@ -260,7 +366,7 @@
   <string name="pref_audio_hacks_title">オーディオ設定</string>
   <string name="pref_audio_use_specific_mode_title">特定のハックを使用する</string>
   <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (デフォルト), 2=MODE_IN_CALL</string>
-  <string name="pref_audio_hacks_use_routing_api_title">ルーティングAPIを使用する</string>
+  <string name="pref_audio_hacks_use_routing_api_title">ルーティングAPIをハックする</string>
   <string name="pref_audio_hacks_use_galaxys_hack_title">Galaxy Sハックを使用する</string>
   <!--Content description-->
   <string name="content_description_back">戻る</string>
@@ -268,9 +374,9 @@
   <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_decline">拒否する</string>
   <string name="content_description_hang_up">ハングアップ</string>
-  <string name="content_description_accept">受理する</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>
@@ -289,6 +395,7 @@
   <string name="content_description_new_discussion">新しいやりとりを行う</string>
   <string name="content_description_search">検索</string>
   <string name="content_description_search_contact">連絡先を検索する</string>
+  <string name="content_description_search_country">国を探す</string>
   <string name="content_description_all_contacts">すべての連絡先</string>
   <string name="content_description_linphone_contacts">Linphoneでの連絡先</string>
   <string name="content_description_call_direction">宛先を指定</string>
@@ -303,27 +410,33 @@
   <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_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_username_field">ユーザー名</string>
   <string name="content_description_activation_code_field">ユーザー名</string>
+  <string name="content_description_phone_number_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_contact_organization">所属</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_audio_route">オーディオルート</string>
   <string name="content_description_exit_conference">会議を終了する</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
new file mode 100644
index 000000000..c71f3121a
--- /dev/null
+++ b/res/values-ka/strings.xml
@@ -0,0 +1,440 @@
+<?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>
+  <string name="about_version">Linphone Android %s</string>
+  <string name="about_liblinphone_version">Linphone ბირთვი %s</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">dd/MM/yyyy - HH:mm -</string>
+  <string name="inapp_popup_date_format">dd/MM/yyyy</string>
+  <string name="inapp_popup_date_day">dd</string>
+  <string name="messages_date_format">dd/MM, HH:mm</string>
+  <string name="messages_list_date_format">dd/MM</string>
+  <string name="today_date_format">HH:mm</string>
+  <!--Common-->
+  <string name="username">მომხმარებლის სახელი</string>
+  <string name="phone_number">ტელეფონის ნომერი</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">თავიდან სცდა</string>
+  <string name="cancel">გაუქმება</string>
+  <string name="accept">მიღება</string>
+  <string name="continue_text">გაგრძელება</string>
+  <string name="about">შესახებ</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>
+  <string name="link">ბმული</string>
+  <string name="link_account_popup">გსურთ ანგარიშის %s მიბმა თქვენს ტელეფონის ნომერზე?</string>
+  <string name="maybe_later">შესაძლოა მოგვიანებით</string>
+  <string name="later">მოგვიანებით</string>
+  <string name="no">არა</string>
+  <string name="ok">OK</string>
+  <string name="yes">დიახ</string>
+  <string name="link_account">ანგარიშის მიბმა</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_link_account">ანგარიშის მიბმა</string>
+  <string name="assistant_continue">გაგრძელება</string>
+  <string name="assistant_activate">გააქტიურეთ თქვენი ანგარიში</string>
+  <string name="assistant_finish">კონფიგურაციის დასრულება</string>
+  <string name="assistant_validate_account_1">თქვენი ანგარიში შექმნილია. გთხოვთ, შეამოწმოთ თქვენი ელფოსტა ანგარიშის დასადასტურებლად:</string>
+  <string name="assistant_validate_account_2">როდესაც მზად იქნება, დაბრუნდით აქ და დააჭირეთ ღილაკს.</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_create_account_phone_number_address">თქვენი SIP მისამართ არის</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">გთხოვთ, დაადასტუროთ თქვენი ქვეყნის კოდი და შეიყვანოთ თქვენი ტელეფონის ნომერი</string>
+  <string name="assistant_create_account_part_2">ჩვენ გამოგიგზავნეთ მოკლე ტექსტური შეტყობინება დადასტურების კოდით თქვენს ტელეფონის ნომერზე:</string>
+  <string name="assistant_create_account_part_3">თქვენი ტელეფონის ნომრის ვერიფიკაციისთვის, გთხოვთ, შეიყვანოთ 4-ნიშნა კოდი ქვემოთ:\n</string>
+  <string name="assistant_create_account_part_email">გთხოვთ, შეიყვანოთ მომხმარებლის სახელი, ელფოსტა და პაროლი თქვენი Linphone ანგარიშისთვის</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_error_confirmation_code">დასტურის კოდი არასწორია.\r\nგთხოვთ, სცადოთ თავიდან.</string>
+  <string name="assistant_account_validated">თქვენი ანგარიში იქნა დადასტურებული</string>
+  <string name="assistant_error_bad_credentials">არასწორი მომხმარებლის სახელი ან პაროლი</string>
+  <string name="assistant_codec_down_question">ეთანხმებით Cisco Systems, Inc. მოერ მოწოდებული OpenH264 ვიდეო კოდეკის გადმოწერას?</string>
+  <string name="assistant_codec_downloading">მიმდინარეობს Cisco Systems, Inc. მიერ მოწოდებული OpenH264 ვიდეო კოდეკის გადმოწერა</string>
+  <string name="assistant_codec_downloaded">Cisco Systems, Inc. მიერ მოწოდებული OpenH264 ვიდეო კოდეკის იქნა გადმოწერილი.</string>
+  <string name="wizard_failed">მოხდა შეცდომა, გთხოვთ, სცადოთ მოგვიანებით.</string>
+  <string name="wizard_server_unavailable">სერვისი მიუეწვდომელია, შეამოწმეთ თქვენი ქსელური კავშირი.</string>
+  <string name="wizard_username_unavailable">ეს მომხმარებლის სახელი უკვე გამოიყენება.</string>
+  <string name="assistant_phone_number_unavailable">ეს ტელეფონის ნომერი უკვე გამოიყენება.\r\nგთხოვთ, შეიყვანოთ სხვა ნომერი.\r\nშეგიძლიათ წაშალოთ არსებული ანგარიში, თუ გსურთ თქვენი ნომერის გამოყენება.</string>
+  <string name="wizard_username_incorrect">თქვენი მომხმარებლის სახელი არასწორია.</string>
+  <string name="assistant_phone_number_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>
+  <string name="forgot_password">დაგავიწყდათ პაროლი?</string>
+  <string name="assistant_choose_country">აირჩიეთ ქვეყანა</string>
+  <string name="select_your_country">აირჩიეთ თქვენი ქვეყანა</string>
+  <string name="country_code">(%s)</string>
+  <string name="use_username_instead_or_phone_number">მომხმარებლის სახელის გამოყენება (არა სავალდებულო)</string>
+  <string name="use_email_for_validation">ელფოსტის მისამართის გამოყენება ანგარიშის დასადატურებლად</string>
+  <string name="login_with_username">თქვენი მომხმარებლის სახელის და პაროლის გამოყენება თქვენი ტელეფონის ნომრის მაგივრად</string>
+  <string name="phone_number_info_title">რისთვის იქნება გამოყენებული ჩემი ტელეფონის ნომერი?</string>
+  <string name="phone_number_info_content">\nთქვენი ტელეფონის ნომრის დახმარებით, თქვენი მეგობრები შეძლებენ გიპოვონ უფრო მარტივად.\n\nთქვენ დაინახავთ თქვენს მისამართები წიგნში ვინ იყენებს Linphone-ს და თქვენს მეგობრებს ეცოდინებათ, რომ შეუძლიათ ასევე დაგიკავშირდნენ Linphone-ით.\n</string>
+  <string name="phone_number_link_info_content">\nთქვენი მეგობრები გიპოვიან უფრო მარტივად, თუ მიაბამთ თქვენს ანგარიშს თქვენს ტელფონის ნომერზე.\n\nთქვენ დაინახავთ თქვენს მისამართები წიგნში ვინ იყენებს Linphone-ს და თქვენს მეგობრებს ეცოდინებათ, რომ შეუძლიათ ასევე დაგიკავშირდნენ Linphone-ით.\n</string>
+  <string name="phone_number_link_info_content_already_account">თქვენ შეგიძლიათ გამოიყენოთ თქვენი ტელეფონის ნომერი მხოლოდ ერთ Linphone ანგარიშთან.\n\nთუ უკვე მიბმული გაქვთ თქვენი ნომერი სხვა ანგარიშზე, მაგრამ გსურთ ამის გამოყენება, უბრალოდ მიაბით იგი ახლა და თქვენი ნომერი იქნება ავტომატურად გადმოტანილი ამ ანგარიშზე.</string>
+  <!--Status-->
+  <string name="invalid_email">არასწორი ელფოსტა</string>
+  <string name="account_already_exist">ანგარიში უკვე არსებობს</string>
+  <string name="phone_number_not_exist">ეს ანგარიში არ არსებობს</string>
+  <string name="invalid_username">არასწორი მომხმარებლის სახელი</string>
+  <string name="invalid_domain">არასწორი დომენი</string>
+  <string name="invalid_route">არასწორი მარშრუტი</string>
+  <string name="invalid_display_name">არასწორი სახელ</string>
+  <string name="username_too_short">მომხმარებლის სახელი ნამეტანი მოკლეა</string>
+  <string name="username_too_long">მომხმარებლის სახელი ნამეტანი გრძელია</string>
+  <string name="username_invalid_size">მომხმარებლის სახელის სიგრძე არასწორია</string>
+  <string name="phone_number_too_long">ტელეფონის ნომერი ნამეტანი გრძელია</string>
+  <string name="phone_number_too_short">ტელეფონის ნომერი ნამეტანი მოკლეა</string>
+  <string name="phone_number_invalid">არასწორი ტელეფონის ნომერი</string>
+  <string name="password_too_short">პაროლი ნამეტანი მოკლეა</string>
+  <string name="password_too_long">პაროლი ნამეტანი გრძელია</string>
+  <string name="request_failed">სერვერის გამოკითხვა ვერ მოხერხდა. გთხოვთ, სცადოთ მოგვიანებით</string>
+  <string name="transport_unsupported">ტრანსპორტი არ არის მხარდაჭერილი</string>
+  <string name="country_code_invalid">ქვეყნის კოდი არასწორი</string>
+  <!--In-app-->
+  <string name="inapp">პროგრამის-შიდა</string>
+  <string name="inapp_notification_title">პროგრამის-შიდა შესყიდვა</string>
+  <string name="inapp_notification_trial_expire">საცდელი პერიოდი მთავრდება %s-ს</string>
+  <string name="inapp_notification_account_expire">გამოწერის პერიოდი მთავრდება %s-ს</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="contact_first_name">სახელი</string>
+  <string name="contact_last_name">გვარი</string>
+  <string name="contact_organization">ორგანიზაცია</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>
+  <string name="share_picture_size_real">რეალური ზომა</string>
+  <string name="text_copied_to_clipboard">ტექსტი კოპირებულია დაფაში</string>
+  <string name="copy_text">ტექსტის კოპირება</string>
+  <string name="image_picker_title">წყაროს არჩევა</string>
+  <string name="image_saved">სურათი შენახულია</string>
+  <string name="image_not_saved">შეცდომა, სურათი ვერ შეინახა</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="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="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_ip">IP ოჯახი:</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_sent">გაგზავნილი ვიდეოს გაფართოება:</string>
+  <string name="call_stats_video_resolution_received">მიღებული ვიდეოს გაფართოება:</string>
+  <string name="call_stats_sender_loss_rate">გამგზავნის დაკარგვის სიხშირე:</string>
+  <string name="call_stats_receiver_loss_rate">მიმღების დაკარგვის სიხშირე:</string>
+  <string name="call_stats_encoder_name">ენკოდერი:</string>
+  <string name="call_stats_decoder_name">დეკოდერი:</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="notification_started">დაწყებულია</string>
+  <string name="unread_messages">%i წაუკითხავი შეტყობინება</string>
+  <string name="missed_calls_notif_title">გამოტოვებული ზარი</string>
+  <string name="missed_calls_notif_body">%i გამოტოვებული ზარი</string>
+  <!--Errors-->
+  <string name="skipable_error_service_not_ready">ყურადღება: სერვისი არ არის მზად</string>
+  <string name="error">შეცდომა</string>
+  <string name="warning_wrong_destination_address">%s-დან დანიშნულების მისამართის შექმნა ვერ მოხერხდა</string>
+  <string name="error_unknown">უცნობი შეცდომა</string>
+  <string name="error_call_declined">ზარი უარყოფილია</string>
+  <string name="error_user_busy">მომხმარებელი დაკავებულია</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="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">მართვა</string>
+  <string name="pref_disable_account">გათიშვა</string>
+  <string name="pref_proxy">პროქსი</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">მაგალითად: ივანე, თუ თქვენი ანგარიში არის ivane@sip.example.org</string>
+  <string name="pref_help_domain">sip.example.org, თუ თქვენი ანგარიში არის ivane@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_friendlist_subscribe">მეგობრების სიის გამოწერა</string>
+  <string name="pref_link_account">ანგარიშის მიბმა</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_change_password">პაროლის შეცვლა</string>
+  <string name="pref_default_account">გამოყენება ნაგულისხმევად</string>
+  <string name="pref_password_changed">პაროლი შეიცვალა</string>
+  <!--Settings-->
+  <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>
+  <string name="pref_tunnel_mode">რეჟიმი</string>
+  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
+  <string-array name="tunnel_mode_entries">
+    <item>გათიშული</item>
+    <item>მხოლოდ 3G</item>
+    <item>ყოველთვის</item>
+    <item>ავტო</item>
+  </string-array>
+  <string name="pref_none">არცერთი</string>
+  <string name="pref_preferences_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="pref_echo_canceller_calibration">ექოს გამმაუქმებელის კალიბრაცია</string>
+  <string name="pref_echo_tester">ექოს ტესტირება</string>
+  <string name="ec_calibrating">მიმდინარეობს კალიბრაცია...</string>
+  <string name="ec_calibrated">დაკალიბრაბულია %s მწმ-ში</string>
+  <string name="no_echo">ექო არ არის</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_overlay">ვიდეოს გადაფარვა</string>
+  <string name="pref_overlay_summary">ზარის ვიდეოს გამოჩენა გადაფარვაში, როდესაც იმყოფებით პროგრამის გარეთ</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">ვიდეოს მოთხოვნის ყოველთვის გაგზავნა</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_device_ringtone">მოწყობილობის რეკვის ხმის გამოყენება</string>
+  <string name="pref_auto_answer">შემომავალ პასუხებზე ავტო-პასუხი</string>
+  <string name="pref_rfc2833_dtmf">არხის-შიდა DTMF-ების გაგზავნა(RFC2833)</string>
+  <string name="pref_sipinfo_dtmf">არხის-გარე DTMF-ების გაგზავნა(SIP INFO)</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="pref_image_sharing_server_desc">არ დაარედაკტიროთ, თუ არ იცით, რას აკეთებთ!</string>
+  <string name="pref_use_lime_encryption">LIME კოდირების გამოყენება</string>
+  <string name="lime_encryption_entry_disabled">გათიშულია</string>
+  <string name="lime_encryption_entry_mandatory">სავალდებულო</string>
+  <string name="lime_encryption_entry_preferred">არჩეული</string>
+  <!--Network settings-->
+  <string name="pref_network_title">ქსელი</string>
+  <string name="pref_wifi_only">მხოლოდ WiFi-ს გამოყენება</string>
+  <string name="pref_stun_server">STUN / TURN სერვერი</string>
+  <string name="pref_ice_enable">ICE-ის ჩართვა</string>
+  <string name="pref_turn_enable"> TURN-ის ჩართვა</string>
+  <string name="pref_turn_username_title">STUN / TURN მომხმარებლის სახელი (არა სავალდებულო)</string>
+  <string name="pref_turn_passwd_title">STUN / TURN პაროლი (არა სავალდებულო)</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>
+  <string name="pref_audio_port_title">ხმის პორტი ან პორტების დიაპაზონი</string>
+  <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>
+  <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_incoming_call_timeout_title">შემომავალი ზარის დაკიდება (წამებში)</string>
+  <string name="pref_remote_provisioning_title">დაშორებული პროვიზია</string>
+  <string name="pref_android_app_settings_title">Android-ის პროგრამის პარამეტრები</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-->
+  <string name="pref_audio_hacks_title">ხმის ჰაკები</string>
+  <string name="pref_audio_use_specific_mode_title">სპეციფიური რეჟიმის ჰაკის გამოყენება</string>
+  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (ნაგულისხმევი), 2=MODE_IN_CALL</string>
+  <string name="pref_audio_hacks_use_routing_api_title">მარშრუტირების API ჰაკის გამოყენება</string>
+  <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_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>
+  <string name="content_description_delete">წაშლა</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_search_country">ქვეყნის ძიება</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_username_field">მომხმარებლის სახელის ველი</string>
+  <string name="content_description_activation_code_field">მომხმარებლის სახელის ველი</string>
+  <string name="content_description_phone_number_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_contact_organization">ორგანიზაცია</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_audio_route">ხმის მარშრუტი</string>
+  <string name="content_description_exit_conference">კონფერენციიდან გამოსვლა</string>
+</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 396ee4bed..b1e5a0303 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -11,9 +11,15 @@
   <string name="tunnel_host"></string>
   <string name="about_version">Linphone Android %s</string>
   <string name="about_liblinphone_version">Linphone Core %s</string>
-  <string name="about_text">GNU General Public License V2\n © 2010-2016 Belledonne Communications</string>
   <string name="about_link">www.linphone.org</string>
   <string name="sync_account_name">kontakt linphone</string>
+  <string name="history_date_format">EEE, d MMM</string>
+  <string name="history_detail_date_format">yyyy/MM/dd - HH:mm - </string>
+  <string name="inapp_popup_date_format">rrrr/mm/dd</string>
+  <string name="inapp_popup_date_day">dd</string>
+  <string name="messages_date_format">dd/MM, HH:mm</string>
+  <string name="messages_list_date_format">dd/MM</string>
+  <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">Nazwa użytkownika</string>
   <string name="phone_number">Numer telefonu</string>
@@ -30,7 +36,7 @@
   <string name="accept">Akceptuj</string>
   <string name="continue_text">Kontynuuj </string>
   <string name="about">O nas</string>
-  <string name="deny">Zaprzeczać</string>
+  <string name="deny">Odmów</string>
   <string name="no_account">Konto nie zostało skonfigurowane</string>
   <string name="search">Szukaj</string>
   <string name="outgoing">Wyjście</string>
@@ -40,20 +46,41 @@
   <string name="connect">Połączenie</string>
   <string name="decline">Utracone</string>
   <string name="conference">Konferencja</string>
+  <string name="link">Link</string>
+  <string name="link_account_popup">Czy chcesz połączyć konta%s z numerem telefonu?</string>
+  <string name="maybe_later">Może później</string>
+  <string name="later">Później</string>
+  <string name="no">Nie</string>
+  <string name="ok">Ok</string>
+  <string name="yes">Tak</string>
+  <string name="link_account">Połącz swoje konto</string>
   <!--Launch screen-->
   <string name="app_description"><i>libre</i> klient SIP</string>
   <!--Assistant-->
   <string name="welcome">Witam</string>
   <string name="assistant">Asystent</string>
   <string name="assistant_create_account">Stwórz konto</string>
+  <string name="assistant_link_account">Połącz konto</string>
   <string name="assistant_continue">Kontynuuj </string>
+  <string name="assistant_activate">Aktywuj swoje konto</string>
   <string name="assistant_finish">Zakończ konfigurację</string>
+  <string name="assistant_validate_account_1">Twoje konto zostało utworzone. Proszę sprawdzić pocztę, aby zweryfikować konto:</string>
+  <string name="assistant_validate_account_2">Jeden raz to jest wykonywane, wróć tutaj i kliknij na przycisk.</string>
+  <string name="assistant_welcome_desc">Ten asystent pomoże Ci skonfigurować i używać konta SIP.</string>
+  <string name="assistant_linphone_login_desc">Wpisz nazwę użytkownika i hasło konta Linphone</string>
+  <string name="assistant_login_desc">Wpisz nazwę użytkownika i hasło w domenie SIP</string>
   <string name="assistant_remote_provisioning_desc">Proszę podać swoje zastrzeganie URL</string>
   <string name="transport">Transport</string>
+  <string name="assistant_create_account_phone_number_address">Twój adres SIP</string>
   <string name="assistant_login_linphone">Użyj konta Linphone</string>
   <string name="assistant_login_generic">Użyj konta SIP</string>
   <string name="assistant_remote_provisioning">Pobierz zdalną konfigurację</string>
+  <string name="assistant_create_account_part_1">Potwierdź swój kod kraju i podaj swój numer telefonu</string>
+  <string name="assistant_create_account_part_2">Wysłaliśmy Ci SMS z kodem weryfikacji na twój numer telefonu:</string>
+  <string name="assistant_create_account_part_3">Aby zakończyć weryfikację numeru telefonu, wprowadź poniżej 4-cyfrowy kod:\n</string>
+  <string name="assistant_create_account_part_email">Podaj nazwę użytkownika, adres e-mail i hasło do konta Linphone</string>
   <string name="assistant_display_name_optional">Wyświetl nazwę (opcjonalnie)</string>
+  <string name="assistant_linphone_account">Użyj swojego konta Linphone</string>
   <string name="assistant_generic_account">Użyj konta SIP</string>
   <string name="assistant_remote_provisioning_title">Pobierz zdalną konfigurację </string>
   <string name="assistant_fetch_apply">Pobierz i zastosuj</string>
@@ -61,6 +88,7 @@
   <string name="assistant_ec_calibration">Anulacja kalibracji echo w trakcie</string>
   <string name="assistant_remote_provisioning_login">Podaj login</string>
   <string name="assistant_account_not_validated">Twoje konto nie zostało jeszcze zatwierdzone.</string>
+  <string name="assistant_error_confirmation_code">Kod potwierdzenia jest nieprawidłowy.\r\nSpróbuj ponownie.</string>
   <string name="assistant_account_validated">Twoje konto zostało zatwierdzone.</string>
   <string name="assistant_error_bad_credentials">Niepoprawna nazwa użytkownika lub hasło</string>
   <string name="assistant_codec_down_question">Czy zgadzają się Państwo na pobranie OpenH264 Video Codec dostarczonego przez Cisco Systems, Inc.?</string>
@@ -69,15 +97,51 @@
   <string name="wizard_failed">Wystąpił błąd, spróbuj ponownie później.</string>
   <string name="wizard_server_unavailable">Serwer niedostępny, sprawdź swoje połączenie sieciowe.</string>
   <string name="wizard_username_unavailable">Nazwa użytkownika zajęta.</string>
+  <string name="assistant_phone_number_unavailable">Ten numer jest już używany.\r\nProszę wpisać inny numer.\r\nMożasz usunąć istniejące konto, jeśli chcesz ponownie wykorzystać swój numer telefonu.</string>
   <string name="wizard_username_incorrect">Twoja nazwa użytkownika jest nieprawidłowa.</string>
+  <string name="assistant_phone_number_incorrect">Numer telefonu jest nieprawidłowy.</string>
   <string name="wizard_email_incorrect">Twój email jest niepoprawny.</string>
   <string name="wizard_password_incorrect">Twoje hasło jest nieprawidłowe</string>
   <string name="wizard_passwords_unmatched">Hasła nie pasują do siebie.</string>
   <string name="setup_confirm_username">Twoja nazwa użytkownika będzie %s.\r\n\r\nIt  może różnić się od danych wejściowych w celu dopasowania wymagań. \ Czy akceptujesz?</string>
   <string name="first_launch_no_login_password">Podaj swój login i hasło</string>
   <string name="forgot_password">Zapomniałeś hasła ?</string>
+  <string name="assistant_choose_country">Wybierz kraj</string>
+  <string name="select_your_country">Wybierz swój kraj</string>
+  <string name="country_code">(%s)</string>
+  <string name="use_username_instead_or_phone_number">Użyj nazwy użytkownika (opcjonalnie)</string>
+  <string name="use_email_for_validation">Użyj adresu e-mail do weryfikacji konta</string>
+  <string name="login_with_username">Użyj nazwy użytkownika i hasła, zamiast numeru telefonu</string>
+  <string name="phone_number_info_title">Jaki będzie używany mój numer telefonu?</string>
+  <string name="phone_number_info_content">
+\nDzięki twojemu numerowi telefonu twoi znajomi będą mogli znaleźć cię łatwiej.\n\nZobaczysz w książce adresowej, kto używa Linphone i twoi znajomi będą wiedzieli, że mogą dotrzeć do ciebie również na Linphone.\n</string>
+  <string name="phone_number_link_info_content">
+\nTwoi znajomi będą mogli znaleźć cię łatwiej, jeśli połączysz swoje konto do swojego numeru telefonu\n\nZobaczysz w książce adresowej, kto używa Linphone i twoi znajomi będą wiedzieli, że mogą dotrzeć do ciebie również na Linphone.\n</string>
+  <string name="phone_number_link_info_content_already_account">Można używać tylko swój numer telefonu z jednego konta Linphone.\n\nIf Jeśli masz już połączony swój numer do innego konta, ale wolisz używać tego jednego, wystarczy połączyć go teraz i numer zostanie automatycznie przeniesiony do tego konta.</string>
   <!--Status-->
+  <string name="invalid_email">Niepoprawny email</string>
+  <string name="account_already_exist">Konto już istnieje</string>
+  <string name="phone_number_not_exist">To konto nie istnieje</string>
+  <string name="invalid_username">Zła nazwa użytkownika</string>
+  <string name="invalid_domain">Nieprawidłowa domena</string>
+  <string name="invalid_route">Nieprawidłowy route</string>
+  <string name="invalid_display_name">Nieprawidłowo wyświetlana nazwa</string>
+  <string name="username_too_short">Nazwa użytkownika jest za krótka</string>
+  <string name="username_too_long">Nazwa użytkownika jest za długa</string>
+  <string name="username_invalid_size">Długość nazwy użytkownika niepoprawna</string>
+  <string name="phone_number_too_long">Numer telefonu jest za długi</string>
+  <string name="phone_number_too_short">Numer telefonu jest za krótki</string>
+  <string name="phone_number_invalid">Nieprawidłowy numer telefonu</string>
+  <string name="password_too_short">Hasło za krótkie</string>
+  <string name="password_too_long">Hasło za długie</string>
+  <string name="request_failed">Nie udało się uzyskać z serwera. Spróbuj ponownie później</string>
+  <string name="transport_unsupported">Transport nieobsługiwany</string>
+  <string name="country_code_invalid">Kod kraju nieprawidłowy</string>
   <!--In-app-->
+  <string name="inapp">In-app</string>
+  <string name="inapp_notification_title">Zakupy wewnątrz aplikacji</string>
+  <string name="inapp_notification_trial_expire">Okres próbny upływa %s</string>
+  <string name="inapp_notification_account_expire">Okres subskrypcji wygasa %s</string>
   <!--Dailer-->
   <string name="address_bar_hint">Wprowadź numer lub adres</string>
   <!--History-->
@@ -110,7 +174,7 @@
   <string name="image_saved">Obraz zapisany</string>
   <string name="image_not_saved">Błąd, obraz nie został zapisany</string>
   <string name="wait">Proszę czekać...</string>
-  <string name="processing_image">Przetwarzania obrazu, może potrwać nawet do kilku sekund w zależności od rozmiaru pliku</string>
+  <string name="processing_image">Przetwarzanie obrazu, może potrwać nawet do kilku sekund w zależności od rozmiaru pliku</string>
   <!--Status Bar-->
   <string name="status_connected">Zarejestrowany</string>
   <string name="status_not_connected">Nie zarejestrowany</string>
@@ -124,19 +188,25 @@
   <string name="quit">Zamknij</string>
   <!--Call-->
   <string name="incoming_call">Połączenie przychodzące</string>
-  <string name="outgoing_call">Połączenia wychodzące</string>
+  <string name="outgoing_call">Połączenie wychodzące</string>
   <string name="add_video_dialog">Twój rozmówca chciałby włączyć wideo</string>
   <string name="no_current_call">Brak aktywnego połączenia</string>
   <string name="call_paused_by_remote">Twój rozmówca przerwał połączenie</string>
   <string name="couldnt_accept_call">Wystąpił błąd podczas odebrania</string>
-  <string name="zrtp_dialog">Znak ZRTP %s\n należy zaakceptować tylko jeśli mają ten sam znak, jak rozmówcy</string>
   <string name="unknown_incoming_call_name">Nieznany</string>
   <string name="call_stats_audio">Audio</string>
   <string name="call_stats_video">Wideo</string>
   <string name="call_stats_codec">Codec:</string>
+  <string name="call_stats_ip">IP Rodzina:</string>
   <string name="call_stats_upload">Prześlij przepustowość:</string>
   <string name="call_stats_download">Pobierz przepustowość:</string>
   <string name="call_stats_ice">Łączność ICE:</string>
+  <string name="call_stats_video_resolution_sent">Wysłana rozdzielczość wideo:</string>
+  <string name="call_stats_video_resolution_received">Odebrana rozdzielczość wideo:</string>
+  <string name="call_stats_sender_loss_rate">Wskaźnik utraty nadawcy</string>
+  <string name="call_stats_receiver_loss_rate">Wskaźnik utraty odbiorcy</string>
+  <string name="call_stats_encoder_name">Encoder:</string>
+  <string name="call_stats_decoder_name">Dekoder:</string>
   <string name="call">Połączenie</string>
   <!--About-->
   <string name="menu_send_log">Wyślij rejestr</string>
@@ -147,12 +217,15 @@
   <string name="incall_notif_video">Przechwytywanie wideo rozmowy w toku</string>
   <string name="notification_started">Rozpoczęty</string>
   <string name="unread_messages">%i nieprzeczytane wiadomości</string>
+  <string name="missed_calls_notif_title">Nieodebrane połączenie</string>
+  <string name="missed_calls_notif_body">%i nieodebranych połączeń</string>
   <!--Errors-->
   <string name="skipable_error_service_not_ready">Ostrzeżenie: usługa nie jest gotowa</string>
   <string name="error">Błąd</string>
   <string name="warning_wrong_destination_address">Nie można zbudować adresu docelowego z %s</string>
   <string name="error_unknown">Nieznany błąd</string>
   <string name="error_call_declined">Spadek połaczeń</string>
+  <string name="error_user_busy">Użytkownik zajęty</string>
   <string name="error_user_not_found">Użytkownik nie znaleziony</string>
   <string name="error_incompatible_media">Parametry nośników niekompatybilne</string>
   <string name="error_low_bandwidth">Twój rozmówca ma niską przepustowość,  nie można uruchomić wideo</string>
@@ -183,6 +256,7 @@
   <string name="pref_avpf_rr_interval">AVPF regularny odstęp RTCP w sekundach (pomiędzy 1 i 5)</string>
   <string name="pref_escape_plus">Wymień + przez 00</string>
   <string name="pref_friendlist_subscribe">Przyjazne subskrybowanie</string>
+  <string name="pref_link_account">Połącz swoje konto</string>
   <string name="pref_auth_userid">Autoryzuj ID użytkownika</string>
   <string name="pref_help_auth_userid">Wprowadź ID użytkownika uwierzytelniania (opcjonalnie)</string>
   <string name="pref_display_name">Nazwa wyświetlana</string>
@@ -194,7 +268,9 @@ Wpisz wyświetlaną nazwę (opcjonalnie)</string>
   <string name="pref_transport_tcp">TCP</string>
   <string name="pref_transport_tls">TLS</string>
   <string name="pref_delete_account">Usuń to konto</string>
+  <string name="pref_change_password">Zmień hasło</string>
   <string name="pref_default_account">Użyj jako domyślny</string>
+  <string name="pref_password_changed">Hasło zostało zmienione</string>
   <!--Settings-->
   <string name="pref_sipaccounts">Konta SIP</string>
   <string name="default_account_flag">Domyślne konto</string>
@@ -213,6 +289,7 @@ Wpisz wyświetlaną nazwę (opcjonalnie)</string>
   <string name="pref_echo_cancellation">Redukcja szumów</string>
   <string name="pref_echo_cancellation_summary">Usuwa usłyszane echo od drugiego końca</string>
   <string name="pref_echo_canceller_calibration">Anulowanie kalibracji echo</string>
+  <string name="pref_echo_tester">Test echo</string>
   <string name="ec_calibrating">Kalibracja ...</string>
   <string name="ec_calibrated">Kalibrowane w %s ms</string>
   <string name="no_echo">Brak echa</string>
@@ -237,7 +314,9 @@ Wpisz wyświetlaną nazwę (opcjonalnie)</string>
   <!--Call settings-->
   <string name="pref_call_title">Połączenie </string>
   <string name="pref_device_ringtone">Zastosowanie urządzenia dzwonka</string>
-  <string name="pref_auto_answer">Auto odbieranie przychodzących połączeń</string>
+  <string name="pref_auto_answer">Auto odbieranie połączeń przychodzących </string>
+  <string name="pref_rfc2833_dtmf">Send in-band DTMFs(RFC2833)</string>
+  <string name="pref_sipinfo_dtmf">Send out-band DTMFs(SIP INFO)</string>
   <string name="pref_voice_mail">Poczta głosowa URI</string>
   <!--Chat settings-->
   <string name="pref_chat_title">Czat</string>
@@ -250,8 +329,11 @@ Wpisz wyświetlaną nazwę (opcjonalnie)</string>
   <!--Network settings-->
   <string name="pref_network_title">Sieć</string>
   <string name="pref_wifi_only">Używaj tylko WiFi</string>
+  <string name="pref_stun_server">STUN / TURN serwer</string>
   <string name="pref_ice_enable">Włącz ICE</string>
   <string name="pref_turn_enable">Włącz TURN</string>
+  <string name="pref_turn_username_title">STUN / TURN nazwa użytkownika (opcjonalnie)</string>
+  <string name="pref_turn_passwd_title">STUN / TURN hasło (opcjonalnie)</string>
   <string name="pref_upnp_enable">Włącz UPNP</string>
   <string name="pref_transport_use_random_ports">Użyj losowych portów</string>
   <string name="pref_sip_port_title">Port SIP w użyciu</string>
@@ -263,7 +345,7 @@ Wpisz wyświetlaną nazwę (opcjonalnie)</string>
   <string name="pref_push_notification">Włącz powiadomienia push</string>
   <string name="pref_ipv6_title">Zezwól IPv6</string>
   <!--Advanced settings-->
-  <string name="pref_advanced_title">Zaawansowany</string>
+  <string name="pref_advanced_title">Zaawansowane</string>
   <string name="pref_debug">Debug</string>
   <string name="pref_background_mode">Tryb tła</string>
   <string name="pref_animation_enable_title">Włącz animacje</string>
@@ -308,6 +390,7 @@ Wpisz wyświetlaną nazwę (opcjonalnie)</string>
   <string name="content_description_new_discussion">Nowa dyskusja</string>
   <string name="content_description_search">Szukaj</string>
   <string name="content_description_search_contact">Wyszukiwanie kontaktu</string>
+  <string name="content_description_search_country">Szukaj Kraju</string>
   <string name="content_description_all_contacts">Wszystkie kontakty</string>
   <string name="content_description_linphone_contacts">Kontakty Linphone</string>
   <string name="content_description_call_direction">Kierunek połączeń</string>
@@ -328,6 +411,7 @@ Wpisz wyświetlaną nazwę (opcjonalnie)</string>
   <string name="content_description_conference">Konferencja</string>
   <string name="content_description_username_field">Nazwa pola</string>
   <string name="content_description_activation_code_field">Nazwa pola</string>
+  <string name="content_description_phone_number_field">Pole numeru telefonu</string>
   <string name="content_description_display_field">Wyświetlana nazwa pola</string>
   <string name="content_description_domain_field">Pole domeny</string>
   <string name="content_description_url_field">Pole zdalnego zastrzegania</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 74b0187f1..76dda9317 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -11,9 +11,13 @@
   <string name="tunnel_host"></string>
   <string name="about_version">Linphone Android %s</string>
   <string name="about_liblinphone_version">Linphone Core %s</string>
-  <string name="about_text">GNU General Public License V2\n © 2010-2016 Belledonne Communications</string>
   <string name="about_link">www.linphone.org</string>
   <string name="sync_account_name">Linphone Contatos</string>
+  <string name="history_date_format">EEE, d MMM</string>
+  <string name="history_detail_date_format">dd/MM/yyyy - HH:mm -</string>
+  <string name="messages_date_format">dd/MM, HH:mm</string>
+  <string name="messages_list_date_format">dd/MM</string>
+  <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">Usuário</string>
   <string name="phone_number">Número do telefone</string>
@@ -131,7 +135,6 @@
   <string name="no_current_call">Nova Chamada</string>
   <string name="call_paused_by_remote">Seu contato gostaria de adicionar vídeo a chamada atual</string>
   <string name="couldnt_accept_call">Ocorreu um erro ao aceitar a chamada</string>
-  <string name="zrtp_dialog">ZRTP token is %s\nVocê só deve aceitar se você tiver o mesmo TOKEN (acima) que seu contato</string>
   <string name="unknown_incoming_call_name">Erro desconhecido</string>
   <string name="call_stats_audio">Audio</string>
   <string name="call_stats_video">Video</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 97c78be16..06f4c0087 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -120,7 +120,6 @@
   <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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e3973a55f..4442aff3d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -11,9 +11,14 @@
   <string name="tunnel_host"></string>
   <string name="about_version">Linphone Android %s</string>
   <string name="about_liblinphone_version">Linphone Çekirdeği %s</string>
-  <string name="about_text">GNU Genel Kamu Lisansı V2\n © 2010-2016 Belledonne Communications</string>
   <string name="about_link">www.linphone.org</string>
   <string name="sync_account_name">Linphone bağlantıları</string>
+  <string name="history_detail_date_format">yyyy/AA/gg - SS:dd -</string>
+  <string name="inapp_popup_date_format">yyyy/AA/gg</string>
+  <string name="inapp_popup_date_day">gg</string>
+  <string name="messages_date_format">gg/AA, SS:dd</string>
+  <string name="messages_list_date_format">gg/AA</string>
+  <string name="today_date_format">SS:dd</string>
   <!--Common-->
   <string name="username">Kullanıcı adı</string>
   <string name="phone_number">Telefon numarası</string>
@@ -82,6 +87,7 @@
   <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_error_confirmation_code">Doğrulama kodu geçersiz.\r\nLütfen yeniden deneyin.</string>
   <string name="assistant_account_validated">Hesabınız onaylandı.</string>
   <string name="assistant_error_bad_credentials">Geçersiz kullanıcı adı ve parola</string>
   <string name="assistant_codec_down_question">Cisco Systems, Inc. tarafından sağlanan OpenH264 Video çözücüsünü indirmeyi kabul ediyor musunuz?</string>
@@ -184,7 +190,6 @@
   <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 yalnızca 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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5b9af0cea..4411ea831 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -10,7 +10,7 @@
   <string name="notification_register_failure">%s 無法註冊</string>
   <string name="tunnel_host"></string>
   <string name="about_version">Linphone Android %s</string>
-  <string name="about_text">GNU General Public License V2\n © 2010-2016 Belledonne Communications</string>
+  <string name="about_liblinphone_version">Linphone Core %s</string>
   <string name="about_link">www.linphone.org</string>
   <string name="sync_account_name">Linphone 聯絡人</string>
   <!--Common-->
@@ -38,21 +38,29 @@
   <string name="connect">連接</string>
   <string name="decline">拒絕</string>
   <string name="conference">會議</string>
+  <string name="link">連結</string>
+  <string name="later">稍候</string>
   <string name="no">否</string>
   <string name="ok">確定</string>
   <string name="yes">是</string>
+  <string name="link_account">連結你的帳號</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_link_account">連結帳號</string>
   <string name="assistant_continue">繼續</string>
+  <string name="assistant_activate">啟動你的帳號</string>
   <string name="assistant_finish">完成設定</string>
+  <string name="assistant_validate_account_1">你的帳號已經建立。請檢查你的信現來驗證你的帳號：</string>
   <string name="transport">傳輸</string>
+  <string name="assistant_create_account_phone_number_address">你的 SIP 位置是</string>
   <string name="assistant_login_linphone">使用 Linphone 帳號</string>
   <string name="assistant_login_generic">使用 SIP 帳號</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>
@@ -64,12 +72,16 @@
   <string name="wizard_server_unavailable">無法連接到伺服器，請確認你的網路連接。</string>
   <string name="wizard_username_unavailable">這個使用者名稱已經被使用。</string>
   <string name="wizard_username_incorrect">你的使用者名稱無效。</string>
+  <string name="assistant_phone_number_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>
   <string name="forgot_password">忘記密碼？</string>
+  <string name="assistant_choose_country">選擇一個國家</string>
+  <string name="select_your_country">選擇你的國家</string>
+  <string name="country_code">(%s)</string>
   <!--Status-->
   <!--In-app-->
   <!--Dailer-->
@@ -126,6 +138,8 @@
   <string name="call_stats_codec">編解碼器：</string>
   <string name="call_stats_upload">上傳頻寬：</string>
   <string name="call_stats_download">下載頻寬：</string>
+  <string name="call_stats_encoder_name">編碼器：</string>
+  <string name="call_stats_decoder_name">解碼器：</string>
   <string name="call">通話</string>
   <!--About-->
   <string name="menu_send_log">傳送記錄</string>
@@ -151,6 +165,7 @@
   <string name="pref_passwd">密碼*</string>
   <string name="pref_username">使用者名稱*</string>
   <string name="pref_escape_plus">以 00 取代 +</string>
+  <string name="pref_link_account">連結你的帳號</string>
   <string name="pref_display_name">顯示名稱</string>
   <string name="pref_help_display_name">輸入顯示名稱(選擇性)</string>
   <string name="pref_prefix">前綴</string>
@@ -159,7 +174,9 @@
   <string name="pref_transport_tcp">TCP</string>
   <string name="pref_transport_tls">TLS</string>
   <string name="pref_delete_account">刪除這個帳號</string>
+  <string name="pref_change_password">變更密碼</string>
   <string name="pref_default_account">設為預設值</string>
+  <string name="pref_password_changed">密碼已變更</string>
   <!--Settings-->
   <string name="pref_sipaccounts">SIP 帳號</string>
   <string name="default_account_flag">預設帳號</string>
@@ -183,6 +200,7 @@
   <string name="pref_echo_cancellation">回音消除</string>
   <string name="pref_echo_cancellation_summary">移除另一端聽到的回音</string>
   <string name="pref_echo_canceller_calibration">回音消除器校正</string>
+  <string name="pref_echo_tester">測試回音</string>
   <string name="ec_calibrating">校正中...</string>
   <string name="no_echo">沒有回音</string>
   <string name="failed">失敗</string>
@@ -210,6 +228,7 @@
   <!--Network settings-->
   <string name="pref_network_title">網路</string>
   <string name="pref_wifi_only">只使用 WiFi</string>
+  <string name="pref_stun_server">STUN / TURN 伺服器</string>
   <string name="pref_ice_enable">啟用 ICE</string>
   <string name="pref_turn_enable">啟用 TURN</string>
   <string name="pref_upnp_enable">啟用 UPNP</string>
@@ -255,6 +274,7 @@
   <string name="content_description_delete">刪除</string>
   <string name="content_description_search">搜尋</string>
   <string name="content_description_search_contact">搜尋聯絡人</string>
+  <string name="content_description_search_country">搜尋國家</string>
   <string name="content_description_all_contacts">所有聯絡人</string>
   <string name="content_description_linphone_contacts">Linphone 聯絡人</string>
   <string name="content_description_call_direction">通話方向</string>
@@ -274,6 +294,7 @@
   <string name="content_description_conference">會議</string>
   <string name="content_description_username_field">使用者名稱欄位</string>
   <string name="content_description_activation_code_field">使用者名稱欄位</string>
+  <string name="content_description_phone_number_field">電話號碼欄位</string>
   <string name="content_description_display_field">顯示名稱欄位</string>
   <string name="content_description_domain_field">網域欄位</string>
   <string name="content_description_confirm_password_field">確認密碼欄位</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ac9b8f769..5c307845a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -187,7 +187,9 @@
     <string name="image_not_saved">Error, image not saved</string>
     <string name="wait">Please wait...</string>
     <string name="image_transfert_error">An error occurred during the file transfer</string>
-    <string name="message_not_encrypted">Warning, this message is not encrypted</string>
+    <string name="message_not_encrypted">This message is not encrypted</string>
+    <string name="message_cant_be_decrypted">You have received an encrypted message you are unable to decrypt from %s\nYou need to call your correspondant in order to exchange your ZRTP keys if you want to decrypt the future messages you will receive.</string>
+    <string name="message_cant_be_decrypted_notif">You are unable to decrypt this message.</string>
     <string name="lime_not_verified">You are trying to send a message using LIME to a contact not verified by ZRTP.\nPlease call this contact and verify his ZRTP key before sending your messages.</string>
     <string name="processing_image">Processing image, can take up to a few seconds depending on the size of the file</string>
 
@@ -211,7 +213,8 @@
     <string name="no_current_call">No active call</string>
     <string name="call_paused_by_remote">Your correspondent paused the call</string>
     <string name="couldnt_accept_call">An error occurred while accepting the call</string>
-    <string name="zrtp_dialog">ZRTP token is %s\nYou should only accept if you have the same token as your correspondent</string>
+    <string name="zrtp_dialog1">Confirm the following SAS with peer:\nSay: %s</string>
+    <string name="zrtp_dialog2">\nYour correspondant should say: %s</string>
     <string name="unknown_incoming_call_name">Unknown</string>
     <string name="call_stats_audio">Audio</string>
     <string name="call_stats_video">Video</string>
@@ -361,6 +364,7 @@
     <string name="lime_encryption_entry_disabled">Disabled</string>
     <string name="lime_encryption_entry_mandatory">Mandatory</string>
     <string name="lime_encryption_entry_preferred">Preferred</string>
+    <string name="lime_encryption_enable_zrtp">LIME requires ZRTP encryption.\nBy activating LIME you automatically activate ZRTP media encryption.</string>
 
     <!-- Network settings -->
     <string name="pref_network_title">Network</string>