# HG changeset patch
# User Nikita Kozlov <nikita@beem-project.com>
# Date 1306277820 -7200
# Node ID 0de5ddd06ecd5700a126b0b93b5a392b8646fbd5
# Parent  c2eb19cd703208822fef6663b864d47d5352b321# Parent  8768d12e4628ccff6fb4f25272798269099ffb91
merge

diff -r c2eb19cd7032 -r 0de5ddd06ecd .hgtags
--- a/.hgtags	Wed May 25 00:36:01 2011 +0200
+++ b/.hgtags	Wed May 25 00:57:00 2011 +0200
@@ -8,3 +8,4 @@
 cf5db8d24b2a28ca501cc3e076abc55b38b41d90 0.1.4
 7b54215139deae5ba9307b7a165f24d65f926938 0.1.5_rc1
 8d19f91dd64c7f29f137b3236fb38c2cbcf98a36 0.1.5
+3b5e81bf741ae4fd47e239f889fb66ae6732dbd6 0.1.6_rc1
diff -r c2eb19cd7032 -r 0de5ddd06ecd AndroidManifest.xml
--- a/AndroidManifest.xml	Wed May 25 00:36:01 2011 +0200
+++ b/AndroidManifest.xml	Wed May 25 00:57:00 2011 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.beem.project.beem" android:versionCode="7"
-	android:versionName="0.1.5">
+	package="com.beem.project.beem" android:versionCode="8"
+	android:versionName="0.1.6_rc1">
 	<application android:label="@string/app_name"
 		android:icon="@drawable/beem_launcher_icon_silver" android:theme="@style/Theme.BEEM.Default"
 		android:name=".BeemApplication">
diff -r c2eb19cd7032 -r 0de5ddd06ecd CREDITS
--- a/CREDITS	Wed May 25 00:36:01 2011 +0200
+++ b/CREDITS	Wed May 25 00:57:00 2011 +0200
@@ -18,6 +18,7 @@
 Daniel Hofmann for german translations
 Andrea Selva for italian translations
 Erik Lindström for swedish translations
+Murilo Ferraz Franco for portuguese translations
 
 
 Thanks to all !
diff -r c2eb19cd7032 -r 0de5ddd06ecd res/layout/chat.xml
--- a/res/layout/chat.xml	Wed May 25 00:36:01 2011 +0200
+++ b/res/layout/chat.xml	Wed May 25 00:57:00 2011 +0200
@@ -45,15 +45,16 @@
 		android:focusable="true"/>
 	<LinearLayout android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:orientation="horizontal"
+		android:gravity="center_vertical"
 		android:background="#222222" android:padding="8px">
 		<EditText android:id="@+id/chat_input" android:layout_width="0dip"
 			android:layout_height="fill_parent" android:layout_weight="1"
 			android:maxLines="5"
-			android:inputType="textShortMessage|textAutoCorrect|textMultiLine"
+			android:inputType="textShortMessage|textAutoCorrect|textMultiLine|textCapSentences"
 			android:imeOptions="actionSend" android:cursorVisible="true"
 			android:hint="@string/chat_input_default_value" />
 		<Button android:id="@+id/chat_send_message"
-			android:layout_width="wrap_content" android:layout_height="fill_parent"
+			android:layout_width="wrap_content" android:layout_height="wrap_content"
 			android:text="@string/chat_send_message" />
 	</LinearLayout>
 </LinearLayout>
diff -r c2eb19cd7032 -r 0de5ddd06ecd res/layout/chat_compact.xml
--- a/res/layout/chat_compact.xml	Wed May 25 00:36:01 2011 +0200
+++ b/res/layout/chat_compact.xml	Wed May 25 00:57:00 2011 +0200
@@ -17,7 +17,7 @@
 		<EditText android:id="@+id/chat_input" android:layout_width="0dip"
 			android:layout_height="fill_parent" android:layout_weight="1"
 			android:maxLines="5"
-			android:inputType="textShortMessage|textAutoCorrect|textMultiLine"
+			android:inputType="textShortMessage|textAutoCorrect|textMultiLine|textCapSentences"
 			android:imeOptions="actionSend" android:cursorVisible="true"
 			android:hint="@string/chat_input_default_value" />
 		<Button android:id="@+id/chat_send_message"
diff -r c2eb19cd7032 -r 0de5ddd06ecd res/layout/preferences.xml
--- a/res/layout/preferences.xml	Wed May 25 00:36:01 2011 +0200
+++ b/res/layout/preferences.xml	Wed May 25 00:57:00 2011 +0200
@@ -12,16 +12,16 @@
 			android:title="@string/contact_list_preferences" android:summary="@string/contact_list_preferences_sum">
 			<CheckBoxPreference android:title="@string/CLP_hidden_contact"
 				android:defaultValue="false" android:summary="@string/CLP_hidden_contact_sum"
-				android:key="settings_key_hidden_contact" />
+				android:key="show_offline_contacts" />
 			<CheckBoxPreference android:title="@string/CLP_hide_groups"
 				android:defaultValue="false" android:summary="@string/CLP_hide_groups_sum"
-				android:key="settings_key_hide_groups" />
+				android:key="hide_groups" />
 			<CheckBoxPreference android:title="@string/away_chk_title"
 				android:defaultValue="true" android:summary="@string/away_chk_sum"
-				android:key="settings_away_chk" />
-			<EditTextPreference android:dependency="settings_away_chk"
+				android:key="use_auto_away" />
+			<EditTextPreference android:dependency="use_auto_away"
 				android:singleLine="true" android:summary="@string/away_message_sum"
-				android:title="@string/away_message_title" android:key="settings_away_message"
+				android:title="@string/away_message_title" android:key="auto_away_msg"
 				android:hint="@string/away_message_hint" />
 		</PreferenceScreen>
 		<PreferenceScreen android:key="chat"
@@ -38,7 +38,7 @@
 			<PreferenceCategory android:title="@string/chat_layout_option">
 				<CheckBoxPreference android:title="@string/settings_chat_compact"
 					android:defaultValue="false" android:summary="@string/settings_chat_compact_sum"
-					android:key="settings_chat_compact_key" />
+					android:key="use_compact_chat_ui" />
 			</PreferenceCategory>
 			</PreferenceScreen>
 		<PreferenceScreen android:title="@string/notification_preferences">
@@ -60,10 +60,10 @@
 			android:title="@string/settings_account_password" android:key="account_password" />
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/user_preferences_advanced">
-		<EditTextPreference android:key="settings_key_resource"
+		<EditTextPreference android:key="connection_resource"
 			android:title="@string/SettingsResourceTitle" android:summary="@string/SettingsResourceSummary"
 			android:defaultValue="Beem" />
-		<EditTextPreference android:key="settings_key_priority"
+		<EditTextPreference android:key="connection_priority"
 			android:title="@string/SettingsPriorityTitle" android:summary="@string/SettingsPrioritySummary"
 			android:numeric="signed" android:defaultValue="0" />
 	</PreferenceCategory>
diff -r c2eb19cd7032 -r 0de5ddd06ecd res/values-pt-rBR/strings.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/values-pt-rBR/strings.xml	Wed May 25 00:57:00 2011 +0200
@@ -0,0 +1,332 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- Generic terms -->
+	<string name="app_name">Beem</string>
+	<string name="OkButton">Ok</string>
+	<string name="ClearButton">Limpar</string>
+	<string name="CancelButton">Cancelar</string>
+	<string name="AcceptButton">Autorizar</string>
+	<string name="RefuseButton">Negar</string>
+	<string name="JabberID">Jabber ID</string>
+	<string name="Password">Senha</string>
+	<string name="Continue">Continuar</string>
+
+	<!--  AccountConfigure class -->
+	<string name="AccountConfigureManualConfiguration">Configuração Manual</string>
+
+	<!--  Beem class -->
+	<string name="BeemJabberID">Jabber ID</string>
+
+	<!--  BeemApplication class -->
+	<string name="BeemApplicationConnect">Conectando...</string>
+
+	<!--  BeemService class -->
+	<string name="BeemServiceDescription">Utilizar Serviço Beem</string>
+	<string name="BeemServiceCreated">Serviço Beem Criado</string>
+	<string name="BeemServiceDestroyed">Serviço Beem Destruído</string>
+
+	<!--  ContactDialog class -->
+	<string name="CDChat">Conversa</string>
+	<string name="CDCall">Chamada</string>
+	<string name="CDInfos">Gerenciar Usuário</string>
+
+	<!-- AddContact class -->
+	<string name="AddCActTitle">Beem - Adicionar usuário</string>
+
+	<string name="AddCLogin">Login</string>
+	<string name="AddCAlias">Apelido</string>
+	<string name="AddCGroup">Grupo</string>
+	<string name="AddCOkButton">Adicionar</string>
+	<string name="AddCContactAdded">Contato Adicionado</string>
+	<string name="AddCContactAddedError">Erro: Contato não adicionado</string>
+	<string name="AddCContactAddedLoginError">Erro de login</string>
+	<string name="AddCBadForm">Jabber ID mal formado</string>
+	<string name="AddCContactAlready">Contato já existe</string>
+
+	<!--  ChangeStatus class -->
+	<string name="ChangeStatusActTitle">Beem - Alterar meu status</string>
+	<string name="ChangeStatusType">Meu status</string>
+	<string name="ChangeStatusMessage">Minha mensagem pessoal</string>
+	<string name="OpenContactList">Abrir lista de contatos</string>
+	
+	<string name="MenuAddContact">Adicionar contato</string>
+	<string name="MenuAccountAbout">Projeto Beem</string>
+	<string name="MenuAccountCreate">Criar conta</string>
+	<string name="MenuConnection">Editar conta</string>
+	<string name="ChangeStatusOk">Atualizando status</string>
+	<string name="ChangeStatusNoChange">Nada a alterar</string>
+	<string name="my_avatar">Meu avatar</string>
+	<string name="select_avatar">Escolha o seu avatar</string>
+	<string name="take_photo">Tirar uma foto</string>
+	<string name="pick_photo">Selecionar imagem</string>
+	<string name="delete_avatar">Sem avatar</string>
+	<string name="photoPickerNotFoundText">Selecionador de fotos não encontrado</string>
+
+
+	<!-- Settings class -->
+	<string name="SettingsText">Editar seu login</string>
+	<string name="SettingsPassword">Editar sua senha</string>
+	<string name="SettingsProxy">Proxy</string>
+	<string name="SettingsProxyProxy">Usar um servidor de proxy</string>
+	<string name="SettingsProxySummary">Efetuar login através de um proxy</string>
+	<string name="SettingsProxyType">Protocolo</string>
+	<string name="SettingsProxyTypeSummary">Selecione um tipo de proxy</string>
+	<string name="SettingsProxyServer">Editar endereço do proxy</string>
+	<string name="SettingsProxyPort">Editar porta do proxy</string>
+	<string name="SettingsProxyUser">Opcional, permite autenticar no servidor de proxy</string>
+	<string name="SettingsProxyPassword">Optional, permite autenticar no servidor de proxy</string>
+	<string name="SettingsAdvanced">Avançado</string>
+	<string name="SettingsAdvancedOptions">Opções de servidor</string>
+	<string name="SettingsAdvancedRecoDelay">Modificar atraso de conexão</string>
+	<string name="SettingsAdvancedSpecOpt">Marque essa caixa se você quer utilizar um servidor específico para a sua conexão</string>
+	<string name="SettingsAdvancedAddOpt">Editar o endereço do servidor</string>
+	<string name="SettingsAdvancedPortOpt">Editar a porta do servidor</string>
+	<string name="SettingsResourceTitle">Recurso</string>
+	<string name="SettingsPriorityTitle">Prioridade</string>
+	<string name="SettingsResourceSummary">Configurar o recurso XMPP do seu cliente</string>
+	<string name="SettingsPrioritySummary">Configurar a prioridade do seu cliente</string>
+	<string name="contact_list_preferences">Lista de contatos</string>
+	<string name="contact_list_preferences_sum">Um conjunto de opções de visualização para a sua lista de contatos
+	</string>
+	<string name="CLP_hide_groups">Ocultar grupos</string>	
+	<string name="CLP_hide_groups_sum">Marque essa opção para ocultar grupos</string>
+	<string name="CLP_hidden_contact">Ocultar contatos</string>
+	<string name="CLP_hidden_contact_sum">Marque essa opção para ocultar contatos desconectados
+	</string>
+	<string name="settings_account_username">Login (JID)</string>
+	<string name="login_username_info_default">beem@beem-project.com</string>
+	<string name="settings_account_password">Senha</string>
+	<string name="settings_account_server">Servidor</string>
+	<string name="settings_account_port">Porta</string>
+	<string name="settings_advanced_service_behaviour">Comportamento do serviço</string>
+	<string name="settings_advanced_sum">Um conjunto de opções para usuários avançados</string>
+	<string name="settings_xmpp_server">Endereço</string>
+	<string name="comments_xmpp_server">exemplo.com</string>
+	<string name="settings_xmpp_port">Porta</string>
+	<string name="settings_xmpp_use_tls">Requer SSL/TLS</string>
+	<string name="settings_reco_delay">Atraso de desconexão</string>
+	<string name="comments_xmpp_port">Padrão: 5222</string>
+	<string name="settings_proxy_sum">Configurações de uso de proxy</string>
+	<string name="settings_proxy_use">Conectar usando um proxy</string>
+	<string name="settings_proxy_type_prompt">Escolha o tipo de proxy</string>
+	<string name="settings_proxy_server">Servidor</string>
+	<string name="settings_proxy_port">Porta</string>
+	<string name="comments_proxy_port">Padrão: 1080</string>
+	<string name="settings_proxy_username">Login</string>
+	<string name="settings_proxy_password">Senha</string>
+	<string name="away_chk_title">Habilitar ausência automática</string>
+	<string name="away_chk_sum">Muda o statos para ausente quando a tela é desligada</string>
+	<string name="away_message_title">Mensagem de ausência</string>
+	<string name="away_message_sum">A mensagem de ausência que será exibida</string>
+	<string name="away_message_hint">Estou ausente, a tela do meu celular está desligada</string>
+	<string name="notification_preferences">Configurações de notificação</string>
+	<string name="notification_enable_vibrate_title">Vibrar</string>
+	<string name="notification_enable_vibrate_sum">Habilita a vibração quando receber mensagens</string>
+	<string name="notification_snd_title">Toque de mensagem</string>
+	<string name="notification_snd_sum">Configura o toque de recebimento de mensagens</string>
+	<string name="settings_chat_compact">Conversa compacta</string>
+	<string name="settings_chat_compact_sum">Habilita o modo compacto da janela de chat</string>
+	<string name="history">Histórico</string>
+	<string name="history_sum">Marque se você deseja gravar o histórico de conversas no seu cartão SD</string>
+	<string name="history_mount">Você precisa ter um cartão SD montado e com permissão de escrita para habilitar o histórico</string>
+	<string name="history_on_off">Habilita histórico de mensagens</string>
+	<string name="chat_preferences">Conversa</string>
+	<string name="chat_preferences_sum">Histórico, Tamanho do layout ...</string>
+	<string name="chat_history_path">Caminho do histórico</string>
+	<string name="chat_history_path_sum">Conversas serão gravadas em uma pasta no cartão SD</string>
+	<string name="settings_smack_debug">Habilitar debug XMPP</string>
+	<string name="settings_full_jid_login">Utilizar meu JID completo como login</string>
+	<string name="settings_full_jid_login_sum">Necessário para alguns servidores, como o Google Talk</string>
+
+	<!-- Subscription class -->
+	<string name="SubscriptAccept">Subscrição aceita</string>
+	<string name="SubscriptError">Erro de subscrição</string>
+	<string name="SubscriptRefused">Subscrição recusada</string>
+	<string name="SubscriptText">%s quer te adicionar como contato. Você autoriza?</string>
+	<string name="SubscriptTitle">Autorizar contato?</string>
+
+	<!--  BeemChatManager -->
+	<string name="BeemChatManagerNewMessage">Você tem uma nova mensagem</string>
+
+	<!--  BeemBroadcastReceiver class -->
+	<string name="BeemBroadcastReceiverDisconnect">BEEM: Você foi desconectado</string>
+
+	<!--  XmppConnectionAdapter class -->
+	<string name="AcceptContactRequest">%s te adicionou na lista de contatos.</string>
+	<string name="AcceptContactRequestFrom">Autorizar %s para contactar você.</string>
+
+	<!-- Activities -->
+	<string name="login_tag">Beem - Atividade de login</string>
+	<string name="edit_settings_name">Beem - Configurações</string>
+	<string name="edit_settings_tag">Beem - Atividade de configurações</string>
+	<string name="create_account_name">Beem - Criar uma conta</string>
+	<string name="create_account_tag">Beem - Atividade de criar conta</string>
+	<string name="contact_list_name">Beem - Lista de contatos</string>
+	<string name="contact_list_tag">Beem - Atividade de lista de contatos</string>
+	<string name="user_info_name">Beem - Informações de usuário</string>
+
+	<!-- Buttons -->
+	<string name="button_create_account">Criar conta</string>
+	<string name="button_create_login_account">Criar e utilizar conta</string>
+
+	<!-- LogAs Activity -->
+	<string name="login_username">Login</string>
+	<string name="login_password">Senha</string>
+	<string name="login_error_dialog_title">Login - Erro</string>
+	<string name="login_close_dialog_button">Fechar</string>
+	<string name="login_menu_create_account">Criar conta</string>
+	<string name="login_menu_settings">Configurações</string>
+	<string name="login_menu_about">Sobre</string>
+	<string name="login_about_title">Beem %s - Sobre</string>
+	<string name="login_about_msg">
+		Beem é um projeto da EPITECH Innovative Project. Visite
+		http://www.beem-project.com !
+	</string>
+	<string name="login_about_button">Fechar</string>
+	<string name="login_settings_button">Configurações</string>
+	<string name="login_login_button">Entrar</string>
+	<string name="login_login_progress">Conectando. Aguarde...</string>
+	<string name="login_error_msg">Infelizmente, ocorreu um erro.\n\nDetalhes
+		do erro:\n%s</string>
+	<string name="login_menu_login">Login</string>
+	<string name="login_no_connectivity">Conexão de internet não encontrada</string>
+	<string name="login_start_msg">Configurações incorretas</string>
+
+	<!-- LoginAnim activity -->
+	<string name="loganim_connecting">Conectando ...</string>
+	<string name="loganim_authenticating">Autenticando ...</string>
+	<string name="loganim_login_success">Entrou com sucesso</string>
+	<string name="loganim_login_failed">Falha no login</string>
+
+	<!-- EditSettings Activity -->
+	<string name="settings_menu_create_account">Criar conta</string>
+	<string name="settings_menu_privacy_lists">Gerenciar minha lista de privacidade</string>
+	<string name="settings_saved_ok">As configurações foram salvas com sucesso.</string>
+
+
+
+	<!-- EditSettings Activity Categories -->
+	<string name="general_preferences">Preferências gerais</string>
+	<string name="user_preferences">Configurações de usuário (requerido)</string>
+	<string name="user_preferences_advanced">Configurações avançadas de usuário (opcional)</string>
+	<string name="network_preferences">Opções de rede</string>
+	<string name="proxy_proxy_settings">Configurações de proxy</string>
+	<string name="proxy_user_settings">Configurações de proxy</string>
+	<string name="history_preferences">Histórico</string>
+	<string name="chat_layout_option">Layout da conversa</string>
+	
+
+	<!-- EditSettings Activity Tabs -->
+	<string name="settings_tab_tag_account">edit_settings_tab_account</string>
+	<string name="settings_tab_label_account">Conta</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>
+
+
+	<!-- wizard activities -->
+	<string name="account_wizard_text1"><b>Bem vindo ao BEEM.</b>\n\nVocê ainda não configurou uma conta XMPP (Jabber).\nEscolha uma das opções :</string>
+	<string name="account_wizard_configure_text"><b>Por favor, preencha os dados da sua conta</b></string>
+	<string name="account_wizard_configure_account">Eu já tenho uma conta</string>
+	<string name="account_wizard_create_account">Quero criar uma conta</string>
+
+	<!-- Create an account Activity -->
+	<string name="create_account_instr_dialog_title">Criar conta - Instruções</string>
+	<string name="create_account_err_dialog_title">Criar conta - Erro</string>
+	<string name="create_account_err_dialog_settings_button">Alterar configurações</string>
+	<string name="create_account_close_dialog_button">Fechar</string>
+	<string name="create_account_successfull_after">conta %s foi criada com sucesso</string>
+	<string name="create_account_err_username">JabberID mal formado</string>
+	<string name="create_account_err_passwords">Senha não confere.</string>
+	<string name="create_account_username">Login</string>
+	<string name="create_account_password">Senha</string>
+	<string name="create_account_confirm_password">Confirmar senha</string>
+
+	<!-- ContactList Activity  -->
+	<string name="contact_list_menu_add_contact">Adicionar contato</string>
+	<string name="contact_list_menu_status">Alterar status</string>
+	<string name="contact_list_menu_settings">Configurações</string>
+	<string name="contact_list_menu_disconnect">Desconectar</string>
+	<string name="contact_list_all_contact">Todos os contatos</string>
+	<string name="contact_list_no_group">Sem grupo</string>
+
+	<!-- UserInfo dialog -->
+	<string name="userinfo_label_alias">Apelido</string>
+	<string name="userinfo_label_chg_group">Gerenciar grupos</string>
+	<string name="userinfo_label_re_subscription">Reenviar convite</string>
+	<string name="userinfo_label_block">BLoquear</string>
+	<string name="userinfo_label_delete">Apagar</string>
+	<string name="userinfo_resend">Reenviar subscrição</string>
+	<string name="userinfo_sure2delete">Tem certeza que deseja apagar esse contato?
+	</string>
+	<string name="userinfo_yes">Sim</string>
+	<string name="userinfo_no">Não</string>
+	<string name="userinfo_sureresend">Tem certeza que deseja reenviar o convite?</string>
+
+	<string name="chat_name">Beem - Conversa</string>
+	<string name="chat_input_default_value">Digite sua mensagem</string>
+	<string name="chat_self">Eu</string>
+	<string name="chat_error">Erro</string>
+	<string name="chat_send_message">Enviar</string>
+	<string name="chat_menu_contacts_list">Lista de contatos</string>
+	<string name="chat_menu_change_chat">Trocar janela de conversa</string>
+	<string name="chat_dialog_change_chat_title">Conversas abertas</string>
+	<string name="chat_menu_close_chat">Fechar essa conversa</string>
+	<string name="chat_no_more_chats">Sem outras conversas ativas</string>
+	<string name="chat_state_composing">está escrevendo uma mensagem</string>
+	<string name="chat_state_gone">deixou a conversa</string>
+	<string name="chat_state_active">presta atenção à conversa</string>
+	<string name="chat_state_inactive">está fazendo outra coisa</string>
+
+	<string name="contact_status_msg_available">Disponível</string>
+	<string name="contact_status_msg_available_chat">Disponível para conversar</string>
+	<string name="contact_status_msg_dnd">Ocupado</string>
+	<string name="contact_status_msg_away">Ausente</string>
+	<string name="contact_status_msg_xa">Indisponível</string>
+	<string name="contact_status_msg_offline">Desconectado</string>
+
+	<string name="privacy_list_name">Beem - Gerenciar minha lista de privacidade</string>
+	<string name="privacy_list_no_data">Não há nenhuma lista de privacidade registrada.</string>
+	<string name="privacy_list_menu_create">Criar lista de privacidade</string>
+	<string name="privacy_list_create_dialog_title">Criar lista de privacidade</string>
+	<string name="privacy_list_create_dialog_list_name_label">Título</string>
+	<string name="privacy_list_create_dialog_create_button">Criar</string>
+	<string name="privacy_list_select_dialog_buddies">Contatos</string>
+	<string name="privacy_list_select_dialog_groups">Grupos</string>
+	<string name="privacy_list_select_dialog_delete">Apagar</string>
+	<string name="privacy_list_delete_dialog_msg">Você realmente deseja apagar a lista de privacidade chamada \'%s\'?</string>
+	<string name="privacy_list_delete_dialog_yes">Sim</string>
+	<string name="privacy_list_delete_dialog_no">Não</string>
+
+	<string name="UpdateButton">Atualizar</string>
+	
+	<!-- Error messages -->
+	
+	<string name="error_login_authentication">Erro durante autenticação: login ou senha incorretos.</string>
+	
+	<string name="interna_server_error">Erro interno do servidor</string>
+	<string name="bad_request">bad-request</string>
+	<string name="forbidden">forbidden</string>
+	<string name="item_not_found">item-not-found</string>
+	<string name="conflict">conflict</string>
+	<string name="feature_not_implemented">feature-not-implemented</string>
+	<string name="gone">gone</string>
+	<string name="jid_malformed">jid-malformed</string>
+	<string name="no_acceptable">no-acceptable</string>
+	<string name="not_allowed">not-allowed</string>
+	<string name="not_authorized">not-authorized</string>
+	<string name="payment_required">payment-required</string>
+	<string name="recipient_unavailable">recipient-unavailable</string>
+	<string name="redirect">redirect</string>
+	<string name="registration_required">registration-required</string>
+	<string name="remote_server_not_found">Servidor remoto não encotrado</string>
+	<string name="remote_server_timeout">Sem resposta do servidor</string>
+	<string name="remote_server_error">Erro do servidor remoto</string>
+	<string name="resource_constraint">resource-constraint</string>
+	<string name="service_unavailable">service-unavailable</string>
+	<string name="subscription_required">subscription-required</string>
+	<string name="undefined_condition">undefined-condition</string>
+	<string name="unexpected_condition">unexpected-condition</string>
+	<string name="request_timeout">request-timeout</string>
+</resources>
diff -r c2eb19cd7032 -r 0de5ddd06ecd res/values-pt/strings.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/values-pt/strings.xml	Wed May 25 00:57:00 2011 +0200
@@ -0,0 +1,332 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- Generic terms -->
+	<string name="app_name">Beem</string>
+	<string name="OkButton">Ok</string>
+	<string name="ClearButton">Limpar</string>
+	<string name="CancelButton">Cancelar</string>
+	<string name="AcceptButton">Autorizar</string>
+	<string name="RefuseButton">Negar</string>
+	<string name="JabberID">Jabber ID</string>
+	<string name="Password">Senha</string>
+	<string name="Continue">Continuar</string>
+
+	<!--  AccountConfigure class -->
+	<string name="AccountConfigureManualConfiguration">Configuração Manual</string>
+
+	<!--  Beem class -->
+	<string name="BeemJabberID">Jabber ID</string>
+
+	<!--  BeemApplication class -->
+	<string name="BeemApplicationConnect">Conectando...</string>
+
+	<!--  BeemService class -->
+	<string name="BeemServiceDescription">Utilizar Serviço Beem</string>
+	<string name="BeemServiceCreated">Serviço Beem Criado</string>
+	<string name="BeemServiceDestroyed">Serviço Beem Destruído</string>
+
+	<!--  ContactDialog class -->
+	<string name="CDChat">Conversa</string>
+	<string name="CDCall">Chamada</string>
+	<string name="CDInfos">Gerenciar Usuário</string>
+
+	<!-- AddContact class -->
+	<string name="AddCActTitle">Beem - Adicionar usuário</string>
+
+	<string name="AddCLogin">Login</string>
+	<string name="AddCAlias">Apelido</string>
+	<string name="AddCGroup">Grupo</string>
+	<string name="AddCOkButton">Adicionar</string>
+	<string name="AddCContactAdded">Contato Adicionado</string>
+	<string name="AddCContactAddedError">Erro: Contato não adicionado</string>
+	<string name="AddCContactAddedLoginError">Erro de login</string>
+	<string name="AddCBadForm">Jabber ID mal formado</string>
+	<string name="AddCContactAlready">Contato já existe</string>
+
+	<!--  ChangeStatus class -->
+	<string name="ChangeStatusActTitle">Beem - Alterar meu status</string>
+	<string name="ChangeStatusType">Meu status</string>
+	<string name="ChangeStatusMessage">Minha mensagem pessoal</string>
+	<string name="OpenContactList">Abrir lista de contatos</string>
+	
+	<string name="MenuAddContact">Adicionar contato</string>
+	<string name="MenuAccountAbout">Projeto Beem</string>
+	<string name="MenuAccountCreate">Criar conta</string>
+	<string name="MenuConnection">Editar conta</string>
+	<string name="ChangeStatusOk">Atualizando status</string>
+	<string name="ChangeStatusNoChange">Nada a alterar</string>
+	<string name="my_avatar">Meu avatar</string>
+	<string name="select_avatar">Escolha o seu avatar</string>
+	<string name="take_photo">Tirar uma foto</string>
+	<string name="pick_photo">Selecionar imagem</string>
+	<string name="delete_avatar">Sem avatar</string>
+	<string name="photoPickerNotFoundText">Selecionador de fotos não encontrado</string>
+
+
+	<!-- Settings class -->
+	<string name="SettingsText">Editar seu login</string>
+	<string name="SettingsPassword">Editar sua senha</string>
+	<string name="SettingsProxy">Proxy</string>
+	<string name="SettingsProxyProxy">Usar um servidor de proxy</string>
+	<string name="SettingsProxySummary">Efetuar login através de um proxy</string>
+	<string name="SettingsProxyType">Protocolo</string>
+	<string name="SettingsProxyTypeSummary">Selecione um tipo de proxy</string>
+	<string name="SettingsProxyServer">Editar endereço do proxy</string>
+	<string name="SettingsProxyPort">Editar porta do proxy</string>
+	<string name="SettingsProxyUser">Opcional, permite autenticar no servidor de proxy</string>
+	<string name="SettingsProxyPassword">Optional, permite autenticar no servidor de proxy</string>
+	<string name="SettingsAdvanced">Avançado</string>
+	<string name="SettingsAdvancedOptions">Opções de servidor</string>
+	<string name="SettingsAdvancedRecoDelay">Modificar atraso de conexão</string>
+	<string name="SettingsAdvancedSpecOpt">Marque essa caixa se você quer utilizar um servidor específico para a sua conexão</string>
+	<string name="SettingsAdvancedAddOpt">Editar o endereço do servidor</string>
+	<string name="SettingsAdvancedPortOpt">Editar a porta do servidor</string>
+	<string name="SettingsResourceTitle">Recurso</string>
+	<string name="SettingsPriorityTitle">Prioridade</string>
+	<string name="SettingsResourceSummary">Configurar o recurso XMPP do seu cliente</string>
+	<string name="SettingsPrioritySummary">Configurar a prioridade do seu cliente</string>
+	<string name="contact_list_preferences">Lista de contatos</string>
+	<string name="contact_list_preferences_sum">Um conjunto de opções de visualização para a sua lista de contatos
+	</string>
+	<string name="CLP_hide_groups">Ocultar grupos</string>	
+	<string name="CLP_hide_groups_sum">Marque essa opção para ocultar grupos</string>
+	<string name="CLP_hidden_contact">Ocultar contatos</string>
+	<string name="CLP_hidden_contact_sum">Marque essa opção para ocultar contatos desconectados
+	</string>
+	<string name="settings_account_username">Login (JID)</string>
+	<string name="login_username_info_default">beem@beem-project.com</string>
+	<string name="settings_account_password">Senha</string>
+	<string name="settings_account_server">Servidor</string>
+	<string name="settings_account_port">Porta</string>
+	<string name="settings_advanced_service_behaviour">Comportamento do serviço</string>
+	<string name="settings_advanced_sum">Um conjunto de opções para usuários avançados</string>
+	<string name="settings_xmpp_server">Endereço</string>
+	<string name="comments_xmpp_server">exemplo.com</string>
+	<string name="settings_xmpp_port">Porta</string>
+	<string name="settings_xmpp_use_tls">Requer SSL/TLS</string>
+	<string name="settings_reco_delay">Atraso de desconexão</string>
+	<string name="comments_xmpp_port">Padrão: 5222</string>
+	<string name="settings_proxy_sum">Configurações de uso de proxy</string>
+	<string name="settings_proxy_use">Conectar usando um proxy</string>
+	<string name="settings_proxy_type_prompt">Escolha o tipo de proxy</string>
+	<string name="settings_proxy_server">Servidor</string>
+	<string name="settings_proxy_port">Porta</string>
+	<string name="comments_proxy_port">Padrão: 1080</string>
+	<string name="settings_proxy_username">Login</string>
+	<string name="settings_proxy_password">Senha</string>
+	<string name="away_chk_title">Habilitar ausência automática</string>
+	<string name="away_chk_sum">Muda o statos para ausente quando a tela é desligada</string>
+	<string name="away_message_title">Mensagem de ausência</string>
+	<string name="away_message_sum">A mensagem de ausência que será exibida</string>
+	<string name="away_message_hint">Estou ausente, a tela do meu celular está desligada</string>
+	<string name="notification_preferences">Configurações de notificação</string>
+	<string name="notification_enable_vibrate_title">Vibrar</string>
+	<string name="notification_enable_vibrate_sum">Habilita a vibração quando receber mensagens</string>
+	<string name="notification_snd_title">Toque de mensagem</string>
+	<string name="notification_snd_sum">Configura o toque de recebimento de mensagens</string>
+	<string name="settings_chat_compact">Conversa compacta</string>
+	<string name="settings_chat_compact_sum">Habilita o modo compacto da janela de chat</string>
+	<string name="history">Histórico</string>
+	<string name="history_sum">Marque se você deseja gravar o histórico de conversas no seu cartão SD</string>
+	<string name="history_mount">Você precisa ter um cartão SD montado e com permissão de escrita para habilitar o histórico</string>
+	<string name="history_on_off">Habilita histórico de mensagens</string>
+	<string name="chat_preferences">Conversa</string>
+	<string name="chat_preferences_sum">Histórico, Tamanho do layout ...</string>
+	<string name="chat_history_path">Caminho do histórico</string>
+	<string name="chat_history_path_sum">Conversas serão gravadas em uma pasta no cartão SD</string>
+	<string name="settings_smack_debug">Habilitar debug XMPP</string>
+	<string name="settings_full_jid_login">Utilizar meu JID completo como login</string>
+	<string name="settings_full_jid_login_sum">Necessário para alguns servidores, como o Google Talk</string>
+
+	<!-- Subscription class -->
+	<string name="SubscriptAccept">Subscrição aceita</string>
+	<string name="SubscriptError">Erro de subscrição</string>
+	<string name="SubscriptRefused">Subscrição recusada</string>
+	<string name="SubscriptText">%s quer te adicionar como contato. Você autoriza?</string>
+	<string name="SubscriptTitle">Autorizar contato?</string>
+
+	<!--  BeemChatManager -->
+	<string name="BeemChatManagerNewMessage">Você tem uma nova mensagem</string>
+
+	<!--  BeemBroadcastReceiver class -->
+	<string name="BeemBroadcastReceiverDisconnect">BEEM: Você foi desconectado</string>
+
+	<!--  XmppConnectionAdapter class -->
+	<string name="AcceptContactRequest">%s te adicionou na lista de contatos.</string>
+	<string name="AcceptContactRequestFrom">Autorizar %s para contactar você.</string>
+
+	<!-- Activities -->
+	<string name="login_tag">Beem - Atividade de login</string>
+	<string name="edit_settings_name">Beem - Configurações</string>
+	<string name="edit_settings_tag">Beem - Atividade de configurações</string>
+	<string name="create_account_name">Beem - Criar uma conta</string>
+	<string name="create_account_tag">Beem - Atividade de criar conta</string>
+	<string name="contact_list_name">Beem - Lista de contatos</string>
+	<string name="contact_list_tag">Beem - Atividade de lista de contatos</string>
+	<string name="user_info_name">Beem - Informações de usuário</string>
+
+	<!-- Buttons -->
+	<string name="button_create_account">Criar conta</string>
+	<string name="button_create_login_account">Criar e utilizar conta</string>
+
+	<!-- LogAs Activity -->
+	<string name="login_username">Login</string>
+	<string name="login_password">Senha</string>
+	<string name="login_error_dialog_title">Login - Erro</string>
+	<string name="login_close_dialog_button">Fechar</string>
+	<string name="login_menu_create_account">Criar conta</string>
+	<string name="login_menu_settings">Configurações</string>
+	<string name="login_menu_about">Sobre</string>
+	<string name="login_about_title">Beem %s - Sobre</string>
+	<string name="login_about_msg">
+		Beem é um projeto da EPITECH Innovative Project. Visite
+		http://www.beem-project.com !
+	</string>
+	<string name="login_about_button">Fechar</string>
+	<string name="login_settings_button">Configurações</string>
+	<string name="login_login_button">Entrar</string>
+	<string name="login_login_progress">Conectando. Aguarde...</string>
+	<string name="login_error_msg">Infelizmente, ocorreu um erro.\n\nDetalhes
+		do erro:\n%s</string>
+	<string name="login_menu_login">Login</string>
+	<string name="login_no_connectivity">Conexão de internet não encontrada</string>
+	<string name="login_start_msg">Configurações incorretas</string>
+
+	<!-- LoginAnim activity -->
+	<string name="loganim_connecting">Conectando ...</string>
+	<string name="loganim_authenticating">Autenticando ...</string>
+	<string name="loganim_login_success">Entrou com sucesso</string>
+	<string name="loganim_login_failed">Falha no login</string>
+
+	<!-- EditSettings Activity -->
+	<string name="settings_menu_create_account">Criar conta</string>
+	<string name="settings_menu_privacy_lists">Gerenciar minha lista de privacidade</string>
+	<string name="settings_saved_ok">As configurações foram salvas com sucesso.</string>
+
+
+
+	<!-- EditSettings Activity Categories -->
+	<string name="general_preferences">Preferências gerais</string>
+	<string name="user_preferences">Configurações de usuário (requerido)</string>
+	<string name="user_preferences_advanced">Configurações avançadas de usuário (opcional)</string>
+	<string name="network_preferences">Opções de rede</string>
+	<string name="proxy_proxy_settings">Configurações de proxy</string>
+	<string name="proxy_user_settings">Configurações de proxy</string>
+	<string name="history_preferences">Histórico</string>
+	<string name="chat_layout_option">Layout da conversa</string>
+	
+
+	<!-- EditSettings Activity Tabs -->
+	<string name="settings_tab_tag_account">edit_settings_tab_account</string>
+	<string name="settings_tab_label_account">Conta</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>
+
+
+	<!-- wizard activities -->
+	<string name="account_wizard_text1"><b>Bem vindo ao BEEM.</b>\n\nVocê ainda não configurou uma conta XMPP (Jabber).\nEscolha uma das opções :</string>
+	<string name="account_wizard_configure_text"><b>Por favor, preencha os dados da sua conta</b></string>
+	<string name="account_wizard_configure_account">Eu já tenho uma conta</string>
+	<string name="account_wizard_create_account">Quero criar uma conta</string>
+
+	<!-- Create an account Activity -->
+	<string name="create_account_instr_dialog_title">Criar conta - Instruções</string>
+	<string name="create_account_err_dialog_title">Criar conta - Erro</string>
+	<string name="create_account_err_dialog_settings_button">Alterar configurações</string>
+	<string name="create_account_close_dialog_button">Fechar</string>
+	<string name="create_account_successfull_after">conta %s foi criada com sucesso</string>
+	<string name="create_account_err_username">JabberID mal formado</string>
+	<string name="create_account_err_passwords">Senha não confere.</string>
+	<string name="create_account_username">Login</string>
+	<string name="create_account_password">Senha</string>
+	<string name="create_account_confirm_password">Confirmar senha</string>
+
+	<!-- ContactList Activity  -->
+	<string name="contact_list_menu_add_contact">Adicionar contato</string>
+	<string name="contact_list_menu_status">Alterar status</string>
+	<string name="contact_list_menu_settings">Configurações</string>
+	<string name="contact_list_menu_disconnect">Desconectar</string>
+	<string name="contact_list_all_contact">Todos os contatos</string>
+	<string name="contact_list_no_group">Sem grupo</string>
+
+	<!-- UserInfo dialog -->
+	<string name="userinfo_label_alias">Apelido</string>
+	<string name="userinfo_label_chg_group">Gerenciar grupos</string>
+	<string name="userinfo_label_re_subscription">Reenviar convite</string>
+	<string name="userinfo_label_block">BLoquear</string>
+	<string name="userinfo_label_delete">Apagar</string>
+	<string name="userinfo_resend">Reenviar subscrição</string>
+	<string name="userinfo_sure2delete">Tem certeza que deseja apagar esse contato?
+	</string>
+	<string name="userinfo_yes">Sim</string>
+	<string name="userinfo_no">Não</string>
+	<string name="userinfo_sureresend">Tem certeza que deseja reenviar o convite?</string>
+
+	<string name="chat_name">Beem - Conversa</string>
+	<string name="chat_input_default_value">Digite sua mensagem</string>
+	<string name="chat_self">Eu</string>
+	<string name="chat_error">Erro</string>
+	<string name="chat_send_message">Enviar</string>
+	<string name="chat_menu_contacts_list">Lista de contatos</string>
+	<string name="chat_menu_change_chat">Trocar janela de conversa</string>
+	<string name="chat_dialog_change_chat_title">Conversas abertas</string>
+	<string name="chat_menu_close_chat">Fechar essa conversa</string>
+	<string name="chat_no_more_chats">Sem outras conversas ativas</string>
+	<string name="chat_state_composing">está escrevendo uma mensagem</string>
+	<string name="chat_state_gone">deixou a conversa</string>
+	<string name="chat_state_active">presta atenção à conversa</string>
+	<string name="chat_state_inactive">está fazendo outra coisa</string>
+
+	<string name="contact_status_msg_available">Disponível</string>
+	<string name="contact_status_msg_available_chat">Disponível para conversar</string>
+	<string name="contact_status_msg_dnd">Ocupado</string>
+	<string name="contact_status_msg_away">Ausente</string>
+	<string name="contact_status_msg_xa">Indisponível</string>
+	<string name="contact_status_msg_offline">Desconectado</string>
+
+	<string name="privacy_list_name">Beem - Gerenciar minha lista de privacidade</string>
+	<string name="privacy_list_no_data">Não há nenhuma lista de privacidade registrada.</string>
+	<string name="privacy_list_menu_create">Criar lista de privacidade</string>
+	<string name="privacy_list_create_dialog_title">Criar lista de privacidade</string>
+	<string name="privacy_list_create_dialog_list_name_label">Título</string>
+	<string name="privacy_list_create_dialog_create_button">Criar</string>
+	<string name="privacy_list_select_dialog_buddies">Contatos</string>
+	<string name="privacy_list_select_dialog_groups">Grupos</string>
+	<string name="privacy_list_select_dialog_delete">Apagar</string>
+	<string name="privacy_list_delete_dialog_msg">Você realmente deseja apagar a lista de privacidade chamada \'%s\'?</string>
+	<string name="privacy_list_delete_dialog_yes">Sim</string>
+	<string name="privacy_list_delete_dialog_no">Não</string>
+
+	<string name="UpdateButton">Atualizar</string>
+	
+	<!-- Error messages -->
+	
+	<string name="error_login_authentication">Erro durante autenticação: login ou senha incorretos.</string>
+	
+	<string name="interna_server_error">Erro interno do servidor</string>
+	<string name="bad_request">bad-request</string>
+	<string name="forbidden">forbidden</string>
+	<string name="item_not_found">item-not-found</string>
+	<string name="conflict">conflict</string>
+	<string name="feature_not_implemented">feature-not-implemented</string>
+	<string name="gone">gone</string>
+	<string name="jid_malformed">jid-malformed</string>
+	<string name="no_acceptable">no-acceptable</string>
+	<string name="not_allowed">not-allowed</string>
+	<string name="not_authorized">not-authorized</string>
+	<string name="payment_required">payment-required</string>
+	<string name="recipient_unavailable">recipient-unavailable</string>
+	<string name="redirect">redirect</string>
+	<string name="registration_required">registration-required</string>
+	<string name="remote_server_not_found">Servidor remoto não encotrado</string>
+	<string name="remote_server_timeout">Sem resposta do servidor</string>
+	<string name="remote_server_error">Erro do servidor remoto</string>
+	<string name="resource_constraint">resource-constraint</string>
+	<string name="service_unavailable">service-unavailable</string>
+	<string name="subscription_required">subscription-required</string>
+	<string name="undefined_condition">undefined-condition</string>
+	<string name="unexpected_condition">unexpected-condition</string>
+	<string name="request_timeout">request-timeout</string>
+</resources>
diff -r c2eb19cd7032 -r 0de5ddd06ecd res/values-ru/strings.xml
--- a/res/values-ru/strings.xml	Wed May 25 00:36:01 2011 +0200
+++ b/res/values-ru/strings.xml	Wed May 25 00:57:00 2011 +0200
@@ -9,6 +9,10 @@
 <string name="RefuseButton">Отказать</string>
 <string name="JabberID">JID</string>
 <string name="Password">Пароль</string>
+<string name="Continue">Продолжить</string>
+
+<!--  AccountConfigure class -->
+<string name="AccountConfigureManualConfiguration">Ручная конфигурация</string>
 
 <!--  Beem class -->
 <string name="BeemJabberID">JID</string>
@@ -18,6 +22,8 @@
 
 <!--  BeemService class -->
 <string name="BeemServiceDescription">Использовать сервис Beem</string>
+<string name="BeemServiceCreated">Сервис Beem создан</string>
+<string name="BeemServiceDestroyed">Сервис Beem уничтожен</string>
 
 <!--  ContactDialog class -->
 <string name="CDChat">Написать</string>
@@ -34,6 +40,7 @@
 <string name="AddCContactAdded">Контакт добавлен</string>
 <string name="AddCContactAddedError">При добавлении контакта возникла ошибка</string>
 <string name="AddCContactAddedLoginError">При выполнении входа возникла ошибка</string>
+<string name="AddCBadForm"></string>
 <string name="AddCContactAlready">Контакт уже добавлен</string>
 
 <!--  ChangeStatus class -->
@@ -54,32 +61,45 @@
 <string name="SettingsPassword">Пароль</string>
 <string name="SettingsProxy">Прокси</string>
 <string name="SettingsProxyProxy">Использовать прокси</string>
+<string name="SettingsProxySummary">Соединяться через прокси</string>
 <string name="SettingsProxyType">Протокол</string>
 <string name="SettingsProxyTypeSummary">Выберите тип прокси</string>
 <string name="SettingsProxyServer">Сервер</string>
 <string name="SettingsProxyPort">Порт</string>
+<string name="SettingsProxyUser">Имя пользователя прокси (необязательно)</string>
+<string name="SettingsProxyPassword">Пароль пользователя прокси (необязательно)</string>
 <string name="SettingsAdvanced">Дополнительно</string>
 <string name="SettingsAdvancedOptions">Дополнительные настройки сервера</string>
 <string name="SettingsAdvancedRecoDelay">Изменить задержку повторного соединения</string>
+<string name="SettingsAdvancedSpecOpt">Отметьте для того, чтобы указать сервер вручную</string>
 <string name="SettingsAdvancedAddOpt">Сервер</string>
 <string name="SettingsAdvancedPortOpt">Порт</string>
-<string name="SettingsResourceTitle">Ресурс</string>
+<string name="SettingsResourceTitle">Метка</string>
 <string name="SettingsPriorityTitle">Приоритет</string>
+<string name="SettingsResourceSummary">Установить метку данного клиента</string>
+<string name="SettingsPrioritySummary">Установить приоритет данного клиента</string>
 <string name="contact_list_preferences">Список контактов</string>
 <string name="contact_list_preferences_sum">A set of display options for your buddy list
 </string>
 <string name="CLP_hide_groups">Скрывать группы</string>
+<string name="CLP_hide_groups_sum">Отметьте для того, чтобы спрятать группы</string>
 <string name="CLP_hidden_contact">Скрывать оффлайн-контакты</string>
 <string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
 </string>
-<string name="settings_account_username">Имя польозвателя</string>
+<string name="settings_account_username">Имя пользователя</string>
+<string name="login_username_info_default"></string>
 <string name="settings_account_password">Пароль</string>
 <string name="settings_account_server">Сервер</string>
 <string name="settings_account_port">Порт</string>
+<string name="settings_advanced_service_behaviour"></string>
+<string name="settings_advanced_sum">Расширенные настройки</string>
 <string name="settings_xmpp_server">Сервер</string>
+<string name="comments_xmpp_server"></string>
 <string name="settings_xmpp_port">Порт</string>
 <string name="settings_xmpp_use_tls">Требовать SSL/TLS</string>
+<string name="settings_reco_delay"></string>
 <string name="comments_xmpp_port">По умолчанию 5222</string>
+<string name="settings_proxy_sum"></string>
 <string name="settings_proxy_use">Соединяться через прокси</string>
 <string name="settings_proxy_type_prompt">Выберите тип проси</string>
 <string name="settings_proxy_server">Сервер</string>
@@ -87,28 +107,48 @@
 <string name="comments_proxy_port">По умолчанию 1080</string>
 <string name="settings_proxy_username">Имя пользователя</string>
 <string name="settings_proxy_password">Пароль</string>
+<string name="away_chk_title">Включить Auto-away</string>
+<string name="away_chk_sum">Устанавливать статус "Отошел" при отключении экрана</string>
+<string name="away_message_title">Сообщение об отсутствии</string>
+<string name="away_message_sum">Напишите сообщение об отсутствии</string>
+<string name="away_message_hint">Я отошел, экран телефона выключен</string>
 <string name="notification_preferences">Настройка оповещений</string>
 <string name="notification_enable_vibrate_title">Вибрация</string>
-<string name="notification_enable_vibrate_sum">Активировать вибрировать на входящие сообщения</string>
+<string name="notification_enable_vibrate_sum">Вибрировать при новых сообщениях</string>
 <string name="notification_snd_title">Сигнал сообщений</string>
+<string name="notification_snd_sum">Установить сигнал для пришедшего сообщения</string>
 
 
 <!-- Subscription class -->
+<string name="SubscriptAccept">Контакт авторизован</string>
+<string name="SubscriptError">Ошибка авторизации</string>
+<string name="SubscriptRefused">Авторизация отклонена</string>
+<string name="SubscriptText">%s желает добавить вас в свой контакт-лист. Авторизовать его(-е)?</string>
+<string name="SubscriptTitle">Авторизовать пользователя?</string>
 
 <!--  BeemChatManager -->
 <string name="BeemChatManagerNewMessage">Пришло новое сообщение</string>
 
 <!--  BeemBroadcastReceiver class -->
+<string name="BeemBroadcastReceiverDisconnect">BEEM: Соединение разорвано</string>
 
 <!--  XmppConnectionAdapter class -->
+<string name="AcceptContactRequest">%s добавил(а) вас в свой контакт-лист.</string>
+<string name="AcceptContactRequestFrom">Авторизовать %s.</string>
 
 <!-- Activities -->
+<string name="login_tag"></string>
 <string name="edit_settings_name">Настройки</string>
+<string name="edit_settings_tag"></string>
 <string name="create_account_name">Создать аккаунт</string>
+<string name="create_account_tag"></string>
 <string name="contact_list_name">Контакты</string>
+<string name="contact_list_tag"></string>
 <string name="user_info_name">Информация о пользователе</string>
 
 <!-- Buttons -->
+<string name="button_create_account">Создать аккаунт</string>
+<string name="button_create_login_account">Создать аккаунт и подключиться</string>
 
 <!-- LogAs Activity -->
 <string name="login_username">Имя пользователя</string>
@@ -118,6 +158,7 @@
 <string name="login_menu_create_account">Создать аккаунт</string>
 <string name="login_menu_settings">Настройки</string>
 <string name="login_menu_about">О программе</string>
+<string name="login_about_title">Beem %s - О программе</string>
 <string name="login_about_msg">
 Beem is an EPITECH Innovative Project. Visit us at
 http://www.beem-project.com !
@@ -129,35 +170,48 @@
 <string name="login_error_msg">Unfortunately, an error occured.\n\nError
 detail:\n%s</string>
 <string name="login_menu_login">Войти</string>
+<string name="login_no_connectivity">Интернет соединение не найдено</string>
+<string name="login_start_msg"></string>
 
 <!-- LoginAnim activity -->
 <string name="loganim_connecting">Соединение ...</string>
 <string name="loganim_authenticating">Аутентификация ...</string>
-<string name="loganim_login_success">Логин успешной</string>
+<string name="loganim_login_success">Вошли в сеть</string>
 <string name="loganim_login_failed">Не удалось войти в сеть</string>
 
 <!-- EditSettings Activity -->
 <string name="settings_menu_create_account">Создать аккаунт</string>
 <string name="settings_menu_privacy_lists">Настроить списки приватности</string>
+<string name="settings_saved_ok">Настройки успешно сохранены</string>
 
 
 
 <!-- EditSettings Activity Categories -->
+<string name="general_preferences">Общие настройки</string>
+<string name="user_preferences">Настройки пользователя (обязательно)</string>
+<string name="user_preferences_advanced">Расширенные настройки пользователя (необязательно)</string>
 <string name="network_preferences">Настройки сети</string>
 <string name="proxy_proxy_settings">Настройки прокси</string>
 <string name="proxy_user_settings">Настройки прокси</string>
 
 <!-- EditSettings Activity Tabs -->
+<string name="settings_tab_tag_account"></string>
 <string name="settings_tab_label_account">Аккаунт</string>
+<string name="settings_tab_tag_xmpp"></string>
 <string name="settings_tab_label_xmpp">XMPP</string>
+<string name="settings_tab_tag_proxy"></string>
 <string name="settings_tab_label_proxy">Прокси</string>
 
 
 <!-- wizard activities -->
+<string name="account_wizard_text1"><b>Добро пожаловать в BEEM.</b>\n\nВы ещё не настроили аккаунт XMPP (Jabber).\nВыберите один из следующих вариантов :</string>
+<string name="account_wizard_configure_text"></string>
 <string name="account_wizard_configure_account">Использовать существующий аккаунт</string>
 <string name="account_wizard_create_account">Создать новый аккаунт</string>
 
 <!-- Create an account Activity -->
+<string name="create_account_instr_dialog_title"></string>
+<string name="create_account_err_dialog_title"></string>
 <string name="create_account_err_dialog_settings_button">Изменить настройки</string>
 <string name="create_account_close_dialog_button">Закрыть</string>
 <string name="create_account_successfull_after">Аккаунт %s успешно создан</string>
@@ -169,8 +223,11 @@
 
 <!-- ContactList Activity  -->
 <string name="contact_list_menu_add_contact">Добавить контакт</string>
+<string name="contact_list_menu_status">Сменить статус</string>
 <string name="contact_list_menu_settings">Настройки</string>
+<string name="contact_list_menu_disconnect">Отключиться</string>
 <string name="contact_list_all_contact">Все контакты</string>
+<string name="contact_list_no_group"></string>
 
 <!-- UserInfo dialog -->
 <string name="userinfo_label_alias">Псевдоним</string>
@@ -178,24 +235,30 @@
 <string name="userinfo_label_re_subscription">Выслать приглашение ещё раз</string>
 <string name="userinfo_label_block">Заблокировать</string>
 <string name="userinfo_label_delete">Удалить</string>
-<string name="userinfo_sure2delete">Are you sure you want to delete this contact?
+<string name="userinfo_resend"></string>
+<string name="userinfo_sure2delete">Are you sure you want to delete this contact ?
 </string>
 <string name="userinfo_yes">Да</string>
 <string name="userinfo_no">Нет</string>
+<string name="userinfo_sureresend"></string>
 
 <string name="chat_name">Чат</string>
+<string name="chat_input_default_value">Печатать сообщение</string>
 <string name="chat_self">Я</string>
 <string name="chat_error">Ошибка</string>
 <string name="chat_send_message">Отправить</string>
 <string name="chat_menu_contacts_list">Список контактов</string>
-<string name="chat_dialog_change_chat_title">Открытые чаты</string>
-<string name="chat_menu_close_chat">Закрыть этот чат</string>
-<string name="chat_state_composing">набирает текст</string>
-<string name="chat_state_gone">покинул чат</string>
+<string name="chat_menu_change_chat">Другая беседа</string>
+<string name="chat_dialog_change_chat_title">Открытые беседы</string>
+<string name="chat_menu_close_chat">Закрыть эту беседу</string>
+<string name="chat_no_more_chats">Нет активных бесед</string>
+<string name="chat_state_composing">пишет</string>
+<string name="chat_state_gone">закрыл(а) окно беседы</string>
 <string name="chat_state_active">вникает в текст</string>
 <string name="chat_state_inactive">занимается чем-то другим</string>
 
 <string name="contact_status_msg_available">Онлайн</string>
+<string name="contact_status_msg_available_chat">Поболтает</string>
 <string name="contact_status_msg_dnd">Занят</string>
 <string name="contact_status_msg_away">Отошёл</string>
 <string name="contact_status_msg_xa">Недоступен</string>
@@ -210,6 +273,7 @@
 <string name="privacy_list_select_dialog_buddies">Контакты</string>
 <string name="privacy_list_select_dialog_groups">Группы</string>
 <string name="privacy_list_select_dialog_delete">Удалить</string>
+<string name="privacy_list_delete_dialog_msg">Вы правда хотите удалить список приватности \'%s\' ?</string>
 <string name="privacy_list_delete_dialog_yes">Да</string>
 <string name="privacy_list_delete_dialog_no">Нет</string>
 
@@ -220,7 +284,27 @@
 <string name="error_login_authentication">Ошибка: неверно указан логин или пароль</string>
 
 <string name="interna_server_error">Ошибка сервера</string>
+<string name="bad_request"></string>
+<string name="forbidden"></string>
+<string name="item_not_found"></string>
+<string name="conflict"></string>
+<string name="feature_not_implemented"></string>
+<string name="gone"></string>
+<string name="jid_malformed"></string>
+<string name="no_acceptable"></string>
+<string name="not_allowed"></string>
+<string name="not_authorized"></string>
+<string name="payment_required"></string>
+<string name="recipient_unavailable"></string>
+<string name="redirect"></string>
+<string name="registration_required"></string>
 <string name="remote_server_not_found">Сервер не найден</string>
 <string name="remote_server_timeout">Сервер не отвечает</string>
 <string name="remote_server_error">Ошибка сервера</string>
+<string name="resource_constraint"></string>
+<string name="service_unavailable"></string>
+<string name="subscription_required"></string>
+<string name="undefined_condition"></string>
+<string name="unexpected_condition"></string>
+<string name="request_timeout"></string>
 </resources>
diff -r c2eb19cd7032 -r 0de5ddd06ecd res/values-sv/strings.xml
--- a/res/values-sv/strings.xml	Wed May 25 00:36:01 2011 +0200
+++ b/res/values-sv/strings.xml	Wed May 25 00:57:00 2011 +0200
@@ -55,6 +55,13 @@
 <string name="MenuConnection">Ändra konto</string>
 <string name="ChangeStatusOk">Uppdaterar status</string>
 <string name="ChangeStatusNoChange">Inget att ändra</string>
+<string name="my_avatar">Min avatar</string>
+<string name="select_avatar">Välj avatar</string>
+<string name="take_photo">Ta ett foto</string>
+<string name="pick_photo">Välj en bild</string>
+<string name="delete_avatar">Ingen avatar</string>
+<string name="photoPickerNotFoundText">Hittar ingen fotoväljare</string>
+
 
 <!-- Settings class -->
 <string name="SettingsText">Ändra ditt användarnamn</string>
@@ -120,8 +127,13 @@
 <string name="settings_chat_compact">Kompakt chatt</string>
 <string name="settings_chat_compact_sum">Gör chattfönstret kompakt</string>
 <string name="history">Historik</string>
+<string name="history_sum">Markera för att spara chattar på SD-kort</string>
 <string name="history_mount">Ett monterat och skrivbart SD-kort krävs för att aktivera historik</string>
 <string name="history_on_off">Aktivera historik</string>
+<string name="chat_preferences">Chatt</string>
+<string name="chat_preferences_sum">Historik, utseende mm.</string>
+<string name="chat_history_path">Sökväg till historik</string>
+<string name="chat_history_path_sum">Konversationer sparas i en mapp på SD-kortet</string>
 <string name="settings_smack_debug">Aktivera XMPP-felsökning</string>
 <string name="settings_full_jid_login">Använd fullständigt JID som användarnamn</string>
 <string name="settings_full_jid_login_sum">Krävs på vissa servrar som Google Talk</string>
@@ -200,6 +212,9 @@
 <string name="network_preferences">Nätverksinställningar</string>
 <string name="proxy_proxy_settings">Proxyinställningar</string>
 <string name="proxy_user_settings">Proxyinställningar</string>
+<string name="history_preferences">Historik</string>
+<string name="chat_layout_option">Utseende</string>
+
 
 <!-- EditSettings Activity Tabs -->
 <string name="settings_tab_tag_account">edit_settings_tab_account</string>
@@ -243,7 +258,7 @@
 <string name="userinfo_label_block">Spärra</string>
 <string name="userinfo_label_delete">Ta bort</string>
 <string name="userinfo_resend">Skicka prenumeration igen</string>
-<string name="userinfo_sure2delete">Are you sure you want to delete this contact ?
+<string name="userinfo_sure2delete">Are you sure you want to delete this contact?
 </string>
 <string name="userinfo_yes">Ja</string>
 <string name="userinfo_no">Nej</string>
diff -r c2eb19cd7032 -r 0de5ddd06ecd src/com/beem/project/beem/BeemApplication.java
--- a/src/com/beem/project/beem/BeemApplication.java	Wed May 25 00:36:01 2011 +0200
+++ b/src/com/beem/project/beem/BeemApplication.java	Wed May 25 00:57:00 2011 +0200
@@ -67,6 +67,10 @@
     public static final String STATUS_KEY = "status";
     /** Preference key for status message. */
     public static final String STATUS_TEXT_KEY = "status_text";
+    /** Preference key for connection resource . */
+    public static final String CONNECTION_RESOURCE_KEY = "connection_resource";
+    /** Preference key for connection priority. */
+    public static final String CONNECTION_PRIORITY_KEY = "connection_priority";
     /** Preference key for the use of a proxy. */
     public static final String PROXY_USE_KEY = "proxy_use";
     /** Preference key for the type of proxy. */
@@ -87,6 +91,16 @@
     public static final String SMACK_DEBUG_KEY = "smack_debug";
     /** Preference key for full Jid for login. */
     public static final String FULL_JID_LOGIN_KEY = "full_jid_login";
+    /** Preference key for display offline contact. */
+    public static final String SHOW_OFFLINE_CONTACTS_KEY = "show_offline_contacts";
+    /** Preference key for hide the groups. */
+    public static final String HIDE_GROUPS_KEY = "hide_groups";
+    /** Preference key for auto away enable. */
+    public static final String USE_AUTO_AWAY_KEY = "use_auto_away";
+    /** Preference key for auto away message. */
+    public static final String AUTO_AWAY_MSG_KEY = "auto_away_msg";
+    /** Preference key for compact chat ui. */
+    public static final String USE_COMPACT_CHAT_UI_KEY = "use_compact_chat_ui";
     /** Preference key for history path on the SDCard. */
     public static final String CHAT_HISTORY_KEY = "settings_chat_history_path";
 
diff -r c2eb19cd7032 -r 0de5ddd06ecd src/com/beem/project/beem/BeemService.java
--- a/src/com/beem/project/beem/BeemService.java	Wed May 25 00:36:01 2011 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Wed May 25 00:57:00 2011 +0200
@@ -75,6 +75,7 @@
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.preference.PreferenceManager;
+import android.provider.Settings;
 import android.util.Log;
 
 import com.beem.project.beem.service.XmppConnectionAdapter;
@@ -191,7 +192,7 @@
 	registerReceiver(mReceiver, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
 	mSettings = PreferenceManager.getDefaultSharedPreferences(this);
 	mSettings.registerOnSharedPreferenceChangeListener(mPreferenceListener);
-	if (mSettings.getBoolean("settings_away_chk", false)) {
+	if (mSettings.getBoolean(BeemApplication.USE_AUTO_AWAY_KEY, false)) {
 	    mOnOffReceiverIsRegistered = true;
 	    registerReceiver(mOnOffReceiver, new IntentFilter(Intent.ACTION_SCREEN_OFF));
 	    registerReceiver(mOnOffReceiver, new IntentFilter(Intent.ACTION_SCREEN_ON));
@@ -224,7 +225,7 @@
 
 	Roster.setDefaultSubscriptionMode(SubscriptionMode.manual);
 	mBind = new XmppFacade(mConnection);
-	Log.d(TAG, "ONCREATE");
+	Log.d(TAG, "Create BeemService");
     }
 
     /**
@@ -240,7 +241,7 @@
 	    unregisterReceiver(mOnOffReceiver);
 	if (mConnection.isAuthentificated() && BeemConnectivity.isConnected(this))
 	    mConnection.disconnect();
-	Log.d(TAG, "ONDESTROY");
+	Log.i(TAG, "Stopping the service");
     }
 
     /**
@@ -266,7 +267,7 @@
 	if (mSettings.getBoolean(BeemApplication.NOTIFICATION_VIBRATE_KEY, true))
 	    notif.defaults |= Notification.DEFAULT_VIBRATE;
 	notif.defaults |= Notification.DEFAULT_LIGHTS;
-	String ringtoneStr = mSettings.getString(BeemApplication.NOTIFICATION_SOUND_KEY, "");
+	String ringtoneStr = mSettings.getString(BeemApplication.NOTIFICATION_SOUND_KEY, Settings.System.DEFAULT_NOTIFICATION_URI.toString());
 	notif.sound = Uri.parse(ringtoneStr);
 	mNotificationManager.notify(id, notif);
     }
@@ -454,8 +455,8 @@
 
 	@Override
 	public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-	    if ("settings_away_chk".equals(key)) {
-		if (sharedPreferences.getBoolean("settings_away_chk", false)) {
+	    if (BeemApplication.USE_AUTO_AWAY_KEY.equals(key)) {
+		if (sharedPreferences.getBoolean(BeemApplication.USE_AUTO_AWAY_KEY, false)) {
 		    mOnOffReceiverIsRegistered = true;
 		    registerReceiver(mOnOffReceiver, new IntentFilter(Intent.ACTION_SCREEN_OFF));
 		    registerReceiver(mOnOffReceiver, new IntentFilter(Intent.ACTION_SCREEN_ON));
@@ -489,7 +490,7 @@
 		mOldStatus = mConnection.getPreviousStatus();
 		if (mConnection.isAuthentificated())
 		    mConnection.changeStatus(Status.CONTACT_STATUS_AWAY,
-			    mSettings.getString("settings_away_message", "Away"));
+			    mSettings.getString(BeemApplication.AUTO_AWAY_MSG_KEY, "Away"));
 	    } else if (intentAction.equals(Intent.ACTION_SCREEN_ON)) {
 		if (mConnection.isAuthentificated())
 		    mConnection.changeStatus(mOldMode, mOldStatus);
diff -r c2eb19cd7032 -r 0de5ddd06ecd src/com/beem/project/beem/service/BeemChatManager.java
--- a/src/com/beem/project/beem/service/BeemChatManager.java	Wed May 25 00:36:01 2011 +0200
+++ b/src/com/beem/project/beem/service/BeemChatManager.java	Wed May 25 00:57:00 2011 +0200
@@ -111,8 +111,6 @@
     @Override
     public IChat createChat(Contact contact, IMessageListener listener) {
 	String jid = contact.getJIDWithRes();
-	Log.d(TAG, "Get chat key1 = ");
-
 	return createChat(jid, listener);
     }
 
@@ -125,7 +123,6 @@
     public IChat createChat(String jid, IMessageListener listener) {
 	String key = jid;
 	ChatAdapter result;
-	Log.d(TAG, "Get chat key2 = ");
 	if (mChats.containsKey(key)) {
 	    result = mChats.get(key);
 	    result.addMessageListener(listener);
@@ -243,7 +240,7 @@
 	@Override
 	public void chatCreated(Chat chat, boolean locally) {
 	    IChat newchat = getChat(chat);
-	    Log.d(TAG, "Chat" + chat.toString() + " created locally " + locally + "with " + chat.getParticipant());
+	    Log.d(TAG, "Chat" + chat.toString() + " created locally " + locally + " with " + chat.getParticipant());
 	    try {
 		newchat.addMessageListener(mChatListener);
 		final int n = mRemoteChatCreationListeners.beginBroadcast();
diff -r c2eb19cd7032 -r 0de5ddd06ecd src/com/beem/project/beem/service/RosterAdapter.java
--- a/src/com/beem/project/beem/service/RosterAdapter.java	Wed May 25 00:36:01 2011 +0200
+++ b/src/com/beem/project/beem/service/RosterAdapter.java	Wed May 25 00:57:00 2011 +0200
@@ -379,8 +379,6 @@
 	    for (int i = 0; i < n; i++) {
 		IBeemRosterListener listener = mRemoteRosListeners.getBroadcastItem(i);
 		try {
-		    if (!presence.isAvailable())
-			mAvatarIdmap.remove(StringUtils.parseBareAddress(presence.getFrom()));
 		    if (presence.getStatus() == null || "".equals(presence.getStatus())) {
 			presence.setStatus(mDefaultStatusMessages.get(Status.getStatusFromPresence(presence)));
 		    }
@@ -409,7 +407,7 @@
 	    String bare = StringUtils.parseBareAddress(from);
 	    if (avatarId == null)
 		mAvatarIdmap.remove(bare);
-	    else {
+	    else if (avatarInfos.size() > 0) {
 		mAvatarIdmap.put(bare, avatarId);
 	    }
 	}
diff -r c2eb19cd7032 -r 0de5ddd06ecd src/com/beem/project/beem/service/XmppConnectionAdapter.java
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Wed May 25 00:36:01 2011 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Wed May 25 00:57:00 2011 +0200
@@ -169,11 +169,11 @@
 	}
 	mPref = mService.getServicePreference();
 	try {
-	    mPreviousPriority = Integer.parseInt(mPref.getString("settings_key_priority", "0"));
+	    mPreviousPriority = Integer.parseInt(mPref.getString(BeemApplication.CONNECTION_PRIORITY_KEY, "0"));
 	} catch (NumberFormatException ex) {
 	    mPreviousPriority = 0;
 	}
-	mResource = mPref.getString("settings_key_resource", "BEEM");
+	mResource = mPref.getString(BeemApplication.CONNECTION_RESOURCE_KEY, "Beem");
     }
 
     /**
diff -r c2eb19cd7032 -r 0de5ddd06ecd src/com/beem/project/beem/ui/Chat.java
--- a/src/com/beem/project/beem/ui/Chat.java	Wed May 25 00:36:01 2011 +0200
+++ b/src/com/beem/project/beem/ui/Chat.java	Wed May 25 00:57:00 2011 +0200
@@ -75,6 +75,7 @@
 import android.preference.PreferenceManager;
 import android.text.util.Linkify;
 import android.util.Log;
+import android.view.inputmethod.EditorInfo;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -83,7 +84,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.View.OnClickListener;
-import android.view.View.OnKeyListener;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.EditText;
@@ -92,6 +92,7 @@
 import android.widget.TextView;
 
 import com.beem.project.beem.R;
+import com.beem.project.beem.BeemApplication;
 import com.beem.project.beem.providers.AvatarProvider;
 import com.beem.project.beem.service.Contact;
 import com.beem.project.beem.service.Message;
@@ -112,7 +113,7 @@
  * This class represents an activity which allows the user to chat with his/her contacts.
  * @author Jean-Manuel Da Silva <dasilvj at beem-project dot com>
  */
-public class Chat extends Activity implements OnKeyListener {
+public class Chat extends Activity implements TextView.OnEditorActionListener {
 
     private static final String TAG = "Chat";
     private static final Intent SERVICE_INTENT = new Intent();
@@ -166,7 +167,7 @@
 	super.onCreate(savedBundle);
 	this.registerReceiver(mBroadcastReceiver, new IntentFilter(BeemBroadcastReceiver.BEEM_CONNECTION_CLOSED));
 	SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
-	mCompact = settings.getBoolean("settings_chat_compact_key", false);
+	mCompact = settings.getBoolean(BeemApplication.USE_COMPACT_CHAT_UI_KEY, false);
 	// UI
 	if (!mCompact) {
 	    setContentView(R.layout.chat);
@@ -183,7 +184,7 @@
 	mMessagesListView = (ListView) findViewById(R.id.chat_messages);
 	mMessagesListView.setAdapter(mMessagesListAdapter);
 	mInputField = (EditText) findViewById(R.id.chat_input);
-	mInputField.setOnKeyListener(this);
+	mInputField.setOnEditorActionListener(this);
 	mInputField.requestFocus();
 	mSendButton = (Button) findViewById(R.id.chat_send_message);
 	mSendButton.setOnClickListener(new OnClickListener() {
@@ -876,7 +877,7 @@
 	 * @param date the time of the message.
 	 */
 	public MessageText(final String bareJid, final String name, final String message,
-	    final boolean isError, Date date) {
+	    final boolean isError, final Date date) {
 	    mBareJid = bareJid;
 	    mName = name;
 	    mMessage = message;
@@ -964,15 +965,10 @@
      * {@inheritDoc}.
      */
     @Override
-    public boolean onKey(View v, int keyCode, KeyEvent event) {
-	if (event.getAction() == KeyEvent.ACTION_DOWN) {
-	    switch (keyCode) {
-		case KeyEvent.KEYCODE_ENTER:
-		    sendMessage();
-		    return true;
-		default:
-		    return false;
-	    }
+    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+	if (v == mInputField && actionId == EditorInfo.IME_ACTION_SEND) {
+	    sendMessage();
+	    return true;
 	}
 	return false;
     }
diff -r c2eb19cd7032 -r 0de5ddd06ecd src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Wed May 25 00:36:01 2011 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Wed May 25 00:57:00 2011 +0200
@@ -91,6 +91,7 @@
 import android.graphics.drawable.LayerDrawable;
 
 import com.beem.project.beem.R;
+import com.beem.project.beem.BeemApplication;
 import com.beem.project.beem.providers.AvatarProvider;
 import com.beem.project.beem.service.Contact;
 import com.beem.project.beem.service.PresenceAdapter;
@@ -116,7 +117,6 @@
 	SERVICE_INTENT.setComponent(new ComponentName("com.beem.project.beem", "com.beem.project.beem.BeemService"));
     }
 
-    private static final String SETTINGS_HIDDEN_CONTACT = "settings_key_hidden_contact";
     private static final String TAG = "ContactList";
     private final BeemContactList mAdapterContactList = new BeemContactList();
     private final List<String> mListGroup = new ArrayList<String>();
@@ -188,6 +188,7 @@
 	    case R.id.menu_disconnect:
 		stopService(SERVICE_INTENT);
 		finish();
+		return true;
 	    default:
 		return false;
 	}
@@ -386,7 +387,7 @@
 	 */
 	@Override
 	public void onEntriesAdded(final List<String> addresses) throws RemoteException {
-	    final boolean hideDisconnected = mSettings.getBoolean(SETTINGS_HIDDEN_CONTACT, false);
+	    final boolean hideDisconnected = mSettings.getBoolean(BeemApplication.SHOW_OFFLINE_CONTACTS_KEY, false);
 	    for (String newName : addresses) {
 		Contact contact = mRoster.getContact(newName);
 		boolean visible = !hideDisconnected || Status.statusOnline(contact.getStatus());
@@ -457,7 +458,7 @@
 	 */
 	@Override
 	public void onEntriesUpdated(final List<String> addresses) throws RemoteException {
-	    final boolean hideDisconnected = mSettings.getBoolean(SETTINGS_HIDDEN_CONTACT, false);
+	    final boolean hideDisconnected = mSettings.getBoolean(BeemApplication.SHOW_OFFLINE_CONTACTS_KEY, false);
 	    for (String adr : addresses) {
 		Contact contact = mRoster.getContact(adr);
 		boolean visible = !hideDisconnected || Status.statusOnline(contact.getStatus());
@@ -502,9 +503,8 @@
 	 */
 	@Override
 	public void onPresenceChanged(PresenceAdapter presence) throws RemoteException {
-	    Log.d(TAG, "presence");
 	    String from = presence.getFrom();
-	    final boolean hideDisconnected = mSettings.getBoolean(SETTINGS_HIDDEN_CONTACT, false);
+	    final boolean hideDisconnected = mSettings.getBoolean(BeemApplication.SHOW_OFFLINE_CONTACTS_KEY, false);
 	    final Contact contact = mRoster.getContact(StringUtils.parseBareAddress(from));
 	    boolean visible = !hideDisconnected || Status.statusOnline(contact.getStatus());
 	    List<String> groups = contact.getGroups();
@@ -552,7 +552,7 @@
 	 * @param contact contact to update
 	 */
 	private void updateCurrentList(String listName, final Contact contact) {
-	    final boolean hideDisconnected = mSettings.getBoolean(SETTINGS_HIDDEN_CONTACT, false);
+	    final boolean hideDisconnected = mSettings.getBoolean(BeemApplication.SHOW_OFFLINE_CONTACTS_KEY, false);
 	    final List<String> groups = contact.getGroups();
 	    String noGroup = getString(R.string.contact_list_no_group);
 	    String allGroup = getString(R.string.contact_list_all_contact);
@@ -807,7 +807,7 @@
 		    mListGroup.add(getString(R.string.contact_list_no_group));
 		    assignContactToGroups(mRoster.getContactList(), tmpGroupList);
 		    makeSortedList(mContactOnGroup);
-		    if (!mSettings.getBoolean("settings_key_hide_groups", false))
+		    if (!mSettings.getBoolean(BeemApplication.HIDE_GROUPS_KEY, false))
 			showGroups();
 		    else
 			hideGroups();
@@ -846,7 +846,7 @@
 	 * @param groupNames list of existing groups
 	 */
 	private void assignContactToGroups(List<Contact> contacts, List<String> groupNames) {
-	    boolean hideDisconnected = mSettings.getBoolean(SETTINGS_HIDDEN_CONTACT, false);
+	    boolean hideDisconnected = mSettings.getBoolean(BeemApplication.SHOW_OFFLINE_CONTACTS_KEY, false);
 	    mContactOnGroup.clear();
 	    List<Contact> all = new LinkedList<Contact>();
 	    List<Contact> noGroups = new LinkedList<Contact>();