diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index dbf872da4..a2e5ba1c2 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -261,7 +261,6 @@
   <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>
@@ -358,7 +357,9 @@
   <string name="pref_ipv6_title">رخِّصْ IPv6</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">متقدم</string>
+  <string name="pref_debug_title">التنقيح</string>
   <string name="pref_debug">التنقيح</string>
+  <string name="pref_friendlist_subscribe">الاشتراك في قائمة الأصدقاء</string>
   <string name="pref_background_mode">وضع الخلفية</string>
   <string name="pref_animation_enable_title">تشغيل التحريكات</string>
   <string name="pref_service_notification">فعِّل إشعارات الخدمة</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1fc02000f..9e145b8a9 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -252,7 +252,6 @@
   <string name="pref_avpf">AVPF</string>
   <string name="pref_avpf_rr_interval"> AVPF Standard RTCP Interval in Sekunden (zwischen 1 und 5)</string>
   <string name="pref_escape_plus">Ersetzen + durch 00</string>
-  <string name="pref_friendlist_subscribe">Freundesliste abonnieren</string>
   <string name="pref_link_account">Verknüpfen Sie Ihr Konto</string>
   <string name="pref_auth_userid">Authentifizierungs-Benutzerkennung</string>
   <string name="pref_help_auth_userid">Authentifizierungs-Benutzerkennung eingeben (optional)</string>
@@ -347,7 +346,9 @@
   <string name="pref_ipv6_title">IPv6 erlauben</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">Erweitert</string>
+  <string name="pref_debug_title">Debug</string>
   <string name="pref_debug">Debug</string>
+  <string name="pref_friendlist_subscribe">Freundesliste abonnieren</string>
   <string name="pref_background_mode">Hintergrundmodus</string>
   <string name="pref_animation_enable_title">Animationen aktivieren</string>
   <string name="pref_service_notification">Dienstbenachrichtigung aktivieren</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9718d1aee..9c7215472 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -160,6 +160,7 @@
   <string name="pref_push_notification">Activar notificaciones push</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">Avanzado</string>
+  <string name="pref_debug_title">Desarrollo</string>
   <string name="pref_debug">Desarrollo</string>
   <string name="pref_animation_enable_title">Habilitar animaciones</string>
   <string name="pref_autostart">Arrancar al inicio</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 69fc21620..3a7263b20 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -247,6 +247,7 @@
   <string name="pref_ipv6_title">Salli IPv6</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">Kehittyneet</string>
+  <string name="pref_debug_title">Virheen korjaus</string>
   <string name="pref_debug">Virheen korjaus</string>
   <string name="pref_background_mode">Toimi taustalla</string>
   <string name="pref_animation_enable_title">Salli animaatiot</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3a69ca59a..4caba5f41 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -11,6 +11,7 @@
   <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-2017 Belledonne Communications</string>
   <string name="about_link">www.linphone.org</string>
   <string name="sync_account_name">contacts linphone</string>
   <!--Common-->
@@ -86,6 +87,7 @@
   <string name="assistant_error_bad_credentials">Nom d\'utilisateur ou mot de passe invalide</string>
   <string name="assistant_codec_down_question">Voulez-vous télécharger le codec vidéo OpenH264 fourni par Cisco Systems, Inc. ? </string>
   <string name="assistant_codec_downloading">Téléchargement du codec vidéo OpenH264 fourni par Cisco Systems, Inc.</string>
+  <string name="assistant_openh264_downloading">Téléchargement de OpenH264</string>
   <string name="assistant_codec_downloaded">Téléchargement du codec vidéo OpenH264 fourni par Cisco Systems, Inc effectué.</string>
   <string name="wizard_failed">Une erreur est survenue, réessayez plus tard.</string>
   <string name="wizard_server_unavailable">Serveur indisponible, veuillez vérifier votre connexion réseau.</string>
@@ -167,6 +169,10 @@ Vos amis pourront vous joindre plus facilement si vous associez votre compte à
   <string name="image_saved">Image sauvegardée</string>
   <string name="image_not_saved">Erreur, image non sauvegardée</string>
   <string name="wait">Merci de patienter...</string>
+  <string name="message_not_encrypted">Ce message n\\'est pas chiffré</string>
+  <string name="message_cant_be_decrypted">Vous avez reçu un message chiffré que vous ne pouvez pas déchiffré de la part de %s\nVous devez appeler votre correspondant pour pouvoir echanger votre clef ZRTP avec lui si vous voulez pouvoir déchiffrer les futurs messages qu\\'il vous enverra.</string>
+  <string name="message_cant_be_decrypted_notif">Vous ne pouvez pas déchiffrer ce message.</string>
+  <string name="lime_not_verified">Vous essayez d\\'envoyer un message à un contact non vérifié par ZRTP tout en utilisant LIME.\nAppelez ce contact et vérifié sa clef ZRTP avant de lui envoyer des messages.</string>
   <string name="processing_image">Traitement de l\'image, cela peut prendre quelques secondes selon sa taille</string>
   <!--Status Bar-->
   <string name="status_connected">Enregistré</string>
@@ -186,6 +192,8 @@ 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_dialog1">Indiquez le code SAS suivant à votre interlocuteur:\nDites: %s</string>
+  <string name="zrtp_dialog2">\nVotre correspondant doit dire: %s</string>
   <string name="unknown_incoming_call_name">Inconnu</string>
   <string name="call_stats_audio">Audio</string>
   <string name="call_stats_video">Vidéo</string>
@@ -246,7 +254,6 @@ Vos amis pourront vous joindre plus facilement si vous associez votre compte à
   <string name="pref_avpf">AVPF</string>
   <string name="pref_avpf_rr_interval">Intervalle AVPF RTCP régulier en secondes (entre 1 et 5) </string>
   <string name="pref_escape_plus">Remplacer + par 00</string>
-  <string name="pref_friendlist_subscribe">Souscrire à la liste d\'amis</string>
   <string name="pref_link_account">Associer votre compte</string>
   <string name="pref_auth_userid">Identifiant d\'authentification</string>
   <string name="pref_help_auth_userid">Entrez l\'userid d\'authentification (optionnel)</string>
@@ -342,7 +349,9 @@ Vos amis pourront vous joindre plus facilement si vous associez votre compte à
   <string name="pref_ipv6_title">Autoriser l\'IPv6</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">Avancé</string>
+  <string name="pref_debug_title">Activer les traces de débogage</string>
   <string name="pref_debug">Activer les traces de débogage</string>
+  <string name="pref_friendlist_subscribe">Souscrire à la liste d\'amis</string>
   <string name="pref_background_mode">Actif en arrière plan</string>
   <string name="pref_animation_enable_title">Activer les animations</string>
   <string name="pref_service_notification">Notification de service</string>
@@ -422,6 +431,7 @@ Vos amis pourront vous joindre plus facilement si vous associez votre compte à
   <string name="content_description_contact_organization">Société</string>
   <string name="content_description_back_call">Retour à l\'appel</string>
   <string name="content_description_send_file">Envoi d\'un fichier</string>
+  <string name="content_description_incoming_file">Fichier entrant</string>
   <string name="content_description_message">Message</string>
   <string name="content_description_unread_chat_message">Message non lu</string>
   <string name="content_description_transfer">Transfert</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f082a68ee..b02255827 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -248,7 +248,6 @@
   <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>
@@ -344,7 +343,9 @@
   <string name="pref_ipv6_title">IPv6を使用する</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">拡張設定</string>
+  <string name="pref_debug_title">デバッグ</string>
   <string name="pref_debug">デバッグ</string>
+  <string name="pref_friendlist_subscribe">フレンドの購読</string>
   <string name="pref_background_mode">バックグラウンド動作</string>
   <string name="pref_animation_enable_title">アニメーションを有効にする</string>
   <string name="pref_service_notification">サービス通知を有効にする</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index efc866067..18ced0d45 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -259,7 +259,6 @@
   <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>
@@ -356,7 +355,9 @@
   <string name="pref_ipv6_title">IPv6-ის ნებართვა</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">გაფართოებული</string>
+  <string name="pref_debug_title">დებაგი</string>
   <string name="pref_debug">დებაგი</string>
+  <string name="pref_friendlist_subscribe">მეგობრების სიის გამოწერა</string>
   <string name="pref_background_mode">ფონის რეჟიმი</string>
   <string name="pref_animation_enable_title">ანიმაციების ჩართვა</string>
   <string name="pref_service_notification">სერვისის შეტყობინების ჩართვა</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 57cc062cb..ffe45a90a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -127,6 +127,7 @@
   <string name="pref_media_encryption">Mediaversleuteling</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">Geavanceerd</string>
+  <string name="pref_debug_title">Foutopsporing</string>
   <string name="pref_debug">Foutopsporing</string>
   <string name="pref_background_mode">Achtergrondsmodus</string>
   <string name="pref_animation_enable_title">Animaties inschakelen</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d65a8f7f1..b3180cbe7 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -248,7 +248,6 @@
   <string name="pref_avpf">AVPF</string>
   <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>
@@ -339,7 +338,9 @@ Wpisz wyświetlaną nazwę (opcjonalnie)</string>
   <string name="pref_ipv6_title">Zezwól IPv6</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">Zaawansowane</string>
+  <string name="pref_debug_title">Debug</string>
   <string name="pref_debug">Debug</string>
+  <string name="pref_friendlist_subscribe">Przyjazne subskrybowanie</string>
   <string name="pref_background_mode">Tryb tła</string>
   <string name="pref_animation_enable_title">Włącz animacje</string>
   <string name="pref_service_notification">Włącz powiadomienie usług</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 7f7ae9fe6..eaf83fcd4 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -274,6 +274,7 @@
   <string name="pref_ipv6_title">Permitir IPv6</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">Avançado</string>
+  <string name="pref_debug_title">Depurar</string>
   <string name="pref_debug">Depurar</string>
   <string name="pref_background_mode">Em segundo plano</string>
   <string name="pref_animation_enable_title">Ativar Animações</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 06f4c0087..45357940a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -247,6 +247,7 @@
   <string name="pref_ipv6_title">Разрешить IPv6</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">Дополнительно</string>
+  <string name="pref_debug_title">Отладка</string>
   <string name="pref_debug">Отладка</string>
   <string name="pref_background_mode">Фоновый режим</string>
   <string name="pref_animation_enable_title">Включить анимацию</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index fe0c68342..3519eba2e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -187,6 +187,7 @@
   <string name="pref_push_notification">Укључи обавештења гурања</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">Напредно</string>
+  <string name="pref_debug_title">Прочисти</string>
   <string name="pref_debug">Прочисти</string>
   <string name="pref_background_mode">Режим позадине</string>
   <string name="pref_animation_enable_title">Укључи анимације</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5b5d900dc..7f7ca60ed 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -353,6 +353,7 @@
   <string name="pref_ipv6_title">IPv6\'ya izin ver</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">Gelişmiş</string>
+  <string name="pref_debug_title">Hata ayıklama</string>
   <string name="pref_debug">Hata ayıklama</string>
   <string name="pref_background_mode">Artalan kipi</string>
   <string name="pref_animation_enable_title">Animasyonlar etkin</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4411ea831..c6783eb12 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -243,6 +243,7 @@
   <string name="pref_ipv6_title">允許 IPv6</string>
   <!--Advanced settings-->
   <string name="pref_advanced_title">進階</string>
+  <string name="pref_debug_title">除錯</string>
   <string name="pref_debug">除錯</string>
   <string name="pref_background_mode">背景模式</string>
   <string name="pref_animation_enable_title">啟用動畫</string>