diff --git a/res/values-FR/custom.xml b/res/values-FR/custom.xml
index c6281c118..4183910ac 100644
--- a/res/values-FR/custom.xml
+++ b/res/values-FR/custom.xml
@@ -10,6 +10,13 @@
 	<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\n 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="tunnel_host"></string>
     <string name="default_tunnel_mode_entry_value">@string/tunnel_mode_entry_value_disabled</string>
 </resources>
diff --git a/res/values-FR/strings.xml b/res/values-FR/strings.xml
index 57a64ec92..cd8929fa2 100644
--- a/res/values-FR/strings.xml
+++ b/res/values-FR/strings.xml
@@ -152,8 +152,6 @@
 	<string name="cont">Continuer</string>
 	<string name="never_remind">Ne plus me le rapeller</string>
 	<string name="config_error">%s, voulez-vous aller dans les paramètres ?</string>
-	<string name="initial_config_error">&lt;P ALIGN=CENTER&gt;Aucun compte SIP configuré, voulez-vous aller dans les paramètres ?&lt;br/&gt;&lt;br/&gt; Besoin d\'aide ?&lt;br/&gt; &quot;http://www.linphone.org/m/help&quot;&lt;/p&gt;</string>
-	<string name="first_launch_message">&lt;P ALIGN=CENTER&gt;Bienvenue dans le téléphone SIP Linphone&lt;br/&gt;&lt;br/&gt; Si vous êtes nouveau, jetez un oeil à &lt;br/&gt; &quot;http://www.linphone.org/m/help&quot;&lt;/p&gt; </string>
 	<string name="ec_calibration_launch_message">Démarrage de la calibration de l\'annulateur d\'écho</string>
 	<string name="warning_already_incall">Impossible de démarrer un nouvel appel, un appel est en cours</string>
 	<string name="tab_history">Historique</string>
@@ -271,12 +269,6 @@
 	<string name="content_description_mark"></string>
 	
 	<string name="setup_title">Assistant de configuration des comptes</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_apply">Appliquer</string>
 	<string name="setup_username_hint">nom d\'utilisateur</string>
 	<string name="setup_password_hint">mot de passe</string>
diff --git a/res/values-RU/custom.xml b/res/values-RU/custom.xml
index 33ce90630..f920a5a65 100755
--- a/res/values-RU/custom.xml
+++ b/res/values-RU/custom.xml
@@ -10,6 +10,13 @@
 	<string name="notification_register_failure">Ошибка регистрации в %s</string>
 	<string name="about_text">Linphone %s SIP (rfc 3261) совместимый телефон под GPL V2 лицензией\n http://www.linphone.org\n\nИнструкции\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="tunnel_host"></string>
     <string name="default_tunnel_mode_entry_value">@string/tunnel_mode_entry_value_disabled</string>
 </resources>
diff --git a/res/values-RU/strings.xml b/res/values-RU/strings.xml
index 8e399dde9..a25ef7733 100755
--- a/res/values-RU/strings.xml
+++ b/res/values-RU/strings.xml
@@ -197,8 +197,6 @@
 	<string name="cont">Продолжить</string>
 	<string name="never_remind">Больше не напоминать</string>
 	<string name="config_error">%s, хотите ли вы перейти к настройкам ?</string>
-	<string name="initial_config_error">&lt;P ALIGN=CENTER&gt;Учётная запись SIP не настроена, хотите ли вы перейти к настройкам page ?&lt;br/&gt;&lt;br/&gt; Нужна помощь ?&lt;br/&gt; &quot;http://www.linphone.org/m/help&quot;&lt;/p&gt;</string>
-	<string name="first_launch_message">&lt;P ALIGN=CENTER&gt;Добро пожаловать в SIP телефон Linphone&lt;br/&gt;&lt;br/&gt; Если Вы новичок SIP, посетите&lt;br/&gt; &quot;http://www.linphone.org/m/help&quot;&lt;/p&gt; </string>
 	<string name="ec_calibration_launch_message">Начинаем автоматическую настройку шумоподавления</string>
 	<string name="warning_already_incall">Невозможно начать новый звонок, звонок уже идёт</string>
 	<string name="tab_history">История</string>
@@ -319,12 +317,6 @@
 	<string name="content_description_mark"></string>
 	
 	<string name="setup_title">Помощник Настройки учётной записи</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_apply">Применить</string>
 	<string name="setup_username_hint">имя пользователя</string>
 	<string name="setup_password_hint">пароль</string>
diff --git a/res/values/custom.xml b/res/values/custom.xml
index ad865d8d9..af608c059 100644
--- a/res/values/custom.xml
+++ b/res/values/custom.xml
@@ -15,6 +15,13 @@
 	<string name="notification_register_failure">Fails to register to %s</string>
 	<string name="about_text">Linphone %s SIP (rfc 3261) compatible phone under GNU Public License V2\n http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/m/help\n\n© 2011 Belledonne Communications</string>
 
+	<string name="setup_welcome">This assistant will help you to use a SIP account for your calls.</string>
+	<string name="setup_create_account">Create an account on linphone.org</string>
+	<string name="setup_login_linphone">I already have a linphone.org account</string>
+	<string name="setup_login_generic">I already have a SIP account</string>
+	<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="tunnel_host"></string>
 </resources>
  
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d6dfa7106..69d670876 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -197,8 +197,6 @@
 	<string name="cont">Continue</string>
 	<string name="never_remind">Never remind me</string>
 	<string name="config_error">%s, do you want to go to the settings page ?</string>
-	<string name="initial_config_error">&lt;P ALIGN=CENTER&gt;No SIP account has been configured yet, do you want to go to the settings page ?&lt;br/&gt;&lt;br/&gt; Need help ?&lt;br/&gt; &quot;http://www.linphone.org/m/help&quot;&lt;/p&gt;</string>
-	<string name="first_launch_message">&lt;P ALIGN=CENTER&gt;Welcome to Linphone SIP phone&lt;br/&gt;&lt;br/&gt; If you are new to SIP, have a look at&lt;br/&gt; &quot;http://www.linphone.org/m/help&quot;&lt;/p&gt; </string>
 	<string name="ec_calibration_launch_message">Starting echo cancelation audio calibration </string>
 	<string name="warning_already_incall">Cannot initiate a new call because a call is already engaged</string>
 	<string name="tab_history">History</string>
@@ -319,12 +317,6 @@
 	<string name="content_description_mark"></string>
 	
 	<string name="setup_title">Account Setup Assistant</string>
-	<string name="setup_welcome">This assistant will help you to use a SIP account for your calls.</string>
-	<string name="setup_create_account">Create an account on linphone.org</string>
-	<string name="setup_login_linphone">I already have a linphone.org account</string>
-	<string name="setup_login_generic">I already have a SIP account</string>
-	<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_apply">Apply</string>
 	<string name="setup_username_hint">username</string>
 	<string name="setup_password_hint">password</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 16c231ede..03474fd02 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <Preference 
+    <Preference
 	    android:title="@string/menu_about"
 	    android:key="@string/menu_about_key"/>