From c98d0ef1f776a106e1b4a0e1670c5a80cd5cb9c6 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Tue, 14 Feb 2017 10:16:15 +0100
Subject: [PATCH] Fix Move date format from translate strings to non
 localizable strings

---
 res/values-ar/strings.xml             | 36 +++++++++++++++++++--------
 res/values-de/strings.xml             | 18 ++++++++------
 res/values-es/strings.xml             |  1 -
 res/values-fr/strings.xml             |  7 ------
 res/values-ja/strings.xml             |  7 ------
 res/values-ka/strings.xml             | 22 ++++++++++------
 res/values-nl/strings.xml             |  1 -
 res/values-pl/strings.xml             |  7 ------
 res/values-pt-rBR/strings.xml         |  5 ----
 res/values-sr/strings.xml             |  1 -
 res/values-tr/strings.xml             | 19 +++++++++-----
 res/values/non_localizable_custom.xml |  9 +++++++
 res/values/strings.xml                |  7 ------
 13 files changed, 74 insertions(+), 66 deletions(-)

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4a6de7166..dbf872da4 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -11,15 +11,9 @@
   <string name="tunnel_host"></string>
   <string name="about_version">لِنْفُونْ أندرويد %s</string>
   <string name="about_liblinphone_version">Linphone Core %s</string>
+  <string name="about_text">رخصة جْنُو العمومية الإصدار \n© 2010-2017 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>
+  <string name="sync_account_name">جهات اتصال لِنْفُونْ</string>
   <!--Common-->
   <string name="username">اسم المستخدم</string>
   <string name="phone_number">رقم الهاتف</string>
@@ -93,6 +87,9 @@
   <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_openh264_downloading">يجري تنزيل OpenH264</string>
+  <string name="assistant_openh264_restart">قبل تشغيل مرماز OpenH264 يجب عليك إعادة تشغيل %s.</string>
+  <string name="assistant_openh264_error">عذرا، حدث خطأ ما.</string>
   <string name="assistant_codec_downloaded">انتهى تنزيل مرماز الفيديو OpenH264 المُقدَّم من طرف شركة Cisco Systems, Inc.</string>
   <string name="wizard_failed">حدث خطأ، حاول لاحقا.</string>
   <string name="wizard_server_unavailable">انعدام الوصول للخادم، تأكد من اتصالك بالشبكة.</string>
@@ -138,6 +135,9 @@
   <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>
@@ -171,6 +171,11 @@
   <string name="image_saved">حُفظَت الصورة</string>
   <string name="image_not_saved">خطأ، لم تُحفَظ الصورة</string>
   <string name="wait">يُرجى الانتظار...</string>
+  <string name="image_transfert_error">حدث خطأ أثناء نقل الملف</string>
+  <string name="message_not_encrypted">إن الرسالة ليست مُعمَّاة</string>
+  <string name="message_cant_be_decrypted">لقد استلمت رسالة مُعمَّاة لم تتمكن من فك تعميتها من  %s\nيجب عليك الاتصال بمخاطبك لتبادل مفاتيح ZRTP إذا أردت فك تعمية الرسائل اللاحقة التي ستستلمها.</string>
+  <string name="message_cant_be_decrypted_notif">تعذر عليك فك تعمية هذه الرسالة.</string>
+  <string name="lime_not_verified">إنك تحاول إرسال رسالة عبر LIME لجهة اتصال لم تتحقق منها بواسطة ZRTP.\nيُرجى الاتصال بجهة الاتصال هذه والتحقق من مفتاحها ZRTP قبل إرسال رسائلك.</string>
   <string name="processing_image">قد تستلزم معالجة الصور بضع ثوان حسب حجم الملف.</string>
   <!--Status Bar-->
   <string name="status_connected">مُسجَّل</string>
@@ -190,6 +195,9 @@
   <string name="no_current_call">لا وجود لأي مكالمة نشيطة</string>
   <string name="call_paused_by_remote">أوقف مخاطبك المكالمة مؤقتا</string>
   <string name="couldnt_accept_call">حدث خطأ خلال قبول المكالمة</string>
+  <string name="zrtp_dialog1">أكد رمز الاستيثاق مع نظيرك :\nقل : %s</string>
+  <string name="zrtp_dialog2">
+\nيجب على مخاطبك أن يقول : %s</string>
   <string name="unknown_incoming_call_name">مجهول</string>
   <string name="call_stats_audio">الصوت</string>
   <string name="call_stats_video">الفيديو</string>
@@ -202,6 +210,7 @@
   <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_jitter_buffer">صِوان الارتعاش :</string>
   <string name="call_stats_encoder_name">مُرمِّز :</string>
   <string name="call_stats_decoder_name">مفك الترميز :</string>
   <string name="call">المكالمة</string>
@@ -271,6 +280,7 @@
   <string name="pref_sipaccounts">حسابات SIP</string>
   <string name="default_account_flag">الحساب الافتراضي</string>
   <string name="pref_add_account">إضافة حساب</string>
+  <string name="pref_in_app_store">متجر التبضع محمول</string>
   <string name="pref_tunnel">النفق</string>
   <string name="pref_tunnel_host">إسم المضيف</string>
   <string name="pref_tunnel_port">المنفذ</string>
@@ -300,6 +310,8 @@
   <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>
@@ -314,6 +326,8 @@
   <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">عنوان العلبة الصوتية</string>
   <!--Chat settings-->
   <string name="pref_chat_title">المحادثة</string>
@@ -323,6 +337,7 @@
   <string name="lime_encryption_entry_disabled">غير مفعلة</string>
   <string name="lime_encryption_entry_mandatory">واجبة</string>
   <string name="lime_encryption_entry_preferred">مفضلة</string>
+  <string name="lime_encryption_enable_zrtp">يتطلب LIME تعمية بواسطة ZRTP.\nبتفعيل LIME سوف تقوم بتفعيل تلقائي لوسيط التعمية ZRTP.</string>
   <!--Network settings-->
   <string name="pref_network_title">الشبكة</string>
   <string name="pref_wifi_only">استخدم WiFi فقط</string>
@@ -411,18 +426,19 @@
   <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_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_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_incoming_file">الملف الوارد</string>
   <string name="content_description_message">رسالة</string>
   <string name="content_description_unread_chat_message">الرسائل غير المقروءة</string>
   <string name="content_description_transfer">تحويل</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 14a5df584..1fc02000f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -11,15 +11,9 @@
   <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-2017 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>
@@ -93,6 +87,9 @@
   <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>
   <string name="assistant_codec_downloading">OpenH264-Videocodec, bereitgestellt von Cisco Systems, Inc., wird heruntergeladen.</string>
+  <string name="assistant_openh264_downloading">OpenH264 wird heruntergeladen</string>
+  <string name="assistant_openh264_restart">Bevor Sie den OpenH264-Codec verwenden können, müssen Sie %s neu starten.</string>
+  <string name="assistant_openh264_error">Entschuldigung, ein Fehler ist aufgetreten.</string>
   <string name="assistant_codec_downloaded">OpenH264-Videocodec, bereitgestellt von Cisco Systems, Inc., heruntergeladen.</string>
   <string name="wizard_failed">Es ist ein Fehler aufgetreten, versuchen Sie es später nochmal</string>
   <string name="wizard_server_unavailable">Server nicht erreichbar, überprüfen Sie Ihre Netzwerkverbindung.</string>
@@ -169,6 +166,9 @@
   <string name="image_saved">Bild gespeichert</string>
   <string name="image_not_saved">Fehler, Bild nicht gespeichert</string>
   <string name="wait">Bitte warten...</string>
+  <string name="image_transfert_error">Während der Dateiübertragung ist ein Fehler aufgetreten</string>
+  <string name="message_not_encrypted">Diese Nachricht ist nicht verschlüsselt</string>
+  <string name="message_cant_be_decrypted_notif">Sie können diese Nachricht nicht entschlüsseln.</string>
   <string name="processing_image">Bild wird verarbeitet. Je nach Größe der Datei kann dies mehrere Sekunden in Anspruch nehmen</string>
   <!--Status Bar-->
   <string name="status_connected">Registriert</string>
@@ -188,6 +188,7 @@
   <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_dialog2">\nIhr Partner sollte sagen: %s</string>
   <string name="unknown_incoming_call_name">Unbekannt</string>
   <string name="call_stats_audio">Audio</string>
   <string name="call_stats_video">Video</string>
@@ -200,6 +201,7 @@
   <string name="call_stats_video_resolution_received">Empfangene Videoauflösung:</string>
   <string name="call_stats_sender_loss_rate">Senderverlustrate:</string>
   <string name="call_stats_receiver_loss_rate">Empfängerverlustrate:</string>
+  <string name="call_stats_jitter_buffer">Jitterpuffer:</string>
   <string name="call_stats_encoder_name">Kodierer:</string>
   <string name="call_stats_decoder_name">Dekodierer:</string>
   <string name="call">Anruf</string>
@@ -324,6 +326,7 @@
   <string name="lime_encryption_entry_disabled">Deaktiviert</string>
   <string name="lime_encryption_entry_mandatory">Obligatorisch</string>
   <string name="lime_encryption_entry_preferred">Bevorzugt</string>
+  <string name="lime_encryption_enable_zrtp">LIME erfordert ZRTP-Verschlüsselung.\nDurch die Aktivierung von LIME aktivieren Sie automatisch die ZRTP-Medienverschlüsselung.</string>
   <!--Network settings-->
   <string name="pref_network_title">Netzwerk</string>
   <string name="pref_wifi_only">Nur WiFi verwenden</string>
@@ -424,6 +427,7 @@
   <string name="content_description_contact_organization">Organisation</string>
   <string name="content_description_back_call">Zurück zum Anruf</string>
   <string name="content_description_send_file">Datei senden</string>
+  <string name="content_description_incoming_file">Eingehende Datei</string>
   <string name="content_description_message">Nachricht</string>
   <string name="content_description_unread_chat_message">Ungelesene Chatnachricht</string>
   <string name="content_description_transfer">Weiterleiten</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 534b9272f..9718d1aee 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -8,7 +8,6 @@
   <string name="wait_dialog_text">Iniciando</string>
   <string name="tunnel_host"></string>
   <string name="sync_account_name">contactos linphone</string>
-  <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">Nombre de usuario</string>
   <string name="phone_number">Número de teléfono</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f4ed9e88a..3a69ca59a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -13,13 +13,6 @@
   <string name="about_liblinphone_version">Linphone Core %s</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>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b27b2685e..f082a68ee 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -13,13 +13,6 @@
   <string name="about_liblinphone_version">Linphone Core %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">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>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index c71f3121a..efc866067 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -11,15 +11,9 @@
   <string name="tunnel_host"></string>
   <string name="about_version">Linphone Android %s</string>
   <string name="about_liblinphone_version">Linphone ბირთვი %s</string>
+  <string name="about_text">GNU ზოგადი საჯარო ლიცენზია V2\n © 2010-2017 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">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>
@@ -93,6 +87,9 @@
   <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_openh264_downloading">მიმდინარეობს OpenH264-ს გადმოწერა</string>
+  <string name="assistant_openh264_restart">სანამ შეძლებთ OpenH264 კოდეკის გამოყენებას უნდა გადატვირთოთ %s.</string>
+  <string name="assistant_openh264_error">ბოდიში, მოხდა შეცდომა.</string>
   <string name="assistant_codec_downloaded">Cisco Systems, Inc. მიერ მოწოდებული OpenH264 ვიდეო კოდეკის იქნა გადმოწერილი.</string>
   <string name="wizard_failed">მოხდა შეცდომა, გთხოვთ, სცადოთ მოგვიანებით.</string>
   <string name="wizard_server_unavailable">სერვისი მიუეწვდომელია, შეამოწმეთ თქვენი ქსელური კავშირი.</string>
@@ -172,6 +169,11 @@
   <string name="image_saved">სურათი შენახულია</string>
   <string name="image_not_saved">შეცდომა, სურათი ვერ შეინახა</string>
   <string name="wait">გთხოვთ, დაელოდოთ...</string>
+  <string name="image_transfert_error">ფაილისი გზავნის დროს მოხდა შეცდომა</string>
+  <string name="message_not_encrypted">ეს შეტყობინება არ არის დაშიფრული</string>
+  <string name="message_cant_be_decrypted">თქვენ მიიღეთ დაშიფრული შეტყობინება, რომლის განშიფრვაც %s-დან არ შეგიძლიათ\nუნდა დაუკავშერდეთ თქვენს კორესპონდენტს იმისათვის, რომ გაცვალოთ ZRTP გასაღებები, თუ გსურთ მომავალი მიღებული შეტყობინებების განშიფრვა.</string>
+  <string name="message_cant_be_decrypted_notif">თქვენ არ შეგიძლიათ ამ შეტყობინების განშიფრვა.</string>
+  <string name="lime_not_verified">თქვენ სცდილობთ შეტყობინების გაგზავნას LIME-ს გამოყენებით კონტაქტის მიმართულებით, რომელიც არ არის დამოწმებული ZRTP-ით.\nგთხოვთ, დაურეკოთ ამ კონტაქტს და შეამოწმოთ მისი ZRTP გასაღები შეტყობინებების გაგზავნამდე.</string>
   <string name="processing_image">მიმდინარეობს სურათის დამუშავება, შეიძლება დაიკავოს რამოდენიმე წამი, ფაილის ზომის მიხედვით</string>
   <!--Status Bar-->
   <string name="status_connected">რეგისტრირებული</string>
@@ -191,6 +193,9 @@
   <string name="no_current_call">აქტიური ზარი არ არის</string>
   <string name="call_paused_by_remote">თვენმა კონტაქტმა შეაჩერა ზარი</string>
   <string name="couldnt_accept_call">ზარის მიღებისას მოხდა შეცდომა</string>
+  <string name="zrtp_dialog1">დაადასტურეთ შემდეგი SAS მომხმარებელთან:\nთქვით: %s</string>
+  <string name="zrtp_dialog2">
+\nთქვენმა კოლეგამ უნდა თქვას: %s</string>
   <string name="unknown_incoming_call_name">უცნობი</string>
   <string name="call_stats_audio">ხმა</string>
   <string name="call_stats_video">ვიდეო</string>
@@ -203,6 +208,7 @@
   <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_jitter_buffer">ჯიტერის ბუფერი:</string>
   <string name="call_stats_encoder_name">ენკოდერი:</string>
   <string name="call_stats_decoder_name">დეკოდერი:</string>
   <string name="call">ზარი</string>
@@ -329,6 +335,7 @@
   <string name="lime_encryption_entry_disabled">გათიშულია</string>
   <string name="lime_encryption_entry_mandatory">სავალდებულო</string>
   <string name="lime_encryption_entry_preferred">არჩეული</string>
+  <string name="lime_encryption_enable_zrtp">LIME-ს სჭირდება ZRTP დაშიფრვა.\nLIME-ს აქტივაციით, თქვენ ავტომატურად ააქტიურებთ ZRTP მედიის დაშიფრვას.</string>
   <!--Network settings-->
   <string name="pref_network_title">ქსელი</string>
   <string name="pref_wifi_only">მხოლოდ WiFi-ს გამოყენება</string>
@@ -429,6 +436,7 @@
   <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_incoming_file">შემომავალი ფაილი</string>
   <string name="content_description_message">შეტყობინება</string>
   <string name="content_description_unread_chat_message">წაუკითხავი ჩატის შეტყობინება</string>
   <string name="content_description_transfer">გზავნილი</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5da86973f..57cc062cb 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -11,7 +11,6 @@
   <string name="tunnel_host"></string>
   <string name="about_version">Linphone Android %s</string>
   <string name="about_liblinphone_version">Linphone Core %s</string>
-  <string name="today_date_format">HH:mm</string>
   <!--Common-->
   <string name="username">Gebruikersnaam</string>
   <string name="phone_number">Telefoonnummer</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index b1e5a0303..d65a8f7f1 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -13,13 +13,6 @@
   <string name="about_liblinphone_version">Linphone Core %s</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>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 76dda9317..7f7ae9fe6 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -13,11 +13,6 @@
   <string name="about_liblinphone_version">Linphone Core %s</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>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 82510f589..fe0c68342 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -8,7 +8,6 @@
   <string name="wait_dialog_text">Покрећем се</string>
   <string name="tunnel_host"></string>
   <string name="sync_account_name">контакти линфона</string>
-  <string name="today_date_format">ЧЧ:мм</string>
   <!--Common-->
   <string name="username">Корисничко име</string>
   <string name="phone_number">Број телефона</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4442aff3d..5b5d900dc 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -11,14 +11,9 @@
   <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-2017 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>
@@ -92,6 +87,9 @@
   <string name="assistant_error_bad_credentials">Geçersiz kullanıcı adı ve parola</string>
   <string name="assistant_codec_down_question">Cisco Systems, Inc. tarafından sağlanan OpenH264 Video çözücüsünü indirmeyi kabul ediyor musunuz?</string>
   <string name="assistant_codec_downloading">Cisco Systems, Inc. tarafından sağlanan OpenH264 Video çözücüsü indiriliyor.</string>
+  <string name="assistant_openh264_downloading">OpenH264 indiriliyor</string>
+  <string name="assistant_openh264_restart">OpenH264 çözücüsünü kullanmadan önce %s\'u yeniden başlatmalısınız.</string>
+  <string name="assistant_openh264_error">Üzgünüz bir hata oluştu.</string>
   <string name="assistant_codec_downloaded">Cisco Systems, Inc. tarafından sağlanan OpenH264 Video çözücüsü indirildi.</string>
   <string name="wizard_failed">Bir hata oluştu,daha sonra tekrar deneyin.</string>
   <string name="wizard_server_unavailable">Sunucuya ulaşılamıyor,ağ bağlantınızı kontrol edin.</string>
@@ -171,6 +169,11 @@
   <string name="image_saved">Resim kaydedildi</string>
   <string name="image_not_saved">Hata,resim kaydedilmedi</string>
   <string name="wait">Lütfen bekleyin...</string>
+  <string name="image_transfert_error">Dosya aktarımı sırasında bir hata oluştu</string>
+  <string name="message_not_encrypted">Bu ileti şifrelenmemiş</string>
+  <string name="message_cant_be_decrypted">%s\'den şifresi çözülemeyen bir şifrelenmiş ileti aldınız.\nEğer gelecekte alacağınız iletileri çözmek istiyorsanız, ZRTP anahtarlarınızın değiş tokuşu için eşinizi aramanız gerekiyor.</string>
+  <string name="message_cant_be_decrypted_notif">Bu iletinin şifresini çözemezsiniz.</string>
+  <string name="lime_not_verified">ZRTP ile doğrulanmamış bir kişiye LIME kullanarak ileti göndermek istiyorsunuz.\nLütfen bu kişiyi arayın ve iletilerinizi göndermeden önce onun ZRTP anahtarını doğrulayın.</string>
   <string name="processing_image">Görüntü işleniyor, dosyanın boyutuna bağlı olarak bir kaç saniye sürebilir</string>
   <!--Status Bar-->
   <string name="status_connected">Kayıtlı</string>
@@ -190,6 +193,8 @@
   <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_dialog1">Eş ile aşağıdaki SAS\'ı doğrulayın:\nSöyleyin: %s</string>
+  <string name="zrtp_dialog2">\nEşiniz şunu söylemeli: %s</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>
@@ -327,6 +332,7 @@
   <string name="lime_encryption_entry_disabled">Devre dışı</string>
   <string name="lime_encryption_entry_mandatory">Zorunlu</string>
   <string name="lime_encryption_entry_preferred">Yeğlenen</string>
+  <string name="lime_encryption_enable_zrtp">LIME, ZRTP şifreleme gerektiriyor.\nLIME\'ı etkinleştirerek ZRTP ortam şifrelemeyi kendiliğinden etkinleştirmiş olacaksınız.</string>
   <!--Network settings-->
   <string name="pref_network_title">Ağ</string>
   <string name="pref_wifi_only">Yalnızca WiFi kullan</string>
@@ -427,6 +433,7 @@
   <string name="content_description_contact_organization">Kuruluş</string>
   <string name="content_description_back_call">Aramaya dön</string>
   <string name="content_description_send_file">Bir dosya gönder</string>
+  <string name="content_description_incoming_file">Gelen dosya</string>
   <string name="content_description_message">İleti</string>
   <string name="content_description_unread_chat_message">Okunmamış konuşma iletisi</string>
   <string name="content_description_transfer">Aktarma</string>
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 086424319..c00a869e1 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -10,6 +10,15 @@
 	<bool name="force_use_of_linphone_friends">false</bool>
 	<bool name="use_linphone_tag">true</bool>
 
+	<!-- Time -->
+	<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>
+
 	<!-- Phone numbers -->
 	<bool name="use_phone_number_validation">true</bool><!-- Use phone number for validation -->
 	<integer name="popup_time_interval">86400000</integer><!-- Time between two inapp notifications in milliseconds -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5c307845a..fbe1ebdae 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,13 +15,6 @@
     <string name="about_text">GNU General Public License V2\n © 2010-2017 Belledonne Communications</string>
     <string name="about_link">www.linphone.org</string>
     <string name="sync_account_name">linphone contacts</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">Username</string>