# HG changeset patch
# User Philippe Lago <lago_p@epitech.net>
# Date 1256314374 -7200
# Node ID 8200d3dbe9d5d0f19819ce104c8b2e5e5aee6d5b
# Parent  ddc7aaec916a81ea0fd2d6c12706b27d19d4dca7# Parent  f2f16274b696e2d20836187a50037ad9e8f78f05
merge

diff -r f2f16274b696 -r 8200d3dbe9d5 res/layout/preferences.xml
--- a/res/layout/preferences.xml	Fri Oct 23 17:56:58 2009 +0200
+++ b/res/layout/preferences.xml	Fri Oct 23 18:12:54 2009 +0200
@@ -13,7 +13,7 @@
 		android:summary="@string/SettingsGmail"
 		android:key="settings_key_gmail" />
 	<PreferenceScreen android:key="proxy" android:title="@string/SettingsProxy">
-		<CheckBoxPreference android:title="@string/SettingsProxy"
+		<CheckBoxPreference android:title="@string/SettingsProxyProxy"
 			android:defaultValue="false"
 			android:summary="@string/SettingsProxySummary"
 			android:key="settings_key_proxy_use" />
@@ -40,19 +40,29 @@
 
 	<PreferenceScreen android:key="advanced"
 		android:title="@string/SettingsAdvanced">
-		<CheckBoxPreference android:title="@string/settings_xmpp_use_tls"
-			android:defaultValue="false" android:key="settings_key_xmpp_tls_use" />
+		<CheckBoxPreference
+			android:title="@string/settings_xmpp_use_tls"
+			android:defaultValue="false"
+			android:key="settings_key_xmpp_tls_use" />
+		
+		<EditTextPreference android:singleLine="true"
+			android:title="@string/settings_reco_delay"
+			android:name="Reconnect delay"
+			android:summary="@string/SettingsAdvancedRecoDelay"
+			android:key="settings_key_reco_delay"
+			android:defaultValue="10" />
+		
 		<CheckBoxPreference android:title="@string/SettingsAdvancedOptions"
 			android:defaultValue="false"
 			android:summary="@string/SettingsAdvancedSpecOpt"
 			android:key="settings_key_specific_server" />
-		<EditTextPreference android:singleLine="true" android:dependency="settings_key_specific_server"
-			android:name="adresse" android:summary="@string/SettingsAdvancedAddOpt"
-			android:title="@string/settings_xmpp_server" android:key="settings_key_xmpp_server"
-			android:defaultValue="10.0.2.2" />
-		<EditTextPreference android:singleLine="true" android:dependency="settings_key_specific_server"
-			android:name="port" android:summary="@string/SettingsAdvancedPortOpt"
-			android:title="@string/settings_xmpp_port" android:defaultValue="5222"
-			android:key="settings_key_xmpp_port" />
+			<EditTextPreference android:singleLine="true" android:dependency="settings_key_specific_server"
+				android:name="adresse" android:summary="@string/SettingsAdvancedAddOpt"
+				android:title="@string/settings_xmpp_server" android:key="settings_key_xmpp_server"
+				android:defaultValue="10.0.2.2" />
+			<EditTextPreference android:singleLine="true" android:dependency="settings_key_specific_server"
+				android:name="port" android:summary="@string/SettingsAdvancedPortOpt"
+				android:title="@string/settings_xmpp_port" android:defaultValue="5222"
+				android:key="settings_key_xmpp_port" />
 	</PreferenceScreen>
 </PreferenceScreen>
\ No newline at end of file
diff -r f2f16274b696 -r 8200d3dbe9d5 res/values-en/colors.xml
--- a/res/values-en/colors.xml	Fri Oct 23 17:56:58 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<color name="blue_sky">#A0C8FF</color>
-	<color name="black">#000000</color>
-	<color name="white">#FFFFFF</color>
-</resources>
\ No newline at end of file
diff -r f2f16274b696 -r 8200d3dbe9d5 res/values-en/strings.xml
--- a/res/values-en/strings.xml	Fri Oct 23 17:56:58 2009 +0200
+++ b/res/values-en/strings.xml	Fri Oct 23 18:12:54 2009 +0200
@@ -13,22 +13,22 @@
 	<string name="BeemApplicationConnect">Connecting...</string>
 
 	<!--  BeemService class -->
-	<string name="BeemServiceDescription">Use the Beem Service</string>
-	<string name="BeemServiceCreated">BeemService Created</string>
-	<string name="BeemServiceDestroyed">BeemService destroyed</string>
+	<string name="BeemServiceDescription">Use Beem Service</string>
+	<string name="BeemServiceCreated">Beem Service Created</string>
+	<string name="BeemServiceDestroyed">Beem Service Destroyed</string>
 
 	<!--  Preferences informations -->
-	<string name="PreferenceStatus">status</string>
+	<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">Userid:</string>
+	<string name="CLSUserid">User id:</string>
 	<string name="CLSPassword">Password:</string>
 	<string name="CLSService">Service:</string>
-	<string name="CLSHostPort">Host/Port:</string>
+	<string name="CLSHostPort">Port:</string>
 	<string name="CLSProxyInfo">Proxy informations</string>
 	<string name="CLSLogin">Login:</string>
 	<string name="CLSOkButton">Ok</string>
@@ -40,6 +40,7 @@
 
 	<!-- AddContact class -->
 	<string name="AddCActTitle">Beem - Add contact</string>
+
 	<string name="AddCLogin">Login :</string>
 	<string name="AddCAlias">Alias :</string>
 	<string name="AddCGroup">Group :</string>
@@ -52,10 +53,11 @@
 
 	<!--  SendIM class -->
 	<string name="SendIMActTitle">Beem - Chat</string>
+
 	<string name="SendIMSays"> %s says :\n%s\n</string>
 	<string name="SendIMYouSay">You say :\n%s\n</string>
 	<string name="SendIMSameSpeaker">%s\n</string>
-	<string name="SendIMToSendHint">Type your message</string>
+	<string name="SendIMToSendHint">Tip text here</string>
 	<string name="SendIMState">Is : </string>
 	<string name="SendIMErrorMsg">Error : %s\n</string>
 	<string name="SendIMFrom">and is speaking from : </string>
@@ -65,8 +67,9 @@
 	
 	<!--  ChangeStatus class -->
 	<string name="ChangeStatusText">Type here your status message :</string>
+
 	<string name="ChangeStatusActTitle">Beem - Change status</string>
-	<string name="MenuAddContact">Add a new contact</string>
+	<string name="MenuAddContact">Add new contact</string>
 	<string name="MenuAccountAbout">Beem Project</string>
 	<string name="MenuAccountCreate">Create account</string>
 	<string name="MenuConnection">Edit account</string>
@@ -74,25 +77,26 @@
 	<string name="ChangeStatusNoChange">Nothing to change</string>
 	
 	<!-- Settings class -->
-	<string name="SettingsText">Allow to modify your username</string>
-	<string name="SettingsPassword">Allow to modify your password</string>
+	<string name="SettingsText">Modify my username</string>
+	<string name="SettingsPassword">Modify my password</string>
 	<string name="SettingsCheckboxText">Using Gmail</string>
-	<string name="SettingsGmail">Check this box if you want to use your Gmail account</string>
-	<string name="SettingsProxy">Use of a proxy</string>
-	<string name="SettingsProxySummary">Check this box if you want to use a proxy server</string>
-	<string name="SettingsProxyType">Proxy server type</string>
-	<string name="SettingsProxyTypeSummary">Allow to choose the proxy server type</string>
+	<string name="SettingsGmail">Use my Gmail account</string>
+	<string name="SettingsProxy">Beem - Settings - Proxy server</string>
+	<string name="SettingsProxyProxy">Use a proxy server</string>
+	<string name="SettingsProxySummary">Check this box if you\'re behind a proxy server</string>
+	<string name="SettingsProxyType">Protocol</string>
+	<string name="SettingsProxyTypeSummary">Choose the proxy server type</string>
 	<string name="SettingsProxyServer">Address definition of the proxy server</string>
 	<string name="SettingsProxyPort">Port definition of the proxy server</string>
 	<string name="SettingsProxyUser">Optional, allow to authenticate yourself on the proxy server</string>
 	<string name="SettingsProxyPassword">Optional, allow to authenticate yourself on the proxy server</string>
-	<string name="SettingsAdvanced">Advanced option</string>
-	<string name="SettingsAdvancedOptions">Use advanced option</string>
-	<string name="SettingsAdvancedSpecOpt">Check this box if you want to use different option for your connection</string>
+	<string name="SettingsAdvanced">Beem - Settings - Advanced options</string>
+	<string name="SettingsAdvancedOptions">Use specific proxy server option</string>
+	<string name="SettingsAdvancedRecoDelay">Modify reconnection delay</string>
+	<string name="SettingsAdvancedSpecOpt">Check this box if you want to use different options for your connection</string>
 	<string name="SettingsAdvancedAddOpt">Allow to edit the server address</string>
 	<string name="SettingsAdvancedPortOpt">Allow to edit the server port</string>
 	
-	
 	<!-- Subscription class -->
 	<string name="SubscriptAccept">Subscription accepted</string>
 	<string name="SubscriptError">Subscription error</string>
@@ -103,7 +107,7 @@
 	<string name="ConListNotConnected">Not connected</string>
 
 	<!--  BeemChatManager -->
-	<string name="BeemChatManagerNewMessage">You have got a new message</string>
+	<string name="BeemChatManagerNewMessage">You\'ve got a new message</string>
 	
 	<!--  BeemBroadcastReceiver class -->
 	<string name="BeemBroadcastReceiverDisconnect">You have been disconnected</string>
@@ -119,14 +123,14 @@
     <!--
     	Activities
     -->
-    <string name="login_tag">BEEM - Login Activity</string>
-    <string name="edit_settings_name">BEEM - Settings</string>
-	<string name="edit_settings_tag">BEEM - EditSettings Activity</string>	
-    <string name="create_account_name">BEEM - Create an account</string>
-    <string name="create_account_tag">BEEM - CreateAccount Activity</string>
-    <string name="contact_list_name">BEEM - Contacts</string>
-    <string name="contact_list_tag">BEEM - ContactList Activity</string>
-    <string name="user_info_name">BEEM - User Info</string>
+    <string name="login_tag">Beem - Login Activity</string>
+    <string name="edit_settings_name">Beem - Settings</string>
+	<string name="edit_settings_tag">Beem - EditSettings Activity</string>	
+    <string name="create_account_name">Beem - Create an account</string>
+    <string name="create_account_tag">Beem - CreateAccount Activity</string>
+    <string name="contact_list_name">Beem - Contacts</string>
+    <string name="contact_list_tag">Beem - ContactList Activity</string>
+    <string name="user_info_name">Beem - User Info</string>
 
     
     <!--
@@ -151,7 +155,7 @@
 	<string name="login_menu_about">About</string>
 	<string name="login_about_title">About</string>
 	<string name="login_about_msg">
-		BEEM is an EPITECH Innovative Project. Visit us at http://www.beem-project.com !
+		Beem is an EPITECH Innovative Project. Visit us at http://www.beem-project.com !
 	</string>
 	<string name="login_about_button">Close</string>
 	<string name="login_settings_button">Settings</string>
@@ -166,6 +170,7 @@
 	<string name="settings_menu_login">Login</string>
 	<string name="settings_saved_ok">The settings have been saved successfully.</string>
 	<string name="settings_filename">beem_settings</string>
+	<string name="settings_reco_delay">Reconnection delay</string>
 	<string name="settings_key_account_username">beem_account_username</string>
 	<string name="settings_key_account_password">beem_account_password</string>
 	<string name="settings_key_xmpp_server">beem_xmpp_server</string>
@@ -241,4 +246,4 @@
 	<string name="userinfo_no">No</string>
 	<string name="userinfo_sureresend">Are you sure you want to resend invit?</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff -r f2f16274b696 -r 8200d3dbe9d5 res/values-en/styles.xml
--- a/res/values-en/styles.xml	Fri Oct 23 17:56:58 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<style name="Label">
-		<item name="android:textSize">16sp</item>
-		<item name="android:textStyle">bold</item>
-		<item name="android:typeface">sans</item>
-		<item name="android:capitalize">characters</item>
-		<item name="android:textColor">#FFFFFF</item>
-		<item name="android:focusable">false</item>
-	</style>
-	<style name="CheckBoxLabel" parent="@style/Label">
-		<item name="android:enabled">true</item>
-	</style>
-	<style name="Theme.BEEM.Default" parent="@android:style/Theme">
-		<item name="android:windowBackground">@drawable/background</item>
-	</style>
-	
-
-<!-- Old PC style -->
-
-	<style name="OldTheme">
-		<item name="android:textViewStyle" >@style/OldThemeTextView</item>
-	</style>
-	<style name="OldThemeTextView" parent="@android:style/Widget.TextView">
-		<item name="android:textColor">#ff009900</item>
-		<item name="android:background">@color/black</item>
-	</style>
-	
-	
-<!-- Other style -->
-
-</resources>
diff -r f2f16274b696 -r 8200d3dbe9d5 res/values-fr/arrays.xml
--- a/res/values-fr/arrays.xml	Fri Oct 23 17:56:58 2009 +0200
+++ b/res/values-fr/arrays.xml	Fri Oct 23 18:12:54 2009 +0200
@@ -6,11 +6,11 @@
 		<item>SOCKS5</item>
 	</string-array>
 	<string-array name="status_types">
-		<item>Disponible pour discuter</item>
-		<item>Disponible</item>
-		<item>Occupé</item>
-		<item>Absent</item>
-		<item>Indisponible</item>
-		<item>Déconnecté</item>
+		<item name="AvailableForChat">Disponible pour chatter</item>
+		<item name="Available">Disponible</item>
+		<item name="Busy">Occupé(e)</item>
+		<item name="Away">Parti(e)</item>
+		<item name="Unavailable">Indisponible</item>
+		<item name="Disconnected">Déconnecté(e)</item>
 	</string-array>
 </resources>
diff -r f2f16274b696 -r 8200d3dbe9d5 res/values-fr/colors.xml
--- a/res/values-fr/colors.xml	Fri Oct 23 17:56:58 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<color name="blue_sky">#A0C8FF</color>
-	<color name="black">#000000</color>
-	<color name="white">#FFFFFF</color>
-</resources>
\ No newline at end of file
diff -r f2f16274b696 -r 8200d3dbe9d5 res/values-fr/strings.xml
--- a/res/values-fr/strings.xml	Fri Oct 23 17:56:58 2009 +0200
+++ b/res/values-fr/strings.xml	Fri Oct 23 18:12:54 2009 +0200
@@ -13,23 +13,23 @@
 	<string name="BeemApplicationConnect">Connexion en cours...</string>
 
 	<!--  BeemService class -->
-	<string name="BeemServiceDescription">Utilisation du service BEEM</string>
+	<string name="BeemServiceDescription">Utilisation du service Beem</string>
 	<string name="BeemServiceCreated">BeemService Créé</string>
 	<string name="BeemServiceDestroyed">BeemService détruit</string>
 
 	<!--  Preferences informations -->
-	<string name="PreferenceStatus">status</string>
+	<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">Utilisateurid:</string>
+	<string name="CLSUserid">Id utilisateur:</string>
 	<string name="CLSPassword">Mot de passe:</string>
 	<string name="CLSService">Service:</string>
-	<string name="CLSHostPort">Host/Port:</string>
-	<string name="CLSProxyInfo">Informations Proxy</string>
+	<string name="CLSHostPort">Port:</string>
+	<string name="CLSProxyInfo">Informations proxy</string>
 	<string name="CLSLogin">Nom d\'utilisateur:</string>
 	<string name="CLSOkButton">Ok</string>
 
@@ -40,6 +40,7 @@
 
 	<!-- AddContact class -->
 	<string name="AddCActTitle">Beem - Ajouter un contact</string>
+
 	<string name="AddCLogin">Nom d\'utilisateur :</string>
 	<string name="AddCAlias">Alias :</string>
 	<string name="AddCGroup">Groupe :</string>
@@ -52,60 +53,64 @@
 
 	<!--  SendIM class -->
 	<string name="SendIMActTitle">Beem - Chat</string>
+
 	<string name="SendIMSays"> %s dit :\n%s\n</string>
 	<string name="SendIMYouSay">Vous dites :\n%s\n</string>
 	<string name="SendIMSameSpeaker">%s\n</string>
 	<string name="SendIMToSendHint">Tapez votre texte ici</string>
 	<string name="SendIMState">Est : </string>
 	<string name="SendIMErrorMsg">Erreur : %s\n</string>
-	<string name="SendIMFrom">et est entrain de parler depuis : </string>
+	<string name="SendIMFrom">et est en train de parler depuis : </string>
 	<string name="SendIMSmiley">Insérer un sourire</string>
-	<string name="SendIMLoginHint">nom d\'utilisateur</string>
+	<string name="SendIMLoginHint">Nom d\'utilisateur</string>
 	<string name="SendIMNoStatusSet">Aucun statut défini</string>
 	
 	<!--  ChangeStatus class -->
+	<string name="ChangeStatusActTitle">Beem - Changer statut</string>
+	
 	<string name="ChangeStatusText">Tapez votre message de statut ici :</string>
-	<string name="ChangeStatusActTitle">Beem - Changer statut</string>
 	<string name="MenuAddContact">Ajouter un nouveau contact</string>
 	<string name="MenuAccountAbout">Beem Project</string>
 	<string name="MenuAccountCreate">Créer un compte</string>
-	<string name="MenuConnection">Modifier compte</string>
+	<string name="MenuConnection">Modifier un compte</string>
 	<string name="ChangeStatusOk">Mise à jour du statut</string>
 	<string name="ChangeStatusNoChange">Rien à changer</string>
 	
 	<!-- Settings class -->
-	<string name="SettingsText">Permet de modifier votre identifiant de connexion</string>
-	<string name="SettingsPassword">Permet de modifier votre mot de passe</string>
+	<string name="SettingsText">Permet la modification de votre identifiant de connexion</string>
+	<string name="SettingsPassword">Permet la modification de votre mot de passe</string>
 	<string name="SettingsCheckboxText">Utilisation de Gmail</string>
 	<string name="SettingsGmail">Cochez cette case si vous souhaitez utiliser votre compte Gmail</string>
-	<string name="SettingsProxy">Utilisation d'un proxy</string>
+	<string name="SettingsProxy">Beem - Paramètres - Proxy</string>
+	<string name="SettingsProxyProxy">Utiliser un proxy</string>
 	<string name="SettingsProxySummary">Cochez cette case si vous souhaitez utiliser un serveur proxy</string>
-	<string name="SettingsProxyType">Protocole du serveur proxy</string>
-	<string name="SettingsProxyTypeSummary">Permet de choisir le type de serveur proxy à utiliser</string>
+	<string name="SettingsProxyType">Protocole</string>
+	<string name="SettingsProxyTypeSummary">Permet de choisir le type de proxy à utiliser</string>
 	<string name="SettingsProxyServer">Définition de l'adresse du serveur.</string>
 	<string name="SettingsProxyPort">Définition du port du serveur.</string>
-	<string name="SettingsProxyUser">Optionnel, permet de s'authentifier sur le serveur proxy</string>
-	<string name="SettingsProxyPassword">Optionnel, permet de s'authentifier sur le serveur proxy</string>
-	<string name="SettingsAdvanced">Options avancées</string>
-	<string name="SettingsAdvancedOptions">Utilisation d'options spécifiques</string>
-	<string name="SettingsAdvancedSpecOpt">Cochez cette case si vous souhaitez utiliser des options spécifiques pour votre connection</string>	
+	<string name="SettingsProxyUser">Optionnel, permet de s'authentifier sur le proxy</string>
+	<string name="SettingsProxyPassword">Optionnel, permet de s'authentifier sur le proxy</string>
+	<string name="SettingsAdvanced">Beem - Paramètres - Options avancées</string>
+	<string name="SettingsAdvancedRecoDelay">Modifier le délai de reconnexion</string>
+	<string name="SettingsAdvancedOptions">Options spécifiques</string>
+	<string name="SettingsAdvancedSpecOpt">Cochez cette case si vous souhaitez utiliser des options spécifiques pour votre connexion</string>	
 	<string name="SettingsAdvancedAddOpt">Permet d'éditer l'adresse du serveur</string>
 	<string name="SettingsAdvancedPortOpt">Permet d'éditer le port du serveur</string>
 	
 	<!-- Subscription class -->
-	<string name="SubscriptAccept">Inscription accepté</string>
+	<string name="SubscriptAccept">Inscription acceptée</string>
 	<string name="SubscriptError">Erreur d\'inscription</string>
-	<string name="SubscriptRefused">Inscription refusé</string>
+	<string name="SubscriptRefused">Inscription refusée</string>
 	<string name="SubscriptText">Vous avez une requête d\'ajout de la part de %s. Souhaitez-vous l\'accepter ?</string>
 	
 	<!-- ContactList class -->
-	<string name="ConListNotConnected">Non connecté</string>
+	<string name="ConListNotConnected">Non connecté(e)</string>
 
 	<!--  BeemChatManager class -->
 	<string name="BeemChatManagerNewMessage">Vous avez reçu un nouveau message</string>
 	
 	<!--  BeemBroadcastReceiver class -->
-	<string name="BeemBroadcastReceiverDisconnect">Vous avez été déconnecté</string>
+	<string name="BeemBroadcastReceiverDisconnect">Vous avez été déconnecté(e)</string>
 	
 	<!--  XmppConnectionAdapter class -->
 	<string name="AcceptContactRequest">Accept contact request</string>
@@ -118,14 +123,14 @@
     <!--
     	Activities
     -->
-    <string name="login_tag">BEEM - Activité de connexion</string>
-    <string name="edit_settings_name">BEEM - Paramètres</string>
-	<string name="edit_settings_tag">BEEM - EditSettings Activity</string>
-    <string name="create_account_name">BEEM - Créer un compte</string>
-    <string name="create_account_tag">BEEM - CreateAccount Activity</string>
-    <string name="contact_list_name">BEEM - Contacts</string>
-    <string name="contact_list_tag">BEEM - ContactList Activity</string>
-    <string name="user_info_name">BEEM - Informations</string>
+    <string name="login_tag">Beem - Activité de connexion</string>
+    <string name="edit_settings_name">Beem - Paramètres</string>
+	<string name="edit_settings_tag">Beem - EditSettings Activity</string>
+    <string name="create_account_name">Beem - Créer un compte</string>
+    <string name="create_account_tag">Beem - CreateAccount Activity</string>
+    <string name="contact_list_name">Beem - Contacts</string>
+    <string name="contact_list_tag">Beem - ContactList Activity</string>
+    <string name="user_info_name">Beem - Informations</string>
     
     <!--
     	Buttons
@@ -140,7 +145,7 @@
     <!--
     	LogAs Activity
     -->
-	<string name="login_username">Nom d'utilisateur</string>
+	<string name="login_username">Nom d\'utilisateur</string>
 	<string name="login_password">Mot de passe</string>
 	<string name="login_error_dialog_title">Connexion - Erreur</string>
 	<string name="login_close_dialog_button">Fermer</string>
@@ -149,7 +154,7 @@
 	<string name="login_menu_about">A propos</string>
 	<string name="login_about_title">A propos</string>
 	<string name="login_about_msg">
-		BEEM est un EPITECH Innovative Project. Rencontrez nous sur http://www.beem-project.com !
+		Beem est un EPITECH Innovative Project. Rencontrez nous sur http://www.beem-project.com !
 	</string>
 	<string name="login_about_button">Fermer</string>
 	<string name="login_settings_button">Paramètres</string>
@@ -164,6 +169,7 @@
 	<string name="settings_menu_login">Se connecter</string>
 	<string name="settings_saved_ok">Les paramètres ont été enregistrés avec succès.</string>
 	<string name="settings_filename">beem_settings</string>
+	<string name="settings_reco_delay">Délai de reconnexion</string>
 	<string name="settings_key_account_username">beem_account_username</string>
 	<string name="settings_key_account_password">beem_account_password</string>
 	<string name="settings_key_xmpp_server">beem_xmpp_server</string>
@@ -235,8 +241,8 @@
 	<string name="userinfo_label_block">Bloquer</string>
 	<string name="userinfo_label_delete">Supprimer</string>
 	<string name="userinfo_resend">Souscription réenvoyée</string>
-	<string name="userinfo_sure2delete">Etes vous sûr de vouloir supprimer ce contact?</string>
+	<string name="userinfo_sure2delete">Etes-vous sûr de vouloir supprimer ce contact ?</string>
 	<string name="userinfo_yes">Oui</string>
 	<string name="userinfo_no">Non</string>
-	<string name="userinfo_sureresend">Etes vous sûr de vouloir renvoyer l'invitation?</string>
+	<string name="userinfo_sureresend">Etes vous sûr de vouloir renvoyer l\'invitation ?</string>
 </resources>
diff -r f2f16274b696 -r 8200d3dbe9d5 res/values-fr/styles.xml
--- a/res/values-fr/styles.xml	Fri Oct 23 17:56:58 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<style name="Label">
-		<item name="android:textSize">16sp</item>
-		<item name="android:textStyle">bold</item>
-		<item name="android:typeface">sans</item>
-		<item name="android:capitalize">characters</item>
-		<item name="android:textColor">#FFFFFF</item>
-		<item name="android:focusable">false</item>
-	</style>
-	<style name="CheckBoxLabel" parent="@style/Label">
-		<item name="android:enabled">true</item>
-	</style>
-	<style name="Theme.BEEM.Default" parent="@android:style/Theme">
-		<item name="android:windowBackground">@drawable/background</item>
-	</style>
-	
-
-<!-- Old PC style -->
-
-	<style name="OldTheme">
-		<item name="android:textViewStyle" >@style/OldThemeTextView</item>
-	</style>
-	<style name="OldThemeTextView" parent="@android:style/Widget.TextView">
-		<item name="android:textColor">#ff009900</item>
-		<item name="android:background">@color/black</item>
-	</style>
-	
-	
-<!-- Other style -->
-
-</resources>
diff -r f2f16274b696 -r 8200d3dbe9d5 res/values/colors.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/values/colors.xml	Fri Oct 23 18:12:54 2009 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<color name="blue_sky">#A0C8FF</color>
+	<color name="black">#000000</color>
+	<color name="white">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff -r f2f16274b696 -r 8200d3dbe9d5 res/values/styles.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/values/styles.xml	Fri Oct 23 18:12:54 2009 +0200
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<style name="Label">
+		<item name="android:textSize">16sp</item>
+		<item name="android:textStyle">bold</item>
+		<item name="android:typeface">sans</item>
+		<item name="android:capitalize">characters</item>
+		<item name="android:textColor">#FFFFFF</item>
+		<item name="android:focusable">false</item>
+	</style>
+	<style name="CheckBoxLabel" parent="@style/Label">
+		<item name="android:enabled">true</item>
+	</style>
+	<style name="Theme.BEEM.Default" parent="@android:style/Theme">
+		<item name="android:windowBackground">@drawable/background</item>
+	</style>
+	
+
+<!-- Old PC style -->
+
+	<style name="OldTheme">
+		<item name="android:textViewStyle" >@style/OldThemeTextView</item>
+	</style>
+	<style name="OldThemeTextView" parent="@android:style/Widget.TextView">
+		<item name="android:textColor">#ff009900</item>
+		<item name="android:background">@color/black</item>
+	</style>
+	
+	
+<!-- Other style -->
+
+</resources>