diff --git a/res/values-ar/custom.xml b/res/values-ar/custom.xml
new file mode 100644
index 000000000..2dd3804e9
--- /dev/null
+++ b/res/values-ar/custom.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">لِنْفُونْ</string>
+  <string name="service_name">خدمة لِنْفُونْ</string>
+  <string name="addressbook_label">لِنْفُونْ</string>
+  <string name="notification_title">لِنْفُونْ</string>
+  <string name="wait_dialog_text">يجري التشغيل</string>
+  <string name="notification_registered">مُسجَّل في %s</string>
+  <string name="notification_register_failure">فشِل التسجيل في %s</string>
+  <string name="about_text">هاتف موافق للِنْفُونْ %s SIP (rfc 3261) برخصة جْنُو العمومية الإصدار 2</string>
+  <string name="about_link">http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/m/help\n\n© 2011 Belledonne Communications</string>
+  <string name="setup_welcome">سيمكنك هذا المرشد من إعداد حسابك SIP لإجراء المكالمات.</string>
+  <string name="setup_create_account">إنشاء حساب في linphone.org</string>
+  <string name="setup_login_linphone">أتوفر على حساب في linphone.org</string>
+  <string name="setup_login_generic">أتوفر على حساب SIP</string>
+  <string name="setup_linphone_account_hint">ادخل إسم المستخدم وكلمة السر لحسابك في linphone.org</string>
+  <string name="setup_general_account_hint">ادخل إسم المستخدم وكلمة السر وكذا نطاق SIP.</string>
+  <string name="setup_username_hint">إسم المستخدم</string>
+  <string name="tunnel_host"></string>
+</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
new file mode 100644
index 000000000..77dda2eb1
--- /dev/null
+++ b/res/values-ar/strings.xml
@@ -0,0 +1,284 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="pref_disable_account">إيقاف</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="communication_encrypted">مُعمَّى</string>
+  <string name="waiting_for_startup">يجري التشغيل...</string>
+  <string name="conf_show_details_text">إظهار التفاصيل</string>
+  <string name="skipable_error_service_not_ready">تحذير : الخدمة غير جاهزة</string>
+  <string name="close_button_text">إغلاق</string>
+  <string name="status_active_call">نشيط</string>
+  <string name="state_paused">مُوقَّف مؤقتا</string>
+  <string name="state_paused_by_remote">مُوقَّف مؤقتا من طرف المُراسِل</string>
+  <string name="state_streams_running"></string>
+  <string name="state_incoming_received">وارد</string>
+  <string name="state_outgoing_ringing">يَرنّ</string>
+  <string name="state_outgoing_progress">يتصل</string>
+  <string name="mutemic_button_txt">كتم</string>
+  <string name="speaker_button_txt">مكبر الصوت</string>
+  <string name="bluetooth_button_txt">بلوتوث</string>
+  <string name="CancelButtonText">إلغاء</string>
+  <string name="AddCallButtonText">إضافة مكالمة</string>
+  <string name="TransferCallButtonText">تحويل المكالمة</string>
+  <string name="conf_admin_choice_enter">دخول اجتماع</string>
+  <string name="conf_admin_choice_leave">مغادرة الاجتماع مؤقتا </string>
+  <string name="conf_admin_choice_terminate">إنهاء الاجتماع</string>
+  <string name="conf_simple_merge_bt_txt">دمج</string>
+  <string name="conf_simple_transfer_bt_txt">تحويل</string>
+  <string name="conf_simple_video_bt_txt">فيديو</string>
+  <!--<string name="conf_simple_no_current_call">No active call</string>-->
+  <string name="show_send_dtmfs_button">لوحة الاتصال الهاتفي</string>
+  <string name="conf_conference">اجتماع</string>
+  <string name="in_conf">أنت ضِمنها</string>
+  <string name="pref_audio_soft_volume_title">استخدام شدة صوت البرمجي</string>
+  <string name="pref_ipv6_title">استخدم ipv6 عوض ipv4</string>
+  <string name="incoming_call_dialog_title">%s يتصل بك</string>
+  <string name="accept">قبول</string>
+  <string name="decline">رفض</string>
+  <string name="unknown_incoming_call_name">مجهول</string>
+  <string name="pref_network_title">الشبكة</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_transport_use_random_ports">استخدم منافذ عشوائية</string>
+  <string name="pref_sip_port_title">منفذ SIP المُراد استخدامه</string>
+  <string name="at_least_a_protocol">عنصر واحد على الأقل ضروري</string>
+  <string name="first_launch_ok">نجح التسجيل</string>
+  <string name="error">خطأ</string>
+  <string name="click_to_show_first_login_view">البدء</string>
+  <string name="dialer_null_on_new_intent">التطبيق غير جاهز</string>
+  <string name="pref_add_account">إضافة حساب</string>
+  <string name="no_phone_numbers">لم يعثر على أرقام هاتف %s</string>
+  <string name="filter_contacts">ترشيح جهات الاتصال</string>
+  <string name="title_numbers_dialog">أرقام هاتف %s</string>
+  <string name="pref_delete_account">حذف هذا الحساب</string>
+  <string name="pref_default_account">استخدام كافتراضي</string>
+  <string name="pref_echo_canceller_calibration">معايرة مزيل الصدى</string>
+  <string name="pref_video_use_front_camera_title">استخدام الكاميرا الأمامية</string>
+  <string name="pref_video">الفيديو</string>
+  <string name="pref_preferences">التفضيلات</string>
+  <string name="pref_video_codecs_title">المراميز</string>
+  <string name="pref_preferred_video_size">حجم الفيديو المفضل</string>
+  <string name="menu_videocall_switch_camera_title">الكاميرا الأمامية/الخلفية</string>
+  <string name="menu_videocall_toggle_camera_title">كتم/إزالة كتم الكاميرا</string>
+  <string name="menu_videocall_toggle_camera_disable">إيقاف الكاميرا</string>
+  <string name="menu_videocall_toggle_camera_enable">تشغيل الكاميرا</string>
+  <string name="menu_videocall_terminate_call_title">إنهاء المكالمة</string>
+  <string name="pref_video_settings_title">إعدادات الفيديو</string>
+  <string name="pref_video_automatically_share_my_video_title">شارك الكاميرا</string>
+  <string name="pref_video_automatically_accept_video_title">قبول طلبات الفيديو الواردة</string>
+  <string name="pref_video_automatically_share_my_video">أرسِل تلقائيا الكاميرا الخاصة بي</string>
+  <string name="pref_video_automatically_accept_video">قبول طلبات الفيديو دائما</string>
+  <string name="pref_video_initiate_call_with_video_title">بدء اتصالات الفيديو</string>
+  <string name="pref_video_initiate_call_with_video">أرسِل دائما طلبات الفيديو</string>
+  <string name="pref_video_enable_title">تشغيل الفيديو</string>
+  <string name="pref_animation_enable_title">تشغيل التحريكات</string>
+  <string name="pref_echo_cancellation">إزالة الصدى</string>
+  <string name="pref_autostart">البدء خلال الإقلاع</string>
+  <string name="pref_codecs">المراميز</string>
+  <string name="pref_communication_expire_title">مهلة الاتصال</string>
+  <string name="pref_incoming_expire_title">مهلة المكالمة الواردة</string>
+  <string name="pref_video_port_title">منفذ الفيديو أو نطاق المنفذ</string>
+  <string name="pref_audio_port_title">منفذ الصوت أو نطاق المنفذ</string>
+  <string name="pref_incoming_call_timeout_title">مهلة المكالمة الواردة (بالثواني)</string>
+  <string name="pref_adaptive_rate_control">التحكم في ملائمة الصبيب</string>
+  <string name="pref_adaptive_rate_algorithm">خوارزمية ملائمة الصبيب</string>
+  <string name="pref_codec_bitrate_limit">حد صبيب المِرماز</string>
+  <string-array name="limit_bitrate_entries">
+    <item>10 ك.بِتْ/ثانية</item>
+    <item>15 ك.بِتْ/ثانية</item>
+    <item>20 ك.بِتْ/ثانية</item>
+    <item>36 ك.بِتْ/ثانية</item>
+    <item>64 ك.بِتْ/ثانية</item>
+    <item>128 ك.بِتْ/ثانية</item>
+  </string-array>
+  <string name="pref_debug">التنقيح</string>
+  <string name="about_bugreport_email_text">اشرح المشكل هنا</string>
+  <string name="about_error_generating_bugreport_attachement">حدث خطأ في توليد تقرير العلل</string>
+  <string name="about_logs_not_found">لم يعثر على السجلات.</string>
+  <string name="about_reading_logs">يقرأ السجلات، قد تأخذ بعض الوقت...</string>
+  <string name="about_mailer_chooser_text">إرسال تقرير العلل مع...</string>
+  <string name="menu_about">حول</string>
+  <string name="menu_send_log">إرسال السجل</string>
+  <string name="pref_audio">الصوت</string>
+  <string name="menu_exit">الخروج</string>
+  <string name="pref_prefix">البادِئة</string>
+  <string name="pref_advanced">متقدم</string>
+  <string name="menu_settings">اﻹعدادات</string>
+  <string name="pref_proxy">الوسيط</string>
+  <string name="pref_domain">النطاق*</string>
+  <string name="pref_passwd">كلمة السر*</string>
+  <string name="pref_username">إسم المستخدم*</string>
+  <string name="pref_sipaccount">حساب SIP</string>
+  <string name="wrong_username">إسم المستخدم خاطئ</string>
+  <string name="wrong_passwd">كلمة السر خاطئة</string>
+  <string name="wrong_domain">النطاق خاطئ</string>
+  <string name="wrong_settings">الإعدادات خاطئة</string>
+  <string name="call_error">لا يمكن الاتصال بـ %s</string>
+  <string name="yes">نعم</string>
+  <string name="no">لا</string>
+  <string name="cont">استمرار</string>
+  <string name="never_remind">لا تذكرني أبدا</string>
+  <string name="tab_history">التاريخ</string>
+  <string name="menu_clear_history">محو</string>
+  <string name="notification_started">بدَأ</string>
+  <string name="pref_stun_server">خادم STUN</string>
+  <string name="pref_ice_enable">تشغيل ICE</string>
+  <string name="pref_ice_enable_summary">يجب تهيئة خادم STUN لاستخدام ICE</string>
+  <string name="ec_calibrating">يُعايِر...</string>
+  <string name="ec_calibrated">تمت المعايرة [%s ميلي-ث]</string>
+  <string name="failed">فشِل</string>
+  <string name="first_login_username">إسم المستخدم</string>
+  <string name="first_login_password">كلمة السر</string>
+  <string name="first_login_connect">اتصال</string>
+  <string name="pref_media_encryption">وسيط التعمية</string>
+  <string name="media_encryption_none">بدون</string>
+  <string name="pref_sipaccounts">حسابات SIP</string>
+  <string name="pref_wifi_only">استخدم WiFi فقط</string>
+  <string name="pref_push_notification">تشغيل إشعارات التنبيه</string>
+  <string name="wizard_failed">حدث خطأ، حاول لاحقا.</string>
+  <string name="delete">حذف</string>
+  <string name="chat">محادثة</string>
+  <string name="call">مكالمة</string>
+  <string name="add_to_contacts">إضافة إلى جهات الاتصال</string>
+  <string name="status_connected">مُسجَّل</string>
+  <string name="status_not_connected">غير مُسجَّل</string>
+  <string name="status_in_progress">يجري التسجيل</string>
+  <string name="status_error">فشِل التسجيل</string>
+  <string name="conference">اجتماع</string>
+  <string name="draft">مسودة</string>
+  <string name="call_stats_audio">الصوت</string>
+  <string name="call_stats_video">الفيديو</string>
+  <string name="call_stats_codec">المِرماز :</string>
+  <string name="call_stats_upload">صبيب الرفع :</string>
+  <string name="call_stats_download">صبيب التنزيل :</string>
+  <string name="call_stats_ice">توصيل ICE :</string>
+  <string name="call_stats_video_resolution">حجم الفيديو :</string>
+  <!--Used by Android to help blind people by describing them images-->
+  <string name="content_description_about"></string>
+  <string name="content_description_chat"></string>
+  <string name="content_description_dial_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_new_discussion"></string>
+  <string name="content_description_edit"></string>
+  <string name="content_description_validate"></string>
+  <string name="content_description_all_contacts"></string>
+  <string name="content_description_linphone_contacts"></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_toggle_speaker"></string>
+  <string name="content_description_toggle_micro"></string>
+  <string name="content_description_add_call"></string>
+  <string name="content_description_pause"></string>
+  <string name="content_description_hang_up"></string>
+  <string name="content_description_numpad"></string>
+  <string name="content_description_settings"></string>
+  <string name="content_description_dialer"></string>
+  <string name="content_description_history"></string>
+  <string name="content_description_contacts"></string>
+  <string name="content_description_led"></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_welcome"></string>
+  <string name="content_description_cancel"></string>
+  <string name="content_description_next"></string>
+  <string name="content_description_back"></string>
+  <string name="content_description_setup_ok"></string>
+  <string name="content_description_message_status"></string>
+  <string name="content_description_conference"></string>
+  <string name="content_description_mark"></string>
+  <string name="setup_apply">تطبيق</string>
+  <string name="setup_password_hint">كلمة السر</string>
+  <string name="setup_domain_hint">النطاق</string>
+  <string name="setup_password_confirm_hint">تأكيد كلمة السر</string>
+  <string name="setup_email_hint">البريد الإلكتروني</string>
+  <string name="setup_create">إنشاء حساب</string>
+  <string name="button_history">التاريخ</string>
+  <string name="button_settings">اﻹعدادات</string>
+  <string name="button_chat">البوابة</string>
+  <string name="button_about">حول</string>
+  <string name="button_setup_cancel">إلغاء</string>
+  <string name="button_setup_back">الرجوع</string>
+  <string name="button_setup_next">هيا بنا</string>
+  <string name="button_new_chat">محادثة جديدة</string>
+  <string name="button_edit">تحرير</string>
+  <string name="button_cancel">إلغاء</string>
+  <string name="button_ok">حسنا</string>
+  <string name="button_all_contacts">الكل</string>
+  <string name="button_sip_contacts">SIP</string>
+  <string name="button_add_contact">جهة اتصال جديدة</string>
+  <string name="button_all_call">الكل</string>
+  <string name="button_missed_call">الفائتة</string>
+  <string name="button_delete_all">حذف</string>
+  <string name="button_transfer">تحويل</string>
+  <string name="button_add_call">إضافة مكالمة</string>
+  <string name="button_video">الفيديو</string>
+  <string name="button_micro">الميكروفون</string>
+  <string name="button_speaker">مكبر الصوت</string>
+  <string name="button_bluetooth">بلوتوث</string>
+  <string name="button_options">الخيارات</string>
+  <string name="button_send_message">إرسال</string>
+  <string name="uploading_image">يجري الرفع...</string>
+  <string name="call_update_desc">يريد المُراسِل إضافة الفيديو إلى هذه المكالمة.</string>
+  <string name="call_update_yes">قبول</string>
+  <string name="call_update_no">رفض</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="save_picture">حفظ الصورة</string>
+  <string name="text_copied_to_clipboard">نُسخ النص في الحافظة</string>
+  <string name="copy_text">نسخ النص</string>
+  <string name="image_saved">حُفظَت الصورة</string>
+  <string name="image_not_saved">خطأ، لم تُحفَظ الصورة</string>
+  <string name="pref_linphone_friend_title">الأصدقاء</string>
+  <string name="pref_auto_accept_friends_title">أصدقاء جدد</string>
+  <string name="linphone_friend_new_request_title">طلب صديق</string>
+  <string name="setup_ec_calibration">تجري معايرة مزيل الصدى</string>
+  <string name="delete_contact">حذف</string>
+  <string name="sip_address">عنوان SIP</string>
+  <string name="phone_number">رقم الهاتف</string>
+  <string name="contact_first_name">اﻹسم</string>
+  <string name="contact_last_name">اللقب</string>
+  <string name="pref_primary_account_title">الحساب اﻷوَّلي</string>
+  <string name="pref_user_name_title">إسم المستخدم</string>
+  <string name="pref_voice_mail">عنوان العلبة الصوتية</string>
+  <string name="error_call_declined">مكالمة مرفوضة</string>
+  <string name="error_user_not_found">لم يعثر على المستخدم</string>
+  <string name="today">اليوم</string>
+  <string name="yesterday">اﻷمس</string>
+  <string name="call_state_missed">الفائتة</string>
+  <string name="call_state_outgoing">الصادرة</string>
+  <string name="call_state_incoming">الواردة</string>
+  <string name="pref_background_mode">وضع الخلفية</string>
+  <string name="show_image">إظهار</string>
+  <string name="download_image">تنزيل</string>
+  <string name="download_image_failed">فشِل التنزيل. يُرجى التحقق من الوصول للإنترنت أو الإعادة لاحقا.</string>
+  <string name="pref_upnp_enable">تشغيل UPnP</string>
+  <string name="pref_manage">الإدارة</string>
+  <string name="wait">يُرجى الانتظار...</string>
+  <string name="importing_messages">يجري تحديث قاعدة بيانات الرسائل</string>
+  <string name="default_account_flag">الحساب الافتراضي</string>
+  <string name="setup_remote_provisioning_hint">سينزِّل هذا المرشد تهيئة موجودة</string>
+  <string name="zrtp_accept">قبول</string>
+  <string name="zrtp_deny">رفض</string>
+  <string name="unread_messages">%i رسائل غير مقروءة</string>
+  <string name="retry">إعادة المحاولة</string>
+</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8e91bded3..37b6475cc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -93,9 +93,6 @@
   <string name="pref_video_use_front_camera_title">Frontkamera benutzen</string>
   <string name="pref_video">Video</string>
   <string name="pref_preferences">Einstellungen</string>
-  <string name="pref_video_codec_h263_title">H263</string>
-  <string name="pref_video_codec_mpeg4_title">MP4V-ES</string>
-  <string name="pref_video_codec_h264_title">H264</string>
   <string name="pref_video_codecs_title">Codecs</string>
   <string name="pref_preferred_video_size">bevorzugte Video-Größe</string>
   <string name="menu_videocall_back_to_dialer_title">Zeige Wählgerät</string>
@@ -121,21 +118,6 @@
   <string name="pref_echo_cancellation">Echounterdrückung</string>
   <string name="pref_autostart">Starte beim Einschalten</string>
   <string name="pref_enable_outbound_proxy">Ausgehender Proxy</string>
-  <string name="pref_codec_pcma">pcma</string>
-  <string name="pref_codec_pcmu">pcmu</string>
-  <string name="pref_codec_gsm">gsm</string>
-  <string name="pref_codec_g722">g722</string>
-  <string name="pref_codec_amr">amr</string>
-  <string name="pref_codec_amrwb">amr-wb</string>
-  <string name="pref_codec_ilbc">ilbc</string>
-  <string name="pref_codec_speex8">speex 8 Khz</string>
-  <string name="pref_codec_speex16">speex 16 Khz</string>
-  <string name="pref_codec_opus">opus 48Khz</string>
-  <string name="pref_codec_silk8">silk 8 Khz</string>
-  <string name="pref_codec_silk12">silk 12 Khz</string>
-  <string name="pref_codec_silk16">silk 16 Khz</string>
-  <string name="pref_codec_silk24">silk 24 Khz</string>
-  <string name="pref_codec_g729">g729</string>
   <string name="pref_codecs">Codecs</string>
   <string name="pref_communication_expire_title">Zeitüberschreitung der Kommunikation</string>
   <string name="pref_incoming_expire_title">Zeitüberschreitung bei eingehendem Anruf</string>
@@ -146,10 +128,6 @@
   <string name="pref_incoming_call_timeout_title">Zeitüberschreitung bei eingehendem Anruf (in Sekunden)</string>
   <string name="place_call_chooser">Anrufen</string>
   <string name="pref_adaptive_rate_control">Starte Kalibrierung der Echounterdrückung </string>
-  <string-array name="adaptive_rate_algorithm_entries">
-    <item>Einfach</item>
-    <item>Zustandsbehaftet</item>
-  </string-array>
   <string-array name="limit_bitrate_entries">
     <item>10 kbits/s</item>
     <item>15 kbits/s</item>
@@ -158,14 +136,6 @@
     <item>64 kbits/s</item>
     <item>128 kbits/s</item>
   </string-array>
-  <string-array name="limit_bitrate_entry_values">
-    <item>10</item>
-    <item>15</item>
-    <item>20</item>
-    <item>36</item>
-    <item>64</item>
-    <item>128</item>
-  </string-array>
   <string name="pref_debug">Debug</string>
   <string name="about_report_issue">Problembeschreibung</string>
   <string name="about_bugreport_email_text">Problembeschreibung</string>
@@ -218,11 +188,8 @@
   <string name="first_launch_no_login_password">Bitte Benutzername und Passwort eingeben</string>
   <string name="first_launch_bad_login_password">Verbindung nicht möglich; Prüfen Sie Ihre Zugangsdaten und versuchen Sie es erneut</string>
   <string name="pref_amr_summary">AMR Codec ist möglicherweise nicht auf Ihrem Telefon vorhanden</string>
-  <string name="pref_video_codec_vp8_title">VP8</string>
   <string name="pref_media_encryption">Medien-Verschlüsselung</string>
   <string name="media_encryption_none">Keine</string>
-  <string name="media_encryption_srtp">SRTP</string>
-  <string name="media_encryption_zrtp">ZRTP</string>
   <string name="pref_video_codec_h264_unavailable">Codec deaktiviert, Erstellen Sie die App aus dem Source-Code, um Ihn zu aktivieren.</string>
   <string name="pref_video_codec_mpeg4_unavailable">Codec deaktiviert, Erstellen Sie die App aus dem Source-Code, um Ihn zu aktivieren.</string>
   <string name="pref_sipaccounts">SIP-Konten</string>
@@ -361,7 +328,7 @@
   <string name="pref_auto_accept_friends_desc">Neue Freundschaftsanfragen automatisch annehmen</string>
   <string name="linphone_friend_new_request_title">Freundschaftsanfrage</string>
   <string name="setup_ec_calibration">Echounterdrückung kalibrieren in Arbeit</string>
-  <string name="delete_contact">Lösche Kontakt</string>
+  <string name="delete_contact">Löschen</string>
   <string name="sip_address">SIP-Adresse</string>
   <string name="phone_number">Telefonnummer</string>
   <string name="contact_first_name">Vorname</string>
@@ -407,7 +374,4 @@
   <string name="remote_composing">Partner schreibt...</string>
   <string name="unread_messages">%i ungelesene Nachrichten</string>
   <string name="retry">Erneut versuchen</string>
-  <string name="pref_dtmf_sequence_title">DTMF Sequenz</string>
-  <string name="dtmf_sequence_not_set_failure">Kein DTMF eingerichtet in den Erweiterten Einstellungen</string>
-  <string name="dtmf_sequence">DTMF Sequenz</string>
 </resources>
diff --git a/res/values-fr/custom.xml b/res/values-fr/custom.xml
index 2224b3b8a..3b7e3c970 100644
--- a/res/values-fr/custom.xml
+++ b/res/values-fr/custom.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
-	<string name="history_detail_date_format">EEEE d MMM HH:mm</string>
-    
-	<string name="app_name">Linphone</string>
-	<string name="notification_title">Linphone</string>
-	<string name="wait_dialog_text">Démarrage</string>
-	<string name="notification_registered">Enregistré comme %s </string> 
-	<string name="notification_register_failure">Erreur lors de l\'enregistrement en tant que %s</string>
-	<string name="about_text">Linphone %s téléphone compatible SIP (rfc 3261) sous licence GPL V2 </string>
-	<string name="about_link">http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/m/help\n\n© 2011 Belledonne Communications</string>
-	
-	<string name="setup_welcome">Cet assistant va vous aider à configurer un compte SIP pour vos appels.</string>
-	<string name="setup_create_account">Créer un compte linphone.org</string>
-	<string name="setup_login_linphone">J\'ai déjà un compte linphone.org</string>
-	<string name="setup_login_generic">J\'ai déjà un compte SIP</string>
-	<string name="setup_linphone_account_hint">Entrez votre nom d\'utilisateur et votre mot de passe linphone.org</string>
-	<string name="setup_general_account_hint">Entrez votre nom d\'utilisateur, votre mot de passe et le domaine de votre compte SIP</string>
-
-        <string name="setup_username_hint">nom d\'utilisateur</string>
-	
-    <string name="tunnel_host"></string>
-    <string name="default_tunnel_mode_entry_value">@string/tunnel_mode_entry_value_disabled</string>
+  <string name="history_date_format">d MMM</string>
+  <string name="history_detail_date_format">EEEE MMM d HH:mm</string>
+  <string name="messages_date_format">HH:mm d MMM</string>
+  <string name="today_date_format">HH:mm</string>
+  <string name="picture_name_format">linphone-mms-%s.jpg</string>
+  <string name="app_name">Linphone</string>
+  <string name="service_name">Linphone Service</string>
+  <string name="addressbook_label">Linphone</string>
+  <string name="notification_title">Linphone</string>
+  <string name="wait_dialog_text">Démarrage</string>
+  <string name="notification_registered">Enregistré sur %s</string>
+  <string name="notification_register_failure">Échec d\'enregistrement sur %s</string>
+  <string name="about_text">Linphone %s SIP (rfc 3261) compatible téléphone, sous licence GNU Public License V2</string>
+  <string name="about_link">http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/m/help\n\n© 2011 Belledonne Communications</string>
+  <string name="setup_welcome">Cet assistant va vous guider pour réaliser des appels à l\'aide d\'un compte SIP.</string>
+  <string name="setup_create_account">Créer un compte sur linphone.org</string>
+  <string name="setup_login_linphone">J\'ai déjà un compte sur linphone.org</string>
+  <string name="setup_login_generic">J\'ai déjà un compte SIP</string>
+  <string name="setup_linphone_account_hint">Entrez votre nom d\'utilisateur et mot de passe de linphone.org</string>
+  <string name="setup_general_account_hint">Entrez votre nom d\'utilisateur, mot de passe et nom de domaine de votre compte SIP</string>
+  <string name="setup_username_hint">nom d\'utilisateur</string>
+  <string name="tunnel_host"></string>
 </resources>
- 
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6d4e194f5..dfbad2e39 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -45,12 +45,20 @@
   <string name="CancelButtonText">Annuler</string>
   <string name="AddCallButtonText">Ajouter un appel</string>
   <string name="TransferCallButtonText">Transférer appel</string>
+  <string name="conf_admin_choice_enter">Entrer dans la onférence</string>
+  <string name="conf_admin_choice_leave">Quitter temporairement la conférence</string>
+  <string name="conf_admin_choice_terminate">Terminer la conférence</string>
   <string name="hangup">Raccrocher</string>
   <string name="conf_simple_merge_bt_txt">Fusionner</string>
   <string name="conf_simple_transfer_bt_txt">Transférer</string>
   <string name="conf_simple_video_bt_txt">Vidéo</string>
   <!--<string name="conf_simple_no_current_call">No active call</string>-->
   <string name="show_send_dtmfs_button">Dialpad</string>
+  <string name="conf_conference">Conférence</string>
+  <string name="in_conf_leave">Sortir</string>
+  <string name="out_conf_enter">Rentrer</string>
+  <string name="pref_audio_hacks_title">Bidouilles audio</string>
+  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (défaut), 2=MODE_IN_CALL</string>
   <string name="pref_audio_soft_volume_title">Utiliser volume logiciel</string>
   <string name="pref_ipv6_title">Utiliser ipv6 au lieu de ipv4</string>
   <string name="error_while_accepting_pending_call">Erreur pendant l\'acceptation de l\'appel</string>
@@ -60,6 +68,9 @@
   <string name="unknown_incoming_call_name">Inconnu</string>
   <string name="pref_network_title">Réseau</string>
   <string name="pref_transport">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_transport_use_random_ports">Utiliser des ports aléatoires</string>
   <string name="pref_sip_port_title">Port SIP à utiliser si port aléatoire désactivé</string>
   <string name="at_least_a_protocol">Au moins un est requis</string>
@@ -79,6 +90,15 @@
   <string name="pref_preferences">Préférences</string>
   <string name="pref_video_codecs_title">Codecs</string>
   <string name="pref_preferred_video_size">Taille de vidéo préférée</string>
+  <string name="menu_videocall_back_to_dialer_title">Afficher le dialer</string>
+  <string name="menu_videocall_switch_camera_title">Caméra frontale / arrière</string>
+  <string name="menu_videocall_change_resolution_when_low_resolution">Tester haute résolution</string>
+  <string name="menu_videocall_change_resolution_when_high_resolution">Basse résolution</string>
+  <string name="menu_videocall_change_resolution_title">Changer résolution</string>
+  <string name="menu_videocall_toggle_camera_title">Activer / Désactiver caméra</string>
+  <string name="menu_videocall_toggle_camera_disable">Désactiver caméra</string>
+  <string name="menu_videocall_toggle_camera_enable">Activer caméra</string>
+  <string name="menu_videocall_terminate_call_title">Terminer l\'appel</string>
   <string name="pref_video_settings_title">Paramètres vidéo</string>
   <string name="pref_video_automatically_share_my_video_title">Partager ma vidéo</string>
   <string name="pref_video_automatically_accept_video_title">Accepter appels vidéo</string>
@@ -101,6 +121,10 @@
   <string name="pref_video_port_description">Port ou plage (min-max) pour l\'audio</string>
   <string name="pref_audio_port_description">Port ou plage (min-max) pour la video</string>
   <string name="pref_incoming_call_timeout_title">Timeout (en secondes) pour les appels entrants</string>
+  <string name="place_call_chooser">Réaliser un appel</string>
+  <string name="pref_adaptive_rate_control">Contrôle qualité adaptatif</string>
+  <string name="pref_adaptive_rate_algorithm">Algorithme de contrôle adaptatif</string>
+  <string name="pref_codec_bitrate_limit">Limite de débit du codec</string>
   <string name="pref_debug">Activer les traces de débogage</string>
   <string name="about_report_issue">Reporter un problème</string>
   <string name="about_bugreport_email_text">Décrivez le problème ici</string>
@@ -109,6 +133,7 @@
   <string name="about_reading_logs">En train de lire les traces, peut prendre du temps…</string>
   <string name="about_mailer_chooser_text">Envoyer le rapport avec…</string>
   <string name="menu_about">A propos</string>
+  <string name="menu_send_log">Envoyer les logs</string>
   <string name="pref_audio">Audio</string>
   <string name="menu_exit">Quitter</string>
   <string name="pref_prefix">Préfixe</string>
@@ -201,6 +226,7 @@
   <string name="call_stats_ice">Connexion ICE :</string>
   <string name="call_stats_video_resolution">Taille vidéo:</string>
   <!--Used by Android to help blind people by describing them images-->
+  <string name="content_description_add_contact">Button Ajouter aux contacts</string>
   <string name="content_description_about"></string>
   <string name="content_description_chat"></string>
   <string name="content_description_dial_back"></string>
@@ -301,6 +327,7 @@
   <string name="linphone_friend_new_request_desc">voudrait être partager son status avec vous et voir le votre.</string>
   <string name="setup_ec_calibration">Calibration de l\'annulateur d\'écho en cours</string>
   <string name="pref_image_sharing_server_title">Serveur de partage</string>
+  <string name="pref_remote_provisioning_title">Configuration distante</string>
   <string name="delete_contact">Supprimer</string>
   <string name="sip_address">Adresse SIP</string>
   <string name="phone_number">Numéro de téléphone</string>
@@ -310,6 +337,7 @@
   <string name="pref_display_name_title">Nom d\'affichage</string>
   <string name="pref_user_name_title">Nom d\'utilisateur</string>
   <string name="pref_expire_title">Expiration</string>
+  <string name="pref_avpf">AVPF</string>
   <string name="pref_rfc2833_dtmf">Envoyer les DTMFs RFC2833</string>
   <string name="pref_sipinfo_dtmf">Envoyer les DTMFs en SIP INFO</string>
   <string name="pref_voice_mail">Adresse messagerie vocale</string>
@@ -331,6 +359,7 @@
   <string name="pref_help_auth_userid">Entrez votre identifiant (optionnel)</string>
   <string name="pref_display_name">Nom d\'affichage</string>
   <string name="pref_help_display_name">Entrez votre nom (optionnel)</string>
+  <string name="pref_upnp_enable">Activer UPNP</string>
   <string name="pref_manage">Gestion</string>
   <string name="wait">Merci de patienter...</string>
   <string name="importing_messages">Mise à jour de la base des messages</string>
@@ -338,6 +367,7 @@
   <string name="setup_remote_provisioning">Télécharger ma configuration</string>
   <string name="setup_remote_provisioning_hint">Cet assistant va télécharger une configuration existante.</string>
   <string name="setup_remote_provisioning_url_hint">addresse où télécharger la configuration</string>
+  <string name="setup_remote_provisioning_login_hint">La configuration téléchargée ne contient pas votre compte. Veuillez le remplir.</string>
   <string name="setup_confirm_username">Votre nom d\'utilisateur sera %s (les majuscules sont interdites). Acceptez-vous ?</string>
   <string name="setup_title_assistant">Assistant de création de compte</string>
   <string name="zrtp_accept">Accepter</string>
@@ -347,4 +377,6 @@
   <string name="unread_messages">%i messages non lus</string>
   <string name="retry">Renvoyer</string>
   <string name="remote_provisioning_failure">Erreur durant le téléchargement ou l\'application de la configuration distante...</string>
+  <string name="remote_provisioning_again_title">Configuration distante</string>
+  <string name="remote_provisioning_again_message">Souhaitez-vous changer l\'URI de configuration ?</string>
 </resources>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index ccc464a31..054b2b22d 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -142,6 +142,7 @@
   <string name="button_options">אפשרויות</string>
   <string name="call_update_yes">קבל</string>
   <string name="call_update_no">דחה</string>
+  <string name="delete_contact">מחק</string>
   <string name="pref_user_name_title">שם משתמש</string>
   <string name="today">היום</string>
   <string name="yesterday">אתמול</string>
diff --git a/res/values-ja/custom.xml b/res/values-ja/custom.xml
new file mode 100644
index 000000000..272b162cd
--- /dev/null
+++ b/res/values-ja/custom.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="history_date_format">d MMM</string>
+  <string name="history_detail_date_format">EEEE MMM d HH:mm</string>
+  <string name="messages_date_format">d MMM HH:mm</string>
+  <string name="today_date_format">HH:mm</string>
+  <string name="picture_name_format">linphone-mms-%s.jpg</string>
+  <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="about_text">Linphone %s SIP (rfc 3261) compatible phone under GNU Public License V2</string>
+  <string name="about_link">http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/m/help\n\n© 2011 Belledonne Communications</string>
+  <string name="setup_welcome">アシスタントがSIPアカウントを使ってあなたの通話を助けます。</string>
+  <string name="setup_create_account">linphone.orgのアカウントを作成する</string>
+  <string name="setup_login_linphone">linphone.orgのアカウントをすでに持っている</string>
+  <string name="setup_login_generic">SIPアカウントをすでに持っている</string>
+  <string name="setup_linphone_account_hint">linphone.orgのユーザー名とパスワードを入力してください</string>
+  <string name="setup_general_account_hint">SIPアカウントのユーザー名とパスワードとドメインを入力してください</string>
+  <string name="setup_username_hint">ユーザー名</string>
+  <string name="tunnel_host"></string>
+</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index dace92393..020d870ff 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -93,9 +93,6 @@
   <string name="pref_video_use_front_camera_title">フロントカメラを使用する</string>
   <string name="pref_video">ビデオ</string>
   <string name="pref_preferences">設定</string>
-  <string name="pref_video_codec_h263_title">H263</string>
-  <string name="pref_video_codec_mpeg4_title">MP4V-ES</string>
-  <string name="pref_video_codec_h264_title">H264</string>
   <string name="pref_video_codecs_title">コーデック</string>
   <string name="pref_preferred_video_size">動画の大きさ</string>
   <string name="menu_videocall_back_to_dialer_title">ダイヤル画面を表示</string>
@@ -121,21 +118,6 @@
   <string name="pref_echo_cancellation">エコーキャンセル</string>
   <string name="pref_autostart">起動時に開始する</string>
   <string name="pref_enable_outbound_proxy">Outbound proxy</string>
-  <string name="pref_codec_pcma">pcma</string>
-  <string name="pref_codec_pcmu">pcmu</string>
-  <string name="pref_codec_gsm">gsm</string>
-  <string name="pref_codec_g722">g722</string>
-  <string name="pref_codec_amr">amr</string>
-  <string name="pref_codec_amrwb">amr-wb</string>
-  <string name="pref_codec_ilbc">ilbc</string>
-  <string name="pref_codec_speex8">speex 8 Khz</string>
-  <string name="pref_codec_speex16">speex 16 Khz</string>
-  <string name="pref_codec_opus">opus 48Khz</string>
-  <string name="pref_codec_silk8">silk 8 Khz</string>
-  <string name="pref_codec_silk12">silk 12 Khz</string>
-  <string name="pref_codec_silk16">silk 16 Khz</string>
-  <string name="pref_codec_silk24">silk 24 Khz</string>
-  <string name="pref_codec_g729">g729</string>
   <string name="pref_codecs">Codecs</string>
   <string name="pref_communication_expire_title">通信がタイムアウト</string>
   <string name="pref_incoming_expire_title">呼び出し時間のタイムアウト</string>
@@ -147,10 +129,6 @@
   <string name="place_call_chooser">電話をかける</string>
   <string name="pref_adaptive_rate_control">適応レート制御</string>
   <string name="pref_adaptive_rate_algorithm">適応レート方式</string>
-  <string-array name="adaptive_rate_algorithm_entries">
-    <item>シンプル</item>
-    <item>ステートフル</item>
-  </string-array>
   <string name="pref_codec_bitrate_limit">コーデックのビットレート制限</string>
   <string-array name="limit_bitrate_entries">
     <item>10 kbits/s</item>
@@ -160,14 +138,6 @@
     <item>64 kbits/s</item>
     <item>128 kbits/s</item>
   </string-array>
-  <string-array name="limit_bitrate_entry_values">
-    <item>10</item>
-    <item>15</item>
-    <item>20</item>
-    <item>36</item>
-    <item>64</item>
-    <item>128</item>
-  </string-array>
   <string name="pref_debug">デバッグ</string>
   <string name="about_report_issue">問題をレポート</string>
   <string name="about_bugreport_email_text">問題点を説明してください</string>
@@ -224,15 +194,11 @@
   <string name="first_launch_no_login_password">ユーザー名とパスワードを入力してください</string>
   <string name="first_launch_bad_login_password">接続できません: ユーザー名とパスワードを確認して再度実行する</string>
   <string name="pref_amr_summary">AMRコーデックは、お使いの電話で使用できない場合があります</string>
-  <string name="pref_video_codec_vp8_title">VP8</string>
   <string name="pref_media_encryption">メディアの暗号化</string>
   <string name="media_encryption_none">なし</string>
-  <string name="media_encryption_srtp">SRTP</string>
-  <string name="media_encryption_zrtp">ZRTP</string>
   <string name="pref_video_codec_h264_unavailable">無効なコーデックです。有効にするには、ソースコードからアプリを構築する必要があります。</string>
   <string name="pref_video_codec_mpeg4_unavailable">無効なコーデックです。有効にするには、ソースコードからアプリを構築する必要があります。</string>
   <string name="pref_sipaccounts">SIPアカウント</string>
-  <string name="pref_dtmf">ゲートコード</string>
   <string name="pref_wifi_only">WiFIでのみ使用</string>
   <string name="pref_push_notification">プッシュ通知を有効にする</string>
   <string name="wizard_failed">エラーが発生しました。のちほど再試行してください。</string>
@@ -375,7 +341,7 @@
   <string name="setup_ec_calibration">エコーキャンセラーの調整進行中</string>
   <string name="pref_image_sharing_server_title">共有サーバー</string>
   <string name="pref_remote_provisioning_title">遠隔準備</string>
-  <string name="delete_contact">連絡先を削除する</string>
+  <string name="delete_contact">削除</string>
   <string name="sip_address">SIPアドレス</string>
   <string name="phone_number">電話番号</string>
   <string name="contact_first_name">名前</string>
@@ -427,7 +393,4 @@
   <string name="remote_provisioning_failure">ダウンロードした、リモートプロビジョニング設定を適用できませんでした...</string>
   <string name="remote_provisioning_again_title">遠隔準備</string>
   <string name="remote_provisioning_again_message">プロビジョニングURIを変更しますか？</string>
-  <string name="pref_dtmf_sequence_title">DTMF方式</string>
-  <string name="dtmf_sequence_not_set_failure">DTMF設定が拡張設定に存在しておりません</string>
-  <string name="dtmf_sequence">DTMF方式</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index efd94842b..12ae854bf 100755
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -93,9 +93,6 @@
   <string name="pref_video_use_front_camera_title">Использовать фронтальную камеру</string>
   <string name="pref_video">Видео</string>
   <string name="pref_preferences">Настройки</string>
-  <string name="pref_video_codec_h263_title">H263</string>
-  <string name="pref_video_codec_mpeg4_title">MPEG4</string>
-  <string name="pref_video_codec_h264_title">H264</string>
   <string name="pref_video_codecs_title">Кодеки</string>
   <string name="pref_preferred_video_size">Preferred video size</string>
   <string name="menu_videocall_back_to_dialer_title">Показать клавиатуру</string>
@@ -121,20 +118,6 @@
   <string name="pref_echo_cancellation">Шумоподавление</string>
   <string name="pref_autostart">Запускаться с системой</string>
   <string name="pref_enable_outbound_proxy">Исходящий прокси</string>
-  <string name="pref_codec_pcma">pcma</string>
-  <string name="pref_codec_pcmu">pcmu</string>
-  <string name="pref_codec_gsm">gsm</string>
-  <string name="pref_codec_g722">g722</string>
-  <string name="pref_codec_amr">amr</string>
-  <string name="pref_codec_amrwb">amr-wb</string>
-  <string name="pref_codec_ilbc">ilbc</string>
-  <string name="pref_codec_speex8">speex 8 Khz</string>
-  <string name="pref_codec_speex16">speex 16 Khz</string>
-  <string name="pref_codec_silk8">silk 8 Khz</string>
-  <string name="pref_codec_silk12">silk 12 Khz</string>
-  <string name="pref_codec_silk16">silk 16 Khz</string>
-  <string name="pref_codec_silk24">silk 24 Khz</string>
-  <string name="pref_codec_g729">g729</string>
   <string name="pref_codecs">Кодеки</string>
   <string name="pref_communication_expire_title">Таймаут соединения</string>
   <string name="pref_incoming_expire_title">Таймаут входящего соединения</string>
@@ -199,11 +182,8 @@
   <string name="first_launch_no_login_password">Пожалуйста введите имя пользователя и пароль</string>
   <string name="first_launch_bad_login_password">Невозможно соединиться; проверьте имя пользователя и пароль и попробуйте ещё</string>
   <string name="pref_amr_summary">Кодек AMR возможно отсутствует в телефоне</string>
-  <string name="pref_video_codec_vp8_title">VP8</string>
   <string name="pref_media_encryption">Шифрование потока</string>
   <string name="media_encryption_none">Отсутствует</string>
-  <string name="media_encryption_srtp">SRTP</string>
-  <string name="media_encryption_zrtp">ZRTP</string>
   <string name="pref_video_codec_h264_unavailable">Кодек поддерживается только если построено из исходников</string>
   <string name="pref_video_codec_mpeg4_unavailable">Кодек поддерживается только если построено из исходников</string>
   <string name="pref_sipaccounts">Учётные записи SIP</string>
diff --git a/res/values-sr/custom.xml b/res/values-sr/custom.xml
new file mode 100644
index 000000000..11472e817
--- /dev/null
+++ b/res/values-sr/custom.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="history_date_format">д МММ</string>
+  <string name="history_detail_date_format">ГГГГ МММ д ЧЧ:мм</string>
+  <string name="messages_date_format">ЧЧ:мм д МММ</string>
+  <string name="today_date_format">ЧЧ:мм</string>
+  <string name="picture_name_format">linphone-mms-%s.jpg</string>
+  <string name="app_name">Линфон</string>
+  <string name="service_name">Услуга Линфона</string>
+  <string name="addressbook_label">Линфон</string>
+  <string name="notification_title">Линфон</string>
+  <string name="wait_dialog_text">Покрећем се</string>
+  <string name="notification_registered">Уписан на „%s“ </string>
+  <string name="notification_register_failure">Нисам успео да се упишем на „%s“</string>
+  <string name="about_text">Линфон %s телефон сагласан са СИП-ом (rfc 3261) под Гнуовом Јавном Лиценцом и2</string>
+  <string name="about_link">http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/m/help\n\n© 2011 Belledonne Communications</string>
+  <string name="setup_welcome">Овај помоћник ће вам помоћи да користите СИП налог за ваше позиве.</string>
+  <string name="setup_create_account">Направи налог на линфон.орг-у</string>
+  <string name="setup_login_linphone">Већ имам налог линфон.орг-а</string>
+  <string name="setup_login_generic">Већ имам СИП налог</string>
+  <string name="setup_linphone_account_hint">Унесите ваше корисничко име и лозинку линфон.орг-а</string>
+  <string name="setup_general_account_hint">Унесите ваше корисничко име, лозинку и домен СИП налога</string>
+  <string name="setup_username_hint">корисничко име</string>
+  <string name="tunnel_host"></string>
+</resources>
diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index cc9cef0d2..f9eddf7b3 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -132,4 +132,39 @@
 	<string name="pref_sipaccount_key">pref_sipaccount_key</string>
 	<string name="pref_advanced_key">pref_advanced_key</string>
 	<string name="pref_manage_key">pref_manage_key</string>
+
+
+	<string name="pref_video_codec_h263_title">H263</string>
+	<string name="pref_video_codec_mpeg4_title">MP4V-ES</string>
+	<string name="pref_video_codec_h264_title">H264</string>
+	<string name="pref_codec_pcma">pcma</string>
+	<string name="pref_codec_pcmu">pcmu</string>
+	<string name="pref_codec_gsm">gsm</string>
+	<string name="pref_codec_g722">g722</string>
+	<string name="pref_codec_amr">amr</string>
+	<string name="pref_codec_amrwb">amr-wb</string>
+	<string name="pref_codec_ilbc">ilbc</string>
+	<string name="pref_codec_speex8">speex 8 Khz</string>
+	<string name="pref_codec_speex16">speex 16 Khz</string>
+	<string name="pref_codec_opus">opus 48Khz</string>
+	<string name="pref_codec_silk8">silk 8 Khz</string>
+	<string name="pref_codec_silk12">silk 12 Khz</string>
+	<string name="pref_codec_silk16">silk 16 Khz</string>
+	<string name="pref_codec_silk24">silk 24 Khz</string>
+	<string name="pref_codec_g729">g729</string>
+	<string-array name="limit_bitrate_entry_values">
+		<item>10</item>
+		<item>15</item>
+		<item>20</item>
+		<item>36</item>
+		<item>64</item>
+		<item>128</item>
+	</string-array>
+	<string-array name="adaptive_rate_algorithm_entries">
+		<item>Simple</item>
+		<item>Stateful</item>
+	</string-array>
+	<string name="pref_video_codec_vp8_title">VP8</string>
+	<string name="media_encryption_srtp">SRTP</string>
+	<string name="media_encryption_zrtp">ZRTP</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5ddedbd24..ea61d5de6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -93,9 +93,6 @@
   <string name="pref_video_use_front_camera_title">Use front camera</string>
   <string name="pref_video">Video</string>
   <string name="pref_preferences">Preferences</string>
-  <string name="pref_video_codec_h263_title">H263</string>
-  <string name="pref_video_codec_mpeg4_title">MP4V-ES</string>
-  <string name="pref_video_codec_h264_title">H264</string>
   <string name="pref_video_codecs_title">Codecs</string>
   <string name="pref_preferred_video_size">Preferred video size</string>
   <string name="menu_videocall_back_to_dialer_title">Display dialer</string>
@@ -121,21 +118,7 @@
   <string name="pref_echo_cancellation">Echo cancellation</string>
   <string name="pref_autostart">Start at boot time</string>
   <string name="pref_enable_outbound_proxy">Outbound proxy</string>
-  <string name="pref_codec_pcma">pcma</string>
-  <string name="pref_codec_pcmu">pcmu</string>
-  <string name="pref_codec_gsm">gsm</string>
-  <string name="pref_codec_g722">g722</string>
-  <string name="pref_codec_amr">amr</string>
-  <string name="pref_codec_amrwb">amr-wb</string>
-  <string name="pref_codec_ilbc">ilbc</string>
-  <string name="pref_codec_speex8">speex 8 Khz</string>
-  <string name="pref_codec_speex16">speex 16 Khz</string>
-  <string name="pref_codec_opus">opus 48Khz</string>
-  <string name="pref_codec_silk8">silk 8 Khz</string>
-  <string name="pref_codec_silk12">silk 12 Khz</string>
-  <string name="pref_codec_silk16">silk 16 Khz</string>
-  <string name="pref_codec_silk24">silk 24 Khz</string>
-  <string name="pref_codec_g729">g729</string>
+
   <string name="pref_codecs">Codecs</string>
   <string name="pref_communication_expire_title">Communication timeout</string>
   <string name="pref_incoming_expire_title">Incoming call timeout</string>
@@ -147,10 +130,6 @@
   <string name="place_call_chooser">Place a call</string>
   <string name="pref_adaptive_rate_control">Adaptive rate control</string>
   <string name="pref_adaptive_rate_algorithm">Adaptive rate algorithm</string>
-  <string-array name="adaptive_rate_algorithm_entries">
-    <item>Simple</item>
-    <item>Stateful</item>
-  </string-array>
   <string name="pref_codec_bitrate_limit">Codec bitrate limit</string>
   <string-array name="limit_bitrate_entries">
     <item>10 kbits/s</item>
@@ -160,14 +139,7 @@
     <item>64 kbits/s</item>
     <item>128 kbits/s</item>
   </string-array>
-  <string-array name="limit_bitrate_entry_values">
-    <item>10</item>
-    <item>15</item>
-    <item>20</item>
-    <item>36</item>
-    <item>64</item>
-    <item>128</item>
-  </string-array>
+
   <string name="pref_debug">Debug</string>
   <string name="about_report_issue">Report issue</string>
   <string name="about_bugreport_email_text">Describe problem here</string>
@@ -224,15 +196,11 @@
   <string name="first_launch_no_login_password">Please enter your login and password</string>
   <string name="first_launch_bad_login_password">Couldn\'t connect; check your login and password and start again</string>
   <string name="pref_amr_summary">AMR codec might not be present on your phone</string>
-  <string name="pref_video_codec_vp8_title">VP8</string>
   <string name="pref_media_encryption">Media encryption</string>
   <string name="media_encryption_none">None</string>
-  <string name="media_encryption_srtp">SRTP</string>
-  <string name="media_encryption_zrtp">ZRTP</string>
   <string name="pref_video_codec_h264_unavailable">Codec disabled, build the app from source code to enable it</string>
   <string name="pref_video_codec_mpeg4_unavailable">Codec disabled, build the app from source code to enable it</string>
   <string name="pref_sipaccounts">SIP Accounts</string>
-  <string name="pref_dtmf">Gate code</string>
   <string name="pref_wifi_only">Use wifi only</string>
   <string name="pref_push_notification">Enable push notifications</string>
   <string name="wizard_failed">An error occurred, try again later.</string>
@@ -426,8 +394,4 @@
   <string name="retry">Retry</string>
   <string name="remote_provisioning_failure">Failed to download or apply remote provisioning profile...</string>
   <string name="remote_provisioning_again_title">Remote provisioning</string>
-  <string name="remote_provisioning_again_message">Do you want to change the provisioning URI ?</string>
-  <string name="pref_dtmf_sequence_title">DTMF sequence</string>
-  <string name="dtmf_sequence_not_set_failure">No DTMF set in advanced preferences</string>
-  <string name="dtmf_sequence">DTMF sequence</string>
-</resources>
+  <string name="remote_provisioning_again_message">Do you want to change the provisioning URI ?</string></resources>