From 6cf35e3e4e9997533834a88e641fd08088b304ba Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 9 Mar 2011 10:58:26 +0100
Subject: [PATCH] Custom.xml resource to store customizable items.

---
 res/values/custom.xml                  | 12 ++++++++++++
 res/values/non_localizable_strings.xml |  6 +-----
 res/values/strings.xml                 | 12 +++---------
 3 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 res/values/custom.xml

diff --git a/res/values/custom.xml b/res/values/custom.xml
new file mode 100644
index 000000000..feb5e1957
--- /dev/null
+++ b/res/values/custom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+
+	<string name="app_name">Linphone</string>
+	<string name="default_domain">test.linphone.org</string>
+
+	<bool name="use_android_contact_picker">true</bool>
+<!--	<string name="merge_another_contact_provider">content://something</string>-->
+    
+</resources>
+ 
\ No newline at end of file
diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index 403bf0a51..52ba576ea 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -2,12 +2,8 @@
 <resources>
 
 
-       <!-- Custom start -->
-       <string name="default_domain">test.linphone.org</string>
-
-       <!-- Custom end -->
-       
 
+    <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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 18b8987bb..473c29ae1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,11 +2,6 @@
 <resources>
 
 
-    <!-- Custom start -->
-    <string name="app_name">RelTime</string>
-
-    <!-- Custom end -->
-
 
     <string name="first_launch_ok">Registration successful</string>
     <string name="error">Error</string>
@@ -14,8 +9,9 @@
     <string name="dialer_null_on_new_intent">Application not ready</string>
 
 
-
-    <string name="pref_echo_canceller_calibration_key">pref_echo_canceller_calibration_key</string>
+	<string name="no_phone_numbers">No phone numbers found for %s</string>
+	<string name="filter_contacts">Filter contacts</string>
+	<string name="title_numbers_dialog">%s\'s phone numbers</string>
     <string name="pref_echo_canceller_calibration">Echo calibration</string>
     <string name="pref_video_use_front_camera_title">Use front camera</string>
 	<string name="pref_video">Video</string>
@@ -44,8 +40,6 @@
     <string name="pref_ilbc_summary">iLBC might be unavailable depending on ARM processor and Android OS version.</string>
     <string name="pref_echo_cancellation">Echo cancellation</string>
     <string name="pref_autostart">Start at boot time</string>
-    <string name="outcall_chooser_cellular">Cellular</string>
-    <string name="outcall_chooser_text">Choose application to call %s</string>
     <string name="pref_enable_outbound_proxy">Outbound proxy</string>
     <string name="pref_codec_pcma">pcma</string>
     <string name="pref_codec_pcmu">pcmu</string>