diff -r bd5bddda04dd -r 03d61b8faa0d res/values/strings.xml
--- a/res/values/strings.xml	Fri Feb 19 02:21:35 2010 +0100
+++ b/res/values/strings.xml	Fri Feb 19 02:26:21 2010 +0100
@@ -71,7 +71,6 @@
 	<string name="ChangeStatusType">My status</string>
 	<string name="ChangeStatusMessage">My personal message</string>
 	<string name="OpenContactList">Open contact list</string>
-
 	
 	<string name="MenuAddContact">Add new contact</string>
 	<string name="MenuAccountAbout">Beem Project</string>
@@ -83,8 +82,6 @@
 	<!-- Settings class -->
 	<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">Login through a proxy server</string>
@@ -104,6 +101,40 @@
 	<string name="SettingsPriorityTitle">Priority</string>
 	<string name="SettingsResourceSummary">Set the XMPP resource of your client </string>
 	<string name="SettingsPrioritySummary">Set the priority of your client</string>
+	<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_hide_groups">Hide groups</string>	
+	<string name="CLP_hide_groups_sum">Check this option to hide groups</string>
+	<string name="CLP_hidden_contact">Hide buddies</string>
+	<string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
+	</string>
+	<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>
+	<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>
+	<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>
+	<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>
+	<string name="away_chk_title">Enable Auto-away</string>
+	<string name="away_chk_sum">Change status to Away when the screen is turned off</string>
+	<string name="away_message_title">Away message</string>
+	<string name="away_message_sum">The away message that will be displayed</string>
+	<string name="away_message_hint">I'm away, my cellphone screen is off</string>
 	
 	<!-- Subscription class -->
 	<string name="SubscriptAccept">Subscription accepted</string>
@@ -190,42 +221,10 @@
 	<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_hide_groups">Hide groups</string>	
-	<string name="CLP_hide_groups_sum">Check this option to hide groups</string>
-	<string name="CLP_hidden_contact">Hide buddies</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="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>
 
-	<!-- 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="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>
-	<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>
-	<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>
+
 
 	<!-- Create an account Activity -->
 	<string name="create_account_instr_dialog_title">Create an account - Instructions</string>