--- a/res/values/strings.xml	Fri Jan 15 11:58:04 2010 +0100
+++ b/res/values/strings.xml	Fri Jan 15 12:02:29 2010 +0100
@@ -67,10 +67,12 @@
 	<string name="SendIMNoStatusSet">No status set</string>
 
 	<!--  ChangeStatus class -->
+	<string name="ChangeStatusActTitle">Beem - Change my status</string>
 	<string name="ChangeStatusType">My status</string>
 	<string name="ChangeStatusMessage">My personal message</string>
+	<string name="OpenContactList">Open contact list</string>
 
-	<string name="ChangeStatusActTitle">Beem - Change my status</string>
+	
 	<string name="MenuAddContact">Add new contact</string>
 	<string name="MenuAccountAbout">Beem Project</string>
 	<string name="MenuAccountCreate">Create account</string>
@@ -117,7 +119,7 @@
 	<string name="BeemChatManagerNewMessage">You\'ve a new message</string>
 
 	<!--  BeemBroadcastReceiver class -->
-	<string name="BeemBroadcastReceiverDisconnect">You have been disconnected</string>
+	<string name="BeemBroadcastReceiverDisconnect">BEEM: You have been disconnected</string>
 
 	<!--  XmppConnectionAdapter class -->
 	<string name="AcceptContactRequest">%s has just added you to his/her buddy list.</string>
@@ -160,29 +162,21 @@
 	<string name="login_max_retry">Max retry</string>
 	<string name="login_error_msg">Unfortunately, an error occured.\n\nError
 		detail:\n%s</string>
+	<string name="login_menu_login">Login</string>
+	<string name="login_no_connectivity">No internet connection found</string>
+	<string name="login_start_msg">Settings configuration in menu</string>
 
 	<!-- EditSettings Activity -->
 	<string name="settings_menu_create_account">Create an account</string>
-	<string name="settings_menu_login">Login</string>
 	<string name="settings_menu_privacy_lists">Manage my privacy lists</string>
 	<string name="settings_saved_ok">The settings have been saved successfully.</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>
-	<string name="settings_key_xmpp_port">beem_xmpp_port</string>
-	<string name="settings_key_xmpp_tls_use">beem_xmpp_tls_use</string>
-	<string name="settings_key_proxy_use">beem_xmpp_proxy_use</string>
-	<string name="settings_key_proxy_server">beem_xmpp_proxy_server</string>
-	<string name="settings_key_proxy_port">beem_xmpp_proxy_port</string>
-	<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 Categories -->
 	<string name="general_preferences">General preferences</string>
-	<string name="user_preferences">User settings</string>
+	<string name="user_preferences">User settings (required)</string>
+	<string name="user_preferences_advanced">User settings advanced (optional)</string>
 	<string name="network_preferences">Network options</string>
 	<string name="proxy_proxy_settings">Proxy settings</string>
 	<string name="proxy_user_settings">Proxy settings</string>
@@ -205,6 +199,7 @@
 
 	<!-- EditSettings Activity Account tab -->
 	<string name="settings_account_username">Username</string>
+	<string name="login_username_info_default">beem@beem-project.com</string>
 	<string name="settings_account_password">Password</string>
 	<string name="settings_account_server">Server</string>
 	<string name="settings_account_port">Port</string>
@@ -213,9 +208,11 @@
 	<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="comments_xmpp_server">example.com</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>
+	<string name="comments_xmpp_port">Default: 5222</string>
 
 	<!-- EditSettings Activity Proxy tab -->
 	<string name="settings_proxy_sum">Settings for proxy usage</string>
@@ -223,6 +220,7 @@
 	<string name="settings_proxy_type_prompt">Choose a type of proxy</string>
 	<string name="settings_proxy_server">Server</string>
 	<string name="settings_proxy_port">Port</string>
+	<string name="comments_proxy_port">Default: 1080</string>
 	<string name="settings_proxy_username">Username</string>
 	<string name="settings_proxy_password">Password</string>
 
@@ -231,7 +229,7 @@
 	<string name="create_account_err_dialog_title">Create an account - Error</string>
 	<string name="create_account_err_dialog_settings_button">Change my settings</string>
 	<string name="create_account_close_dialog_button">Close</string>
-	<string name="create_account_successfull_after">has been created successfully</string>
+	<string name="create_account_successfull_after">account %s has been created successfully</string>
 	<string name="create_account_err_username">Bad JabberID</string>
 	<string name="create_account_err_passwords">Passwords do not match.</string>
 	<string name="create_account_username">Username</string>
@@ -244,10 +242,10 @@
 	<string name="contact_list_all_contact">All contacts</string>
 	<string name="contact_list_no_group">No group</string>
 
-	<!-- UserInfo Activity -->
+	<!-- UserInfo dialog -->
 	<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_re_subscription">Resend invit</string>
 	<string name="userinfo_label_block">Block</string>
 	<string name="userinfo_label_delete">Delete</string>
 	<string name="userinfo_resend">Suscription resend</string>
@@ -283,6 +281,9 @@
 	<string name="privacy_list_select_dialog_buddies">Buddies</string>
 	<string name="privacy_list_select_dialog_groups">Groups</string>
 	<string name="privacy_list_select_dialog_delete">Delete</string>
+	<string name="privacy_list_delete_dialog_msg">Do you really want to delete the privacy list entitled \'%s\' ?</string>
+	<string name="privacy_list_delete_dialog_yes">Yes</string>
+	<string name="privacy_list_delete_dialog_no">No</string>
 
 	<string name="UpdateButton">Update</string>
 </resources>