diff --git a/po/es.po b/po/es.po
index d9dc890f8280a954afcda8d241d4ca38f28467fd..82ec8ea51511a2ca35bcc71df087ad857053cb66 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-09-03 01:19+0200\n"
 "PO-Revision-Date: 2005-05-21 20:03+0100\n"
 "Last-Translator: Membris Khan <membriskhan@gmail.com>\n"
 "Language-Team: none\n"
@@ -24,7 +24,7 @@ msgstr "Un cliente de Jabber en GTK"
 
 #: ../gajim.desktop.in.h:2
 msgid "Gajim Instant Messenger"
-msgstr ""
+msgstr "Mensajero Gajim"
 
 #: ../gajim.desktop.in.h:3
 msgid "Jabber IM Client"
@@ -63,7 +63,7 @@ msgid ""
 "\n"
 "Please wait..."
 msgstr ""
-"<b>La cuenta estÃ¡ siendo creada</b>\n"
+"<b>Se estÃ¡ creando La cuenta</b>\n"
 "\n"
 "Por favor espera..."
 
@@ -143,7 +143,7 @@ msgstr "_Finalizar"
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/manage_proxies_window.glade.h:9
 msgid "_Host:"
-msgstr ""
+msgstr "_Servidor"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:22
 #: ../data/glade/account_modification_window.glade.h:45
@@ -158,7 +158,7 @@ msgstr "_Puerto:"
 #: ../data/glade/account_creation_wizard_window.glade.h:24
 #, fuzzy
 msgid "_Retype Password:"
-msgstr "C_ontraseÃ±a:"
+msgstr "Con_traseÃ±a:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Server:"
@@ -234,16 +234,16 @@ msgid "Edit Personal Information..."
 msgstr "_Editar informaciÃ³n personal personales..."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:308
-#: ../src/notify.py:330 ../src/notify.py:342 ../src/tooltips.py:350
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:395
+#: ../src/notify.py:417 ../src/notify.py:429 ../src/tooltips.py:350
 msgid "Gajim"
 msgstr "Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 #: ../data/glade/vcard_information_window.glade.h:17
-#: ../src/roster_window.py:290 ../src/roster_window.py:1184
-#: ../src/roster_window.py:1405
+#: ../src/roster_window.py:299 ../src/roster_window.py:1258
+#: ../src/roster_window.py:1642
 msgid "General"
 msgstr "General"
 
@@ -299,14 +299,14 @@ msgstr "InformaciÃ³n acerca de tÃ a guardar en el servidor"
 msgid "Manage..."
 msgstr "Gestionar..."
 
-#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1448
+#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1515
 msgid "No key selected"
 msgstr "Ninguna clave seleccionada"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1053
-#: ../src/config.py:1058 ../src/config.py:1230 ../src/config.py:1505
-#: ../src/config.py:1578 ../src/config.py:2282
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1112
+#: ../src/config.py:1117 ../src/config.py:1289 ../src/config.py:1573
+#: ../src/config.py:1646 ../src/config.py:2356
 msgid "None"
 msgstr "Ninguno"
 
@@ -385,7 +385,6 @@ msgid "Use file transfer proxies"
 msgstr "lista de transferencias"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/add_new_contact_window.glade.h:6
 msgid "_Jabber ID:"
 msgstr "ID de _Jabber: "
 
@@ -420,41 +419,56 @@ msgstr "_Eliminar"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
+msgid "A_ccount:"
+msgstr "Cuentas:"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+#, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Permitirle ver mi estado"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/glade/add_new_contact_window.glade.h:3
 msgid "Add New Contact"
 msgstr "AÃ±adir un contacto"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/glade/add_new_contact_window.glade.h:4
 msgid "I would like to add you to my contact list."
 msgstr "Me gustarÃa aÃ±adirte a mi lista de contactos."
 
-#: ../data/glade/add_new_contact_window.glade.h:4
-#, fuzzy
-msgid "_Account:"
-msgstr "Cuentas:"
-
 #: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register to this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Grupo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:7
+#: ../data/glade/add_new_contact_window.glade.h:12
 msgid "_Nickname:"
 msgstr "_Alias:"
 
-#: ../data/glade/add_new_contact_window.glade.h:8
+#: ../data/glade/add_new_contact_window.glade.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Protocolo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
-msgid "_Subscribe"
-msgstr "_AÃ±adir"
+#: ../data/glade/add_new_contact_window.glade.h:14
+#, fuzzy
+msgid "_Register"
+msgstr "_Suscribir"
 
-#: ../data/glade/add_new_contact_window.glade.h:10
+#: ../data/glade/add_new_contact_window.glade.h:15
 #, fuzzy
 msgid "_User ID:"
 msgstr "Identificador:"
@@ -544,82 +558,63 @@ msgstr "<b>Sonidos</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:5
 #, fuzzy
-msgid "Add"
-msgstr "DirecciÃ³n"
-
-#: ../data/glade/advanced_notifications_window.glade.h:6
-#, fuzzy
 msgid "Advanced Actions"
 msgstr "Acciones A_vanzadas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/glade/advanced_notifications_window.glade.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Editor avanzado de configurciÃ³n"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../data/glade/advanced_notifications_window.glade.h:7
 #, fuzzy
 msgid "All Status "
 msgstr "Estado: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
-msgid "And I "
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:10
-#, fuzzy
-msgid "Away "
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/helpers.py:230
+msgid "Away"
 msgstr "Ausente"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/glade/advanced_notifications_window.glade.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "Ocupado"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
-#, fuzzy
-msgid "Down"
-msgstr "Descarga"
-
-#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
-#: ../src/common/helpers.py:239
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:240
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/glade/advanced_notifications_window.glade.h:13
 #, fuzzy
 msgid "Launch a command"
 msgstr "comando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
-#, fuzzy
-msgid "List of special notifications settings"
-msgstr "<b>Notificationes Visuales</b>"
-
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid "Not Available "
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:213
+msgid "Not Available"
 msgstr "No disponible"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:15
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Libre para hablar"
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:16
 #, fuzzy
 msgid "Play a sound"
 msgstr "Reproducir _sonidos"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:17
 msgid ""
 "Receive a Message\n"
 "Contact Connected\n"
@@ -632,75 +627,75 @@ msgid ""
 "File Transfert Finished"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "Some special(s) status..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
-msgid "Up"
-msgstr ""
-
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
-msgstr ""
+msgstr "Cuando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:29
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "Preguntar antes de cerrar una ventana/petaÃ±a de salÃ³n de charla."
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:40
+#: ../data/glade/advanced_notifications_window.glade.h:35
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "Usar una sola ventana de conversaciÃ³n con pestaÃ±as"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/glade/advanced_notifications_window.glade.h:36
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "SÃ³lo mostrar en la _lista de contactos"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:37
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "SÃ³lo mostrar en la _lista de contactos"
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "and I "
+msgstr ""
+
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
 "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:46
+#: ../data/glade/advanced_notifications_window.glade.h:42
 #, fuzzy
 msgid "for "
 msgstr "Puerto: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:47
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm "
 msgstr ""
 
@@ -738,7 +733,7 @@ msgstr "Entrar a un grupo de charla"
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/chat_control_popup_menu.glade.h:4
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "_Add to Roster"
 msgstr "_AÃ±adir a la lista de contactos"
 
@@ -769,7 +764,7 @@ msgid "Click to see past conversations with this contact"
 msgstr "Click para ver anteriores conversaciones con este contacto"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../data/glade/roster_contact_context_menu.glade.h:7
 msgid "Send _File"
 msgstr "Enviar archivo"
 
@@ -785,7 +780,7 @@ msgstr "Vista _compacta    Alt+C"
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 #: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
 msgid "_History"
 msgstr "_HistÃ³rico"
 
@@ -889,8 +884,7 @@ msgstr ""
 "Contacto\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
-#: ../data/glade/privacy_list_edit_window.glade.h:4 ../src/config.py:326
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/config.py:327
 msgid "Active"
 msgstr "Activo"
 
@@ -1072,7 +1066,7 @@ msgstr "Denegar"
 msgid "Invitation Received"
 msgstr "InvitaciÃ³n recibida"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:941
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1067
 msgid "Join Group Chat"
 msgstr "Entrar a un salÃ³n de chat"
 
@@ -1102,7 +1096,7 @@ msgid "Server:"
 msgstr "Servidor:"
 
 #: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1145
-#: ../src/disco.py:1507
+#: ../src/disco.py:1510
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1165,7 +1159,7 @@ msgstr "Usar autentificaciÃ³n"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Haz click para insertar un emoticono (Alt+E)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:966
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1026
 msgid "OpenPGP Encryption"
 msgstr "EncriptaciÃ³n OpenPGP"
 
@@ -1282,7 +1276,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "Antes del nombre:"
 
-#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:718
+#: ../data/glade/preferences_window.glade.h:28 ../src/chat_control.py:773
 msgid "Chat"
 msgstr "Charla"
 
@@ -1302,38 +1296,43 @@ msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:31
 #, fuzzy
+msgid "Default Status Messages"
+msgstr "Mensaje de estado"
+
+#: ../data/glade/preferences_window.glade.h:32
+#, fuzzy
 msgid "Default status _iconset:"
 msgstr "_Iconos de estado por defecto:"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 #, fuzzy
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostrar en el roster los avatares de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Mostrar en el roster los mensajes de estado de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 #, fuzzy
 msgid "E_very 5 minutes"
 msgstr "Cada 5 _minutos"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/glade/preferences_window.glade.h:37
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Gestionar emoticonos"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/glade/preferences_window.glade.h:38
 msgid "Events"
 msgstr "Eventos"
 
-#: ../data/glade/preferences_window.glade.h:38
+#: ../data/glade/preferences_window.glade.h:39
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1343,7 +1342,7 @@ msgstr ""
 "Gajim puede enviar y recibir meta-informaciÃ³n relacionada con una "
 "conversaciÃ³n que puedas tener con un contacto"
 
-#: ../data/glade/preferences_window.glade.h:39
+#: ../data/glade/preferences_window.glade.h:40
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -1351,7 +1350,7 @@ msgstr ""
 "Gajim mostrarÃ¡ automÃ¡ticamente los nuevos mensajes recibidos en una ventana "
 "de charla o pestaÃ±a en una ventana de chat existente"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -1360,7 +1359,7 @@ msgstr ""
 "Gajim te notificarÃ¡ de nuevos mensajes a travÃ©s de un mensaje emergente en "
 "la esquina inferior derecha de la pantalla"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -1368,7 +1367,7 @@ msgstr ""
 "Gajim notificarÃ¡ con un mensaje emergente en la parte inferior derecha de la "
 "pantalla cuando un contacto se conecte"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1376,13 +1375,13 @@ msgstr ""
 "Gajim notificarÃ¡ con un mensaje emergente en la parte inferior derecha de la "
 "pantalla cuando un contacto se desconecte"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim sÃ³lo cambiarÃ¡ el icono del contacto que envÃa el nuevo mensaje"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -1390,7 +1389,7 @@ msgid ""
 msgstr ""
 "Si estÃ¡ marcado, Gajim mostrarÃ¡ los avatares de los usuarios en el roster"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -1399,7 +1398,7 @@ msgstr ""
 "Si estÃ¡ marcado, Gajim mostrarÃ¡ los mensajes de estado de los contactos "
 "debajo de cada nombre en el roster"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -1407,7 +1406,7 @@ msgstr ""
 "Si estÃ¡ marcado, Gajim recordarÃ¡ la posiciÃ³n y tamaÃ±o de la ventana de "
 "contactos para futuras ejecuciones"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1417,7 +1416,7 @@ msgstr ""
 "un contacto de MSN tendrÃ¡ el icono de msn equivalente para su estado en "
 "lÃnea, ausente, ocupado, etc...)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:50
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -1426,12 +1425,12 @@ msgstr ""
 "Si estÃ¡ marcado, Gajim reemplazarÃ¡ emoticonos de texto como ':)' por su "
 "equivalente en iconos"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Gestionar..."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "Never\n"
 "Always\n"
@@ -1439,84 +1438,84 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid "Notify me about contacts that: "
 msgstr "Notificar cuand un contacto: "
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 msgid "On every _message"
 msgstr "En cada _mensaje"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid "One message _window:"
 msgstr "Enviar mensaje y cerrar ventana"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 msgid "Play _sounds"
 msgstr "Reproducir _sonidos"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 msgid "Print time:"
 msgstr "Insertar la hora:"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 "Guarda _posiciÃ³n y tamaÃ±o para las ventanas de conversaciones y lista de "
 "contactos"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid "Show only in _roster"
 msgstr "SÃ³lo mostrar en la _lista de contactos"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Sign _in"
 msgstr "Conectar"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 #, fuzzy
 msgid "T_heme:"
 msgstr "Tema:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 msgid "The auto away status message"
 msgstr "El mensaje de estado de auto-ausencia"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "The auto not available status message"
 msgstr "El mensaje de estado de no auto-no disponible"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Use _transports iconsets"
 msgstr "_Usar los iconos del transporte"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:73
 #, fuzzy
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Icono en el Ã¡rea de notificaciÃ³n"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:74
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -1529,106 +1528,106 @@ msgstr ""
 "nuevo mensaje sÃ³lo aparecen cuando proceden de un contacto con el que no se "
 "estÃ¡ hablando ya"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:75
 msgid "When new event is received"
 msgstr "Cuando se reciba un nuevo evento"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "_Advanced Notifications Control..."
 msgstr "Editor avanzado de configurciÃ³n"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid "_After time:"
 msgstr "DespuÃ©s de la hora:"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "_Before time:"
 msgstr "Antes de la hora:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:79
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:80
 #, fuzzy
 msgid "_File manager:"
 msgstr "Administrador de archivos:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:81
 #, fuzzy
 msgid "_Font:"
 msgstr "Fuente:"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Highlight misspelled words"
 msgstr "_Resaltar errores ortogrÃ¡ficos"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorar mensajes de contactos que no estÃ¡n en la lista de contactos"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:84
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Mensaje entrante:"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_Log status changes of contacts"
 msgstr "_Registrar cambios de estado de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Mail client:"
 msgstr "_Cliente de correo:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Notify me about it"
 msgstr "_Notificarme"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:89
 #, fuzzy
 msgid "_Open..."
 msgstr "Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "_Outgoing message:"
 msgstr "Mensaje saliente:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Player:"
 msgstr "_Reproductor:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_Pop it up"
 msgstr "_Emerger"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:93
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Restablecer colores por defecto"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:94
 #, fuzzy
 msgid "_Sort contacts by status"
 msgstr "Ordenar contactos por estado"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:95
 #, fuzzy
 msgid "_Status message:"
 msgstr "Mensaje de estado:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_URL:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:97
 msgid "minutes"
 msgstr "minutos"
 
@@ -1645,18 +1644,22 @@ msgstr "<b>Formato del renglÃ³n</b>"
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:5 ../src/config.py:2281
-msgid "All"
+#: ../data/glade/privacy_list_edit_window.glade.h:4
+msgid "Active for this session"
 msgstr ""
 
-#: ../data/glade/privacy_list_edit_window.glade.h:6
-msgid "Allow"
+#: ../data/glade/privacy_list_edit_window.glade.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "C_onectar al inicio de Gajim"
+
+#: ../data/glade/privacy_list_edit_window.glade.h:6 ../src/config.py:2355
+msgid "All"
 msgstr ""
 
 #: ../data/glade/privacy_list_edit_window.glade.h:7
-#, fuzzy
-msgid "Default"
-msgstr "Eliminar MOTD"
+msgid "Allow"
+msgstr ""
 
 #: ../data/glade/privacy_list_edit_window.glade.h:9
 #, fuzzy
@@ -1668,7 +1671,7 @@ msgstr "ID de Jabber:"
 msgid "Order:"
 msgstr "Servidor:"
 
-#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1626
+#: ../data/glade/privacy_list_edit_window.glade.h:11 ../src/dialogs.py:1761
 msgid "Privacy List"
 msgstr ""
 
@@ -1744,39 +1747,45 @@ msgid "Assign Open_PGP Key"
 msgstr "Asignar clave OpenPGP"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
+#: ../src/roster_window.py:1621
 msgid "Edit _Groups"
 msgstr "Editar grupos"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:1579
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:6
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Send Single _Message"
 msgstr "Enviar mensaje"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 msgid "Start _Chat"
 msgstr "Iniciar conversaciÃ³n"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Permitirle ver mi estado"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Prohibirle ver mi estado"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../src/roster_window.py:1482
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1573 ../src/roster_window.py:1719
 msgid "_Remove from Roster"
 msgstr "_Eliminar del Roster"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:1470
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:1707
 msgid "_Rename"
 msgstr "Renombrar"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Subscription"
 msgstr "_SubscripciÃ³n"
 
@@ -1816,8 +1825,8 @@ msgstr "_Contenidos"
 msgid "_Discover Services"
 msgstr "_Descubrir servicios"
 
-#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1252
-#: ../src/roster_window.py:1462
+#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1255
+#: ../src/roster_window.py:1699
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -2128,30 +2137,123 @@ msgstr "_Mensaje"
 msgid "_Presence"
 msgstr "_Presencia"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:67
 msgid "Preference Name"
 msgstr "Nombre de la opciÃ³n"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:73
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced.py:80
+#: ../src/advanced.py:82
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:138
 msgid "(None)"
 msgstr "(Ninguno)"
 
 #. we talk about password
-#: ../src/advanced.py:235
+#: ../src/advanced.py:237
 msgid "Hidden"
 msgstr "Oculta"
 
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":"'"$j"'", ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:48
+msgid "en"
+msgstr "inglÃ©s"
+
+#: ../src/chat_control.py:48
+msgid "bg"
+msgstr "bÃºlgaro"
+
+#: ../src/chat_control.py:48
+msgid "br"
+msgstr "bretÃ³n"
+
+#: ../src/chat_control.py:48
+msgid "cs"
+msgstr "checo"
+
+#: ../src/chat_control.py:48
+msgid "de"
+msgstr "alemÃ¡n"
+
+#: ../src/chat_control.py:48
+msgid "el"
+msgstr "Griego"
+
+#: ../src/chat_control.py:48
+msgid "eo"
+msgstr "esperanto"
+
+#: ../src/chat_control.py:48
+msgid "es"
+msgstr "espaÃ±ol"
+
+#: ../src/chat_control.py:48
+msgid "eu"
+msgstr "euskera"
+
+#: ../src/chat_control.py:48
+msgid "fr"
+msgstr "francÃ©s"
+
+#: ../src/chat_control.py:48
+msgid "hr"
+msgstr "croata"
+
+#: ../src/chat_control.py:48
+msgid "it"
+msgstr "italiano"
+
+#: ../src/chat_control.py:48
+msgid "nb"
+msgstr "noruego (2)"
+
+#: ../src/chat_control.py:48
+msgid "nl"
+msgstr "holandÃ©s"
+
+#: ../src/chat_control.py:48
+msgid "no"
+msgstr "noruego (of)"
+
+#: ../src/chat_control.py:48
+msgid "pl"
+msgstr "polaco"
+
+#: ../src/chat_control.py:48
+msgid "pt"
+msgstr "portuguÃ©s"
+
+#: ../src/chat_control.py:48
+msgid "pt_BR"
+msgstr "portuguÃ©s (Br)"
+
+#: ../src/chat_control.py:48
+msgid "ru"
+msgstr "ruso"
+
+#: ../src/chat_control.py:48
+msgid "sk"
+msgstr "eslovaco"
+
+#: ../src/chat_control.py:48
+msgid "sv"
+msgstr "sueco"
+
+#: ../src/chat_control.py:48
+msgid "zh_CN"
+msgstr "chino (China)"
+
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:163 ../src/dialogs.py:1291
+#: ../src/chat_control.py:180 ../src/dialogs.py:1424
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2168,52 +2270,61 @@ msgstr ""
 "El resalto de palabras mal escritas no serÃ¡ usado"
 
 #. we are not connected
-#: ../src/chat_control.py:186 ../src/chat_control.py:391
+#: ../src/chat_control.py:208 ../src/chat_control.py:445
 msgid "A connection is not available"
 msgstr "No hay disponible una conexiÃ³n"
 
-#: ../src/chat_control.py:187 ../src/chat_control.py:392
+#: ../src/chat_control.py:209 ../src/chat_control.py:446
 msgid "Your message can not be sent until you are connected."
 msgstr "Tu mensaje no serÃ¡ enviado mientras no estÃ©s conectado."
 
-#: ../src/chat_control.py:718
+#: ../src/chat_control.py:342
+msgid "Spelling language"
+msgstr ""
+
+#: ../src/chat_control.py:773
 #, fuzzy
 msgid "Chats"
 msgstr "Charla"
 
+#: ../src/chat_control.py:959
+#, python-format
+msgid "%s from room %s"
+msgstr ""
+
 #. we talk about a contact here
-#: ../src/chat_control.py:980
+#: ../src/chat_control.py:1040
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s no ha revelado su clave OpenPGP ni tÃº le has asignado una"
 
-#: ../src/chat_control.py:1106
+#: ../src/chat_control.py:1166
 msgid "Encryption enabled"
 msgstr "EncriptaciÃ³n activada"
 
-#: ../src/chat_control.py:1111
+#: ../src/chat_control.py:1171
 msgid "Encryption disabled"
 msgstr "EncriptaciÃ³n desactivada"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1239 ../src/conversation_textview.py:407
-#: ../src/dialogs.py:512 ../src/gajim.py:635 ../src/gajim.py:636
-#: ../src/gajim.py:955 ../src/roster_window.py:276
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1645
-#: ../src/roster_window.py:1806 ../src/roster_window.py:1817
-#: ../src/roster_window.py:2123 ../src/roster_window.py:2179
-#: ../src/roster_window.py:2977 ../src/roster_window.py:2979
-#: ../src/common/helpers.py:39 ../src/common/helpers.py:241
+#: ../src/chat_control.py:1299 ../src/conversation_textview.py:475
+#: ../src/dialogs.py:604 ../src/gajim.py:657 ../src/gajim.py:658
+#: ../src/gajim.py:983 ../src/roster_window.py:285
+#: ../src/roster_window.py:1448 ../src/roster_window.py:1882
+#: ../src/roster_window.py:2083 ../src/roster_window.py:2094
+#: ../src/roster_window.py:2416 ../src/roster_window.py:2472
+#: ../src/roster_window.py:3277 ../src/roster_window.py:3279
+#: ../src/common/helpers.py:40 ../src/common/helpers.py:242
 msgid "Not in Roster"
 msgstr "no estÃ¡ en el roster"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1383
+#: ../src/chat_control.py:1443
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
 
-#: ../src/chat_control.py:1384
+#: ../src/chat_control.py:1444
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2221,277 +2332,286 @@ msgstr ""
 "Si cierras esta pestaÃ±a y tienes el regstro desactivado, este mensaje se "
 "perderÃ¡."
 
-#: ../src/config.py:120 ../src/config.py:511
+#: ../src/config.py:121 ../src/config.py:541
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:199
+#: ../src/config.py:200
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Cada %s _minutos"
 
-#: ../src/config.py:334
+#: ../src/config.py:335
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:881
+#: ../src/config.py:940
 msgid "status message title"
 msgstr "tÃtulo del mensaje de estado"
 
-#: ../src/config.py:881
+#: ../src/config.py:940
 msgid "status message text"
 msgstr "texto del mensaje de estado"
 
-#: ../src/config.py:916
+#: ../src/config.py:975
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:917
+#: ../src/config.py:976
 #, fuzzy
 msgid "Next Message Received"
 msgstr "Nuevo mensaje"
 
-#: ../src/config.py:918
+#: ../src/config.py:977
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Nombre de contacto"
 
-#: ../src/config.py:919
+#: ../src/config.py:978
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contacto conectado"
 
-#: ../src/config.py:920
+#: ../src/config.py:979
 #, fuzzy
 msgid "Message Sent"
 msgstr "Mensaje"
 
-#: ../src/config.py:921
+#: ../src/config.py:980
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:922
+#: ../src/config.py:981
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:1112
+#: ../src/config.py:1171
 msgid "OpenPGP is not usable in this computer"
 msgstr "GPG no es usable en este ordenador"
 
-#: ../src/config.py:1154
+#: ../src/config.py:1213
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:1155
+#: ../src/config.py:1214
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:1158 ../src/config.py:1715
+#: ../src/config.py:1217 ../src/config.py:1784
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1159
+#: ../src/config.py:1218
 #, fuzzy
 msgid "To change the account name, you must read all pending events."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:1163
+#: ../src/config.py:1222
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "El nombre de la cuenta estÃ¡ en uso"
 
-#: ../src/config.py:1164
+#: ../src/config.py:1223
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1168 ../src/config.py:1172
+#: ../src/config.py:1227 ../src/config.py:1231
 msgid "Invalid account name"
 msgstr "Nombre de cuenta no vÃ¡lido"
 
-#: ../src/config.py:1169
+#: ../src/config.py:1228
 msgid "Account name cannot be empty."
 msgstr "El nombre de la cuenta no puede estar vacÃo."
 
-#: ../src/config.py:1173
+#: ../src/config.py:1232
 msgid "Account name cannot contain spaces."
 msgstr "El nombre de la cuenta no puede contener espacios."
 
-#: ../src/config.py:1181 ../src/config.py:1187 ../src/config.py:1196
-#: ../src/config.py:2662
+#: ../src/config.py:1240 ../src/config.py:1246 ../src/config.py:1255
+#: ../src/config.py:2736
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no vÃ¡lida"
 
-#: ../src/config.py:1188
+#: ../src/config.py:1247
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Una ID de Jabber debe estar en la forma \"usuario@nombreservidor\"."
 
-#: ../src/config.py:1244
+#: ../src/config.py:1303
 msgid "Invalid entry"
 msgstr "Entrada no vÃ¡lida"
 
-#: ../src/config.py:1245
+#: ../src/config.py:1304
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un nÃºmero de puerto"
 
-#: ../src/config.py:1366
+#: ../src/config.py:1428
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1376
+#: ../src/config.py:1438
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1377
+#: ../src/config.py:1439
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1403
+#: ../src/config.py:1465
 msgid "No such account available"
 msgstr "No estÃ¡ disponible dicha cuenta"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1466
 msgid "You must create your account before editing your personal information."
 msgstr "Debes crear una cuenta antes de editar tu informaciÃ³n personal"
 
-#: ../src/config.py:1410 ../src/dialogs.py:925 ../src/dialogs.py:1099
-#: ../src/disco.py:410 ../src/vcard.py:457 ../src/vcard.py:490
+#: ../src/config.py:1472 ../src/dialogs.py:1051 ../src/dialogs.py:1229
+#: ../src/disco.py:411 ../src/vcard.py:462 ../src/vcard.py:495
 msgid "You are not connected to the server"
 msgstr "No estÃ¡s conectado al servidor"
 
-#: ../src/config.py:1411
+#: ../src/config.py:1473
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sin una conexiÃ³n, no puedes editar tu informaciÃ³n personal"
 
-#: ../src/config.py:1435
+#: ../src/config.py:1477
+msgid "Your server doesn't support Vcard"
+msgstr ""
+
+#: ../src/config.py:1478
+#, fuzzy
+msgid "Your server can't save your personal information."
+msgstr "Debes crear una cuenta antes de editar tu informaciÃ³n personal"
+
+#: ../src/config.py:1502
 msgid "Failed to get secret keys"
 msgstr "Error obteniendo las claves secretas"
 
-#: ../src/config.py:1436
+#: ../src/config.py:1503
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
 
-#: ../src/config.py:1439
+#: ../src/config.py:1506
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "EncriptaciÃ³n OpenPGP"
 
-#: ../src/config.py:1440
+#: ../src/config.py:1507
 msgid "Choose your OpenPGP key"
 msgstr "Elige tu clave OpenPGP"
 
 #. Name column
-#: ../src/config.py:1667 ../src/disco.py:727 ../src/disco.py:1466
+#: ../src/config.py:1736 ../src/disco.py:727 ../src/disco.py:1469
 #: ../src/history_window.py:77
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1739
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1785
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1911
+#: ../src/config.py:1982
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:1913
+#: ../src/config.py:1984
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
 
-#: ../src/config.py:1984
+#: ../src/config.py:2055
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1985
+#: ../src/config.py:2056
 #, fuzzy
 msgid "Member List"
 msgstr "_Miembro"
 
-#: ../src/config.py:1986
+#: ../src/config.py:2057
 #, fuzzy
 msgid "Owner List"
 msgstr "_Propietario"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2058
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2020 ../src/disco.py:734 ../src/history_manager.py:151
+#: ../src/config.py:2091 ../src/disco.py:734 ../src/history_manager.py:151
 msgid "JID"
 msgstr ""
 
-#: ../src/config.py:2028
+#: ../src/config.py:2099
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2033
+#: ../src/config.py:2104
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:2037
+#: ../src/config.py:2108
 #, fuzzy
 msgid "Role"
 msgstr "Puesto:"
 
-#: ../src/config.py:2058
+#: ../src/config.py:2129
 #, fuzzy
 msgid "Banning..."
 msgstr "Expulsando a %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2060
+#: ../src/config.py:2131
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Â¿QuÃ© quieres hacer?</b>"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2133
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2063
+#: ../src/config.py:2134
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Â¿QuÃ© quieres hacer?</b>"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2136
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2066
+#: ../src/config.py:2137
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Â¿QuÃ© quieres hacer?</b>"
 
-#: ../src/config.py:2068
+#: ../src/config.py:2139
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:2069
+#: ../src/config.py:2140
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Â¿QuÃ© quieres hacer?</b>"
 
-#: ../src/config.py:2070
+#: ../src/config.py:2141
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2501,91 +2621,91 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2166
+#: ../src/config.py:2238
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2183 ../src/roster_window.py:1857
+#: ../src/config.py:2255 ../src/roster_window.py:2147
 msgid "Password Required"
 msgstr "ContraseÃ±a requerida"
 
-#: ../src/config.py:2184 ../src/roster_window.py:1858
+#: ../src/config.py:2256 ../src/roster_window.py:2148
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseÃ±a para la cuenta %s"
 
-#: ../src/config.py:2185 ../src/roster_window.py:1859
+#: ../src/config.py:2257 ../src/roster_window.py:2149
 msgid "Save password"
 msgstr "Guardar contraseÃ±a"
 
-#: ../src/config.py:2198
+#: ../src/config.py:2270
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "La cuenta \"%s\" estÃ¡ conectada al servidor"
 
-#: ../src/config.py:2199
+#: ../src/config.py:2271
 msgid "If you remove it, the connection will be lost."
 msgstr "Si la eliminas, se perderÃ¡ la conexiÃ³n con el servidor"
 
-#: ../src/config.py:2282
+#: ../src/config.py:2356
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2352
+#: ../src/config.py:2426
 msgid "New Room"
 msgstr "Nuevo salÃ³n"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2457
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene informaciÃ³n no vÃ¡lida"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2458
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, asegÃºrate de rellenar los campos de servidor y salÃ³n o elimina "
 "este marcador."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2712
 msgid "Invalid username"
 msgstr "Nombre de usuario no vÃ¡lido"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2713
 msgid "You must provide a username to configure this account."
 msgstr "Debes proporcionar un nombre para configurar esta cuenta."
 
-#: ../src/config.py:2648 ../src/dialogs.py:1118
+#: ../src/config.py:2722 ../src/dialogs.py:1248
 msgid "Invalid password"
 msgstr "ContraseÃ±a no vÃ¡lida"
 
-#: ../src/config.py:2649
+#: ../src/config.py:2723
 msgid "You must enter a password for the new account."
 msgstr "Debes introducir una contraseÃ±a para la nueva cuenta"
 
-#: ../src/config.py:2653 ../src/dialogs.py:1123
+#: ../src/config.py:2727 ../src/dialogs.py:1253
 msgid "Passwords do not match"
 msgstr "Las contraseÃ±as no coinciden"
 
-#: ../src/config.py:2654 ../src/dialogs.py:1124
+#: ../src/config.py:2728 ../src/dialogs.py:1254
 msgid "The passwords typed in both fields must be identical."
 msgstr "Las contraseÃ±as escritas en ambos campos deben ser idÃ©nticas."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2747
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "ID de Jabber no vÃ¡lida"
 
-#: ../src/config.py:2674
+#: ../src/config.py:2748
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Este contacto ya estÃ¡ listado en tu roster."
 
-#: ../src/config.py:2691
+#: ../src/config.py:2765
 msgid "Account has been added successfully"
 msgstr "La cuenta ha sido aÃ±adida con Ã©xito"
 
-#: ../src/config.py:2692 ../src/config.py:2725
+#: ../src/config.py:2766 ../src/config.py:2799
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -2594,23 +2714,23 @@ msgstr ""
 "Avanzado, o mÃ¡s tarde mediante el submenÃº Cuentas del menÃº Editar de la "
 "ventana principal."
 
-#: ../src/config.py:2724
+#: ../src/config.py:2798
 msgid "Your new account has been created successfully"
 msgstr "Tu nueva cuenta ha sido creada con Ã©xito"
 
-#: ../src/config.py:2740
+#: ../src/config.py:2814
 msgid "An error occured during account creation"
 msgstr "Ha ocurrido un error durante la creaciÃ³n de la cuenta"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2871
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta estÃ¡ en uso"
 
-#: ../src/config.py:2798
+#: ../src/config.py:2872
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
 
-#: ../src/conversation_textview.py:205
+#: ../src/conversation_textview.py:272
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2618,48 +2738,48 @@ msgstr ""
 "El texto bajo esta lÃnea es lo que ha sido dicho desde la Ãºltima vez que "
 "prestaste atenciÃ³n a este salÃ³n de charla"
 
-#: ../src/conversation_textview.py:263
+#: ../src/conversation_textview.py:331
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Acciones para \"%s\""
 
-#: ../src/conversation_textview.py:275
+#: ../src/conversation_textview.py:343
 msgid "Read _Wikipedia Article"
 msgstr "Leer artÃculo de _Wikipedia"
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:348
 msgid "Look it up in _Dictionary"
 msgstr "Buscarlo en el _Diccionario"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:296
+#: ../src/conversation_textview.py:364
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta un \"%s\" en la URL del Diccionario y no estÃ¡ en WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:308
+#: ../src/conversation_textview.py:376
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" en la URL de la bÃºsqueda web"
 
-#: ../src/conversation_textview.py:311
+#: ../src/conversation_textview.py:379
 msgid "Web _Search for it"
 msgstr "_Buscarlo en la web"
 
-#: ../src/conversation_textview.py:607
+#: ../src/conversation_textview.py:675
 msgid "Yesterday"
 msgstr "Ayer"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:679
 #, python-format
 msgid "%i days ago"
 msgstr "hace %i dÃas"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:686
+#: ../src/conversation_textview.py:755
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
@@ -2673,174 +2793,210 @@ msgstr "Los enlaces D-Bus de python no se encuentran en este ordenador"
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Las capacidades D-Bus de Gajim no pueden ser usadas"
 
-#: ../src/dialogs.py:55
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../src/dialogs.py:57
+#, fuzzy, python-format
+msgid "Contact name: <i>%s</i>"
 msgstr "Nombre del contacto : <i>%s</i>"
 
-#: ../src/dialogs.py:57
+#: ../src/dialogs.py:59
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#. Group name
-#. In group boolean
-#: ../src/dialogs.py:173
+#: ../src/dialogs.py:204
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:180
+#: ../src/dialogs.py:211
 msgid "In the group"
 msgstr "En el grupo"
 
-#: ../src/dialogs.py:230
+#: ../src/dialogs.py:261
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:233
+#: ../src/dialogs.py:264
 msgid "Contact name"
 msgstr "Nombre de contacto"
 
-#: ../src/dialogs.py:266
+#: ../src/dialogs.py:298
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaje de estado %s"
 
-#: ../src/dialogs.py:268
+#: ../src/dialogs.py:300
 msgid "Status Message"
 msgstr "Mensaje de estado"
 
-#: ../src/dialogs.py:343
+#: ../src/dialogs.py:375
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Mensajes de estado predefinidos</b>"
 
-#: ../src/dialogs.py:344
+#: ../src/dialogs.py:376
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Escribe tu nuevo mensaje de estado:"
 
-#: ../src/dialogs.py:391
+#: ../src/dialogs.py:396
+#, fuzzy
+msgid "Jabber ID"
+msgstr "ID de Jabber:"
+
+#: ../src/dialogs.py:397
+#, fuzzy
+msgid "AIM Address"
+msgstr "DirecciÃ³n"
+
+#: ../src/dialogs.py:398
+msgid "GG Number"
+msgstr ""
+
+#: ../src/dialogs.py:399
+msgid "ICQ Number"
+msgstr ""
+
+#: ../src/dialogs.py:400
+#, fuzzy
+msgid "MSN Address"
+msgstr "DirecciÃ³n"
+
+#: ../src/dialogs.py:401
+#, fuzzy
+msgid "Yahoo! Address"
+msgstr "DirecciÃ³n"
+
+#: ../src/dialogs.py:436
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, introduce la inforamciÃ³n del contacto que quieres aÃ±adir a la "
 "cuenta %s"
 
-#: ../src/dialogs.py:393
+#: ../src/dialogs.py:438
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor, rellena la informaciÃ³n del contacto que quieres aÃ±adir"
 
-#: ../src/dialogs.py:403 ../src/disco.py:109 ../src/disco.py:110
-#: ../src/disco.py:1249 ../src/roster_window.py:207
-#: ../src/roster_window.py:273 ../src/roster_window.py:309
-#: ../src/roster_window.py:329 ../src/roster_window.py:353
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2975
-#: ../src/common/helpers.py:39
+#: ../src/dialogs.py:446 ../src/disco.py:109 ../src/disco.py:110
+#: ../src/disco.py:1252 ../src/roster_window.py:216
+#: ../src/roster_window.py:282 ../src/roster_window.py:318
+#: ../src/roster_window.py:370 ../src/roster_window.py:397
+#: ../src/roster_window.py:3273 ../src/roster_window.py:3275
+#: ../src/common/helpers.py:40
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/dialogs.py:493 ../src/dialogs.py:499
+#: ../src/dialogs.py:584 ../src/dialogs.py:590
 msgid "Invalid User ID"
 msgstr "ID de Usuario no vÃ¡lida"
 
-#: ../src/dialogs.py:500
+#: ../src/dialogs.py:591
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: ../src/dialogs.py:513
+#: ../src/dialogs.py:605
 msgid "Contact already in roster"
 msgstr "Contacto ya presente en el roster"
 
-#: ../src/dialogs.py:514
+#: ../src/dialogs.py:606
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto ya estÃ¡ listado en tu roster."
 
-#: ../src/dialogs.py:576
+#: ../src/dialogs.py:638
+#, fuzzy
+msgid "User ID"
+msgstr "Identificador:"
+
+#: ../src/dialogs.py:692
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:693
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:578
+#: ../src/dialogs.py:694
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:702
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:704
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:592
+#: ../src/dialogs.py:708
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:598
+#: ../src/dialogs.py:714
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:612
+#: ../src/dialogs.py:728
 msgid "translator-credits"
 msgstr "Membris Khan <membriskhan@gmail.com>"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:854
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "No se pudo entrar al salÃ³n"
 
-#: ../src/dialogs.py:739
+#: ../src/dialogs.py:855
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "canceled."
 msgstr ""
 
-#: ../src/dialogs.py:881
+#: ../src/dialogs.py:997
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "PeticiÃ³n de adiciÃ³n para la cuenta %s de %s"
 
-#: ../src/dialogs.py:884
+#: ../src/dialogs.py:1000
 #, python-format
 msgid "Subscription request from %s"
 msgstr "PeticiÃ³n de adiciÃ³n de %s"
 
-#: ../src/dialogs.py:926
+#: ../src/dialogs.py:1044 ../src/roster_window.py:590
+#, python-format
+msgid "You are already in room %s"
+msgstr "Ya estÃ¡s en el salÃ³n %s"
+
+#: ../src/dialogs.py:1052
 msgid "You can not join a group chat unless you are connected."
 msgstr "No puedes entrar a un salÃ³n de chat hasta que no estÃ©s conectado."
 
-#: ../src/dialogs.py:939
+#: ../src/dialogs.py:1065
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar a un salÃ³n de chat con la cuenta %s"
 
-#: ../src/dialogs.py:1030
+#: ../src/dialogs.py:1158
 #, fuzzy
 msgid "Invalid room or server name"
 msgstr "Nombre de usuario no vÃ¡lido"
 
-#: ../src/dialogs.py:1031
+#: ../src/dialogs.py:1159
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:1050
+#: ../src/dialogs.py:1180
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversaciÃ³n con la cuenta %s"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1182
 msgid "Start Chat"
 msgstr "Iniciar conversaciÃ³n"
 
-#: ../src/dialogs.py:1053
+#: ../src/dialogs.py:1183
 #, fuzzy
 msgid ""
 "Fill in the jid, or nick of the contact you would like\n"
@@ -2850,210 +3006,223 @@ msgstr ""
 "un mensaje de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1078 ../src/dialogs.py:1427 ../src/dialogs.py:1551
+#: ../src/dialogs.py:1208 ../src/dialogs.py:1562 ../src/dialogs.py:1686
 msgid "Connection not available"
 msgstr "ConexiÃ³n no disponible"
 
-#: ../src/dialogs.py:1079 ../src/dialogs.py:1428 ../src/dialogs.py:1552
+#: ../src/dialogs.py:1209 ../src/dialogs.py:1563 ../src/dialogs.py:1687
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegÃºrate de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:1088 ../src/dialogs.py:1091
+#: ../src/dialogs.py:1218 ../src/dialogs.py:1221
 #, fuzzy
 msgid "Invalid JID"
 msgstr "ID de Jabber no vÃ¡lida"
 
-#: ../src/dialogs.py:1091
+#: ../src/dialogs.py:1221
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "No se puede escribir el archivo en %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1230
 msgid "Without a connection, you can not change your password."
 msgstr "Sin una conexiÃ³n, no puedes cambiar tu contraseÃ±a."
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1249
 msgid "You must enter a password."
 msgstr "Debes introducir una contraseÃ±a."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1165 ../src/notify.py:126 ../src/notify.py:268
+#: ../src/dialogs.py:1295 ../src/notify.py:194 ../src/notify.py:355
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:1167 ../src/notify.py:134 ../src/notify.py:270
+#: ../src/dialogs.py:1297 ../src/notify.py:202 ../src/notify.py:357
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #. chat message
-#: ../src/dialogs.py:1169 ../src/notify.py:154 ../src/notify.py:272
+#: ../src/dialogs.py:1299 ../src/notify.py:221 ../src/notify.py:359
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
 #. single message
-#: ../src/dialogs.py:1169 ../src/notify.py:138 ../src/notify.py:272
+#: ../src/dialogs.py:1299 ../src/notify.py:206 ../src/notify.py:359
 msgid "New Single Message"
 msgstr "Nuevo mensaje"
 
 #. private message
-#: ../src/dialogs.py:1170 ../src/notify.py:145 ../src/notify.py:273
+#: ../src/dialogs.py:1300 ../src/notify.py:213 ../src/notify.py:360
 msgid "New Private Message"
 msgstr "Nuevo mensaje privado"
 
-#: ../src/dialogs.py:1170 ../src/gajim.py:1044 ../src/notify.py:281
+#: ../src/dialogs.py:1300 ../src/gajim.py:1072 ../src/notify.py:368
 #, fuzzy
 msgid "New E-mail"
 msgstr "Correo-e"
 
-#: ../src/dialogs.py:1172 ../src/gajim.py:1187 ../src/notify.py:275
+#: ../src/dialogs.py:1302 ../src/gajim.py:1215 ../src/notify.py:362
 msgid "File Transfer Request"
 msgstr "PeticiÃ³n de transferencia de archivo"
 
-#: ../src/dialogs.py:1174 ../src/gajim.py:1022 ../src/gajim.py:1164
-#: ../src/notify.py:277
+#: ../src/dialogs.py:1304 ../src/gajim.py:1050 ../src/gajim.py:1192
+#: ../src/notify.py:364
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: ../src/dialogs.py:1176 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:279
+#: ../src/dialogs.py:1306 ../src/gajim.py:1250 ../src/gajim.py:1272
+#: ../src/gajim.py:1289 ../src/notify.py:366
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: ../src/dialogs.py:1177 ../src/gajim.py:1225 ../src/notify.py:279
+#: ../src/dialogs.py:1307 ../src/gajim.py:1253 ../src/notify.py:366
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: ../src/dialogs.py:1179 ../src/gajim.py:920 ../src/notify.py:283
+#: ../src/dialogs.py:1309 ../src/gajim.py:948 ../src/notify.py:370
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "Ninguno"
 
-#: ../src/dialogs.py:1181 ../src/notify.py:118 ../src/notify.py:285
+#: ../src/dialogs.py:1311 ../src/notify.py:186 ../src/notify.py:372
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contacto desconectado"
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1359
-#, python-format
-msgid "Single Message with account %s"
+#: ../src/dialogs.py:1492
+#, fuzzy, python-format
+msgid "Single Message using account %s"
+msgstr "Nuevo mensaje con la cuenta %s"
+
+#: ../src/dialogs.py:1494
+#, fuzzy, python-format
+msgid "Single Message in account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: ../src/dialogs.py:1361
+#: ../src/dialogs.py:1496
 msgid "Single Message"
 msgstr "Mensaje:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1499
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1387
+#: ../src/dialogs.py:1522
 #, python-format
 msgid "Received %s"
 msgstr "Recibido %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1454
+#: ../src/dialogs.py:1589
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1455
+#: ../src/dialogs.py:1590
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribiÃ³:\n"
 
-#: ../src/dialogs.py:1499
+#: ../src/dialogs.py:1634
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:1501
+#: ../src/dialogs.py:1636
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:1620
+#: ../src/dialogs.py:1755
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1624
+#: ../src/dialogs.py:1759
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1851
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato del renglÃ³n</b>"
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1936
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato del renglÃ³n</b>"
 
-#: ../src/dialogs.py:1897
+#: ../src/dialogs.py:2033
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1899
+#: ../src/dialogs.py:2035
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Iniciar conversaciÃ³n"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1988
+#: ../src/dialogs.py:2124
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s invitado a %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2130
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2193
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/dialogs.py:2064 ../src/dialogs.py:2107
+#: ../src/dialogs.py:2203 ../src/dialogs.py:2248
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2208
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2238
 msgid "Choose Image"
 msgstr "Elegir Imagen"
 
-#: ../src/dialogs.py:2112
+#: ../src/dialogs.py:2253
 msgid "Images"
 msgstr "ImÃ¡genes"
 
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2298
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2300
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2232
+#. # means number
+#: ../src/dialogs.py:2371
+msgid "#"
+msgstr ""
+
+#: ../src/dialogs.py:2377
 #, fuzzy
 msgid "Condition"
 msgstr "ConexiÃ³n"
 
+#: ../src/dialogs.py:2498
+msgid "when I am "
+msgstr ""
+
 #: ../src/disco.py:108
 msgid "Others"
 msgstr "Others"
@@ -3063,7 +3232,7 @@ msgstr "Others"
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:411
+#: ../src/disco.py:412
 msgid "Without a connection, you can not browse available services"
 msgstr "Sin una conexiÃ³n no puedes navegar los servicios disponibles"
 
@@ -3109,22 +3278,22 @@ msgstr "_Navegar"
 msgid "This service does not contain any items to browse."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: ../src/disco.py:1137 ../src/disco.py:1254
+#: ../src/disco.py:1137 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: ../src/disco.py:1291
+#: ../src/disco.py:1294
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Escaneando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1473
+#: ../src/disco.py:1476
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1480
+#: ../src/disco.py:1483
 msgid "Description"
 msgstr "DescripciÃ³n"
 
@@ -3157,7 +3326,7 @@ msgstr "TamaÃ±o: %s"
 msgid "You"
 msgstr "TÃº"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:174
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
@@ -3184,6 +3353,11 @@ msgstr "Transferencia de archivo cancelada"
 msgid "Connection with peer cannot be established."
 msgstr "La conexiÃ³n con el cliente no se pudo establecer."
 
+#: ../src/filetransfers_window.py:224
+#, fuzzy, python-format
+msgid "Recipient: %s"
+msgstr "Recipiente: "
+
 #: ../src/filetransfers_window.py:225
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Transferencia de archivo detenida por el contacto de la otra parte"
@@ -3606,31 +3780,31 @@ msgstr ""
 "El argumento \"%s\" no se ha especificado. \n"
 "Escribe \"%s help %s\" para mÃ¡s informaciÃ³n"
 
-#: ../src/gajim.py:48
+#: ../src/gajim.py:56
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim necesita Xserver para funcionar. Abortando..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:60
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim necesita PyGTK 2.6 o superior"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:61
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim necesita PyGTK 2.6 o superior para funcionar. Abortando..."
 
-#: ../src/gajim.py:55
+#: ../src/gajim.py:63
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim necesita GTK 2.6 o superior"
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:64
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim necesita GTK 2.6 o superior para funcionar. Abortando..."
 
-#: ../src/gajim.py:61
+#: ../src/gajim.py:69
 msgid "GTK+ runtime is missing libglade support"
 msgstr "La biblioteca GTK+ necesita soporte de libglade"
 
-#: ../src/gajim.py:63
+#: ../src/gajim.py:71
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3639,7 +3813,7 @@ msgstr ""
 "Por favor elimina tu actual biblioteca GTK+ e instala la Ãºltima versiÃ³n "
 "estable desde %s"
 
-#: ../src/gajim.py:65
+#: ../src/gajim.py:73
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -3647,82 +3821,87 @@ msgstr ""
 "Por favor, asegÃºrate de que gtk y pygtk tienen soporte de libglade en este "
 "sistema."
 
-#: ../src/gajim.py:70
+#: ../src/gajim.py:78
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necesita PySQLite2 para funcionar"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:151
+#: ../src/gajim.py:159
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:152
+#: ../src/gajim.py:160
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:267
+#: ../src/gajim.py:261
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "AutorizaciÃ³n HTTP (%s) para %s (id: %s)"
 
-#: ../src/gajim.py:268
+#: ../src/gajim.py:262
 msgid "Do you accept this request?"
 msgstr "Â¿Aceptas esta peticiÃ³n?"
 
-#: ../src/gajim.py:611
+#: ../src/gajim.py:590
+#, fuzzy, python-format
+msgid "Subject: %s"
+msgstr "Tema: %s\n"
+
+#: ../src/gajim.py:633
 #, fuzzy, python-format
 msgid "error while sending %s ( %s )"
 msgstr "error durante el envÃo"
 
-#: ../src/gajim.py:651
+#: ../src/gajim.py:673
 msgid "Authorization accepted"
 msgstr "AutorizaciÃ³n aceptada"
 
-#: ../src/gajim.py:652
+#: ../src/gajim.py:674
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "El contacto \"%s\" te ha autorizado a ver su estado."
 
-#: ../src/gajim.py:660
+#: ../src/gajim.py:682
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "El contacto \"%s\" eliminÃ³ su subscripciÃ³n de tÃ"
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:683
 msgid "You will always see him or her as offline."
 msgstr "Siempre le verÃ¡s desconectado."
 
-#: ../src/gajim.py:704
+#: ../src/gajim.py:726
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "No se ha podido establecer contacto con \"%s\""
 
-#: ../src/gajim.py:705 ../src/common/connection.py:398
+#: ../src/gajim.py:727 ../src/common/connection.py:402
 msgid "Check your connection or try again later."
 msgstr "Comprueba tu conexiÃ³n o reintÃ©ntalo mÃ¡s tarde."
 
-#: ../src/gajim.py:849 ../src/roster_window.py:1025
+#: ../src/gajim.py:871 ../src/roster_window.py:1084
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s estÃ¡ ahora %s (%s)"
 
-#: ../src/gajim.py:930
+#: ../src/gajim.py:958
 msgid "Your passphrase is incorrect"
 msgstr "ContraseÃ±a incorrecta"
 
-#: ../src/gajim.py:931
+#: ../src/gajim.py:959
 msgid "You are currently connected without your OpenPGP key."
 msgstr "EstÃ¡s actualmente conectado sin tu clave GPG"
 
 #. FIXME: find a better image
-#: ../src/gajim.py:1033
+#: ../src/gajim.py:1061
 #, python-format
 msgid "New E-mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1035
+#: ../src/gajim.py:1063
 #, fuzzy, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
@@ -3730,53 +3909,53 @@ msgstr[0] "Tienes mensajes sin leer"
 msgstr[1] "Tienes mensajes sin leer"
 
 #. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1040
+#: ../src/gajim.py:1068
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1185
+#: ../src/gajim.py:1213
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quiere enviarte un archivo."
 
-#: ../src/gajim.py:1245
+#: ../src/gajim.py:1273
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Has recibido con Ã©xito el archivo %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1249
+#: ../src/gajim.py:1277
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
 
-#: ../src/gajim.py:1262
+#: ../src/gajim.py:1290
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Has enviado con Ã©xito el archivo %(filename)s a %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1266
+#: ../src/gajim.py:1294
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferencia de %(filename)s a %(name)s detenida."
 
-#: ../src/gajim.py:1295
+#: ../src/gajim.py:1323
 msgid "vCard publication succeeded"
 msgstr "vCard publicada con Ã©xito"
 
-#: ../src/gajim.py:1295
+#: ../src/gajim.py:1323
 msgid "Your personal information has been published successfully."
 msgstr "Tu informaciÃ³n personal ha sido publicada con Ã©xito"
 
-#: ../src/gajim.py:1304
+#: ../src/gajim.py:1332
 msgid "vCard publication failed"
 msgstr "fallÃ³ la publicaciÃ³n de la vCard"
 
-#: ../src/gajim.py:1304
+#: ../src/gajim.py:1332
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -3786,36 +3965,28 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1683
+#: ../src/gajim.py:1711
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: ../src/gajim.py:1903
+#: ../src/gajim.py:1935
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Soporte de manejo de sesiÃ³n no disponible (falta el mÃ³dulo gnome.ui)"
 
-#: ../src/gajim.py:1932
-msgid "Migrating Logs..."
-msgstr "Migrando el registro..."
-
-#: ../src/gajim.py:1933
-msgid "Please wait while logs are being migrated..."
-msgstr "Por favor, espera mientras el registro estÃ¡ siendo migrado..."
-
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Tema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:141
+#: ../src/gajim_themes_window.py:142
 msgid "theme name"
 msgstr "nombre del tema"
 
-#: ../src/gajim_themes_window.py:158
+#: ../src/gajim_themes_window.py:159
 msgid "You cannot delete your current theme"
 msgstr "No puedes eliminar el tema actual"
 
-#: ../src/gajim_themes_window.py:159
+#: ../src/gajim_themes_window.py:160
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primero elige otro distinto como tema actual."
 
@@ -3839,100 +4010,100 @@ msgstr "FallÃ³ el envÃo del mensaje privado"
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Ya no estÃ¡s en el salÃ³n \"%s\" o \"%s\" ya no existe."
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:136
 msgid "Group Chat"
 msgstr "Grupos de charla"
 
-#: ../src/groupchat_control.py:129
+#: ../src/groupchat_control.py:136
 #, fuzzy
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/groupchat_control.py:308
+#: ../src/groupchat_control.py:307
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cambiar _Alias"
 
-#: ../src/groupchat_control.py:702
+#: ../src/groupchat_control.py:649
 msgid "This room has no subject"
 msgstr "Este salÃ³n no tiene tema"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:801
+#: ../src/groupchat_control.py:748
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:805
+#: ../src/groupchat_control.py:752
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:759
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ha sido expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:816
+#: ../src/groupchat_control.py:763
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:824
+#: ../src/groupchat_control.py:771
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: ../src/groupchat_control.py:826
+#: ../src/groupchat_control.py:773
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s es ahora conocido como %s"
 
-#: ../src/groupchat_control.py:897
+#: ../src/groupchat_control.py:850
 #, python-format
 msgid "%s has left"
 msgstr "%s ha salido"
 
-#: ../src/groupchat_control.py:902
+#: ../src/groupchat_control.py:855
 #, python-format
 msgid "%s has joined the room"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:904 ../src/roster_window.py:1028
+#: ../src/groupchat_control.py:857 ../src/roster_window.py:1087
 #, python-format
 msgid "%s is now %s"
 msgstr "%s estÃ¡ ahora %s"
 
-#: ../src/groupchat_control.py:1022 ../src/groupchat_control.py:1039
-#: ../src/groupchat_control.py:1132 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:975 ../src/groupchat_control.py:993
+#: ../src/groupchat_control.py:1086 ../src/groupchat_control.py:1102
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alias no encontrado: %s"
 
-#: ../src/groupchat_control.py:1066
+#: ../src/groupchat_control.py:1020
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s invitado a %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1073 ../src/groupchat_control.py:1103
+#: ../src/groupchat_control.py:1027 ../src/groupchat_control.py:1057
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s no parece ser un JID vÃ¡lido"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1139
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "No existe el comando: /%s (si quieres enviar este prefijo con /say)"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1161
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -3945,7 +4116,7 @@ msgstr ""
 "actualmente en el salÃ³n, el/ella puede ser tambiÃ©n expulsado. NO soporta "
 "espacio en el alias."
 
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1169
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -3953,12 +4124,12 @@ msgstr ""
 "Uso: /%s <alias>, abre una ventana de conversaciÃ³n con el ocupante "
 "especificado."
 
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1173
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, limpia de texto la ventana."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1175
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -3967,12 +4138,12 @@ msgstr ""
 "Uso: /%s [motivo], cierra la ventana o pestaÃ±a actual, mostrando el motivo "
 "si se especifica."
 
-#: ../src/groupchat_control.py:1224
+#: ../src/groupchat_control.py:1178
 #, fuzzy, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, limpia de texto la ventana."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1180
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -3981,7 +4152,7 @@ msgstr ""
 "Uso: /%s <JID> [reason], invita al JID al salÃ³n actual, opcionalmente "
 "proveyendo un motivo."
 
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1184
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -3990,7 +4161,7 @@ msgstr ""
 "Uso: /%s <salÃ³n>@<servidor>[/alias], ofrece la entrada a salÃ³n@servidor "
 "opcionalmente usando el alias especificado"
 
-#: ../src/groupchat_control.py:1234
+#: ../src/groupchat_control.py:1188
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4000,7 +4171,7 @@ msgstr ""
 "Uso: /%s <alias> [motivo], elimina del salÃ³n al ocupante especificado por el "
 "alias y opcionalmente muestra un motivo. NO soporta espacios en el alias."
 
-#: ../src/groupchat_control.py:1239
+#: ../src/groupchat_control.py:1193
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -4009,7 +4180,7 @@ msgstr ""
 "Uso: /%s <acciÃ³n>, envÃa una acciÃ³n al salÃ³n actual. Usa la tercera persona. "
 "(p.ej. /%s grita.)"
 
-#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1197
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4018,91 +4189,91 @@ msgstr ""
 "Uso: /%s <alias> [message], abre una ventana de conversaciÃ³n privada y envÃa "
 "un mensaje al ocupante especificado por el alias."
 
-#: ../src/groupchat_control.py:1248
+#: ../src/groupchat_control.py:1202
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Uso: /%s <alias>, cambia tu alias en el salÃ³n actual."
 
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1206
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of room occupants."
 msgstr "Uso: /%s [tema], muestra o actualiza el tema actual del salÃ³n."
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Uso: /%s [tema], muestra o actualiza el tema actual del salÃ³n."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1213
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Uso: /%s <mensaje>, envÃa un mensaje sin buscar otros comandos."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1216
 #, python-format
 msgid "No help info for /%s"
 msgstr "No hay informaciÃ³n de ayuda para /%s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1258
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Â¿EstÃ¡s seguro de querer abandonar el salÃ³n \"%s\"?"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1259
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Si cierras esta ventana, serÃ¡s desconectado de este salÃ³n."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1263
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_No preguntarme otra vez"
 
-#: ../src/groupchat_control.py:1343
+#: ../src/groupchat_control.py:1297
 msgid "Changing Subject"
 msgstr "Cambiando el tema"
 
-#: ../src/groupchat_control.py:1344
+#: ../src/groupchat_control.py:1298
 msgid "Please specify the new subject:"
 msgstr "Especifica el nuevo tema:"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1306
 msgid "Changing Nickname"
 msgstr "Cambiando alias"
 
-#: ../src/groupchat_control.py:1353
+#: ../src/groupchat_control.py:1307
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifica el nuevo alias que quieres usar:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1333
 msgid "Bookmark already set"
 msgstr "Marcador ya definido"
 
-#: ../src/groupchat_control.py:1380
+#: ../src/groupchat_control.py:1334
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "El salÃ³n \"%s\" ya se encuentra en tus marcadores."
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1343
 msgid "Bookmark has been added successfully"
 msgstr "Marcador aÃ±adido con Ã©xito"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1344
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Puedes gestionar tus marcadores mediante el menÃº Acciones de tu roster"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1454
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: ../src/groupchat_control.py:1501 ../src/groupchat_control.py:1779
+#: ../src/groupchat_control.py:1455 ../src/groupchat_control.py:1733
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1778
+#: ../src/groupchat_control.py:1732
 #, python-format
 msgid "Banning %s"
 msgstr "Expulsando a %s"
@@ -4223,10 +4394,6 @@ msgstr "Migrando el registro..."
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:467
-msgid "who"
-msgstr ""
-
 #: ../src/history_manager.py:505
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
@@ -4253,7 +4420,7 @@ msgstr "HistÃ³rico de conversaciones con %s"
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s estÃ¡ ahora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:113
+#: ../src/history_window.py:262 ../src/notify.py:181
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s estÃ¡ ahora %(status)s"
@@ -4268,79 +4435,74 @@ msgstr "El estado es ahora: %(status)s: %(status_msg)s "
 msgid "Status is now: %(status)s"
 msgstr "El estado es ahora: %(status)s"
 
-#: ../src/message_window.py:244
+#: ../src/message_window.py:254
 #, fuzzy
 msgid "Messages"
 msgstr "Mensaje"
 
-#: ../src/message_window.py:245
+#: ../src/message_window.py:255
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:111
+#: ../src/notify.py:179
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s estÃ¡ ahora %(status)s"
 
-#: ../src/notify.py:121
+#: ../src/notify.py:189
 #, fuzzy, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/notify.py:129
+#: ../src/notify.py:197
 #, fuzzy, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Contacto desconectado"
 
-#: ../src/notify.py:141
+#: ../src/notify.py:209
 #, fuzzy, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuevo mensaje"
 
-#: ../src/notify.py:150
+#: ../src/notify.py:217
 #, fuzzy, python-format
 msgid "New Private Message from room %s"
 msgstr "Nuevo mensaje privado"
 
-#: ../src/notify.py:151
+#: ../src/notify.py:218
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: ../src/notify.py:157
+#: ../src/notify.py:224
 #, fuzzy, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nuevo mensaje como %s "
 
-#: ../src/roster_window.py:131
+#: ../src/roster_window.py:137
 msgid "Merged accounts"
 msgstr "Cuentas combinadas"
 
-#: ../src/roster_window.py:288 ../src/common/helpers.py:39
+#: ../src/roster_window.py:297 ../src/common/helpers.py:40
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
-#: ../src/roster_window.py:544
-#, python-format
-msgid "You are already in room %s"
-msgstr "Ya estÃ¡s en el salÃ³n %s"
-
-#: ../src/roster_window.py:548 ../src/roster_window.py:2280
+#: ../src/roster_window.py:594 ../src/roster_window.py:2574
 msgid "You cannot join a room while you are invisible"
 msgstr "No puedes entrar a un salÃ³n de chat estando invisible"
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:793
 #, python-format
 msgid "to %s account"
 msgstr "a la cuenta %s"
 
 #. disco
-#: ../src/roster_window.py:755
+#: ../src/roster_window.py:798
 #, python-format
 msgid "using %s account"
 msgstr "usando la cuenta %s"
@@ -4348,109 +4510,127 @@ msgstr "usando la cuenta %s"
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:763 ../src/systray.py:193 ../src/systray.py:198
+#: ../src/roster_window.py:804 ../src/systray.py:199 ../src/systray.py:204
 #, python-format
 msgid "using account %s"
 msgstr "usando la cuenta %s"
 
 #. profile, avatar
-#: ../src/roster_window.py:772
+#: ../src/roster_window.py:870
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "para la cuenta %s"
 
-#: ../src/roster_window.py:831
+#: ../src/roster_window.py:890
 msgid "Manage Bookmarks..."
 msgstr "Gestionar marcadores..."
 
-#: ../src/roster_window.py:855
+#: ../src/roster_window.py:914
 #, python-format
 msgid "for account %s"
 msgstr "para la cuenta %s"
 
 #. History manager
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:935
 #, fuzzy
 msgid "History Manager"
 msgstr "_HistÃ³rico"
 
-#: ../src/roster_window.py:885
+#: ../src/roster_window.py:944
 msgid "_Join New Room"
 msgstr "_Entrar en un nuevo salÃ³n"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1223
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "El transporte \"%s\" serÃ¡ eliminado"
 
-#: ../src/roster_window.py:1159
+#: ../src/roster_window.py:1224
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr ""
 "Ya no podrÃ¡s enviar y recibir mensajes a contactos desde este transporte"
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1226
+#, fuzzy
+msgid "Transports will be removed"
+msgstr "El transporte \"%s\" serÃ¡ eliminado"
+
+#: ../src/roster_window.py:1231
+#, fuzzy, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Ya no podrÃ¡s enviar y recibir mensajes a contactos desde este transporte"
+
+#: ../src/roster_window.py:1275
 msgid "Assign OpenPGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/roster_window.py:1202
+#: ../src/roster_window.py:1276
 msgid "Select a key to apply to the contact"
 msgstr "Selecciona una clave para ser aplicada al contacto"
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1413 ../src/roster_window.py:1588
+#, fuzzy
+msgid "_New room"
+msgstr "Nuevo salÃ³n"
+
+#: ../src/roster_window.py:1471
 msgid "I would like to add you to my roster"
 msgstr "Me gustarÃa aÃ±adirte a mi lista de contactos"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1647
 msgid "Re_name"
 msgstr "Re_nombrar"
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1678
 msgid "_Log on"
 msgstr "_Conectar"
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1687
 msgid "Log _off"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1782
 msgid "_Change Status Message"
 msgstr "_Cambiar mensaje de estado"
 
-#: ../src/roster_window.py:1621
+#: ../src/roster_window.py:1858
 msgid "Authorization has been sent"
 msgstr "La autorizaciÃ³n ha sido enviada"
 
-#: ../src/roster_window.py:1622
+#: ../src/roster_window.py:1859
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ahora \"%s\" podrÃ¡ saber tu estado."
 
-#: ../src/roster_window.py:1646
+#: ../src/roster_window.py:1883
 msgid "Subscription request has been sent"
 msgstr "La peticiÃ³n de subscripciÃ³n ha sido enviada"
 
-#: ../src/roster_window.py:1647
+#: ../src/roster_window.py:1884
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Si \"%s\" acepta esta peticiÃ³n podrÃ¡s saber su estado."
 
-#: ../src/roster_window.py:1658
+#: ../src/roster_window.py:1895
 msgid "Authorization has been removed"
 msgstr "La autorizaciÃ³n ha sido eliminada"
 
-#: ../src/roster_window.py:1659
+#: ../src/roster_window.py:1896
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ahora \"%s\" siempre te verÃ¡ desconectado."
 
-#: ../src/roster_window.py:1822
+#: ../src/roster_window.py:2102
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" serÃ¡ eliminado de tu roster"
 
-#: ../src/roster_window.py:1826
+#: ../src/roster_window.py:2106
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -4459,7 +4639,7 @@ msgstr ""
 "Eliminando este contacto tambiÃ©n se estÃ¡ eliminando la autorizaciÃ³n. Este "
 "contacto siempre te verÃ¡ desconectado."
 
-#: ../src/roster_window.py:1830
+#: ../src/roster_window.py:2110
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -4467,37 +4647,52 @@ msgstr ""
 "Eliminando este contacto tambiÃ©n se estÃ¡ eliminando la autorizaciÃ³n. Este "
 "contacto siempre te verÃ¡ desconectado."
 
-#: ../src/roster_window.py:1831
+#: ../src/roster_window.py:2111
 msgid "I want this contact to know my status after removal"
 msgstr "Quiero que este contacto conozca mi estado despuÃ©s de la eliminaciÃ³n"
 
-#: ../src/roster_window.py:1899
+#. several contact to remove at the same time
+#: ../src/roster_window.py:2115
+#, fuzzy
+msgid "Contacts will be removed from your roster"
+msgstr "El contacto \"%s\" serÃ¡ eliminado de tu roster"
+
+#: ../src/roster_window.py:2119
+#, fuzzy, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Eliminando este contacto tambiÃ©n se estÃ¡ eliminando la autorizaciÃ³n. Este "
+"contacto siempre te verÃ¡ desconectado."
+
+#: ../src/roster_window.py:2189
 msgid "Passphrase Required"
 msgstr "ContraseÃ±a requerida"
 
-#: ../src/roster_window.py:1900
+#: ../src/roster_window.py:2190
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Introduce contraseÃ±a GPG para la cuenta %s"
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:2195
 msgid "Save passphrase"
 msgstr "Guardar contraseÃ±a"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2203
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "ContraseÃ±a"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:2204
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:2020
+#: ../src/roster_window.py:2256 ../src/roster_window.py:2313
 msgid "You are participating in one or more group chats"
 msgstr "EstÃ¡s participando en uno o mÃ¡s grupos de charla"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:2257 ../src/roster_window.py:2314
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4505,19 +4700,19 @@ msgstr ""
 "Cambiando tu estado a invisible provocarÃ¡ tu desconexiÃ³n de los grupos de "
 "charla. Â¿EstÃ¡s seguro de querer ser invisible?"
 
-#: ../src/roster_window.py:1980
+#: ../src/roster_window.py:2273
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2274
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Debes crear una cuenta antes de poder conversar con otros contactos."
 
-#: ../src/roster_window.py:2452 ../src/roster_window.py:2458
+#: ../src/roster_window.py:2746 ../src/roster_window.py:2752
 msgid "You have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: ../src/roster_window.py:2453 ../src/roster_window.py:2459
+#: ../src/roster_window.py:2747 ../src/roster_window.py:2753
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4525,25 +4720,25 @@ msgstr ""
 "Los mensajes sÃ³lo estarÃ¡n disponibles para lectura posterior si tienes el "
 "histÃ³rico activado"
 
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3542
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "De %s en el salÃ³n %s"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3549
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Enviar archivo a un contacto"
 
-#: ../src/roster_window.py:3408
+#: ../src/roster_window.py:3726
 msgid "Change Status Message..."
 msgstr "Cambiar mensaje de estado..."
 
-#: ../src/systray.py:154
+#: ../src/systray.py:160
 msgid "_Change Status Message..."
 msgstr "_Cambiar mensaje de estado..."
 
-#: ../src/systray.py:231
+#: ../src/systray.py:237
 msgid "Hide this menu"
 msgstr "Oculta este menÃº"
 
@@ -4676,20 +4871,20 @@ msgstr ""
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:289
+#: ../src/vcard.py:291
 msgid "?Client:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:291
+#: ../src/vcard.py:293
 msgid "?OS:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:312
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Navegando %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:336
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4697,7 +4892,7 @@ msgstr ""
 "Este contacto estÃ¡ interesado en la informaciÃ³n de tu presencia, pero tÃº no "
 "lo estÃ¡s en la suya"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:338
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4705,14 +4900,14 @@ msgstr ""
 "EstÃ¡s interesado en la informaciÃ³n de la presencia del contacto, pero Ã©l/"
 "ella no lo estÃ¡ en la tuya"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:340
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Tanto tÃº como el contacto estÃ¡is interesados en la informaciÃ³n de la "
 "presencia del otro"
 
 #. None
-#: ../src/vcard.py:338
+#: ../src/vcard.py:342
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4720,24 +4915,24 @@ msgstr ""
 "No estÃ¡s interesado en la presencia del contacto y el/ella tampoco lo estÃ¡ "
 "en el tuyuo"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:351
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "EstÃ¡s esperando la respuesta del contacto acerca de tu peticiÃ³n de adiciÃ³n"
 
-#: ../src/vcard.py:359 ../src/vcard.py:382
+#: ../src/vcard.py:363 ../src/vcard.py:386
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
-#: ../src/vcard.py:458
+#: ../src/vcard.py:463
 msgid "Without a connection you can not publish your contact information."
 msgstr "Sin una conexiÃ³n no puedes publicar tu informaciÃ³n de contacto."
 
-#: ../src/vcard.py:491
+#: ../src/vcard.py:496
 msgid "Without a connection, you can not get your contact information."
 msgstr "Sin una conexiÃ³n, no puedes obtener tu informaciÃ³n de contacto."
 
-#: ../src/vcard.py:495
+#: ../src/vcard.py:500
 #, fuzzy
 msgid "Personal details"
 msgstr "InformaciÃ³n personal"
@@ -4746,23 +4941,23 @@ msgstr "InformaciÃ³n personal"
 msgid "creating logs database"
 msgstr "creando base de datos de registros"
 
-#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:93
-#: ../src/common/check_paths.py:100
+#: ../src/common/check_paths.py:87 ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:105
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s es un archivo pero podrÃa ser un directorio"
 
-#: ../src/common/check_paths.py:83 ../src/common/check_paths.py:94
-#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:109
+#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:106 ../src/common/check_paths.py:114
 msgid "Gajim will now exit"
 msgstr "Gajim se cerrarÃ¡ ahora"
 
-#: ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:113
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s es un directorio pero podrÃa ser un archivo"
 
-#: ../src/common/check_paths.py:124
+#: ../src/common/check_paths.py:129
 #, python-format
 msgid "creating %s directory"
 msgstr "creando directorio %s"
@@ -4812,46 +5007,54 @@ msgid "List (space separated) of rows (accounts and groups) that are collapsed"
 msgstr ""
 
 #: ../src/common/config.py:83
+msgid "Language used by speller"
+msgstr ""
+
+#: ../src/common/config.py:88
+msgid "Languages available in speller"
+msgstr ""
+
+#: ../src/common/config.py:89
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:90
 msgid ""
 "Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most "
 "precise clock, 4 the less precise one."
 msgstr ""
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:93
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:94
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Si es True, no elimiina */_ . Entonces *abc* serÃ¡ negrita, pero sin eliminar "
 "* *"
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:104
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat"
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:105
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat"
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:137
 msgid "Add * and [n] in roster title?"
 msgstr "Â¿AÃ±adir * y [n] en el tÃtulo del roster?"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:138
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4859,12 +5062,12 @@ msgstr ""
 "CuÃ¡ntas lÃneas recordar de la Ãºltima conversaciÃ³n cuando se vuelve a abrir "
 "una pestaÃ±a/ventana de conversaciÃ³n"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:139
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "CuÃ¡ntos minutos debe durar la Ãºltima lÃnea de la conversaciÃ³n anterior."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:140
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4872,11 +5075,11 @@ msgstr ""
 "EnvÃa un mensaje con Ctrl+Intro y con Intro hace un nuevo renglÃ³n (Al estilo "
 "del cliente Mirabilis ICQ)"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:142
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "CuÃ¡ntas lÃneas almacenar para Ctrl+Arriba."
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:145
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4885,36 +5088,36 @@ msgstr ""
 "URL personalizada con %s donde %s es la palabra/frase o 'WIKTIONARY' que "
 "significa usar wiktionary"
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:148
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Si estÃ¡ marcado, Gajim puede ser controlado remotamente usando gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:151
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes"
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:152
 msgid "Ask before closing a group chat tab/window."
 msgstr "Preguntar antes de cerrar una ventana/petaÃ±a de salÃ³n de charla."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:153
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Preguntar antes de cerrar una ventana/petaÃ±a de salÃ³n de charla."
 
-#: ../src/common/config.py:148
+#: ../src/common/config.py:154
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Preguntar antes de cerrar una ventana/petaÃ±a de salÃ³n de charla."
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:157
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4922,24 +5125,24 @@ msgstr ""
 "Se elimina el host que enviamos para la transferencia de un archivo en caso "
 "de traducciÃ³n de la direcciÃ³n o redirecciÃ³n de puertos."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:159
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "SegÃºn el estÃ¡ndar IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:167
 msgid "Show tab when only one conversation?"
 msgstr "Â¿Mostrar pestaÃ±a cuando sÃ³lo hay una conversaciÃ³n?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:168
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Â¿Mostrar borde de la pestaÃ±a cuando sÃ³lo hay una conversaciÃ³n?"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:169
 msgid "Show close button in tab?"
 msgstr "Â¿Mostrar botÃ³n de cerrar en la pestaÃ±a?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:182
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4947,7 +5150,7 @@ msgstr ""
 "Una lista de palabras separadas por ';' que serÃ¡n resaltadas en las "
 "conversaciones de varios usuarios."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:183
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4956,11 +5159,11 @@ msgstr ""
 "pulsado. Esta preferencia sÃ³lo se activa si se usa el icono del Ã¡rea de "
 "notificaciÃ³n. "
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:184
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Si es True, Gajim registra xmpp:// en cada inicio."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:185
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4968,7 +5171,7 @@ msgstr ""
 "Si es True, Gajim mostrarÃ¡ un icono en cada pestaÃ±a que contenga mensajes "
 "sin leer. Dependiendo del tema, este icono puede ser animado."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:186
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4976,7 +5179,7 @@ msgstr ""
 "Si es True, Gajim mostrarÃ¡ el mensaje de estado, si no estÃ¡ vacÃo, para cada "
 "contacto bajo su nombre en la lista de contactos."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:188
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4984,7 +5187,7 @@ msgstr ""
 "Si es True, Gajim pedirÃ¡ un avatar a cada contacto que no tuvo un avatar la "
 "Ãºltima vez o se tiene guardado uno demasiado antiguo."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:189
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -4993,7 +5196,7 @@ msgstr ""
 "Si es False, no verÃ¡s mÃ¡s la lÃnea de estado en las conversaciones cuando un "
 "contacto cambia su estado y/o su mensaje de estado."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:190
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -5002,25 +5205,30 @@ msgid ""
 "room"
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:193
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+
+#: ../src/common/config.py:194
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:196
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:198
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:194
+#: ../src/common/config.py:201
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5031,112 +5239,158 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:202
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:203
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:204
 #, fuzzy
 msgid "Hides the buttons in group chat window"
 msgstr "Preguntar antes de cerrar una ventana/petaÃ±a de salÃ³n de charla."
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:205
 msgid "Hides the buttons in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:206
 #, fuzzy
 msgid "Hides the banner in a group chat window"
 msgstr "Preguntar antes de cerrar una ventana/petaÃ±a de salÃ³n de charla."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:207
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:208
 msgid "Hides the room occupants list in groupchat window"
 msgstr ""
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:209
 msgid "Merge consecutive nickname in chat window"
 msgstr ""
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:210
 msgid "Indentation when using merge consecutive nickame"
 msgstr ""
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:211
 msgid "List of colors that will be used to color nicknames in groupchats"
 msgstr ""
 
+#: ../src/common/config.py:212
+msgid "Ctrl-Tab go to next composing tab when none is unread"
+msgstr ""
+
 #. yes, no, ask
-#: ../src/common/config.py:237
+#: ../src/common/config.py:245
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:249
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:310
+msgid "all or space separated status"
+msgstr ""
+
+#: ../src/common/config.py:311
+msgid "'yes', 'no', or 'both'"
+msgstr ""
+
+#: ../src/common/config.py:312 ../src/common/config.py:314
+#: ../src/common/config.py:315 ../src/common/config.py:318
+#: ../src/common/config.py:319
+msgid "'yes', 'no' or ''"
+msgstr ""
+
+#: ../src/common/config.py:325
 msgid "Sleeping"
 msgstr "Durmiendo"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:326
 msgid "Back soon"
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:326
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:327
 msgid "Eating"
 msgstr "Comiendo"
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:327
 msgid "I'm eating, so leave me a message."
 msgstr "Estoy comiendo, dÃ©jame un mensaje."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:328
 msgid "Movie"
 msgstr "PelÃcula"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:328
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una pelÃcula."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:329
 msgid "Working"
 msgstr "Trabajando"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:329
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:330
 msgid "Phone"
 msgstr "TelÃ©fono"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:330
 msgid "I'm on the phone."
 msgstr "Estoy al telÃ©fono."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:331
 msgid "Out"
 msgstr "Fuera"
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:331
 msgid "I'm out enjoying life"
 msgstr "Estoy disfrutando la vida"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:335
+#, fuzzy
+msgid "I'm avavilable"
+msgstr "En lÃnea"
+
+#: ../src/common/config.py:336
+#, fuzzy
+msgid "I'm free for chat"
+msgstr "Libre para hablar"
+
+#: ../src/common/config.py:337
+msgid "Be right back"
+msgstr ""
+
+#: ../src/common/config.py:338
+#, fuzzy
+msgid "I'm not available"
+msgstr "Servicio no disponible"
+
+#: ../src/common/config.py:339
+msgid "Do not disturb"
+msgstr ""
+
+#: ../src/common/config.py:340 ../src/common/config.py:341
+#, fuzzy
+msgid "Bye !"
+msgstr "Ocupado"
+
+#: ../src/common/config.py:350
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -5144,7 +5398,7 @@ msgstr ""
 "Sonido a reproducir cuando un mensaje MUC contiene una de las palabras "
 "listadas en muc_highlight_words, o cuando un mensaje MUC contiene tu alias."
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:351
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -5152,99 +5406,99 @@ msgstr ""
 "Sonido a reproducir cuando se recibe cualquier mensaje MUC. (Esta "
 "preferencia sÃ³lo se activa si notify_on_all_muc_messages es False)"
 
-#: ../src/common/config.py:321 ../src/common/optparser.py:185
+#: ../src/common/config.py:359 ../src/common/optparser.py:188
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:325 ../src/common/optparser.py:171
+#: ../src/common/config.py:363 ../src/common/optparser.py:174
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:367
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:371
 msgid "marine"
 msgstr ""
 
-#: ../src/common/connection.py:172
+#: ../src/common/connection.py:176
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Se ha perdido la conexiÃ³n de la cuenta \"%s\""
 
-#: ../src/common/connection.py:173
+#: ../src/common/connection.py:177
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Para continuar enviando y reciviendo mensajes, necesitarÃ¡s volver a conectar."
 
-#: ../src/common/connection.py:185 ../src/common/connection.py:211
+#: ../src/common/connection.py:189 ../src/common/connection.py:215
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:210
+#: ../src/common/connection.py:214
 #, fuzzy
 msgid "Invalid answer"
 msgstr "ContraseÃ±a no vÃ¡lida"
 
-#: ../src/common/connection.py:397 ../src/common/connection.py:433
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:401 ../src/common/connection.py:437
+#: ../src/common/connection.py:860
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "No se puede conectar a \"%s\""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:415
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Conectado al servidor %s:%s con %s"
 
-#: ../src/common/connection.py:434
+#: ../src/common/connection.py:438
 msgid "Check your connection or try again later"
 msgstr "Comprueba tu conexiÃ³n o intÃ©ntalo mÃ¡s tarde"
 
-#: ../src/common/connection.py:459
+#: ../src/common/connection.py:463
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "FallÃ³ la autentificaciÃ³n con \"%s\""
 
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:464
 msgid "Please check your login and password for correctness."
 msgstr ""
 "Por favor, comprueba que tu nombre de usuario y contraseÃ±a sean correctos."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:573
+#: ../src/common/connection.py:577
 msgid "OpenPGP passphrase was not given"
 msgstr "No se ha facilitado la clave OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:575
+#: ../src/common/connection.py:579
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Te conectarÃ¡s a %s sin OpenPGP"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:612
+#: ../src/common/connection.py:616
 msgid "invisible"
 msgstr "invisible"
 
-#: ../src/common/connection.py:613
+#: ../src/common/connection.py:617
 msgid "offline"
 msgstr "desconectado"
 
-#: ../src/common/connection.py:614
+#: ../src/common/connection.py:618
 #, python-format
 msgid "I'm %s"
 msgstr "Estoy %s"
 
 #. we're not english
-#: ../src/common/connection.py:699
+#: ../src/common/connection.py:703
 msgid "[This message is encrypted]"
 msgstr "[Este mensaje estÃ¡ encriptado]"
 
-#: ../src/common/connection.py:742
+#: ../src/common/connection.py:746
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -5253,58 +5507,74 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:795 ../src/common/connection_handlers.py:1511
-msgid "I would like to add you to my roster."
-msgstr "Me gustarÃa aÃ±adirte a mi lista de contactos"
+#: ../src/common/connection.py:884
+msgid "Not fetched because of invisible status"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:49
+#: ../src/common/connection_handlers.py:51
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "No se pudo entrar al salÃ³n"
 
-#: ../src/common/connection_handlers.py:581
+#: ../src/common/connection_handlers.py:176
+#, fuzzy
+msgid "Wrong host"
+msgstr "ContraseÃ±a"
+
+#: ../src/common/connection_handlers.py:176
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:588
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "La informaciÃ³n de registro para el transporte %s no llegÃ³ a tiempo"
 
+#: ../src/common/connection_handlers.py:1438
+#, fuzzy, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Alias no encontrado: %s"
+
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection_handlers.py:1450
-#: ../src/common/connection_handlers.py:1453
-#: ../src/common/connection_handlers.py:1456
-#: ../src/common/connection_handlers.py:1459
-#: ../src/common/connection_handlers.py:1462
-#: ../src/common/connection_handlers.py:1465
-#: ../src/common/connection_handlers.py:1473
+#: ../src/common/connection_handlers.py:1507
+#: ../src/common/connection_handlers.py:1510
+#: ../src/common/connection_handlers.py:1513
+#: ../src/common/connection_handlers.py:1516
+#: ../src/common/connection_handlers.py:1519
+#: ../src/common/connection_handlers.py:1522
+#: ../src/common/connection_handlers.py:1530
 msgid "Unable to join room"
 msgstr "No se pudo entrar al salÃ³n"
 
-#: ../src/common/connection_handlers.py:1451
+#: ../src/common/connection_handlers.py:1508
 msgid "A password is required to join this room."
 msgstr "Se requiere una contraseÃ±a para entrar a este salÃ³n"
 
-#: ../src/common/connection_handlers.py:1454
+#: ../src/common/connection_handlers.py:1511
 msgid "You are banned from this room."
 msgstr "EstÃ¡s expulsado de este salÃ³n"
 
-#: ../src/common/connection_handlers.py:1457
+#: ../src/common/connection_handlers.py:1514
 msgid "Such room does not exist."
 msgstr "No existe el salÃ³n."
 
-#: ../src/common/connection_handlers.py:1460
+#: ../src/common/connection_handlers.py:1517
 msgid "Room creation is restricted."
 msgstr "La creaciÃ³n de salones estÃ¡ restringida."
 
-#: ../src/common/connection_handlers.py:1463
+#: ../src/common/connection_handlers.py:1520
 msgid "Your registered nickname must be used."
 msgstr "Es necesario usar el alias registrado."
 
-#: ../src/common/connection_handlers.py:1466
+#: ../src/common/connection_handlers.py:1523
 msgid "You are not in the members list."
 msgstr "No estÃ¡s en la lista de miembros"
 
-#: ../src/common/connection_handlers.py:1474
+#: ../src/common/connection_handlers.py:1531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5312,23 +5582,27 @@ msgstr ""
 "Tu alias deseado estÃ¡ en uso o registrado por otro ocupante. \n"
 "Por favor, especifica otro alias abajo:"
 
+#: ../src/common/connection_handlers.py:1577
+msgid "I would like to add you to my roster."
+msgstr "Me gustarÃa aÃ±adirte a mi lista de contactos"
+
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1519
+#: ../src/common/connection_handlers.py:1598
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos ahora suscritos a %s"
 
-#: ../src/common/connection_handlers.py:1521
+#: ../src/common/connection_handlers.py:1600
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "peticiÃ³n de eliminaciÃ³n de suscripciÃ³n de %s"
 
-#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1602
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ya no estamos suscritos a %s"
 
-#: ../src/common/connection_handlers.py:1680
+#: ../src/common/connection_handlers.py:1772
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5338,198 +5612,190 @@ msgstr ""
 "herramientas de gestiÃ³n del roster como http://jru.jabberstudio.org/ para "
 "eliminarlo"
 
-#: ../src/common/helpers.py:100
+#: ../src/common/helpers.py:101
 msgid "Invalid character in username."
 msgstr "Caracter no vÃ¡lido en el nombre de usuario."
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:106
 msgid "Server address required."
 msgstr "Se requiere la direcciÃ³n del servidor."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:111
 msgid "Invalid character in hostname."
 msgstr "CarÃ¡cter no vÃ¡lido en el nombre del host."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:117
 msgid "Invalid character in resource."
 msgstr "CarÃ¡cter no vÃ¡lido en el recurso."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:157
 #, python-format
 msgid "%s GiB"
 msgstr ""
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:160
 #, python-format
 msgid "%s GB"
 msgstr ""
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s MiB"
 msgstr ""
 
 #. MB means megabyte
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:167
 #, python-format
 msgid "%s MB"
 msgstr ""
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s KiB"
 msgstr ""
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:174
 #, python-format
 msgid "%s KB"
 msgstr ""
 
 #. B means bytes
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:177
 #, python-format
 msgid "%s B"
 msgstr ""
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:206
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:208
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:211
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: ../src/common/helpers.py:212
-msgid "Not Available"
-msgstr "No disponible"
-
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:216
 msgid "_Free for Chat"
 msgstr "_Libre para hablar"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:218
 msgid "Free for Chat"
 msgstr "Libre para hablar"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:221
 msgid "_Available"
 msgstr "En lÃne_a"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:223
 msgid "Available"
 msgstr "En lÃnea"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:225
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:228
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:229
-msgid "Away"
-msgstr "Ausente"
-
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:233
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:235
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:238
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:244
 msgid "?contact has status:Unknown"
 msgstr "Desconocido"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Has errors"
 msgstr "Tiene errores"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:251
 msgid "?Subscription we already have:None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:253
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:255
 msgid "From"
 msgstr "SalÃ³n:"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:257
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:265
 msgid "?Ask (for Subscription):None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:267
 msgid "Subscribe"
 msgstr "_AÃ±adir"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:276
 msgid "?Group Chat Contact Role:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:279
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:281
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:284
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:286
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:289
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:291
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:327
 msgid "is paying attention to the conversation"
 msgstr "estÃ¡ prestando atenciÃ³n a la conversaciÃ³n"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:329
 msgid "is doing something else"
 msgstr "estÃ¡ haciendo algo mÃ¡s"
 
-#: ../src/common/helpers.py:330
+#: ../src/common/helpers.py:331
 msgid "is composing a message..."
 msgstr "estÃ¡ escribiendo..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:334
 msgid "paused composing a message"
 msgstr "ha parado de escribir"
 
-#: ../src/common/helpers.py:335
+#: ../src/common/helpers.py:336
 msgid "has closed the chat window or tab"
 msgstr "ha cerrado la ventana de chat"
 
@@ -5539,14 +5805,50 @@ msgstr "ha cerrado la ventana de chat"
 msgid "error: cannot open %s for reading"
 msgstr "error: no se puede abrir %s para lectura"
 
-#: ../src/common/optparser.py:171
+#: ../src/common/optparser.py:174
 msgid "gtk+"
 msgstr ""
 
-#: ../src/common/optparser.py:180 ../src/common/optparser.py:181
+#: ../src/common/optparser.py:183 ../src/common/optparser.py:184
 msgid "cyan"
 msgstr ""
 
+#~ msgid "_Subscribe"
+#~ msgstr "_AÃ±adir"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "DirecciÃ³n"
+
+#, fuzzy
+#~ msgid "Away "
+#~ msgstr "Ausente"
+
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Descarga"
+
+#, fuzzy
+#~ msgid "List of special notifications settings"
+#~ msgstr "<b>Notificationes Visuales</b>"
+
+#, fuzzy
+#~ msgid "Not Available "
+#~ msgstr "No disponible"
+
+#~ msgid "Up"
+#~ msgstr "Arriba"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Eliminar MOTD"
+
+#~ msgid "Migrating Logs..."
+#~ msgstr "Migrando el registro..."
+
+#~ msgid "Please wait while logs are being migrated..."
+#~ msgstr "Por favor, espera mientras el registro estÃ¡ siendo migrado..."
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Autorizar contactos automÃ¡ticamente"
 
@@ -5754,9 +6056,6 @@ msgstr ""
 #~ msgid "Open Download Page"
 #~ msgstr "Abrir pÃ¡gina de descarga"
 
-#~ msgid "Service not available"
-#~ msgstr "Servicio no disponible"
-
 #~ msgid "Session bus is not available."
 #~ msgstr "El bus de la sesiÃ³n no estÃ¡ disponible."
 
@@ -5854,9 +6153,6 @@ msgstr ""
 #~ msgid "Service"
 #~ msgstr "Servicio"
 
-#~ msgid "Node"
-#~ msgstr "Nodo"
-
 #~ msgid ""
 #~ "Your new account has been created and added to your gajim configuration.\n"
 #~ "You can set advanced account options using \"Edit->Accounts\" in the main "
@@ -5889,9 +6185,6 @@ msgstr ""
 #~ msgid "theme_name"
 #~ msgstr "nombre_del_tema"
 
-#~ msgid "Edit"
-#~ msgstr "Editar"
-
 #~ msgid "<b>Please fill in the data for your existing account</b>"
 #~ msgstr "Por favor, introduce los datos de tu cuenta actual"