From b0b8564a28d11e69646e2c67ae707e653e4bb75c Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 11 Jun 2013 15:43:28 +0200
Subject: [PATCH] Move setup_username_hint to custom

---
 res/values-FR/custom.xml  | 4 +++-
 res/values-FR/strings.xml | 1 -
 res/values/custom.xml     | 4 +++-
 res/values/strings.xml    | 1 -
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/res/values-FR/custom.xml b/res/values-FR/custom.xml
index 4183910ac..1fc54f5d0 100644
--- a/res/values-FR/custom.xml
+++ b/res/values-FR/custom.xml
@@ -16,8 +16,10 @@
 	<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>
 </resources>
- 
\ No newline at end of file
+ 
diff --git a/res/values-FR/strings.xml b/res/values-FR/strings.xml
index cd8929fa2..6f902ca3b 100644
--- a/res/values-FR/strings.xml
+++ b/res/values-FR/strings.xml
@@ -270,7 +270,6 @@
 	
 	<string name="setup_title">Assistant de configuration des comptes</string>
 	<string name="setup_apply">Appliquer</string>
-	<string name="setup_username_hint">nom d\'utilisateur</string>
 	<string name="setup_password_hint">mot de passe</string>
 	<string name="setup_domain_hint">domaine</string>
 	<string name="setup_password_confirm_hint">confirmez le mot de passe</string>
diff --git a/res/values/custom.xml b/res/values/custom.xml
index af608c059..b96131b80 100644
--- a/res/values/custom.xml
+++ b/res/values/custom.xml
@@ -22,6 +22,8 @@
 	<string name="setup_linphone_account_hint">Enter your linphone.org username and password</string>
 	<string name="setup_general_account_hint">Enter your SIP account username, password and domain</string>
 	
+        <string name="setup_username_hint">username</string>
+
     <string name="tunnel_host"></string>
 </resources>
- 
\ No newline at end of file
+ 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 69d670876..74c9b9f7a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -318,7 +318,6 @@
 	
 	<string name="setup_title">Account Setup Assistant</string>
 	<string name="setup_apply">Apply</string>
-	<string name="setup_username_hint">username</string>
 	<string name="setup_password_hint">password</string>
 	<string name="setup_domain_hint">domain</string>
 	<string name="setup_password_confirm_hint">confirm password</string>