diff -r 7ac6af9ceb0d -r 3c83d2e2c478 res/values/strings.xml
--- a/res/values/strings.xml	Fri Nov 06 19:28:02 2009 +0100
+++ b/res/values/strings.xml	Fri Nov 06 19:38:17 2009 +0100
@@ -78,25 +78,25 @@
 	<string name="ChangeStatusNoChange">Nothing to change</string>
 	
 	<!-- Settings class -->
-	<string name="SettingsText">Modify my username</string>
-	<string name="SettingsPassword">Modify my password</string>
+	<string name="SettingsText">Edit your username</string>
+	<string name="SettingsPassword">Edit your password</string>
 	<string name="SettingsCheckboxText">Using Gmail</string>
 	<string name="SettingsGmail">Use my Gmail account</string>
 	<string name="SettingsProxy">Proxy</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="SettingsProxySummary">Login through 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="SettingsProxyServer">Edit proxy server address</string>
+	<string name="SettingsProxyPort">Edit proxy server port</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</string>
-	<string name="SettingsAdvancedOptions">Use specific server option</string>
+	<string name="SettingsAdvancedOptions">Specific server option</string>
 	<string name="SettingsAdvancedRecoDelay">Modify reconnection delay</string>
 	<string name="SettingsAdvancedSpecOpt">Check this box if you want to use a specific server for your connection</string>
-	<string name="SettingsAdvancedAddOpt">Allow to edit the server address</string>
-	<string name="SettingsAdvancedPortOpt">Allow to edit the server port</string>
+	<string name="SettingsAdvancedAddOpt">Edit the server address</string>
+	<string name="SettingsAdvancedPortOpt">Edit the server port</string>
 	
 	<!-- Subscription class -->
 	<string name="SubscriptAccept">Subscription accepted</string>
@@ -116,14 +116,8 @@
 	<!--  XmppConnectionAdapter class -->
 	<string name="AcceptContactRequest">Accept contact request</string>
 	<string name="AcceptContactRequestFrom">Accept contact request from </string>
-	
-    <!--
-    	Services
-    -->
     
-    <!--
-    	Activities
-    -->
+    <!-- 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>	
@@ -133,20 +127,14 @@
     <string name="contact_list_tag">Beem - ContactList Activity</string>
     <string name="user_info_name">Beem - User Info</string>
 
-    
-    <!--
-    	Buttons
-    -->
+    <!-- Buttons -->
     <string name="button_reset">Reset</string>
     <string name="button_login">Login</string>
     <string name="button_save">Save</string>
     <string name="button_create_account">Create this account</string>
     <string name="button_create_login_account">Create and log</string>
-    
-    
-    <!--
-    	LogAs Activity
-    -->
+
+    <!-- LogAs Activity -->
 	<string name="login_username">Username</string>
 	<string name="login_password">Password</string>
 	<string name="login_error_dialog_title">Login - Error</string>
@@ -164,15 +152,13 @@
 	<string name="login_login_progress">Connecting. Please wait...</string>
 	<string name="login_max_retry">Max retry</string>
 	<string name="login_error_msg">Unfortunately, an error occured.\n\nError detail:\n%s</string>
-	
-	<!--
-		EditSettings Activity
-	-->
+
+	<!-- EditSettings Activity -->
 	<string name="settings_menu_create_account">Create an account</string>
 	<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>
@@ -184,27 +170,45 @@
 	<string name="settings_key_proxy_username">beem_xmpp_proxy_username</string>
 	<string name="settings_key_proxy_password">beem_xmpp_proxy_password</string>
 	<string name="settings_key_proxy_type">beem_xmpp_proxy_type</string>
+	<string name="settings_key_hidden_contact">settings_key_hidden_contact</string>
 	
-	<!-- EditSettings Activity tabs -->
+	<!-- EditSettings Activity Categories -->
+	<string name="general_preferences">General preferences</string>
+	<string name="user_preferences">User settings</string>
+	<string name="network_preferences">Network options</string>
+	<string name="proxy_proxy_settings">Proxy settings</string>
+	<string name="proxy_user_settings">Proxy settings</string>
+
+	<!-- EditSettings Activity Tabs -->
 	<string name="settings_tab_tag_account">edit_settings_tab_account</string>
 	<string name="settings_tab_label_account">Account</string>
 	<string name="settings_tab_tag_xmpp">edit_settings_tab_xmpp</string>
 	<string name="settings_tab_label_xmpp">XMPP</string>
 	<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">Buddy list</string>
+	<string name="contact_list_preferences_sum">A set of display options for your buddy list</string>
+	<string name="CLP_hidden_contact">Hidden</string>
+	<string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies</string>
+
 	<!-- EditSettings Activity Account tab -->
 	<string name="settings_account_username">Username</string>
 	<string name="settings_account_password">Password</string>
 	<string name="settings_account_server">Server</string>
 	<string name="settings_account_port">Port</string>
-	
-	<!-- EditSettings Activity XMPP tab -->
-	<string name="settings_xmpp_server">Server</string>
+
+	<!-- EditSettings Activity Advanced Options tab -->
+	<string name="settings_advanced_service_behaviour">Service behaviour</string>
+	<string name="settings_advanced_sum">A set of options for advanced users</string>
+	<string name="settings_xmpp_server">Address</string>
 	<string name="settings_xmpp_port">Port</string>
 	<string name="settings_xmpp_use_tls">Require SSL/TLS</string>
-	
+	<string name="settings_reco_delay">Reconnection delay</string>
+
 	<!-- EditSettings Activity Proxy tab -->
+	<string name="settings_proxy_sum">Settings for proxy usage</string>
 	<string name="settings_proxy_use">Connect using a proxy</string>
 	<string name="settings_proxy_type_prompt">Choose a type of proxy</string>
 	<string name="settings_proxy_server">Server</string>
@@ -212,9 +216,7 @@
 	<string name="settings_proxy_username">Username</string>
 	<string name="settings_proxy_password">Password</string>
 	
-	<!--
-		Create an account Activity
-	-->
+	<!-- Create an account Activity -->
 	<string name="create_account_instr_dialog_title">Create an account - Instructions</string>
 	<string name="create_account_err_dialog_title">Create an account - Error</string>
 	<string name="create_account_err_dialog_settings_button">Change my settings</string>
@@ -226,27 +228,23 @@
 	<string name="create_account_password">Password</string>
 	<string name="create_account_confirm_password">Confirm password</string>
 	
-	<!--
-		ContactList Activity 
-	-->
+	<!-- 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_all_contact">All contacts</string>
 	<string name="contact_list_no_group">No group</string>
 	 
-	<!-- 
-		UserInfo Activity
-	-->
+	<!-- UserInfo Activity -->
 	<string name="userinfo_label_alias">Alias</string>
 	<string name="userinfo_label_chg_group">Manage groups</string>
 	<string name="userinfo_label_re_suscription">Resend invit</string>
 	<string name="userinfo_label_block">Block</string>
 	<string name="userinfo_label_delete">Delete</string>
 	<string name="userinfo_resend">Suscription resend</string>
-	<string name="userinfo_sure2delete">Are you sure you want to delete this contact?</string>
+	<string name="userinfo_sure2delete">Are you sure you want to delete this contact ?</string>
 	<string name="userinfo_yes">Yes</string>
 	<string name="userinfo_no">No</string>
-	<string name="userinfo_sureresend">Are you sure you want to resend invit?</string>
+	<string name="userinfo_sureresend">Are you sure you want to resend invit ?</string>
 
 <string name="chat_name">Beem - Chat</string>
 <string name="chat_input_default_value">Type your message</string>