From f80a6fa587d5c663111dce9c93673c8069ed92c9 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 4 Jun 2012 15:36:54 +0200
Subject: [PATCH] clarify help messages

---
 res/values/strings.xml                                      | 4 ++--
 src/org/linphone/LinphonePreferencesSIPAccountActivity.java | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 63a57e0f9..39a44158e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -259,6 +259,6 @@
 <string name="wizard_confirmation">Confirmation</string>
 <string name="wizard_verify_account">Check</string>
 
-<string name="pref_help_proxy">Redirect registrar packets to this server</string>
-<string name="pref_help_outbound_proxy">Redirect all traffic to proxy server</string>
+<string name="pref_help_proxy">SIP proxy hostname or ip address (optional)</string>
+<string name="pref_help_outbound_proxy">Route all calls through SIP proxy</string>
 </resources>
diff --git a/src/org/linphone/LinphonePreferencesSIPAccountActivity.java b/src/org/linphone/LinphonePreferencesSIPAccountActivity.java
index 1de114bf8..46c63074b 100644
--- a/src/org/linphone/LinphonePreferencesSIPAccountActivity.java
+++ b/src/org/linphone/LinphonePreferencesSIPAccountActivity.java
@@ -57,7 +57,8 @@ public class LinphonePreferencesSIPAccountActivity extends PreferenceActivity {
     	username.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
     	username.setTitle(getString(R.string.pref_username));
     	username.setPersistent(true);
-    	username.setDialogMessage("Example: toto if your account is toto@sip.linphone.org");
+    	//TODO make it translatable, use john instead of toto.
+    	//username.setDialogMessage("Example: toto if your account is toto@sip.linphone.org");
     	username.setKey(getString(R.string.pref_username_key) + getAccountNumber(n));
     	username.setOnPreferenceChangeListener(preferenceChangedListener);
     	
@@ -71,7 +72,8 @@ public class LinphonePreferencesSIPAccountActivity extends PreferenceActivity {
     	domain.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
     	domain.setTitle(getString(R.string.pref_domain));
     	domain.setPersistent(true);
-    	domain.setDialogMessage("Example: sip.linphone.org if your account is toto@sip.linphone.org");
+    	//TODO make it translatable, use john instead of toto.
+    	//domain.setDialogMessage("Example: sip.linphone.org if your account is toto@sip.linphone.org");
     	domain.setKey(getString(R.string.pref_domain_key) + getAccountNumber(n));
     	domain.setOnPreferenceChangeListener(preferenceChangedListener);