diff -r 489fde4ab7d4 -r 1b88edb34d96 res/values/strings.xml
--- a/res/values/strings.xml	Mon Jun 14 22:45:56 2010 +0200
+++ b/res/values/strings.xml	Mon Jun 14 22:47:22 2010 +0200
@@ -21,16 +21,6 @@
 	<string name="BeemServiceCreated">Beem Service Created</string>
 	<string name="BeemServiceDestroyed">Beem Service Destroyed</string>
 
-	<!-- ContactListSettings class -->
-	<string name="CLSServerConnection">Server connection</string>
-	<string name="CLSUserid">User id:</string>
-	<string name="CLSPassword">Password:</string>
-	<string name="CLSService">Service:</string>
-	<string name="CLSHostPort">Port:</string>
-	<string name="CLSProxyInfo">Proxy informations</string>
-	<string name="CLSLogin">Login:</string>
-	<string name="CLSOkButton">Ok</string>
-
 	<!--  ContactDialog class -->
 	<string name="CDChat">Chat</string>
 	<string name="CDCall">Call</string>
@@ -119,8 +109,8 @@
 	<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>
 	<string name="notification_preferences">Notification settings</string>
-	<string name="notification_disable_vibrate_title">Vibrate</string>
-	<string name="notification_disable_vibrate_sum">Disable vibrate on incoming messages</string>
+	<string name="notification_enable_vibrate_title">Enable vibrate</string>
+	<string name="notification_enable_vibrate_sum">Enable vibrate on incoming messages</string>
 	<string name="notification_snd_title">Message ringtone</string>
 	<string name="notification_snd_sum">Set your incoming message ringtone</string>
 
@@ -132,9 +122,6 @@
 	<string name="SubscriptText">%s wants to add you to his/her buddy list. Do you want to authorize him/her ?</string>
 	<string name="SubscriptTitle">Authorize buddy ?</string>
 
-	<!-- ContactList class -->
-	<string name="ConListNotConnected">Not connected</string>
-
 	<!--  BeemChatManager -->
 	<string name="BeemChatManagerNewMessage">You\'ve a new message</string>
 
@@ -156,9 +143,6 @@
 	<string name="user_info_name">Beem - User Info</string>
 
 	<!-- 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 use this account</string>
 
@@ -179,13 +163,18 @@
 	<string name="login_settings_button">Settings</string>
 	<string name="login_login_button">Log in</string>
 	<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>
 	<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>
 
+	<!-- LoginAnim activity -->
+	<string name="loganim_connecting">Connecting ...</string>
+	<string name="loganim_authenticating">Authenticating ...</string>
+	<string name="loganim_login_success">Login success</string>
+	<string name="loganim_login_failed">Login failed</string>
+
 	<!-- EditSettings Activity -->
 	<string name="settings_menu_create_account">Create an account</string>
 	<string name="settings_menu_privacy_lists">Manage my privacy lists</string>
@@ -230,6 +219,7 @@
 
 	<!-- ContactList Activity  -->
 	<string name="contact_list_menu_add_contact">Add a contact</string>
+	<string name="contact_list_menu_status">Change status</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>