# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1274274536 -7200
# Node ID 5a09712de41cc88b192f4db1dbcaa4006840a781
# Parent  a325803b7a4b4367657d0a494c3b5c0fcfdab684# Parent  3691532291fada2c9c4ee0e903bf484f57649f20
Merge

diff -r a325803b7a4b -r 5a09712de41c .hgtags
--- a/.hgtags	Wed May 19 14:42:05 2010 +0200
+++ b/.hgtags	Wed May 19 15:08:56 2010 +0200
@@ -2,3 +2,4 @@
 bccd99644eac57bb19a239697704db089dd585f7 0.1
 af35b5109f172411de5798991e89919b7ed5cf85 0.1.1
 25f6fded204ab05c9f89556cbc08cd191e0f2c52 0.1.2
+c77d496146964d9239b4c45446d99b960415a4a6 0.1.3
diff -r a325803b7a4b -r 5a09712de41c AndroidManifest.xml
--- a/AndroidManifest.xml	Wed May 19 14:42:05 2010 +0200
+++ b/AndroidManifest.xml	Wed May 19 15:08:56 2010 +0200
@@ -29,7 +29,9 @@
 					android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
 			</intent-filter>
 		</activity>
-		<activity android:name=".ui.ChangeStatus" android:label="@string/ChangeStatusActTitle">
+		<activity android:name=".ui.ChangeStatus" android:label="@string/ChangeStatusActTitle"
+		    android:launchMode="singleTask"
+		    android:windowSoftInputMode="stateHidden" >
 			<intent-filter android:label="Beem Connection">
 				<action
 					android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
diff -r a325803b7a4b -r 5a09712de41c res/drawable/ic_menu_add.png
Binary file res/drawable/ic_menu_add.png has changed
diff -r a325803b7a4b -r 5a09712de41c res/drawable/ic_menu_close_clear_cancel.png
Binary file res/drawable/ic_menu_close_clear_cancel.png has changed
diff -r a325803b7a4b -r 5a09712de41c res/drawable/ic_menu_manage.png
Binary file res/drawable/ic_menu_manage.png has changed
diff -r a325803b7a4b -r 5a09712de41c res/layout/changestatus.xml
--- a/res/layout/changestatus.xml	Wed May 19 14:42:05 2010 +0200
+++ b/res/layout/changestatus.xml	Wed May 19 15:08:56 2010 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="fill_parent"
+	android:layout_width="fill_parent" android:layout_height="wrap_content"
 	android:orientation="vertical">
 	<RelativeLayout android:orientation="vertical"
 		android:layout_width="fill_parent" android:layout_height="fill_parent"
@@ -13,30 +13,36 @@
 			android:drawSelectorOnTop="true" android:layout_below="@id/ChangeStatusTypeLabel" />
 		<TextView android:id="@+id/ChangeStatusMessageLabel"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:text="@string/ChangeStatusMessage" style="@style/Label"
-			android:layout_below="@id/ChangeStatusSpinner" />
+			android:layout_below="@id/ChangeStatusSpinner"
+			style="@style/Label"
+			android:inputType="textShortMessage|textCapSentences|textAutoCorrect|textMultiLine|textImeMultiLine"
+			android:imeOptions="actionDone"
+			android:selectAllOnFocus="true"
+			/>
 		<EditText android:id="@+id/ChangeStatusMessage"
 			android:inputType="textShortMessage|textAutoCorrect"
 			android:imeOptions="actionDone" android:layout_width="fill_parent"
 			android:layout_height="wrap_content" android:layout_below="@id/ChangeStatusMessageLabel"
 			android:layout_marginBottom="18dp" />
 		<LinearLayout android:id="@+id/ChangeStatusButtons"
-			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:orientation="horizontal" android:layout_below="@id/ChangeStatusMessage"
-			android:layout_alignParentBottom="true">
-			<Button android:id="@+id/ChangeStatusOk" android:layout_width="fill_parent"
-				android:layout_height="wrap_content" android:layout_weight="1"
+			android:layout_height="wrap_content" android:layout_width="fill_parent"
+			android:layout_below="@id/ChangeStatusMessage"
+			android:orientation="horizontal">
+			<Button android:id="@+id/ChangeStatusOk"
+				android:layout_width="fill_parent" android:layout_height="wrap_content"
+				android:layout_weight="1"
 				android:text="@string/UpdateButton" android:textStyle="bold"
 				android:textSize="18sp" android:textColor="#333333" />
 			<Button android:id="@+id/ChangeStatusClear"
 				android:layout_width="fill_parent" android:layout_height="wrap_content"
-				android:layout_weight="1" android:text="@string/ClearButton"
+				android:layout_weight="1"
+				android:text="@string/ClearButton"
 				android:textStyle="bold" android:textColor="#333333"
 				android:textSize="18sp" />
 		</LinearLayout>
 		<Button android:id="@+id/OpenContactList" android:layout_width="fill_parent"
 			android:layout_height="wrap_content" android:text="@string/OpenContactList"
 			android:layout_below="@+id/ChangeStatusButtons" android:textStyle="bold" android:textColor="#333333"
-				android:textSize="18sp" />
+			android:textSize="18sp" />
 	</RelativeLayout>
 </ScrollView>
diff -r a325803b7a4b -r 5a09712de41c res/layout/preferences.xml
--- a/res/layout/preferences.xml	Wed May 19 14:42:05 2010 +0200
+++ b/res/layout/preferences.xml	Wed May 19 15:08:56 2010 +0200
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- 
+    The format of the preference key is defined in
+    src/com/beem/project/beem/BeemApplication.java
+    Basically it is just a simple name like account_username.
+    TODO: There is still a lot of keys to convert
+-->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
 	android:shouldDisableView="true" android:selectable="true">
 	<PreferenceCategory android:title="@string/general_preferences">
@@ -31,11 +37,11 @@
 	<PreferenceCategory android:title="@string/user_preferences">
 		<EditTextPreference android:singleLine="true"
 			android:summary="@string/SettingsText" android:title="@string/settings_account_username"
-			android:key="settings_key_account_username" android:hint="@string/login_username_info_default"
+			android:key="account_username" android:hint="@string/login_username_info_default"
 			android:inputType="textEmailAddress" />
 		<EditTextPreference android:name="password"
 			android:singleLine="true" android:password="true" android:summary="@string/SettingsPassword"
-			android:title="@string/settings_account_password" android:key="settings_key_account_password" />
+			android:title="@string/settings_account_password" android:key="account_password" />
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/user_preferences_advanced">
 		<EditTextPreference android:key="settings_key_resource"
diff -r a325803b7a4b -r 5a09712de41c res/menu/contact_list.xml
--- a/res/menu/contact_list.xml	Wed May 19 14:42:05 2010 +0200
+++ b/res/menu/contact_list.xml	Wed May 19 15:08:56 2010 +0200
@@ -2,9 +2,13 @@
 	<item android:id="@+id/contact_list_menu_add_contact"
 		android:visible="true"
 		android:title="@string/contact_list_menu_add_contact"
-		android:icon="@android:drawable/ic_menu_add" />
+		android:icon="@drawable/ic_menu_add" />
 	<item android:id="@+id/contact_list_menu_settings"
 		android:visible="true"
 		android:title="@string/contact_list_menu_settings"
-		android:icon="@android:drawable/ic_menu_manage" />
+		android:icon="@drawable/ic_menu_manage" />
+	<item android:id="@+id/menu_disconnect"
+		android:visible="true"
+		android:title="@string/contact_list_menu_disconnect"
+		android:icon="@drawable/ic_menu_close_clear_cancel" />
 </menu>
diff -r a325803b7a4b -r 5a09712de41c res/values-de/strings.xml
--- a/res/values-de/strings.xml	Wed May 19 14:42:05 2010 +0200
+++ b/res/values-de/strings.xml	Wed May 19 15:08:56 2010 +0200
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<!-- Generic terms -->
 	<string name="app_name">Beem</string>
 	<string name="OkButton">Ok</string>
 	<string name="ClearButton">Löschen</string>
 	<string name="CancelButton">Abbrechen</string>
 	<string name="AcceptButton">Authorisieren</string>
 	<string name="RefuseButton">Ablehnen</string>
+	
+	<string name="Password">Passwort</string>
 
 	<!--  Beem class -->
 	<string name="BeemJabberID">Jabber ID</string>
@@ -21,8 +24,7 @@
 	<!--  Preferences informations -->
 	<string name="PreferenceStatus">Status</string>
 	<string name="PreferenceStatusText">status_text</string>
-	<string name="PreferenceIsConfigured">preference_is_configured
-	</string>
+	<string name="PreferenceIsConfigured">preference_is_configured	</string>
 
 	<!-- ContactListSettings class -->
 	<string name="CLSServerConnection">Server Verbindung</string>
@@ -57,7 +59,6 @@
 	<string name="ChangeStatusType">Mein Status</string>
 	<string name="ChangeStatusMessage">Meine persönliche Nachricht</string>
 	<string name="OpenContactList">Kontaktliste öffnen</string>
-
 	
 	<string name="MenuAddContact">Kontakt hinzufügen</string>
 	<string name="MenuAccountAbout">Beem Project</string>
@@ -88,6 +89,44 @@
 	<string name="SettingsPriorityTitle">Priorität</string>
 	<string name="SettingsResourceSummary">XMPP Ressource des Clients einstellen</string>
 	<string name="SettingsPrioritySummary">Priorität des Clients einstellen</string>
+	<string name="contact_list_preferences">Kontaktliste</string>
+	<string name="contact_list_preferences_sum">Anzeigeoptionen der Kontaktliste	</string>
+	<string name="CLP_hide_groups">Gruppen verstecken</string>	
+	<string name="CLP_hide_groups_sum">Aktivieren, um Gruppen zu verstecken</string>
+	<string name="CLP_hidden_contact">Kontakte verstecken</string>
+	<string name="CLP_hidden_contact_sum">Aktivieren, um Kontakte zu verstecken, die offline sind	</string>
+	<string name="settings_account_username">Benutzername</string>
+	<string name="login_username_info_default">beem@beem-project.com</string>
+	<string name="settings_account_password">Passwort</string>
+	<string name="settings_account_server">Server</string>
+	<string name="settings_account_port">Port</string>
+	<string name="settings_advanced_service_behaviour">Verhalten des Dienstes</string>
+	<string name="settings_advanced_sum">Erweiterte Einstellungen für fortgeschrittene Benutzer</string>
+	<string name="settings_xmpp_server">Adresse</string>
+	<string name="comments_xmpp_server">example.com</string>
+	<string name="settings_xmpp_port">Port</string>
+	<string name="settings_xmpp_use_tls">Verwende SSL/TLS</string>
+	<string name="settings_reco_delay">Verzögerung bei der Wiederverbindung</string>
+	<string name="comments_xmpp_port">Standard: 5222</string>
+	<string name="settings_proxy_sum">Einstellungen für das Benutzen eines Proxyservers</string>
+	<string name="settings_proxy_use">Benutze einen Proxyserver</string>
+	<string name="settings_proxy_type_prompt">Art des Proxyservers wählen</string>
+	<string name="settings_proxy_server">Server</string>
+	<string name="settings_proxy_port">Port</string>
+	<string name="comments_proxy_port">Standard: 1080</string>
+	<string name="settings_proxy_username">Benutzername</string>
+	<string name="settings_proxy_password">Passwort</string>
+	<string name="away_chk_title">Aktiviere automatische Abwesenheit</string>
+	<string name="away_chk_sum">Status auf Abwesend wenn Bildschirm aus</string>
+	<string name="away_message_title">Abwesendheitsnachricht</string>
+	<string name="away_message_sum">Angezeigte Abwesendheitsnachricht</string>
+	<string name="away_message_hint">Ich bin abwesend, mein Telefonbildschirm ist aus</string>
+	<string name="notification_preferences">Benachrichtigungseinstellungen</string>
+	<string name="notification_disable_vibrate_title">Vibrieren</string>
+	<string name="notification_disable_vibrate_sum">Deaktivieren Sie vibriert bei eingehenden Nachrichten</string>
+	<string name="notification_snd_title">Nachrichtensignalton</string>
+	<string name="notification_snd_sum">Lege den Signalton für eingehende Nachrichten fest</string>
+
 	
 	<!-- Subscription class -->
 	<string name="SubscriptAccept">Zustimmung angenommen</string>
@@ -135,17 +174,13 @@
 	<string name="login_menu_settings">Einstellungen</string>
 	<string name="login_menu_about">Über</string>
 	<string name="login_about_title">Beem %s - Über</string>
-	<string name="login_about_msg">
-		Beem ist ein EPITECH Innovative Projekt. Besuche uns auf
-		http://www.beem-project.com !
-	</string>
+	<string name="login_about_msg">		Beem ist ein EPITECH Innovative Projekt. Besuche uns auf		http://www.beem-project.com !	</string>
 	<string name="login_about_button">Schließen</string>
 	<string name="login_settings_button">Einstellungen</string>
 	<string name="login_login_button">Anmelden</string>
 	<string name="login_login_progress">Verbinden. Bitte warten...</string>
 	<string name="login_max_retry">Maximaler Wiederholungsversuch</string>
-	<string name="login_error_msg">Leider trat ein Fehler auf.\n\nFehler 
-		Detail:\n%s</string>
+	<string name="login_error_msg">Leider trat ein Fehler auf.\n\nFehler 		Detail:\n%s</string>
 	<string name="login_menu_login">Anmelden</string>
 	<string name="login_no_connectivity">Keine Internetverbindung gefunden</string>
 	<string name="login_start_msg">Konfiguration der Einstellungen im Menü</string>
@@ -173,43 +208,12 @@
 	<string name="settings_tab_tag_proxy">edit_settings_tab_proxy</string>
 	<string name="settings_tab_label_proxy">Proxy</string>
 
-	<!-- EditSettings Activity General Preferences Tabs -->
-	<string name="contact_list_preferences">Kontaktliste</string>
-	<string name="contact_list_preferences_sum">Anzeigeoptionen der Kontaktliste
-	</string>
+
+	<!-- wizard activities -->
+	<string name="account_wizard_text1">Du hast noch keinen Jabberaccount konfiguriert. Wähle eine der folgenden Optionen:</string>
 	
-	<string name="CLP_hide_groups">Gruppen verstecken</string>
-	<string name="CLP_hide_groups_sum">Aktivieren, um Gruppen zu verstecken</string>
-	<string name="CLP_hidden_contact">Kontakte verstecken</string>
-	<string name="CLP_hidden_contact_sum">Aktivieren, um Kontakte zu verstecken, die offline sind
-	</string>
-
-	<!-- EditSettings Activity Account tab -->
-	<string name="settings_account_username">Benutzername</string>
-	<string name="login_username_info_default">beem@beem-project.com</string>
-	<string name="settings_account_password">Passwort</string>
-	<string name="settings_account_server">Server</string>
-	<string name="settings_account_port">Port</string>
-
-	<!-- EditSettings Activity Advanced Options tab -->
-	<string name="settings_advanced_service_behaviour">Verhalten des Dienstes</string>
-	<string name="settings_advanced_sum">Erweiterte Einstellungen für fortgeschrittene Benutzer</string>
-	<string name="settings_xmpp_server">Adresse</string>
-	<string name="comments_xmpp_server">example.com</string>
-	<string name="settings_xmpp_port">Port</string>
-	<string name="settings_xmpp_use_tls">Verwende SSL/TLS</string>
-	<string name="settings_reco_delay">Verzögerung bei der Wiederverbindung</string>
-	<string name="comments_xmpp_port">Standard: 5222</string>
-
-	<!-- EditSettings Activity Proxy tab -->
-	<string name="settings_proxy_sum">Einstellungen für das Benutzen eines Proxyservers</string>
-	<string name="settings_proxy_use">Benutze einen Proxyserver</string>
-	<string name="settings_proxy_type_prompt">Art des Proxyservers wählen</string>
-	<string name="settings_proxy_server">Server</string>
-	<string name="settings_proxy_port">Port</string>
-	<string name="comments_proxy_port">Standard: 1080</string>
-	<string name="settings_proxy_username">Benutzername</string>
-	<string name="settings_proxy_password">Passwort</string>
+	<string name="account_wizard_configure_account">Ich habe bereits einen Jabberaccount, den ich benutzen will</string>
+	<string name="account_wizard_create_account">Ich möchte einen neuen Account registrieren</string>
 
 	<!-- Create an account Activity -->
 	<string name="create_account_instr_dialog_title">Konto erstellen - Anweisungen</string>
@@ -236,8 +240,7 @@
 	<string name="userinfo_label_block">Sperren</string>
 	<string name="userinfo_label_delete">Löschen</string>
 	<string name="userinfo_resend">Zustimmung erneut senden</string>
-	<string name="userinfo_sure2delete">Bist du sicher, dass du diesen Kontakt löschen willst ?
-	</string>
+	<string name="userinfo_sure2delete">Bist du sicher, dass du diesen Kontakt löschen willst ?	</string>
 	<string name="userinfo_yes">Ja</string>
 	<string name="userinfo_no">Nein</string>
 	<string name="userinfo_sureresend">Bist du sicher, dass du die Einladung erneut senden willst ?</string>
@@ -252,6 +255,10 @@
 	<string name="chat_dialog_change_chat_title">Offene Chats</string>
 	<string name="chat_menu_close_chat">Diesen Chat schließen</string>
 	<string name="chat_no_more_chats">Keine weiteren aktiven Chats</string>
+	<string name="chat_state_composing">schreibt gerade</string>
+	<string name="chat_state_gone">hat die Unterhaltung verlassen</string>
+	<string name="chat_state_active">verfolgt die Unterhaltung</string>
+	<string name="chat_state_inactive">macht etwas anderes</string>
 
 	<string name="contact_status_msg_available">Online</string>
 	<string name="contact_status_msg_available_chat">Bereit zum Chatten</string>
diff -r a325803b7a4b -r 5a09712de41c res/values-fr/strings.xml
--- a/res/values-fr/strings.xml	Wed May 19 14:42:05 2010 +0200
+++ b/res/values-fr/strings.xml	Wed May 19 15:08:56 2010 +0200
@@ -21,12 +21,6 @@
 	<string name="BeemServiceCreated">BeemService Créé</string>
 	<string name="BeemServiceDestroyed">BeemService détruit</string>
 
-	<!--  Preferences informations -->
-	<string name="PreferenceStatus">Status</string>
-	<string name="PreferenceStatusText">status_text</string>
-	<string name="PreferenceIsConfigured">preference_is_configured
-	</string>
-
 	<!-- ContactListSettings class -->
 	<string name="CLSServerConnection">Connexion au serveur</string>
 	<string name="CLSUserid">Id utilisateur:</string>
@@ -249,6 +243,7 @@
 	 -->
 	<string name="contact_list_menu_add_contact">Ajouter un contact</string>
 	<string name="contact_list_menu_settings">Paramètres</string>
+	<string name="contact_list_menu_disconnect">Se déconnecter</string>
 	<string name="contact_list_all_contact">Tous les contacts</string>
 	<string name="contact_list_no_group">Aucun groupe</string>
 
diff -r a325803b7a4b -r 5a09712de41c res/values-ru/arrays.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/values-ru/arrays.xml	Wed May 19 15:08:56 2010 +0200
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string-array name="proxy_types">
+		<item>HTTP</item>
+		<item>SOCKS4</item>
+		<item>SOCKS5</item>
+	</string-array>
+	<string-array name="status_types">
+		<item name="AvailableForChat">Готов пообщаться</item>
+		<item name="Available">Доступен</item>
+		<item name="Busy">Занят</item>
+		<item name="Away">Oтсутствии</item>
+		<item name="Unavailable">Недоступен</item>
+		<item name="Disconnected">Не в сети</item>
+	</string-array>
+	<string-array name="privacy_list_select_dialog">
+		<item name="@string/privacy_list_select_dialog_buddies">Собеседники</item>
+		<item name="@string/privacy_list_select_dialog_groups">Groups</item>
+		<item name="@string/privacy_list_select_dialog_delete">Delete</item>
+	</string-array>
+	<string-array name="loganim_state">
+		<item name="@string/loganim_connecting">Соединение...</item>
+		<item name="@string/loganim_authenticating">Аутентификация...</item>
+		<item name="@string/loganim_login_success">Логин успешной</item>
+		<item name="@string/loganim_login_failed">Не удалось войти в сеть</item>
+	</string-array>
+</resources>
diff -r a325803b7a4b -r 5a09712de41c res/values-ru/strings.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/values-ru/strings.xml	Wed May 19 15:08:56 2010 +0200
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<!-- Generic terms -->
+<string name="app_name">Beem</string>
+<string name="OkButton">ОК</string>
+<string name="ClearButton">Очистить</string>
+<string name="CancelButton">Отмена</string>
+<string name="AcceptButton">Разрешить</string>
+<string name="RefuseButton">Отказать</string>
+<string name="JabberID">JID</string>
+<string name="Password">Пароль</string>
+
+<!--  Beem class -->
+<string name="BeemJabberID">JID</string>
+
+<!--  BeemApplication class -->
+<string name="BeemApplicationConnect">Соединяемся...</string>
+
+<!--  BeemService class -->
+<string name="BeemServiceDescription">Использовать сервис Beem</string>
+<string name="BeemServiceCreated"></string>
+<string name="BeemServiceDestroyed"></string>
+
+<!--  Preferences informations -->
+<string name="PreferenceStatus">Статус</string>
+<string name="PreferenceStatusText"></string>
+<string name="PreferenceIsConfigured">preference_is_configured
+</string>
+
+<!-- ContactListSettings class -->
+<string name="CLSServerConnection">Соединение</string>
+<string name="CLSUserid">Имя пользователя:</string>
+<string name="CLSPassword">Пароль:</string>
+<string name="CLSService">Сервер:</string>
+<string name="CLSHostPort">Порт:</string>
+<string name="CLSProxyInfo">Прокси</string>
+<string name="CLSLogin">Имя пользователя:</string>
+<string name="CLSOkButton">ОК</string>
+
+<!--  ContactDialog class -->
+<string name="CDChat">Написать</string>
+<string name="CDCall">Повонить</string>
+<string name="CDInfos">Настройки</string>
+
+<!-- AddContact class -->
+<string name="AddCActTitle">Добавление контакта</string>
+
+<string name="AddCLogin">Имя пользователя</string>
+<string name="AddCAlias">Псевдоним</string>
+<string name="AddCGroup">Группа</string>
+<string name="AddCOkButton">Добавить</string>
+<string name="AddCContactAdded">Контакт добавлен</string>
+<string name="AddCContactAddedError">При добавлении контакта возникла ошибка</string>
+<string name="AddCContactAddedLoginError">При выполнении входа возникла ошибка</string>
+<string name="AddCBadForm"></string>
+<string name="AddCContactAlready">Контакт уже добавлен</string>
+
+<!--  ChangeStatus class -->
+<string name="ChangeStatusActTitle">Изменение статуса</string>
+<string name="ChangeStatusType">Мой статус</string>
+<string name="ChangeStatusMessage">Персональное сообщение</string>
+<string name="OpenContactList">Открыть список контактов</string>
+
+<string name="MenuAddContact">Добавить новый контакт</string>
+<string name="MenuAccountAbout">О проекте Beem</string>
+<string name="MenuAccountCreate">Создать аккаунт</string>
+<string name="MenuConnection">Изменить аккаунт</string>
+<string name="ChangeStatusOk">Обновляем статус...</string>
+<string name="ChangeStatusNoChange">Ничего не поменялось</string>
+
+<!-- Settings class -->
+<string name="SettingsText">Имя пользователя</string>
+<string name="SettingsPassword">Пароль</string>
+<string name="SettingsProxy">Прокси</string>
+<string name="SettingsProxyProxy">Использовать прокси</string>
+<string name="SettingsProxySummary"></string>
+<string name="SettingsProxyType">Протокол</string>
+<string name="SettingsProxyTypeSummary">Выберите тип прокси</string>
+<string name="SettingsProxyServer">Сервер</string>
+<string name="SettingsProxyPort">Порт</string>
+<string name="SettingsProxyUser"></string>
+<string name="SettingsProxyPassword"></string>
+<string name="SettingsAdvanced">Дополнительно</string>
+<string name="SettingsAdvancedOptions">Дополнительные настройки сервера</string>
+<string name="SettingsAdvancedRecoDelay">Изменить задержку повторного соединения</string>
+<string name="SettingsAdvancedSpecOpt"></string>
+<string name="SettingsAdvancedAddOpt">Сервер</string>
+<string name="SettingsAdvancedPortOpt">Порт</string>
+<string name="SettingsResourceTitle">Ресурс</string>
+<string name="SettingsPriorityTitle">Приоритет</string>
+<string name="SettingsResourceSummary"></string>
+<string name="SettingsPrioritySummary"></string>
+<string name="contact_list_preferences">Список контактов</string>
+<string name="contact_list_preferences_sum">A set of display options for your buddy list
+</string>
+<string name="CLP_hide_groups">Скрывать группы</string>
+<string name="CLP_hide_groups_sum"></string>
+<string name="CLP_hidden_contact">Скрывать оффлайн-контакты</string>
+<string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
+</string>
+<string name="settings_account_username">Имя польозвателя</string>
+<string name="login_username_info_default"></string>
+<string name="settings_account_password">Пароль</string>
+<string name="settings_account_server">Сервер</string>
+<string name="settings_account_port">Порт</string>
+<string name="settings_advanced_service_behaviour"></string>
+<string name="settings_advanced_sum"></string>
+<string name="settings_xmpp_server">Сервер</string>
+<string name="comments_xmpp_server"></string>
+<string name="settings_xmpp_port">Порт</string>
+<string name="settings_xmpp_use_tls">Требовать SSL/TLS</string>
+<string name="settings_reco_delay"></string>
+<string name="comments_xmpp_port">По умолчанию 5222</string>
+<string name="settings_proxy_sum"></string>
+<string name="settings_proxy_use">Соединяться через прокси</string>
+<string name="settings_proxy_type_prompt">Выберите тип проси</string>
+<string name="settings_proxy_server">Сервер</string>
+<string name="settings_proxy_port">Порт</string>
+<string name="comments_proxy_port">По умолчанию 1080</string>
+<string name="settings_proxy_username">Имя пользователя</string>
+<string name="settings_proxy_password">Пароль</string>
+<string name="away_chk_title"></string>
+<string name="away_chk_sum"></string>
+<string name="away_message_title"></string>
+<string name="away_message_sum"></string>
+<string name="away_message_hint"></string>
+<string name="notification_preferences">Настройка оповещений</string>
+<string name="notification_disable_vibrate_title">Вибрация</string>
+<string name="notification_disable_vibrate_sum">Отключить вибрировать на входящие сообщения</string>
+<string name="notification_snd_title">Сигнал сообщений</string>
+<string name="notification_snd_sum"></string>
+
+
+<!-- Subscription class -->
+<string name="SubscriptAccept"></string>
+<string name="SubscriptError"></string>
+<string name="SubscriptRefused"></string>
+<string name="SubscriptText"></string>
+<string name="SubscriptTitle"></string>
+
+<!-- ContactList class -->
+<string name="ConListNotConnected">Не подключен</string>
+
+<!--  BeemChatManager -->
+<string name="BeemChatManagerNewMessage">Пришло новое сообщение</string>
+
+<!--  BeemBroadcastReceiver class -->
+<string name="BeemBroadcastReceiverDisconnect"></string>
+
+<!--  XmppConnectionAdapter class -->
+<string name="AcceptContactRequest"></string>
+<string name="AcceptContactRequestFrom"></string>
+
+<!-- Activities -->
+<string name="login_tag"></string>
+<string name="edit_settings_name">Настройки</string>
+<string name="edit_settings_tag"></string>
+<string name="create_account_name">Создать аккаунт</string>
+<string name="create_account_tag"></string>
+<string name="contact_list_name">Контакты</string>
+<string name="contact_list_tag"></string>
+<string name="user_info_name">Информация о пользователе</string>
+
+<!-- Buttons -->
+<string name="button_reset">Очистить</string>
+<string name="button_login">Войти</string>
+<string name="button_save">Сохранить</string>
+<string name="button_create_account"></string>
+<string name="button_create_login_account"></string>
+
+<!-- LogAs Activity -->
+<string name="login_username">Имя пользователя</string>
+<string name="login_password">Пароль</string>
+<string name="login_error_dialog_title">Ошибка входа</string>
+<string name="login_close_dialog_button">Закрыть</string>
+<string name="login_menu_create_account">Создать аккаунт</string>
+<string name="login_menu_settings">Настройки</string>
+<string name="login_menu_about">О программе</string>
+<string name="login_about_title"></string>
+<string name="login_about_msg">
+Beem is an EPITECH Innovative Project. Visit us at
+http://www.beem-project.com !
+</string>
+<string name="login_about_button">Закрыть</string>
+<string name="login_settings_button">Настройки</string>
+<string name="login_login_button">Войти</string>
+<string name="login_login_progress">Соединяемся, подождите немного...</string>
+<string name="login_max_retry"></string>
+<string name="login_error_msg">Unfortunately, an error occured.\n\nError
+detail:\n%s</string>
+<string name="login_menu_login">Войти</string>
+<string name="login_no_connectivity"></string>
+<string name="login_start_msg"></string>
+
+<!-- EditSettings Activity -->
+<string name="settings_menu_create_account">Создать аккаунт</string>
+<string name="settings_menu_privacy_lists">Настроить списки приватности</string>
+<string name="settings_saved_ok"></string>
+
+
+
+<!-- EditSettings Activity Categories -->
+<string name="general_preferences"></string>
+<string name="user_preferences"></string>
+<string name="user_preferences_advanced"></string>
+<string name="network_preferences">Настройки сети</string>
+<string name="proxy_proxy_settings">Настройки прокси</string>
+<string name="proxy_user_settings">Настройки прокси</string>
+
+<!-- EditSettings Activity Tabs -->
+<string name="settings_tab_tag_account"></string>
+<string name="settings_tab_label_account">Аккаунт</string>
+<string name="settings_tab_tag_xmpp"></string>
+<string name="settings_tab_label_xmpp">XMPP</string>
+<string name="settings_tab_tag_proxy"></string>
+<string name="settings_tab_label_proxy">Прокси</string>
+
+
+<!-- wizard activities -->
+<string name="account_wizard_text1"></string>
+<string name="account_wizard_configure_text"></string>
+<string name="account_wizard_configure_account">Использовать существующий аккаунт</string>
+<string name="account_wizard_create_account">Создать новый аккаунт</string>
+
+<!-- Create an account Activity -->
+<string name="create_account_instr_dialog_title"></string>
+<string name="create_account_err_dialog_title"></string>
+<string name="create_account_err_dialog_settings_button">Изменить настройки</string>
+<string name="create_account_close_dialog_button">Закрыть</string>
+<string name="create_account_successfull_after">Аккаунт %s успешно создан</string>
+<string name="create_account_err_username">Неправильный JID</string>
+<string name="create_account_err_passwords">Пароли не совпадают</string>
+<string name="create_account_username">Имя пользователя</string>
+<string name="create_account_password">Пароль</string>
+<string name="create_account_confirm_password">Ещё раз</string>
+
+<!-- ContactList Activity  -->
+<string name="contact_list_menu_add_contact">Добавить контакт</string>
+<string name="contact_list_menu_settings">Настройки</string>
+<string name="contact_list_all_contact">Все контакты</string>
+<string name="contact_list_no_group"></string>
+
+<!-- UserInfo dialog -->
+<string name="userinfo_label_alias">Псевдоним</string>
+<string name="userinfo_label_chg_group">Управление группами</string>
+<string name="userinfo_label_re_subscription">Выслать приглашение ещё раз</string>
+<string name="userinfo_label_block">Заблокировать</string>
+<string name="userinfo_label_delete">Удалить</string>
+<string name="userinfo_resend"></string>
+<string name="userinfo_sure2delete">Are you sure you want to delete this contact ?
+</string>
+<string name="userinfo_yes">Да</string>
+<string name="userinfo_no">Нет</string>
+<string name="userinfo_sureresend"></string>
+
+<string name="chat_name">Чат</string>
+<string name="chat_input_default_value"></string>
+<string name="chat_self">Я</string>
+<string name="chat_error">Ошибка</string>
+<string name="chat_send_message">Отправить</string>
+<string name="chat_menu_contacts_list">Список контактов</string>
+<string name="chat_menu_change_chat"></string>
+<string name="chat_dialog_change_chat_title">Открытые чаты</string>
+<string name="chat_menu_close_chat">Закрыть этот чат</string>
+<string name="chat_no_more_chats"></string>
+<string name="chat_state_composing">набирает текст</string>
+<string name="chat_state_gone">покинул чат</string>
+<string name="chat_state_active">вникает в текст</string>
+<string name="chat_state_inactive">занимается чем-то другим</string>
+
+<string name="contact_status_msg_available">Онлайн</string>
+<string name="contact_status_msg_available_chat"></string>
+<string name="contact_status_msg_dnd">Занят</string>
+<string name="contact_status_msg_away">Отошёл</string>
+<string name="contact_status_msg_xa">Недоступен</string>
+<string name="contact_status_msg_offline">Оффлайн</string>
+
+<string name="privacy_list_name">Настройки приватности</string>
+<string name="privacy_list_no_data">Нет списков приватности</string>
+<string name="privacy_list_menu_create">Создать список приватности</string>
+<string name="privacy_list_create_dialog_title">Создать список приватности</string>
+<string name="privacy_list_create_dialog_list_name_label">Название</string>
+<string name="privacy_list_create_dialog_create_button">Создать</string>
+<string name="privacy_list_select_dialog_buddies">Контакты</string>
+<string name="privacy_list_select_dialog_groups">Группы</string>
+<string name="privacy_list_select_dialog_delete">Удалить</string>
+<string name="privacy_list_delete_dialog_msg"></string>
+<string name="privacy_list_delete_dialog_yes">Да</string>
+<string name="privacy_list_delete_dialog_no">Нет</string>
+
+<string name="UpdateButton">Обновить</string>
+
+<!-- Error messages -->
+
+<string name="error_login_authentication">Ошибка: неверно указан логин или пароль</string>
+
+<string name="interna_server_error">Ошибка сервера</string>
+<string name="bad_request"></string>
+<string name="forbidden"></string>
+<string name="item_not_found"></string>
+<string name="conflict"></string>
+<string name="feature_not_implemented"></string>
+<string name="gone"></string>
+<string name="jid_malformed"></string>
+<string name="no_acceptable"></string>
+<string name="not_allowed"></string>
+<string name="not_authorized"></string>
+<string name="payment_required"></string>
+<string name="recipient_unavailable"></string>
+<string name="redirect"></string>
+<string name="registration_required"></string>
+<string name="remote_server_not_found">Сервер не найден</string>
+<string name="remote_server_timeout">Сервер не отвечает</string>
+<string name="remote_server_error">Ошибка сервера</string>
+<string name="resource_constraint"></string>
+<string name="service_unavailable"></string>
+<string name="subscription_required"></string>
+<string name="undefined_condition"></string>
+<string name="unexpected_condition"></string>
+<string name="request_timeout"></string>
+</resources>
diff -r a325803b7a4b -r 5a09712de41c res/values/strings.xml
--- a/res/values/strings.xml	Wed May 19 14:42:05 2010 +0200
+++ b/res/values/strings.xml	Wed May 19 15:08:56 2010 +0200
@@ -21,12 +21,6 @@
 	<string name="BeemServiceCreated">Beem Service Created</string>
 	<string name="BeemServiceDestroyed">Beem Service Destroyed</string>
 
-	<!--  Preferences informations -->
-	<string name="PreferenceStatus">Status</string>
-	<string name="PreferenceStatusText">status_text</string>
-	<string name="PreferenceIsConfigured">preference_is_configured
-	</string>
-
 	<!-- ContactListSettings class -->
 	<string name="CLSServerConnection">Server connection</string>
 	<string name="CLSUserid">User id:</string>
@@ -126,7 +120,7 @@
 	<string name="away_message_hint">I\'m away, my cellphone screen is off</string>
 	<string name="notification_preferences">Notification settings</string>
 	<string name="notification_disable_vibrate_title">Vibrate</string>
-	<string name="notification_disable_vibrate_sum">Vibrate phone for incoming messages</string>
+	<string name="notification_disable_vibrate_sum">Disable vibrate on incoming messages</string>
 	<string name="notification_snd_title">Message ringtone</string>
 	<string name="notification_snd_sum">Set your incoming message ringtone</string>
 
@@ -237,6 +231,7 @@
 	<!-- ContactList Activity  -->
 	<string name="contact_list_menu_add_contact">Add a contact</string>
 	<string name="contact_list_menu_settings">Settings</string>
+	<string name="contact_list_menu_disconnect">Disconnect</string>
 	<string name="contact_list_all_contact">All contacts</string>
 	<string name="contact_list_no_group">No group</string>
 
diff -r a325803b7a4b -r 5a09712de41c src/com/beem/project/beem/BeemApplication.java
--- a/src/com/beem/project/beem/BeemApplication.java	Wed May 19 14:42:05 2010 +0200
+++ b/src/com/beem/project/beem/BeemApplication.java	Wed May 19 15:08:56 2010 +0200
@@ -55,6 +55,20 @@
  */
 public class BeemApplication extends Application {
 
+    /* Constants for PREFERENCE_KEY
+     * The format of the Preference key is :
+     * $name_KEY = "$name"
+     */
+    /** Preference key for account username. */
+    public static final String ACCOUNT_USERNAME_KEY = "account_username";
+    /** Preference key for account password. */
+    public static final String ACCOUNT_PASSWORD_KEY = "account_password";
+    /** Preference key for status (available, busy, away, ...). */
+    public static final String STATUS_KEY = "status";
+    /** Preference key for status message. */
+    public static final String STATUS_TEXT_KEY = "status_text";
+    //TODO add the other one
+
     private boolean mIsConnected;
     private boolean mIsAccountConfigured;
     private SharedPreferences mSettings;
@@ -70,8 +84,8 @@
     public void onCreate() {
 	super.onCreate();
 	mSettings = PreferenceManager.getDefaultSharedPreferences(this);
-	String login = mSettings.getString("settings_key_account_username", "");
-	String password = mSettings.getString("settings_key_account_password", "");
+	String login = mSettings.getString(BeemApplication.ACCOUNT_USERNAME_KEY, "");
+	String password = mSettings.getString(BeemApplication.ACCOUNT_PASSWORD_KEY, "");
 	mIsAccountConfigured = !("".equals(login) || "".equals(password));
 	mSettings.registerOnSharedPreferenceChangeListener(mPreferenceListener);
     }
@@ -120,9 +134,9 @@
 
 	@Override
 	public void onSharedPreferenceChanged(SharedPreferences  sharedPreferences, String key) {
-	    if ("settings_key_account_username".equals(key) || "settings_key_account_password".equals(key)) {
-		String login = mSettings.getString("settings_key_account_username", "");
-		String password = mSettings.getString("settings_key_account_password", "");
+	    if (BeemApplication.ACCOUNT_USERNAME_KEY.equals(key) || BeemApplication.ACCOUNT_PASSWORD_KEY.equals(key)) {
+		String login = mSettings.getString(BeemApplication.ACCOUNT_USERNAME_KEY, "");
+		String password = mSettings.getString(BeemApplication.ACCOUNT_PASSWORD_KEY, "");
 		mIsAccountConfigured = !("".equals(login) || "".equals(password));
 	    }
 	}
diff -r a325803b7a4b -r 5a09712de41c src/com/beem/project/beem/BeemService.java
--- a/src/com/beem/project/beem/BeemService.java	Wed May 19 14:42:05 2010 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Wed May 19 15:08:56 2010 +0200
@@ -185,9 +185,9 @@
 	    registerReceiver(mOnOffReceiver, new IntentFilter(Intent.ACTION_SCREEN_OFF));
 	    registerReceiver(mOnOffReceiver, new IntentFilter(Intent.ACTION_SCREEN_ON));
 	}
-	String tmpJid = mSettings.getString("settings_key_account_username", "");
+	String tmpJid = mSettings.getString(BeemApplication.ACCOUNT_USERNAME_KEY, "");
 	mLogin = StringUtils.parseName(tmpJid);
-	mPassword = mSettings.getString("settings_key_account_password", "");
+	mPassword = mSettings.getString(BeemApplication.ACCOUNT_PASSWORD_KEY, "");
 	mPort = DEFAULT_XMPP_PORT;
 	mService = StringUtils.parseServer(tmpJid);
 	mHost = mService;
@@ -221,6 +221,7 @@
     public void onDestroy() {
 	super.onDestroy();
 	Log.d("Service", "onDestroy");
+	resetStatus();
 	mNotificationManager.cancelAll();
 	unregisterReceiver(mReceiver);
 	mSettings.unregisterOnSharedPreferenceChangeListener(mPreferenceListener);
@@ -267,7 +268,7 @@
      */
     public void resetStatus() {
 	Editor edit = mSettings.edit();
-	edit.putInt("PreferenceStatus", 1);
+	edit.putInt(BeemApplication.STATUS_KEY, 1);
 	edit.commit();
     }
 
diff -r a325803b7a4b -r 5a09712de41c src/com/beem/project/beem/ui/ChangeStatus.java
--- a/src/com/beem/project/beem/ui/ChangeStatus.java	Wed May 19 14:42:05 2010 +0200
+++ b/src/com/beem/project/beem/ui/ChangeStatus.java	Wed May 19 15:08:56 2010 +0200
@@ -65,6 +65,7 @@
 import android.widget.Toast;
 
 import com.beem.project.beem.BeemService;
+import com.beem.project.beem.BeemApplication;
 import com.beem.project.beem.R;
 import com.beem.project.beem.service.aidl.IXmppFacade;
 import com.beem.project.beem.utils.BeemBroadcastReceiver;
@@ -129,7 +130,7 @@
 
 	mSettings = PreferenceManager.getDefaultSharedPreferences(this);
 	mStatusMessageEditText = (EditText) findViewById(R.id.ChangeStatusMessage);
-	mStatusMessageEditText.setText(getPreferenceString(R.string.PreferenceStatusText));
+	mStatusMessageEditText.setText(mSettings.getString(BeemApplication.STATUS_TEXT_KEY, ""));
 
 	mSpinner = (Spinner) findViewById(R.id.ChangeStatusSpinner);
 	mAdapter = ArrayAdapter.createFromResource(this, R.array.status_types, android.R.layout.simple_spinner_item);
@@ -180,7 +181,7 @@
      * @return the status index from status the settings.
      */
     private int getPreferenceStatusIndex() {
-	return mSettings.getInt(getString(R.string.PreferenceStatus), AVAILABLE_IDX);
+	return mSettings.getInt(BeemApplication.STATUS_KEY, AVAILABLE_IDX);
     }
 
     /**
@@ -269,27 +270,22 @@
 	@Override
 	public void onClick(View v) {
 	    if (v == mOk) {
-		if (!mStatusMessageEditText.getText().toString().equals(
-		    getPreferenceString(R.string.PreferenceStatusText))
-		    || getPreferenceStatusIndex() != mSpinner.getSelectedItemPosition()) {
-		    String msg = mStatusMessageEditText.getText().toString();
-		    int status = getStatusForService((String) mSpinner.getSelectedItem());
-		    Editor edit = mSettings.edit();
-		    edit.putString(getString(R.string.PreferenceStatusText), msg);
-		    if (status == Status.CONTACT_STATUS_DISCONNECT) {
-			stopService(new Intent(ChangeStatus.this, BeemService.class));
-			edit.putInt(getString(R.string.PreferenceStatus), AVAILABLE_IDX);
-		    } else {
-			try {
-			    mXmppFacade.changeStatus(status, msg.toString());
-			    edit.putInt(getString(R.string.PreferenceStatus), mSpinner.getSelectedItemPosition());
-			} catch (RemoteException e) {
-			    e.printStackTrace();
-			}
-			mToast.show();
+		String msg = mStatusMessageEditText.getText().toString();
+		int status = getStatusForService((String) mSpinner.getSelectedItem());
+		Editor edit = mSettings.edit();
+		edit.putString(BeemApplication.STATUS_TEXT_KEY, msg);
+		if (status == Status.CONTACT_STATUS_DISCONNECT) {
+		    stopService(new Intent(ChangeStatus.this, BeemService.class));
+		} else {
+		    try {
+			mXmppFacade.changeStatus(status, msg.toString());
+			edit.putInt(BeemApplication.STATUS_KEY, mSpinner.getSelectedItemPosition());
+		    } catch (RemoteException e) {
+			e.printStackTrace();
 		    }
-		    edit.commit();
+		    mToast.show();
 		}
+		edit.commit();
 		ChangeStatus.this.finish();
 	    } else if (v == mClear) {
 		mStatusMessageEditText.setText(null);
diff -r a325803b7a4b -r 5a09712de41c src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Wed May 19 14:42:05 2010 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Wed May 19 15:08:56 2010 +0200
@@ -148,11 +148,6 @@
 	return true;
     }
 
-    /**
-     * Callback for menu item selected.
-     * @param item the item selected
-     * @return true on success, false otherwise
-     */
     @Override
     public final boolean onOptionsItemSelected(MenuItem item) {
 	switch (item.getItemId()) {
@@ -162,6 +157,10 @@
 	    case R.id.contact_list_menu_add_contact:
 		startActivity(new Intent(ContactList.this, AddContact.class));
 		return true;
+	    case R.id.menu_disconnect:
+		    stopService(SERVICE_INTENT);
+		    finish();
+		return true;
 	    default:
 		return false;
 	}
diff -r a325803b7a4b -r 5a09712de41c src/com/beem/project/beem/ui/CreateAccount.java
--- a/src/com/beem/project/beem/ui/CreateAccount.java	Wed May 19 14:42:05 2010 +0200
+++ b/src/com/beem/project/beem/ui/CreateAccount.java	Wed May 19 15:08:56 2010 +0200
@@ -64,6 +64,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.beem.project.beem.BeemApplication;
 import com.beem.project.beem.R;
 
 /**
@@ -318,10 +319,9 @@
 		else {
 		    if (createAccount(username, passwordFieldValue)) {
 			SharedPreferences.Editor settingsEditor = mSettings.edit();
-			settingsEditor.putString("settings_key_account_username", usernameFieldValue);
-			settingsEditor.putString("settings_key_account_password", passwordFieldValue);
+			settingsEditor.putString(BeemApplication.ACCOUNT_USERNAME_KEY, usernameFieldValue);
+			settingsEditor.putString(BeemApplication.ACCOUNT_PASSWORD_KEY, passwordFieldValue);
 			settingsEditor.putBoolean("settings_key_gmail", false);
-			settingsEditor.putBoolean("PreferenceIsConfigured", true);
 			settingsEditor.commit();
 			finish();
 		    }
diff -r a325803b7a4b -r 5a09712de41c src/com/beem/project/beem/ui/Settings.java
--- a/src/com/beem/project/beem/ui/Settings.java	Wed May 19 14:42:05 2010 +0200
+++ b/src/com/beem/project/beem/ui/Settings.java	Wed May 19 15:08:56 2010 +0200
@@ -48,7 +48,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.view.Menu;
@@ -108,19 +107,6 @@
      * {@inheritDoc}
      */
     @Override
-    public void onStop() {
-	super.onStop();
-	SharedPreferences settings = getPreferenceManager().getSharedPreferences();
-	settings.edit().putBoolean(
-	    "PreferenceIsConfigured",
-	    !"".equals(settings.getString("settings_key_account_username", ""))
-		|| !"".equals(settings.getString("settings_key_account_password", ""))).commit();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
     public boolean onCreateOptionsMenu(Menu menu) {
 	MenuInflater mInflater = getMenuInflater();
 	mInflater.inflate(R.menu.edit_settings, menu);
diff -r a325803b7a4b -r 5a09712de41c src/com/beem/project/beem/ui/wizard/AccountConfigure.java
--- a/src/com/beem/project/beem/ui/wizard/AccountConfigure.java	Wed May 19 14:42:05 2010 +0200
+++ b/src/com/beem/project/beem/ui/wizard/AccountConfigure.java	Wed May 19 15:08:56 2010 +0200
@@ -62,6 +62,7 @@
 
 import com.beem.project.beem.ui.Login;
 import com.beem.project.beem.ui.Settings;
+import com.beem.project.beem.BeemApplication;
 import com.beem.project.beem.R;
 
 /**
@@ -130,8 +131,8 @@
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 	if (requestCode == MANUAL_CONFIGURATION) {
 	    SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
-	    String login = settings.getString("settings_key_account_username", "");
-	    String password = settings.getString("settings_key_account_password", "");
+	    String login = settings.getString(BeemApplication.ACCOUNT_USERNAME_KEY, "");
+	    String password = settings.getString(BeemApplication.ACCOUNT_PASSWORD_KEY, "");
 	    mAccountJID.setText(login);
 	    mAccountPassword.setText(password);
 	    checkUsername(login);
@@ -146,9 +147,8 @@
     private void configureAccount() {
 	SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
 	SharedPreferences.Editor edit = settings.edit();
-	edit.putString("settings_key_account_username", mAccountJID.getText().toString());
-	edit.putString("settings_key_account_password", mAccountPassword.getText().toString());
-	edit.putBoolean("PreferenceIsConfigured", true);
+	edit.putString(BeemApplication.ACCOUNT_USERNAME_KEY, mAccountJID.getText().toString());
+	edit.putString(BeemApplication.ACCOUNT_PASSWORD_KEY, mAccountPassword.getText().toString());
 	edit.commit();
     }