--- a/res/values-es/strings.xml	Wed Mar 06 21:30:51 2013 +0100
+++ b/res/values-es/strings.xml	Wed Mar 06 22:09:34 2013 +0100
@@ -7,7 +7,7 @@
 <string name="CancelButton">Cancelar</string>
 <string name="AcceptButton">Autorizar</string>
 <string name="RefuseButton">Denegar</string>
-<string name="JabberID">JabberID</string>
+<string name="JabberID">Jabber ID</string>
 <string name="Password">Contraseña</string>
 <string name="Continue">Continuar</string>
 
@@ -15,18 +15,18 @@
 <string name="AccountConfigureManualConfiguration">Configuración manual</string>
 
 <!--  Beem class -->
-<string name="BeemJabberID">JabberID</string>
+<string name="BeemJabberID">Jabber ID</string>
 
 <!--  BeemApplication class -->
 <string name="BeemApplicationConnect">Conectando...</string>
 
 <!--  BeemService class -->
-<string name="BeemServiceDescription">Usa el servicio Beem</string>
+<string name="BeemServiceDescription">Usar el servicio Beem</string>
 <string name="BeemServiceCreated">Servicio Beem creado</string>
 <string name="BeemServiceDestroyed">Servicio Beem suprimido</string>
 
 <!--  ContactDialog class -->
-<string name="CDChat">Chat</string>
+<string name="CDChat">Charla</string>
 <string name="CDCall">Llamada</string>
 <string name="CDInfos">Gestión de usuario</string>
 
@@ -38,10 +38,10 @@
 <string name="AddCGroup">Grupo</string>
 <string name="AddCOkButton">Añadir</string>
 <string name="AddCContactAdded">Contacto añadido</string>
-<string name="AddCContactAddedError">Error añadiendo contacto</string>
+<string name="AddCContactAddedError">Error al añadir contacto</string>
 <string name="AddCContactAddedLoginError">Error en el login</string>
 <string name="AddCBadForm">Formulario incorrecto</string>
-<string name="AddCContactAlready">Contacto ya existe</string>
+<string name="AddCContactAlready">El contacto ya existe</string>
 
 <!--  ChangeStatus class -->
 <string name="ChangeStatusActTitle">Beem - Cambiar mi estado</string>
@@ -55,76 +55,95 @@
 <string name="MenuConnection">Editar cuenta</string>
 <string name="ChangeStatusOk">Actualizando estado</string>
 <string name="ChangeStatusNoChange">Nada que cambiar</string>
+<string name="my_avatar">Mi avatar</string>
+<string name="select_avatar">Escoja su avatar</string>
+<string name="take_photo">Tomar una foto</string>
+<string name="pick_photo">Seleccionar una imagen</string>
+<string name="delete_avatar">Sin avatar</string>
+<string name="photoPickerNotFoundText">Seleccionador de imagen no encontrado</string>
+
 
 <!-- Settings class -->
 <string name="SettingsText">Editar su usuario</string>
 <string name="SettingsPassword">Editar su contraseña</string>
 <string name="SettingsProxy">Proxy</string>
 <string name="SettingsProxyProxy">Usar un servidor proxy</string>
-<string name="SettingsProxySummary">Iniciar a traves de un servidor proxy</string>
+<string name="SettingsProxySummary">Iniciar a través de un servidor proxy</string>
 <string name="SettingsProxyType">Protocolo</string>
 <string name="SettingsProxyTypeSummary">Escoja el tipo de servidor proxy</string>
-<string name="SettingsProxyServer">Editar direccion del servidor proxy</string>
+<string name="SettingsProxyServer">Editar dirección del servidor proxy</string>
 <string name="SettingsProxyPort">Editar puerto del servidor proxy</string>
-<string name="SettingsProxyUser">Opcional, permitir auto-autentificarse en el server proxy.</string>
-<string name="SettingsProxyPassword">Opcional, permitir auto-autentificarse en el server proxy.</string>
+<string name="SettingsProxyUser">Opcional, permitir el inicio de sesión en el server proxy.</string>
+<string name="SettingsProxyPassword">Opcional, permitir el inicio de sesión en el server proxy.</string>
 <string name="SettingsAdvanced">Avanzado</string>
-<string name="SettingsAdvancedOptions">Opciones especificas del server</string>
-<string name="SettingsAdvancedRecoDelay">Modificar retraso de conexion</string>
-<string name="SettingsAdvancedSpecOpt">Marca esta casilla si deseas usar un servidor especifico para esta conexion</string>
-<string name="SettingsAdvancedAddOpt">Editar direccion del server</string>
-<string name="SettingsAdvancedPortOpt">Editar puerto del server</string>
+<string name="SettingsAdvancedOptions">Opciones especificas del servidor</string>
+<string name="SettingsAdvancedRecoDelay">Modificar retraso de conexión</string>
+<string name="SettingsAdvancedSpecOpt">Marca esta casilla si deseas usar un servidor especifico para esta conexión</string>
+<string name="SettingsAdvancedAddOpt">Editar dirección del servidor</string>
+<string name="SettingsAdvancedPortOpt">Editar puerto del servidor</string>
 <string name="SettingsResourceTitle">Recurso</string>
 <string name="SettingsPriorityTitle">Prioridad</string>
-<string name="SettingsResourceSummary">Establecer recursosXMPP</string>
-<string name="SettingsPrioritySummary">Establecer prioridades</string>
-<string name="contact_list_preferences">Lista de Amigos</string>
+<string name="SettingsResourceSummary">Establecer el recurso XMPP de tu cliente</string>
+<string name="SettingsPrioritySummary">Establecer la prioridad de tu cliente</string>
+<string name="contact_list_preferences">Lista de amigos</string>
 <string name="contact_list_preferences_sum">A set of display options for your buddy list
 </string>
 <string name="CLP_hide_groups">Ocultar grupos</string>
-<string name="CLP_hide_groups_sum">Opciones de ocultar grupos</string>
+<string name="CLP_hide_groups_sum">Habilita esta opción para ocultar grupos</string>
 <string name="CLP_hidden_contact">Ocultar amigos</string>
 <string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
 </string>
-<string name="settings_account_username">Nombre de usuario</string>
+<string name="settings_account_username">Nombre de usuario (JID)</string>
 <string name="login_username_info_default">beem@beem-project.com</string>
 <string name="settings_account_password">Contraseña</string>
 <string name="settings_account_server">Servidor</string>
 <string name="settings_account_port">Puerto</string>
-<string name="settings_advanced_service_behaviour">Servicio de comportamiento</string>
-<string name="settings_advanced_sum">Opciones de usuarios abanzados</string>
+<string name="settings_advanced_service_behaviour">Comportamiento del servicio</string>
+<string name="settings_advanced_sum">Una serie de opciones para usuarios avanzados</string>
 <string name="settings_xmpp_server">Dirección del servidor XMPP</string>
 <string name="comments_xmpp_server">Comentgarios del servidor XMPP</string>
-<string name="settings_xmpp_port">Puerto XMPP</string>
-<string name="settings_xmpp_use_tls">Establecer SSL/TTL en XMPP</string>
+<string name="settings_xmpp_port">Puerto</string>
+<string name="settings_xmpp_use_tls">Requerir SSL/TTL</string>
 <string name="settings_reco_delay">Tiempo de reconexión</string>
 <string name="comments_xmpp_port">Puerto por defecto: 5222</string>
-<string name="settings_proxy_sum">Establecer uso de servidor Proxy</string>
-<string name="settings_proxy_use">Conectar mediante servidor proxy</string>
-<string name="settings_proxy_type_prompt">Seleccionar tipo de servidor proxy</string>
-<string name="settings_proxy_server">Servidor proxy</string>
-<string name="settings_proxy_port">Puerto proxy</string>
-<string name="comments_proxy_port">Puerto proxy por defecto 1080</string>
-<string name="settings_proxy_username">Nombre de usuario proxy</string>
-<string name="settings_proxy_password">Contraseña de usuario proxy</string>
-<string name="away_chk_title">Habilitar auto-ausente</string>
-<string name="away_chk_sum">Cambiar estado a ausente cuando la pantalla se apage</string>
-<string name="away_message_title">Mensaje ausente</string>
-<string name="away_message_sum">El mensaje de ausente que sera mostrado</string>
-<string name="away_message_hint">Ausente, my pantalla esta apagada</string>
-<string name="notification_preferences">Configuracion de notificaciones</string>
-<string name="notification_enable_vibrate_title">Habilitar vibracion</string>
-<string name="notification_enable_vibrate_sum">Habilitar vibracion en mensajes entrantes</string>
+<string name="settings_proxy_sum">Configuración del proxy</string>
+<string name="settings_proxy_use">Conectar mediante proxy</string>
+<string name="settings_proxy_type_prompt">Seleccionar tipo de proxy</string>
+<string name="settings_proxy_server">Servidor</string>
+<string name="settings_proxy_port">Puerto</string>
+<string name="comments_proxy_port">Puerto por defecto: 1080</string>
+<string name="settings_proxy_username">Nombre de usuario</string>
+<string name="settings_proxy_password">Contraseña</string>
+<string name="away_chk_title">Habilitar ausente automático</string>
+<string name="away_chk_sum">Cambiar estado a Ausente cuando la pantalla se apague</string>
+<string name="away_message_title">Mensaje de ausente</string>
+<string name="away_message_sum">El mensaje de ausente que será mostrado</string>
+<string name="away_message_hint">Estoy ausente, mi pantalla está apagada</string>
+<string name="notification_preferences">Configuración de notificaciones</string>
+<string name="notification_enable_vibrate_title">Habilitar vibración</string>
+<string name="notification_enable_vibrate_sum">Habilitar vibración en mensajes entrantes</string>
 <string name="notification_snd_title">Tono de mensaje entrante</string>
 <string name="notification_snd_sum">Configurar tono de mensaje entrante</string>
-
+<string name="settings_chat_compact">Charla compacta</string>
+<string name="settings_chat_compact_sum">Establecer las ventanas de charla en modo compacto</string>
+<string name="history">Historial</string>
+<string name="history_sum">Tilda esto para guardar las conversaciones en la tarjeta SD</string>
+<string name="history_mount">Se necesita una tarjeta SD montada y escribible para habilitar el historial</string>
+<string name="history_on_off">Habilitar historial de mensajes</string>
+<string name="chat_preferences">Charla</string>
+<string name="chat_preferences_sum">Historial, tamaño de la distribución visual...</string>
+<string name="chat_history_path">Ruta al historial</string>
+<string name="chat_history_path_sum">Las conversaciones se guardan en una carpeta en la tarjeta SD</string>
+<string name="settings_smack_debug">Habilitar depuración de XMPP</string>
+<string name="settings_full_jid_login">Usar el JID completo como nombre de usuario</string>
+<string name="settings_full_jid_login_sum">Necesario para algunos servidores como por ejemplo Google Talk</string>
 
 <!-- Subscription class -->
-<string name="SubscriptAccept">Suscripcion aceptada</string>
-<string name="SubscriptError">Error de suscripcion</string>
-<string name="SubscriptRefused">Suscripcion rechazada</string>
-<string name="SubscriptText">%s desea agregarlo a su lista de contactos. Desea autorizarlo/a ?</string>
-<string name="SubscriptTitle">Autorizar contacto ?</string>
+<string name="SubscriptAccept">Suscripción aceptada</string>
+<string name="SubscriptError">Error de suscripción</string>
+<string name="SubscriptRefused">Suscripción rechazada</string>
+<string name="SubscriptText">%s desea agregarlo/a a su lista de contactos. ¿Desea autorizarlo/a ?</string>
+<string name="SubscriptTitle">¿Autorizar contacto?</string>
 
 <!--  BeemChatManager -->
 <string name="BeemChatManagerNewMessage">Tienes un nuevo mensaje</string>
@@ -133,18 +152,18 @@
 <string name="BeemBroadcastReceiverDisconnect">BEEM: Ha sido desconectado</string>
 
 <!--  XmppConnectionAdapter class -->
-<string name="AcceptContactRequest">%s le agrego en su lista de contactos.</string>
-<string name="AcceptContactRequestFrom">Autoriza %s para que lo contacte.</string>
+<string name="AcceptContactRequest">%s lo/la agregó a su lista de contactos.</string>
+<string name="AcceptContactRequestFrom">Autorice a %s para que lo contacte.</string>
 
 <!-- Activities -->
 <string name="login_tag">Beem - Actividad inicio</string>
-<string name="edit_settings_name">Beem - Configuracion</string>
-<string name="edit_settings_tag">Beem - Actividad editar configuracion</string>
+<string name="edit_settings_name">Beem - Configuración</string>
+<string name="edit_settings_tag">Beem - Actividad editar configuración</string>
 <string name="create_account_name">Beem - Crear una cuenta</string>
-<string name="create_account_tag"></string>
+<string name="create_account_tag">Beem - Actividad creación cuenta</string>
 <string name="contact_list_name">Beem - Contactos</string>
 <string name="contact_list_tag">Beem - Actividad lista contactos</string>
-<string name="user_info_name">Beem - Informacion usuario</string>
+<string name="user_info_name">Beem - Información de usuario</string>
 
 <!-- Buttons -->
 <string name="button_create_account">Crear esta cuenta</string>
@@ -153,29 +172,29 @@
 <!-- LogAs Activity -->
 <string name="login_username">Usuario</string>
 <string name="login_password">Contraseña</string>
-<string name="login_error_dialog_title">Inicio sesion - Error</string>
+<string name="login_error_dialog_title">Inicio sesión - Error</string>
 <string name="login_close_dialog_button">Cerrar</string>
 <string name="login_menu_create_account">Crear una cuenta</string>
-<string name="login_menu_settings">Configuracion</string>
-<string name="login_menu_about">Acerca</string>
-<string name="login_about_title">Beem %s - Acerca</string>
+<string name="login_menu_settings">Configuración</string>
+<string name="login_menu_about">Acerca de</string>
+<string name="login_about_title">Beem %s - Acerca de</string>
 <string name="login_about_msg">
 Beem is an EPITECH Innovative Project. Visit us at
 http://www.beem-project.com !
 </string>
 <string name="login_about_button">Cerrar</string>
-<string name="login_settings_button">Configuracion</string>
+<string name="login_settings_button">Configuración</string>
 <string name="login_login_button">Inicio</string>
 <string name="login_login_progress">Conectando. Espere por favor ...</string>
 <string name="login_error_msg">Unfortunately, an error occured.\n\nError
 detail:\n%s</string>
-<string name="login_menu_login">Iniciar sesion</string>
-<string name="login_no_connectivity">No se detecto conexion a internet</string>
-<string name="login_start_msg">Configuracion de parametros en menu</string>
+<string name="login_menu_login">Iniciar sesión</string>
+<string name="login_no_connectivity">No se detecto una conexión a internet</string>
+<string name="login_start_msg">Configuración de parametros en menú</string>
 
 <!-- LoginAnim activity -->
-<string name="loganim_connecting">Conectando ...</string>
-<string name="loganim_authenticating">Autentificando ...</string>
+<string name="loganim_connecting">Conectando...</string>
+<string name="loganim_authenticating">Autenticando...</string>
 <string name="loganim_login_success">Inicio correcto</string>
 <string name="loganim_login_failed">Inicio fallido</string>
 
@@ -188,87 +207,90 @@
 
 <!-- EditSettings Activity Categories -->
 <string name="general_preferences">Preferencias generales</string>
-<string name="user_preferences">Configuracion de usuario (requerido)</string>
-<string name="user_preferences_advanced">Configuracion avanzada de usuario (opcional)</string>
+<string name="user_preferences">Configuración de usuario (requerido)</string>
+<string name="user_preferences_advanced">Configuración avanzada de usuario (opcional)</string>
 <string name="network_preferences">Opciones de red</string>
-<string name="proxy_proxy_settings">Configuracion Proxy</string>
-<string name="proxy_user_settings">Configuracion Proxy</string>
+<string name="proxy_proxy_settings">Configuración Proxy</string>
+<string name="proxy_user_settings">Configuración Proxy</string>
+<string name="history_preferences">Historial</string>
+<string name="chat_layout_option">Distribución visual de la conversación</string>
+
 
 <!-- EditSettings Activity Tabs -->
-<string name="settings_tab_tag_account">editar_configuracion_pestaña_cuenta</string>
+<string name="settings_tab_tag_account">editar_configuración_pestaña_cuenta</string>
 <string name="settings_tab_label_account">Cuenta</string>
-<string name="settings_tab_tag_xmpp">editar_configuracion_pestaña_xmpp</string>
+<string name="settings_tab_tag_xmpp">editar_configuración_pestaña_xmpp</string>
 <string name="settings_tab_label_xmpp">XMPP</string>
-<string name="settings_tab_tag_proxy">editar_configuracion_pestaña_proxy</string>
+<string name="settings_tab_tag_proxy">editar_configuración_pestaña_proxy</string>
 <string name="settings_tab_label_proxy">Proxy</string>
 
 
 <!-- wizard activities -->
-<string name="account_wizard_text1"><b>Bienvenido a BEEM.</b>\n\nNo ha configurado su cuenta XMPP(Jabber) todavia.\nEscoja una de las siguientes opciones:</string>
-<string name="account_wizard_configure_text"><b>Por favor complete con su cuenta existente</b></string>
-<string name="account_wizard_configure_account">Ya tengo una cuenta y deseo usarla</string>
-<string name="account_wizard_create_account">Deseo crear una nueva cuenta</string>
+<string name="account_wizard_text1"><b>Bienvenido a BEEM.</b>\n\nTodavía no ha configurado su cuenta XMPP (Jabber).\nEscoja una de las siguientes opciones:</string>
+<string name="account_wizard_configure_text"><b>Por favor, complete con la información de su cuenta existente</b></string>
+<string name="account_wizard_configure_account">Ya tengo una cuenta y deseo utilizarla</string>
+<string name="account_wizard_create_account">Deseo registrar una nueva cuenta</string>
 
 <!-- Create an account Activity -->
-<string name="create_account_instr_dialog_title">Instrucciones - Crear una cuenta</string>
-<string name="create_account_err_dialog_title">Error - Creando una cuenta</string>
-<string name="create_account_err_dialog_settings_button">Cambiar mi configuracion</string>
+<string name="create_account_instr_dialog_title">Crear cuenta - Instrucciones</string>
+<string name="create_account_err_dialog_title">Crear cuenta - Error</string>
+<string name="create_account_err_dialog_settings_button">Cambiar mi configuración</string>
 <string name="create_account_close_dialog_button">Cerrar</string>
-<string name="create_account_successfull_after">cuenta %s fue creada correctamente</string>
-<string name="create_account_err_username">Incorrecto JabberID</string>
+<string name="create_account_successfull_after">la cuenta %s fue creada correctamente</string>
+<string name="create_account_err_username">JabberID incorrecto </string>
 <string name="create_account_err_passwords">La clave no coincide</string>
 <string name="create_account_username">Usuario</string>
 <string name="create_account_password">Contraseña</string>
-<string name="create_account_confirm_password">Confirmar Contraseña</string>
+<string name="create_account_confirm_password">Confirmar contraseña</string>
 
 <!-- ContactList Activity  -->
-<string name="contact_list_menu_add_contact">Añadir a Contacto</string>
-<string name="contact_list_menu_status">Cambiar Estado</string>
-<string name="contact_list_menu_settings">Configuracion</string>
+<string name="contact_list_menu_add_contact">Añadir un contacto</string>
+<string name="contact_list_menu_status">Cambiar estado</string>
+<string name="contact_list_menu_settings">Configuración</string>
 <string name="contact_list_menu_disconnect">Desconectar</string>
-<string name="contact_list_all_contact">Todos Contactos</string>
-<string name="contact_list_no_group">Sin Grupo</string>
+<string name="contact_list_all_contact">Todos los contactos</string>
+<string name="contact_list_no_group">Sin grupo</string>
 
 <!-- UserInfo dialog -->
 <string name="userinfo_label_alias">Alias</string>
-<string name="userinfo_label_chg_group">Manten. Grupos</string>
-<string name="userinfo_label_re_subscription">Reenviar Invitacion</string>
+<string name="userinfo_label_chg_group">Administrar grupos</string>
+<string name="userinfo_label_re_subscription">Reenviar invitación</string>
 <string name="userinfo_label_block">Bloquear</string>
 <string name="userinfo_label_delete">Borrar</string>
-<string name="userinfo_resend">Reenviar Suscripcion</string>
-<string name="userinfo_sure2delete">Are you sure you want to delete this contact ?
+<string name="userinfo_resend">Reenviar suscripción</string>
+<string name="userinfo_sure2delete">Are you sure you want to delete this contact?
 </string>
 <string name="userinfo_yes">Sí</string>
 <string name="userinfo_no">No</string>
-<string name="userinfo_sureresend">Estas Seguro de Reenviar Invitacion?</string>
+<string name="userinfo_sureresend">¿Estás seguro/a de que deseas reenviar la invitación?</string>
 
-<string name="chat_name">Beem - Chat</string>
+<string name="chat_name">Beem - Charla</string>
 <string name="chat_input_default_value">Escribe tu Mensaje</string>
 <string name="chat_self">Yo</string>
 <string name="chat_error">Error</string>
 <string name="chat_send_message">Enviar</string>
 <string name="chat_menu_contacts_list">Lista de Contactos</string>
-<string name="chat_menu_change_chat">Cambiar chat</string>
-<string name="chat_dialog_change_chat_title">Chats abiertos</string>
-<string name="chat_menu_close_chat">Cerrar Chat</string>
-<string name="chat_no_more_chats">No más chats activos</string>
-<string name="chat_state_composing">componiendo un mensaje</string>
+<string name="chat_menu_change_chat">Cambiar charla</string>
+<string name="chat_dialog_change_chat_title">Charlas abiertos</string>
+<string name="chat_menu_close_chat">Cerrar charla</string>
+<string name="chat_no_more_chats">No hay más charlas activas</string>
+<string name="chat_state_composing">está escribiendo un mensaje</string>
 <string name="chat_state_gone">ha dejado la conversación</string>
 <string name="chat_state_active">presta atención a la conversación</string>
-<string name="chat_state_inactive">esta haciendo otra cosa</string>
+<string name="chat_state_inactive">está haciendo otra cosa</string>
 
 <string name="contact_status_msg_available">Disponible</string>
 <string name="contact_status_msg_available_chat">Disponible para chatear</string>
 <string name="contact_status_msg_dnd">No interumpir</string>
-<string name="contact_status_msg_away">Fuera</string>
-<string name="contact_status_msg_xa">No Disponibles</string>
+<string name="contact_status_msg_away">Ausente</string>
+<string name="contact_status_msg_xa">No disponible</string>
 <string name="contact_status_msg_offline">Desconectado</string>
 
-<string name="privacy_list_name">Beem - Manten. mi lista privada</string>
-<string name="privacy_list_no_data">No existe ninguna lista privada registrada</string>
-<string name="privacy_list_menu_create">Crear lista privada</string>
-<string name="privacy_list_create_dialog_title">Crear lista privada</string>
-<string name="privacy_list_create_dialog_list_name_label">Titulo</string>
+<string name="privacy_list_name">Beem - Administrar mi lista de privacidad</string>
+<string name="privacy_list_no_data">No existe ninguna lista de privacidad registrada</string>
+<string name="privacy_list_menu_create">Crear una lista de privacidad</string>
+<string name="privacy_list_create_dialog_title">Crear una lista de privacidad</string>
+<string name="privacy_list_create_dialog_list_name_label">Título</string>
 <string name="privacy_list_create_dialog_create_button">Crear</string>
 <string name="privacy_list_select_dialog_buddies">Contactos</string>
 <string name="privacy_list_select_dialog_groups">Grupos</string>
@@ -281,30 +303,30 @@
 
 <!-- Error messages -->
 
-<string name="error_login_authentication">Error Autenticando, mal usuario y contraseña.</string>
+<string name="error_login_authentication">Error al iniciar sesión, usuario o contraseña erroneos.</string>
 
 <string name="interna_server_error">Error Servidor remoto</string>
-<string name="bad_request">mala  pregunta</string>
+<string name="bad_request">pedido equivocado</string>
 <string name="forbidden">prohibido</string>
 <string name="item_not_found">elemento no encontrado</string>
 <string name="conflict">conflicto</string>
 <string name="feature_not_implemented">caracteristica no implementada</string>
 <string name="gone">ir</string>
-<string name="jid_malformed">jid-malformado</string>
-<string name="no_acceptable">no-aceptable</string>
+<string name="jid_malformed">jid malformado</string>
+<string name="no_acceptable">inaceptable</string>
 <string name="not_allowed">no permitido</string>
 <string name="not_authorized">no autorizado</string>
 <string name="payment_required">pago requerido</string>
-<string name="recipient_unavailable">recibidor no disponible</string>
+<string name="recipient_unavailable">receptor no disponible</string>
 <string name="redirect">redireccionar</string>
 <string name="registration_required">registro requerido</string>
 <string name="remote_server_not_found">servidor remoto no encontrado</string>
 <string name="remote_server_timeout">Sin respuesta del servidor</string>
 <string name="remote_server_error">Error en servidor remoto</string>
-<string name="resource_constraint">restriccion en recurso</string>
+<string name="resource_constraint">restricción en recurso</string>
 <string name="service_unavailable">servicio no disponible</string>
-<string name="subscription_required">suscripcion requerida</string>
-<string name="undefined_condition">condicion indefinida</string>
-<string name="unexpected_condition">condicion inesperada</string>
+<string name="subscription_required">suscripción requerida</string>
+<string name="undefined_condition">condición indefinida</string>
+<string name="unexpected_condition">condición inesperada</string>
 <string name="request_timeout">tiempo de espera de solicitud </string>
 </resources>

--- a/res/values-pt-rBR/strings.xml	Wed Mar 06 21:30:51 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,332 +0,0 @@
-<?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>