From 3368158ea7d4870cbf6ed328a1cba375c2c5c450 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 21 Mar 2019 14:13:46 +0100
Subject: [PATCH] Resources improvements

---
 app/src/main/res/values/config.xml            |  35 --
 .../res/values/non_localizable_custom.xml     | 100 +++---
 .../res/values/non_localizable_strings.xml    | 330 +++++++++---------
 3 files changed, 214 insertions(+), 251 deletions(-)
 delete mode 100644 app/src/main/res/values/config.xml

diff --git a/app/src/main/res/values/config.xml b/app/src/main/res/values/config.xml
deleted file mode 100644
index ad641dc16..000000000
--- a/app/src/main/res/values/config.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="account_linphone_login">wizard15</string>
-    <string name="account_linphone_pwd">wizard15</string>
-    <string name="account_linphone_domain">sip.linphone.org</string>
-    <string name="account_linphone_display_name">Bob</string>
-
-    <string name="account_generic_login">wizard15</string>
-    <string name="account_generic_pwd">wizard15</string>
-    <string name="account_generic_domain">test.linphone.org</string>
-
-    <string name="account_create_login">wizard42</string>
-    <string name="account_create_pwd">wizard42</string>
-    <string name="account_create_email">wizard42@linphone.org</string>
-    <string name="account_create_country_name">france</string>
-    <string name="account_create_country_code">33</string>
-    <string name="account_create_phone_number">12345678</string>
-
-    <string name="account_test_calls_login">wizard13</string>
-    <string name="account_test_calls_pwd">wizard13</string>
-    <string name="account_test_calls_domain">sip.linphone.org</string>
-
-    <string name="contact_name">Wizard</string>
-    <string name="contact_number">+33952636505</string>
-    <string name="contact_sip">wizard@sip.linphone.org</string>
-
-    <string name="chat_test_text_sent">Ping!</string>
-    <string name="chat_test_text_received">Pong!</string>
-
-    <string name="conference_account_login">wizard16</string>
-    <string name="conference_account_password">wizard16</string>
-    <string name="conference_account_domain">sip.linphone.org</string>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/non_localizable_custom.xml b/app/src/main/res/values/non_localizable_custom.xml
index 32a693080..257e97fca 100644
--- a/app/src/main/res/values/non_localizable_custom.xml
+++ b/app/src/main/res/values/non_localizable_custom.xml
@@ -1,12 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- Global -->
-    <string name="default_domain">sip.linphone.org</string><!-- Set the default domain used for account creation/addresses -->
-    <string name="default_conference_factory_uri">sip:conference-factory@sip.linphone.org</string>
-    <string name="default_lime_x3dh_server_url">https://lime.linphone.org/lime-server/lime-server.php</string>
-    <string name="rls_uri">sip:rls@sip.linphone.org</string>
-    <string name="user_agent">LinphoneAndroid</string>
+    <!-- URLs, URIs and domain -->
+    <!-- Set the default domain used for account creation/addresses -->
+    <string name="default_domain" translatable="false">sip.linphone.org</string>
+    <string name="default_stun" translatable="false">stun.linphone.org</string>
+    <string name="default_conference_factory_uri" translatable="false">sip:conference-factory@sip.linphone.org</string>
+    <string name="default_lime_x3dh_server_url" translatable="false">https://lime.linphone.org/lime-server/lime-server.php</string>
+    <string name="rls_uri" translatable="false">sip:rls@sip.linphone.org</string>
+
+    <!-- Textual mention of the app name -->
+    <string name="user_agent" translatable="false">LinphoneAndroid</string>
+    <string name="temp_photo_name" translatable="false">linphone-android-photo-temp</string>
+    <string name="temp_photo_name_with_date" translatable="false">linphone-android-photo-%s</string>
+    <string name="about_text" translatable="false">GNU General Public License V2\n © 2010–2018 Belledonne Communications</string>
+    <string name="about_bugreport_email" translatable="false">linphone-android@belledonne-communications.com</string>
+    <string name="notification_service_channel_id" translatable="false">linphone_notification_service_id</string>
+    <string name="notification_channel_id" translatable="false">linphone_notification_id</string>
+
+    <!-- Push notification settings -->
+    <bool name="enable_push_id">true</bool>
+    <string name="push_type" translatable="false">firebase</string>
+
+    <!-- UI config -->
     <bool name="orientation_portrait_only">false</bool>
     <bool name="show_statusbar_only_on_dialer">false</bool>
     <bool name="force_use_of_linphone_friends">false</bool>
@@ -15,34 +31,33 @@
     <bool name="set_notification_bar_background_color_to_primary">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>
+    <string name="history_date_format" translatable="false">EEE d MMM</string>
+    <string name="history_detail_date_format" translatable="false">yyyy/MM/dd - HH:mm - </string>
+    <string name="inapp_popup_date_format" translatable="false">yyyy/MM/dd</string>
+    <string name="inapp_popup_date_day" translatable="false">dd</string>
+    <string name="messages_date_format" translatable="false">dd/MM, HH:mm</string>
+    <string name="messages_list_date_format" translatable="false">dd/MM</string>
+    <string name="today_date_format" translatable="false">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 -->
+    <!-- Time between two inapp notifications in milliseconds -->
+    <integer name="popup_time_interval">86400000</integer>
 
     <!-- Assistant -->
-    <bool name="assistant_allow_username">true
-    </bool> <!-- Allow to use an username instead of the phone number for account creation -->
-
+    <!-- Allow to use an username instead of the phone number for account creation -->
+    <bool name="assistant_allow_username">true</bool>
     <!-- Only on should be set to true at a time! If not the first one will be used -->
-    <bool name="assistant_use_linphone_login_as_first_fragment">false
-    </bool><!-- Start assistant in loginFragment view instead of menu -->
-    <bool name="assistant_use_create_linphone_account_as_first_fragment">false
-    </bool><!-- Start Linphone creation account in loginFragment view instead of menu -->
+    <!-- Start assistant in loginFragment view instead of menu -->
+    <bool name="assistant_use_linphone_login_as_first_fragment">false</bool>
+    <!-- Start Linphone creation account in loginFragment view instead of menu -->
+    <bool name="assistant_use_create_linphone_account_as_first_fragment">false</bool>
 
     <bool name="replace_assistant_with_old_interface">false</bool>
     <bool name="hide_assistant">false</bool>
     <bool name="assistant_cancel_move_to_back">false</bool>
-    <bool name="pre_fill_email_in_assistant">true
-    </bool> <!-- Set the email field of the wizard with one of the gmail account registered on the device -->
+    <!-- Set the email field of the wizard with one of the gmail account registered on the device -->
+    <bool name="pre_fill_email_in_assistant">true</bool>
     <bool name="assistant_account_validation_mandatory">false</bool>
     <bool name="allow_only_phone_numbers_in_assistant">false</bool>
     <bool name="hide_linphone_accounts_in_assistant">false</bool>
@@ -56,44 +71,27 @@
     <bool name="display_confirmation_popup_after_first_configuration">false</bool>
     <bool name="allow_cancel_remote_provisioning_login_activity">true</bool>
 
-    <!-- Inapp -->
-    <bool name="enable_in_app_purchase">false</bool>
-    <integer name="days_notification_shown">5
-    </integer><!-- Notification shown before end of trial version in days -->
-    <integer name="time_between_inapp_notification">86400000
-    </integer><!-- Time between two inapp notifications in milliseconds -->
-    <bool name="hide_username_in_inapp">true</bool>
-
-    <!-- Push notification settings -->
-    <bool name="enable_push_id">true</bool>
-    <string name="push_sender_id">929724111839</string><!--firebase 929724111839 !! gcm 622464153529 -->
-    <string name="push_type">firebase</string>
-
     <!-- Call -->
     <bool name="forbid_self_call">false</bool>
     <bool name="allow_ringing_while_early_media">true</bool>
     <bool name="allow_transfers">true</bool>
     <bool name="disable_options_in_call">false</bool>
-    <bool name="automatically_start_intercepted_outgoing_gsm_call">true
-    </bool><!-- This settings handle the behavior of the view waiting for the remote provisioning configuration to be done -->
+    <!-- This settings handle the behavior of the view waiting for the remote provisioning configuration to be done -->
+    <bool name="automatically_start_intercepted_outgoing_gsm_call">true</bool>
     <bool name="hide_camera_settings">false</bool>
     <bool name="hide_in_call_stats">false</bool>
     <bool name="do_not_use_sliders_to_answer_hangup_call_if_phone_unlocked">true</bool>
 
     <!-- Settings -->
     <bool name="disable_every_log">false</bool>
-    <bool name="disable_all_security_features_for_markets">false
-    </bool> <!-- Disable TLS/SRTP/ZRTP -->
+    <bool name="disable_all_security_features_for_markets">false </bool>
     <bool name="disable_all_patented_codecs_for_markets">false</bool> <!-- Disable MPEG4/H264 -->
-    <string name="default_stun">stun.linphone.org</string>
     <bool name="hide_accounts">false</bool>
 
     <!-- Chat -->
     <bool name="disable_chat">false</bool>
     <bool name="disable_chat_message_notification">false</bool>
     <bool name="disable_chat_send_file">false</bool>
-    <string name="temp_photo_name">linphone-android-photo-temp</string>
-    <string name="temp_photo_name_with_date">linphone-android-photo-%s</string>
     <bool name="lower_space_between_chat_bubbles_if_same_person">true</bool>
     <bool name="allow_multiple_images_and_text">true</bool>
     <bool name="send_text_and_images_as_different_messages">false</bool>
@@ -121,18 +119,18 @@
     <bool name="hide_settings_from_side_menu">false</bool>
 
     <!-- Others Parameters-->
-    <string name="about_text">GNU General Public License V2\n © 2010–2018 Belledonne Communications</string>
-    <string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
     <bool name="enable_call_notification">true</bool>
     <bool name="kill_service_with_task_manager">true</bool>
-    <string name="notification_service_channel_id">linphone_notification_service_id</string>
-    <string name="notification_channel_id">linphone_notification_id</string>
     <integer name="notification_ms_on">1000</integer>
     <integer name="notification_ms_off">7000</integer>
 
-    <!-- Tutorial settings -->
-    <bool name="show_tutorials_instead_of_app">false
-    </bool> <!-- Be careful ! Setting this to true prevent the app from working ! It will only display tutorial activities -->
+    <!-- Inapp -->
+    <bool name="enable_in_app_purchase">false</bool>
+    <!-- Notification shown before end of trial version in days -->
+    <integer name="days_notification_shown">5</integer>
+    <!-- Time between two inapp notifications in milliseconds -->
+    <integer name="time_between_inapp_notification">86400000</integer>
+    <bool name="hide_username_in_inapp">true</bool>
 
 </resources>
 
diff --git a/app/src/main/res/values/non_localizable_strings.xml b/app/src/main/res/values/non_localizable_strings.xml
index 0f6e4b1bd..3ae74fce6 100644
--- a/app/src/main/res/values/non_localizable_strings.xml
+++ b/app/src/main/res/values/non_localizable_strings.xml
@@ -3,190 +3,190 @@
     <!-- Do not translate any of the strings below -->
     <bool name="isTablet">false</bool>
 
-    <string name="dummy_group_chat_subject">dummy subject</string>
+    <string name="dummy_group_chat_subject" translatable="false">dummy subject</string>
 
-    <string name="pref_dark_mode_key">pref_dark_mode_key</string>
+    <string name="pref_dark_mode_key" translatable="false">pref_dark_mode_key</string>
 
     <item name="contact_search_name" type="id" />
-    <string name="pref_disable_account_key">pref_disable_account_key</string>
-    <string name="pref_extra_accounts">pref_nb_accounts_extra</string>
-    <string name="pref_default_account_key">pref_default_account</string>
+    <string name="pref_disable_account_key" translatable="false">pref_disable_account_key</string>
+    <string name="pref_extra_accounts" translatable="false">pref_nb_accounts_extra</string>
+    <string name="pref_default_account_key" translatable="false">pref_default_account</string>
 
-    <string name="pref_tunnel_key">pref_tunnel_key</string>
-    <string name="pref_tunnel_mode_key">pref_tunnel_mode_key</string>
-    <string name="tunnel_mode_entry_value_disabled">disabled</string>
-    <string name="tunnel_mode_entry_value_3G_only">3G_only</string>
-    <string name="tunnel_mode_entry_value_always">always</string>
+    <string name="pref_tunnel_key" translatable="false">pref_tunnel_key</string>
+    <string name="pref_tunnel_mode_key" translatable="false">pref_tunnel_mode_key</string>
+    <string name="tunnel_mode_entry_value_disabled" translatable="false">disabled</string>
+    <string name="tunnel_mode_entry_value_3G_only" translatable="false">3G_only</string>
+    <string name="tunnel_mode_entry_value_always" translatable="false">always</string>
     <string-array name="tunnel_mode_entry_values">
         <item>@string/tunnel_mode_entry_value_disabled</item>
         <item>@string/tunnel_mode_entry_value_3G_only</item>
         <item>@string/tunnel_mode_entry_value_always</item>
         <item>@string/tunnel_mode_entry_value_auto</item>
     </string-array>
-    <string name="pref_tunnel_host_key">pref_tunnel_host_key</string>
-    <string name="pref_tunnel_port_key">pref_tunnel_port_key</string>
-    <string name="tunnel_mode_entry_value_auto">auto</string>
+    <string name="pref_tunnel_host_key" translatable="false">pref_tunnel_host_key</string>
+    <string name="pref_tunnel_port_key" translatable="false">pref_tunnel_port_key</string>
+    <string name="tunnel_mode_entry_value_auto" translatable="false">auto</string>
 
-    <string name="pref_audio_use_specific_mode_key">pref_audio_use_specific_mode_key</string>
-    <string name="pref_audio_hacks_use_galaxys_hack_key">pref_audio_hacks_use_galaxys_hack_key</string>
-    <string name="pref_audio_hacks_use_routing_api_key">pref_audio_hacks_use_routing_api_key</string>
-    <string name="pref_audio_soft_volume_key">pref_audio_soft_volume_key</string>
-    <string name="pref_audio_ringtone">pref_audio_ringtone</string>
-    <string name="pref_incoming_call_vibration_key">pref_incoming_call_vibration_key</string>
-    <string name="pref_mic_gain_db_key">pref_mic_gain_db_key</string>
-    <string name="pref_playback_gain_db_key">pref_playback_gain_db_key</string>
+    <string name="pref_audio_use_specific_mode_key" translatable="false">pref_audio_use_specific_mode_key</string>
+    <string name="pref_audio_hacks_use_galaxys_hack_key" translatable="false">pref_audio_hacks_use_galaxys_hack_key</string>
+    <string name="pref_audio_hacks_use_routing_api_key" translatable="false">pref_audio_hacks_use_routing_api_key</string>
+    <string name="pref_audio_soft_volume_key" translatable="false">pref_audio_soft_volume_key</string>
+    <string name="pref_audio_ringtone" translatable="false">pref_audio_ringtone</string>
+    <string name="pref_incoming_call_vibration_key" translatable="false">pref_incoming_call_vibration_key</string>
+    <string name="pref_mic_gain_db_key" translatable="false">pref_mic_gain_db_key</string>
+    <string name="pref_playback_gain_db_key" translatable="false">pref_playback_gain_db_key</string>
 
-    <string name="pref_ipv6_key">pref_ipv6_key</string>
+    <string name="pref_ipv6_key" translatable="false">pref_ipv6_key</string>
 
-    <string name="menu_about_key">menu_about_key</string>
-    <string name="pref_sipaccounts_key">pref_sipaccounts_key</string>
-    <string name="setup_key">setup_key</string>
-    <string name="pref_add_account_key">pref_add_account_key</string>
-    <string name="pref_in_app_store_key">pref_in_app_store_key</string>
-    <string name="pref_video_key">pref_video_key</string>
-    <string name="pref_video_codecs_key">pref_video_codecs_key</string>
+    <string name="menu_about_key" translatable="false">menu_about_key</string>
+    <string name="pref_sipaccounts_key" translatable="false">pref_sipaccounts_key</string>
+    <string name="setup_key" translatable="false">setup_key</string>
+    <string name="pref_add_account_key" translatable="false">pref_add_account_key</string>
+    <string name="pref_in_app_store_key" translatable="false">pref_in_app_store_key</string>
+    <string name="pref_video_key" translatable="false">pref_video_key</string>
+    <string name="pref_video_codecs_key" translatable="false">pref_video_codecs_key</string>
 
-    <string name="pref_transport_key">pref_transport_key</string>
-    <string name="pref_transport_udp_key">pref_transport_udp_key</string>
-    <string name="pref_transport_tcp_key">pref_transport_tcp_key</string>
-    <string name="pref_transport_tls_key">pref_transport_tls_key</string>
-    <string name="pref_transport_use_random_ports_key">pref_transport_use_random_ports_key</string>
-    <string name="pref_sip_port_key">pref_sip_port_key</string>
+    <string name="pref_transport_key" translatable="false">pref_transport_key</string>
+    <string name="pref_transport_udp_key" translatable="false">pref_transport_udp_key</string>
+    <string name="pref_transport_tcp_key" translatable="false">pref_transport_tcp_key</string>
+    <string name="pref_transport_tls_key" translatable="false">pref_transport_tls_key</string>
+    <string name="pref_transport_use_random_ports_key" translatable="false">pref_transport_use_random_ports_key</string>
+    <string name="pref_sip_port_key" translatable="false">pref_sip_port_key</string>
 
-    <string name="pref_echo_canceller_calibration_key">pref_echo_canceller_calibration_key</string>
-    <string name="pref_prefix_key">pref_prefix_key</string>
-    <string name="pref_proxy_key">pref_proxy_key</string>
-    <string name="pref_domain_key">pref_domain_key</string>
-    <string name="pref_passwd_key">pref_passwd_key</string>
-    <string name="pref_username_key">pref_username_key</string>
-    <string name="pref_auth_userid_key">pref_auth_userid_key</string>
-    <string name="pref_wizard_key">pref_wizard_key</string>
-    <string name="pref_activated_key">pref_activated_key</string>
-    <string name="pref_debug_key">pref_debug_key</string>
-    <string name="pref_java_debug_key">pref_java_debug_key</string>
-    <string name="first_launch_succeeded_once_key">first_launch_succeeded_once_key</string>
+    <string name="pref_echo_canceller_calibration_key" translatable="false">pref_echo_canceller_calibration_key</string>
+    <string name="pref_prefix_key" translatable="false">pref_prefix_key</string>
+    <string name="pref_proxy_key" translatable="false">pref_proxy_key</string>
+    <string name="pref_domain_key" translatable="false">pref_domain_key</string>
+    <string name="pref_passwd_key" translatable="false">pref_passwd_key</string>
+    <string name="pref_username_key" translatable="false">pref_username_key</string>
+    <string name="pref_auth_userid_key" translatable="false">pref_auth_userid_key</string>
+    <string name="pref_wizard_key" translatable="false">pref_wizard_key</string>
+    <string name="pref_activated_key" translatable="false">pref_activated_key</string>
+    <string name="pref_debug_key" translatable="false">pref_debug_key</string>
+    <string name="pref_java_debug_key" translatable="false">pref_java_debug_key</string>
+    <string name="first_launch_succeeded_once_key" translatable="false">first_launch_succeeded_once_key</string>
 
-    <string name="pref_wifi_only_key">pref_wifi_only_key</string>
-    <string name="pref_doze_mode_key">pref_doze_mode_key</string>
+    <string name="pref_wifi_only_key" translatable="false">pref_wifi_only_key</string>
+    <string name="pref_doze_mode_key" translatable="false">pref_doze_mode_key</string>
 
-    <string name="pref_overlay_key">pref_overlay_key</string>
-    <string name="pref_video_use_front_camera_key">pref_video_use_front_camera_key</string>
-    <string name="pref_video_codec_h263_key">pref_video_codec_h263_key</string>
-    <string name="pref_video_codec_mpeg4_key">pref_video_codec_mpeg4_key</string>
-    <string name="pref_video_codec_h264_key">pref_video_codec_h264_key</string>
-    <string name="pref_video_automatically_accept_video_key">pref_video_automatically_accept_video_key</string>
-    <string name="pref_video_initiate_call_with_video_key">pref_video_initiate_call_with_video_key</string>
-    <string name="pref_video_enable_key">pref_video_enable_key</string>
-    <string name="pref_video_preset_key">pref_video_preset_key</string>
-    <string name="pref_preferred_video_size_key">pref_preferred_video_size_key</string>
-    <string name="pref_preferred_video_fps_key">pref_preferred_video_fps_key</string>
-    <string name="pref_bandwidth_limit_key">pref_bandwidth_limit_key</string>
-    <string name="pref_animation_enable_key">pref_animation_enable_key</string>
-    <string name="pref_service_notification_key">pref_service_notification_key</string>
-    <string name="pref_escape_plus_key">pref_escape_plus_key</string>
-    <string name="pref_friendlist_subscribe_key">pref_friendlist_subscribe_key</string>
-    <string name="pref_link_account_key">pref_link_account_key</string>
-    <string name="pref_proxy_push_notif_key">pref_proxy_push_notif_key</string>
-    <string name="pref_device_power_saver_settings_key">pref_device_power_saver_settings_key</string>
-    <string name="pref_echo_cancellation_key">pref_echo_cancellation_key</string>
-    <string name="pref_autostart_key">pref_autostart_key</string>
-    <string name="pref_enable_outbound_proxy_key">Outbound proxy</string>
-    <string name="pref_codec_pcma_key">pref_codec_pcma_key</string>
-    <string name="pref_codec_pcmu_key">pref_codec_pcmu_key</string>
-    <string name="pref_codec_gsm_key">pref_codec_gsm_key</string>
-    <string name="pref_codec_g722_key">pref_codec_g722_key</string>
-    <string name="pref_codec_g729_key">pref_codec_g729_key</string>
-    <string name="pref_codec_amr_key">pref_codec_amr_key</string>
-    <string name="pref_codec_amrwb_key">pref_codec_amrwb_key</string>
-    <string name="pref_codec_ilbc_key">pref_codec_ilbc_key</string>
-    <string name="pref_codec_speex8_key">pref_codec_speex8_key</string>
-    <string name="pref_codec_speex16_key">pref_codec_speex16_key</string>
-    <string name="pref_codec_speex32_key">pref_codec_speex32_key</string>
-    <string name="pref_codec_silk8_key">pref_codec_silk8_key</string>
-    <string name="pref_codec_silk12_key">pref_codec_silk12_key</string>
-    <string name="pref_codec_silk16_key">pref_codec_silk16_key</string>
-    <string name="pref_codec_silk24_key">pref_codec_silk24_key</string>
-    <string name="pref_codec_opus_key">pref_codec_opus_key</string>
-    <string name="pref_codecs_key">pref_codecs_key</string>
-    <string name="pref_stun_server_key">pref_stun_server_key</string>
-    <string name="pref_ice_enable_key">pref_ice_enable_key</string>
-    <string name="pref_turn_enable_key">pref_turn_enable_key</string>
-    <string name="pref_video_codec_vp8_key">pref_video_codec_vp8_key</string>
-    <string name="pref_media_encryption_key">pref_media_encryption_key</string>
-    <string name="pref_media_encryption_key_none">none</string>
-    <string name="pref_media_encryption_key_srtp">srtp</string>
-    <string name="pref_media_encryption_key_zrtp">zrtp</string>
-    <string name="pref_media_encryption_key_dtls">dtls</string>
-    <string name="pref_background_mode_key">pref_background_mode_key</string>
-    <string name="pref_codec_bitrate_limit_key">pref_codec_bitrate_limit_key</string>
-    <string name="pref_adaptive_rate_control_key">pref_adaptive_rate_control_key</string>
-    <string name="pref_echo_tester_key">pref_echo_tester_key</string>
-    <string name="pref_auto_download_policy_key">pref_auto_download_policy_key</string>
-    <string name="pref_auto_download_max_size_key">pref_auto_download_max_size_key</string>
-    <string name="pref_auto_download_policy_disabled_key">-1</string>
-    <string name="pref_auto_download_policy_always_key">0</string>
-    <string name="pref_auto_download_policy_size_key">10000000</string>
+    <string name="pref_overlay_key" translatable="false">pref_overlay_key</string>
+    <string name="pref_video_use_front_camera_key" translatable="false">pref_video_use_front_camera_key</string>
+    <string name="pref_video_codec_h263_key" translatable="false">pref_video_codec_h263_key</string>
+    <string name="pref_video_codec_mpeg4_key" translatable="false">pref_video_codec_mpeg4_key</string>
+    <string name="pref_video_codec_h264_key" translatable="false">pref_video_codec_h264_key</string>
+    <string name="pref_video_automatically_accept_video_key" translatable="false">pref_video_automatically_accept_video_key</string>
+    <string name="pref_video_initiate_call_with_video_key" translatable="false">pref_video_initiate_call_with_video_key</string>
+    <string name="pref_video_enable_key" translatable="false">pref_video_enable_key</string>
+    <string name="pref_video_preset_key" translatable="false">pref_video_preset_key</string>
+    <string name="pref_preferred_video_size_key" translatable="false">pref_preferred_video_size_key</string>
+    <string name="pref_preferred_video_fps_key" translatable="false">pref_preferred_video_fps_key</string>
+    <string name="pref_bandwidth_limit_key" translatable="false">pref_bandwidth_limit_key</string>
+    <string name="pref_animation_enable_key" translatable="false">pref_animation_enable_key</string>
+    <string name="pref_service_notification_key" translatable="false">pref_service_notification_key</string>
+    <string name="pref_escape_plus_key" translatable="false">pref_escape_plus_key</string>
+    <string name="pref_friendlist_subscribe_key" translatable="false">pref_friendlist_subscribe_key</string>
+    <string name="pref_link_account_key" translatable="false">pref_link_account_key</string>
+    <string name="pref_proxy_push_notif_key" translatable="false">pref_proxy_push_notif_key</string>
+    <string name="pref_device_power_saver_settings_key" translatable="false">pref_device_power_saver_settings_key</string>
+    <string name="pref_echo_cancellation_key" translatable="false">pref_echo_cancellation_key</string>
+    <string name="pref_autostart_key" translatable="false">pref_autostart_key</string>
+    <string name="pref_enable_outbound_proxy_key" translatable="false">Outbound proxy</string>
+    <string name="pref_codec_pcma_key" translatable="false">pref_codec_pcma_key</string>
+    <string name="pref_codec_pcmu_key" translatable="false">pref_codec_pcmu_key</string>
+    <string name="pref_codec_gsm_key" translatable="false">pref_codec_gsm_key</string>
+    <string name="pref_codec_g722_key" translatable="false">pref_codec_g722_key</string>
+    <string name="pref_codec_g729_key" translatable="false">pref_codec_g729_key</string>
+    <string name="pref_codec_amr_key" translatable="false">pref_codec_amr_key</string>
+    <string name="pref_codec_amrwb_key" translatable="false">pref_codec_amrwb_key</string>
+    <string name="pref_codec_ilbc_key" translatable="false">pref_codec_ilbc_key</string>
+    <string name="pref_codec_speex8_key" translatable="false">pref_codec_speex8_key</string>
+    <string name="pref_codec_speex16_key" translatable="false">pref_codec_speex16_key</string>
+    <string name="pref_codec_speex32_key" translatable="false">pref_codec_speex32_key</string>
+    <string name="pref_codec_silk8_key" translatable="false">pref_codec_silk8_key</string>
+    <string name="pref_codec_silk12_key" translatable="false">pref_codec_silk12_key</string>
+    <string name="pref_codec_silk16_key" translatable="false">pref_codec_silk16_key</string>
+    <string name="pref_codec_silk24_key" translatable="false">pref_codec_silk24_key</string>
+    <string name="pref_codec_opus_key" translatable="false">pref_codec_opus_key</string>
+    <string name="pref_codecs_key" translatable="false">pref_codecs_key</string>
+    <string name="pref_stun_server_key" translatable="false">pref_stun_server_key</string>
+    <string name="pref_ice_enable_key" translatable="false">pref_ice_enable_key</string>
+    <string name="pref_turn_enable_key" translatable="false">pref_turn_enable_key</string>
+    <string name="pref_video_codec_vp8_key" translatable="false">pref_video_codec_vp8_key</string>
+    <string name="pref_media_encryption_key" translatable="false">pref_media_encryption_key</string>
+    <string name="pref_media_encryption_key_none" translatable="false">none</string>
+    <string name="pref_media_encryption_key_srtp" translatable="false">srtp</string>
+    <string name="pref_media_encryption_key_zrtp" translatable="false">zrtp</string>
+    <string name="pref_media_encryption_key_dtls" translatable="false">dtls</string>
+    <string name="pref_background_mode_key" translatable="false">pref_background_mode_key</string>
+    <string name="pref_codec_bitrate_limit_key" translatable="false">pref_codec_bitrate_limit_key</string>
+    <string name="pref_adaptive_rate_control_key" translatable="false">pref_adaptive_rate_control_key</string>
+    <string name="pref_echo_tester_key" translatable="false">pref_echo_tester_key</string>
+    <string name="pref_auto_download_policy_key" translatable="false">pref_auto_download_policy_key</string>
+    <string name="pref_auto_download_max_size_key" translatable="false">pref_auto_download_max_size_key</string>
+    <string name="pref_auto_download_policy_disabled_key" translatable="false">-1</string>
+    <string name="pref_auto_download_policy_always_key" translatable="false">0</string>
+    <string name="pref_auto_download_policy_size_key" translatable="false">10000000</string>
     <string-array name="pref_auto_download_policy_entries_values">
         <item>@string/pref_auto_download_policy_disabled_key</item>
         <item>@string/pref_auto_download_policy_always_key</item>
         <item>@string/pref_auto_download_policy_size_key</item>
     </string-array>
 
-    <string name="push_reg_id_key">push_reg_id_key</string>
-    <string name="push_sender_id_key">push_sender_id_key</string>
-    <string name="pref_push_notification_key">pref_push_notification_key</string>
+    <string name="push_reg_id_key" translatable="false">push_reg_id_key</string>
+    <string name="push_sender_id_key" translatable="false">push_sender_id_key</string>
+    <string name="pref_push_notification_key" translatable="false">pref_push_notification_key</string>
 
-    <string name="pref_auto_accept_friends_key">pref_auto_accept_friends_key</string>
-    <string name="pref_image_sharing_server_key">pref_image_sharing_server_key</string>
-    <string name="pref_remote_provisioning_key">pref_remote_provisioning_key</string>
+    <string name="pref_auto_accept_friends_key" translatable="false">pref_auto_accept_friends_key</string>
+    <string name="pref_image_sharing_server_key" translatable="false">pref_image_sharing_server_key</string>
+    <string name="pref_remote_provisioning_key" translatable="false">pref_remote_provisioning_key</string>
 
-    <string name="pref_video_port_key">pref_video_port_key</string>
-    <string name="pref_audio_port_key">pref_audio_port_key</string>
-    <string name="pref_incoming_call_timeout_key">pref_incoming_expire_key</string>
-    <string name="pref_call_timeout_key">pref_call_timeout_key</string>
-    <string name="pref_auto_answer_time_key">pref_auto_answer_time_key</string>
+    <string name="pref_video_port_key" translatable="false">pref_video_port_key</string>
+    <string name="pref_audio_port_key" translatable="false">pref_audio_port_key</string>
+    <string name="pref_incoming_call_timeout_key" translatable="false">pref_incoming_expire_key</string>
+    <string name="pref_call_timeout_key" translatable="false">pref_call_timeout_key</string>
+    <string name="pref_auto_answer_time_key" translatable="false">pref_auto_answer_time_key</string>
 
-    <string name="pref_display_name_key">pref_display_name_key</string>
-    <string name="pref_user_name_key">pref_user_name_key</string>
-    <string name="pref_expire_key">pref_expire_key</string>
-    <string name="pref_avpf_key">pref_avpf_key</string>
-    <string name="pref_avpf_rr_interval_key">pref_avpf_rr_interval_key</string>
+    <string name="pref_display_name_key" translatable="false">pref_display_name_key</string>
+    <string name="pref_user_name_key" translatable="false">pref_user_name_key</string>
+    <string name="pref_expire_key" translatable="false">pref_expire_key</string>
+    <string name="pref_avpf_key" translatable="false">pref_avpf_key</string>
+    <string name="pref_avpf_rr_interval_key" translatable="false">pref_avpf_rr_interval_key</string>
 
-    <string name="pref_rfc2833_dtmf_key">pref_rfc2833_dtmf_key</string>
-    <string name="pref_sipinfo_dtmf_key">pref_sipinfo_dtmf_key</string>
-    <string name="pref_voice_mail_key">pref_voice_mail_key</string>
-    <string name="pref_dialer_call_key">pref_dialer_call_key</string>
-    <string name="pref_upnp_enable_key">pref_upnp_enable_key</string>
+    <string name="pref_rfc2833_dtmf_key" translatable="false">pref_rfc2833_dtmf_key</string>
+    <string name="pref_sipinfo_dtmf_key" translatable="false">pref_sipinfo_dtmf_key</string>
+    <string name="pref_voice_mail_key" translatable="false">pref_voice_mail_key</string>
+    <string name="pref_dialer_call_key" translatable="false">pref_dialer_call_key</string>
+    <string name="pref_upnp_enable_key" translatable="false">pref_upnp_enable_key</string>
 
-    <string name="pref_first_time_linphone_chat_storage">pref_first_time_linphone_chat_storage</string>
+    <string name="pref_first_time_linphone_chat_storage" translatable="false">pref_first_time_linphone_chat_storage</string>
 
-    <string name="pref_sipaccount_key">pref_sipaccount_key</string>
-    <string name="pref_audio_key">pref_audio_key</string>
-    <string name="pref_call_key">pref_call_key</string>
-    <string name="pref_chat_key">pref_chat_key</string>
-    <string name="pref_network_key">pref_network_key</string>
-    <string name="pref_advanced_key">pref_advanced_key</string>
-    <string name="pref_manage_key">pref_manage_key</string>
+    <string name="pref_sipaccount_key" translatable="false">pref_sipaccount_key</string>
+    <string name="pref_audio_key" translatable="false">pref_audio_key</string>
+    <string name="pref_call_key" translatable="false">pref_call_key</string>
+    <string name="pref_chat_key" translatable="false">pref_chat_key</string>
+    <string name="pref_network_key" translatable="false">pref_network_key</string>
+    <string name="pref_advanced_key" translatable="false">pref_advanced_key</string>
+    <string name="pref_manage_key" translatable="false">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 name="pref_video_codec_h263_title" translatable="false">H263</string>
+    <string name="pref_video_codec_mpeg4_title" translatable="false">MP4V-ES</string>
+    <string name="pref_video_codec_h264_title" translatable="false">H264</string>
+    <string name="pref_codec_pcma" translatable="false">pcma</string>
+    <string name="pref_codec_pcmu" translatable="false">pcmu</string>
+    <string name="pref_codec_gsm" translatable="false">gsm</string>
+    <string name="pref_codec_g722" translatable="false">g722</string>
+    <string name="pref_codec_amr" translatable="false">amr</string>
+    <string name="pref_codec_amrwb" translatable="false">amr-wb</string>
+    <string name="pref_codec_ilbc" translatable="false">ilbc</string>
+    <string name="pref_codec_speex8" translatable="false">speex 8 Khz</string>
+    <string name="pref_codec_speex16" translatable="false">speex 16 Khz</string>
+    <string name="pref_codec_opus" translatable="false">opus 48Khz</string>
+    <string name="pref_codec_silk8" translatable="false">silk 8 Khz</string>
+    <string name="pref_codec_silk12" translatable="false">silk 12 Khz</string>
+    <string name="pref_codec_silk16" translatable="false">silk 16 Khz</string>
+    <string name="pref_codec_silk24" translatable="false">silk 24 Khz</string>
+    <string name="pref_codec_g729" translatable="false">g729</string>
 
     <string-array name="adaptive_rate_algorithm_entries">
         <item>Simple</item>
@@ -216,12 +216,12 @@
         <item>custom</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>
-    <string name="media_encryption_dtls">DTLS</string>
+    <string name="pref_video_codec_vp8_title" translatable="false">VP8</string>
+    <string name="media_encryption_srtp" translatable="false">SRTP</string>
+    <string name="media_encryption_zrtp" translatable="false">ZRTP</string>
+    <string name="media_encryption_dtls" translatable="false">DTLS</string>
 
-    <string name="debug_popup_title">Debug</string>
+    <string name="debug_popup_title" translatable="false">Debug</string>
     <string-array name="popup_enable_log">
         <item>Enable logs</item>
         <item>Cancel</item>
@@ -232,13 +232,13 @@
         <item>Cancel</item>
     </string-array>
 
-    <string name="pref_use_lime_encryption_key">pref_use_lime_encryption_key</string>
-    <string name="pref_device_ringtone_key">pref_device_ringtone_key</string>
-    <string name="pref_auto_answer_key">pref_auto_answer_key</string>
-    <string name="pref_android_app_settings_key">pref_android_app_settings_key</string>
-    <string name="pref_android_app_notif_settings_key">pref_android_app_notif_settings_key</string>
-    <string name="pref_turn_username_key">pref_turn_username_key</string>
-    <string name="pref_turn_passwd_key">pref_turn_passwd_key</string>
+    <string name="pref_use_lime_encryption_key" translatable="false">pref_use_lime_encryption_key</string>
+    <string name="pref_device_ringtone_key" translatable="false">pref_device_ringtone_key</string>
+    <string name="pref_auto_answer_key" translatable="false">pref_auto_answer_key</string>
+    <string name="pref_android_app_settings_key" translatable="false">pref_android_app_settings_key</string>
+    <string name="pref_android_app_notif_settings_key" translatable="false">pref_android_app_notif_settings_key</string>
+    <string name="pref_turn_username_key" translatable="false">pref_turn_username_key</string>
+    <string name="pref_turn_passwd_key" translatable="false">pref_turn_passwd_key</string>
 
     <string-array name="pref_auto_download_policy_entries_labels">
         <item>@string/pref_auto_download_disabled</item>