update po files

1 files changed, 5131 insertions, 4136 deletions

diff --git a/po/gl.po b/po/gl.po
index 701cb3b77..86d74f4a9 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,15 +6,11 @@
 # Automatically generated, 2004.
 #
 # Iván Méndez López <>, 2009.
-#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 20:39+0200\n"
+"POT-Creation-Date: 2017-01-10 03:06+0000\n"
 "PO-Revision-Date: 2009-08-19 23:51+0200\n"
 "Last-Translator: Iván Méndez López <>\n"
 "Language-Team:  <softwarelibre@udc.es>\n"
@@ -25,76 +21,94 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7
+#: ../data/gui/account_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "E_stado"
+
+#: ../data/gui/account_context_menu.ui.h:2
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Información persoal"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 #, fuzzy
-msgid "Join _Group Chat..."
+msgid "_Start Chat..."
+msgstr "_Iniciar a charla"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/chat_context_menu.ui.h:6
+#: ../data/gui/roster_window.ui.h:5 ../data/gui/systray_context_menu.ui.h:3
+msgid "Join _Group Chat"
 msgstr "Entrar nun grupo de charla"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Engadir un contacto..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Descubrir os servizos"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "Executar o _comando..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Modificar conta"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Abrir a caixa de entrada de GMail"
 
-#: ../data/gui/account_context_menu.ui.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Información persoal"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Iniciar a charla"
-
 #: ../data/gui/account_context_menu.ui.h:9
 #: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "E_stado"
+msgid "_Modify Account..."
+msgstr "_Modificar a conta..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
-#, fuzzy
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:3
+#: ../src/config.py:1247 ../src/config.py:1262 ../src/config.py:1267
+#: ../src/config.py:1315 ../src/config.py:1425 ../src/config.py:1755
+#: ../src/config.py:1760 ../src/config.py:2369 ../src/config.py:2451
+#: ../src/config.py:2466 ../src/config.py:3758 ../src/config.py:3835
+#: ../src/dialogs.py:327 ../src/dialogs.py:329 ../src/dialogs.py:537
+#: ../src/dialogs.py:550 ../src/roster_window.py:3086
+#: ../src/roster_window.py:3092 ../src/roster_window.py:3097
+msgid "None"
+msgstr "Ningún"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: asistente para crear unha conta"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:3
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Estase a crear a conta</b>\n"
-"\n"
-"Por favor, agarde..."
+"Precisa unha conta para se conectar\n"
+"á rede Jabber"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+#, fuzzy
+msgid "I already have an account I want to _use"
+msgstr "Xa teño unha conta e quero empregala"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
+msgid "I want to _register for a new account"
+msgstr "Quero _rexistrar unha conta nova de Jabber"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Por favor, elixa unha das opcións seguintes:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Por favor, introduza os datos para a súa conta nova</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:7
+msgid "_Jabber ID:"
+msgstr "ID de _Jabber: "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
 #, fuzzy
@@ -102,243 +116,216 @@ msgid "Anon_ymous authentication"
 msgstr "Usar a autenticación"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Connect when I press Finish"
-msgstr "Conectar cando prema Rematar"
+#: ../data/gui/accounts_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "_Password:"
+msgstr "C_ontrasinal:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: asistente para crear unha conta"
+#: ../data/gui/accounts_window.ui.h:16
+msgid "Save pass_word"
+msgstr "_Gardar o contrasinal"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-#, fuzzy
-msgid "I already have an account I want to _use"
-msgstr "Xa teño unha conta e quero empregala"
+#: ../data/gui/accounts_window.ui.h:17
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "Se isto está marcado, o Gajim lembrará o contrasinal para esta conta"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I want to _register for a new account"
-msgstr "Quero _rexistrar unha conta nova de Jabber"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:15
-#: ../data/gui/accounts_window.ui.h:28
-msgid "If checked, Gajim will remember the password for this account"
-msgstr "Se isto está marcado, o Gajim lembrará o contrasinal para esta conta"
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Server:"
+msgstr "_Servidor:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
-msgid "Manage..."
-msgstr "Xestionar..."
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:17
-#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
-#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
-#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
-#: ../src/dialogs.py:527 ../src/roster_window.py:2956
-#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
-msgid "None"
-msgstr "Ningún"
+msgid "Manage..."
+msgstr "Xestionar..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-#, fuzzy
-msgid "Prox_y:"
-msgstr "Proxy"
+msgid "Use custom hostname/port"
+msgstr "Usa un nome de host e un porto personalizados"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "_Gardar o contrasinal"
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Nome do host:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Configurar o meu perfil ao me conectar"
+msgid "_Port:"
+msgstr "_Porto:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Use custom hostname/port"
-msgstr "Usa un nome de host e un porto personalizados"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Avanzado"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Precisa unha conta para se conectar\n"
-"á rede Jabber"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:16
-msgid "_Advanced"
-msgstr "_Avanzado"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "_Rematar"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
-msgid "_Hostname:"
-msgstr "Nome do host:"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "ID de _Jabber: "
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Estase a crear a conta</b>\n"
+"\n"
+"Por favor, agarde..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "C_ontrasinal:"
+msgid "Connect when I press Finish"
+msgstr "Conectar cando prema Rematar"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Porto:"
+msgid "Set my profile when I connect"
+msgstr "Configurar o meu perfil ao me conectar"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Varios</b>"
+msgid "_Finish"
+msgstr "_Rematar"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
-
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Información persoal</b>"
-
-#: ../data/gui/accounts_window.ui.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Propiedades</b>"
+msgid "Accounts"
+msgstr "Contas"
 
-#: ../data/gui/accounts_window.ui.h:5
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3568
+#: ../src/dialogs.py:3614
 #, fuzzy
-msgid "A_djust to status"
-msgstr "_Adaptar ao estado"
+msgid "Add"
+msgstr "Enderezo"
 
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Conta"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3572
+#: ../src/dialogs.py:3669
+msgid "Delete"
+msgstr "Eliminar"
 
-#: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Contas"
+#: ../data/gui/accounts_window.ui.h:5
+msgid "Re_name"
+msgstr "Re_nomear"
 
-#: ../data/gui/accounts_window.ui.h:8
-#, fuzzy
-msgid "Administration operations"
-msgstr "Listaxe de administradores"
+#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4210
+#: ../src/plugins/gui.py:92
+msgid "Active"
+msgstr "Activo"
 
 #: ../data/gui/accounts_window.ui.h:9
 #, fuzzy
-msgid "Anonymous authentication"
-msgstr "Usar a autenticación"
+msgid "Resour_ce:"
+msgstr "Re_curso: "
 
 #: ../data/gui/accounts_window.ui.h:10
-#, fuzzy
-msgid "Auto-reconnect when connection is lost"
-msgstr "Conectar automaticamente se se perde a conexión"
+msgid "Priori_ty:"
+msgstr "Pr_ioridade:"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Navegar"
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"O recurso envíaselle ao servidor de Jabber para 'separar' o mesmo "
+"identificador en dous ou máis partes a depender do número de clientes que "
+"estiveren conectados no servidor coa mesma conta. Así pode estar conectado e "
+"empregar a mesma conta co recurso 'Casa' ou 'Traballo' ao mesmo tempo. O "
+"recurso que teña a prioridade máis alta será o que reciba os eventos (mire "
+"máis abaixo)."
 
-#: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "C_onectar ao inicio de Gajim"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:12 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1119
+#: ../src/common/helpers.py:1131 ../src/notify.py:327 ../src/notify.py:350
+#: ../src/notify.py:401 ../src/notify.py:417
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:13
-msgid "Chan_ge Password"
-msgstr "Cam_biar o contrasinal"
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Adaptar ao estado"
 
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
+msgid "Priority will change automatically according to your status."
+msgstr "A prioridade mudará automaticamente segundo o seu estado."
 
 #: ../data/gui/accounts_window.ui.h:15
 #, fuzzy
-msgid "Choose Client Cert"
-msgstr "Elixa un ficheiro para enviar..."
-
-#: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Elixir a _chave..."
-
-#: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Prema para cambiar o contrasinal da conta"
+msgid "Anonymous authentication"
+msgstr "Usar a autenticación"
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
 msgstr ""
+"Jabber emprega a prioridade para determinar quen obtén os acontecementos do "
+"servidor cando dous ou máis clientes están conectados e usan a mesma conta. "
+"O cliente con maior prioridade recibe os acontecementos."
 
 #: ../data/gui/accounts_window.ui.h:19
 #, fuzzy
-msgid "Client certificate"
-msgstr "O nome de usuario non é válido"
+msgid "Synchronize contacts"
+msgstr "Amosar os contactos desconectados"
 
 #: ../data/gui/accounts_window.ui.h:20
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "C_onectar ao inicio de Gajim"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Conexión"
+msgid "Chan_ge Password"
+msgstr "Cam_biar o contrasinal"
 
 #: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "Correo electrónico:"
+msgid "Click to change account's password"
+msgstr "Prema para cambiar o contrasinal da conta"
 
 #: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Nome:"
+#, fuzzy
+msgid "Administration operations"
+msgstr "Listaxe de administradores"
 
-#. No configured account
-#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+msgstr ""
 
-#. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
-#. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
-#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
-#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
-msgid "General"
-msgstr "Xeral"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Navegar"
 
 #: ../data/gui/accounts_window.ui.h:26
-msgid ""
-"If checked, Gajim will also broadcast some more IPs except from just your "
-"IP, so file transfer has higher chances of working."
-msgstr ""
-"Se isto está marcado, o Gajim tamén emitirá algúns IP máis agás desde o seu "
-"IP, para que a súa transferencia teña máis posibilidades de funcionar."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "[Esta mensaxe está cifrada]"
 
 #: ../data/gui/accounts_window.ui.h:27
 #, fuzzy
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Se isto está marcado, o Gajim lembrará o contrasinal para esta conta"
+msgid "Client certificate"
+msgstr "O nome de usuario non é válido"
+
+#: ../data/gui/accounts_window.ui.h:28 ../data/gui/join_groupchat_window.ui.h:2
+msgid "Account"
+msgstr "Conta"
 
 #: ../data/gui/accounts_window.ui.h:29
-#, fuzzy
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr ""
-"Se isto está marcado, o Gajim enviará paquetes de mantemento de actividade "
-"para previr que expire a conexión"
+msgid "C_onnect on Gajim startup"
+msgstr "C_onectar ao inicio de Gajim"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -349,6 +336,24 @@ msgstr ""
 "Jabber con esta conta."
 
 #: ../data/gui/accounts_window.ui.h:31
+#, fuzzy
+msgid "Auto-reconnect when connection is lost"
+msgstr "Conectar automaticamente se se perde a conexión"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Gravar as conversas para todos os contactos"
+
+#: ../data/gui/accounts_window.ui.h:33
+#, fuzzy
+msgid "Synchronize logs with server"
+msgstr "Amosar os contactos desconectados"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Synch_ronize account status with global status"
+msgstr "Sinc_ronizar o estado da conta co estado global"
+
+#: ../data/gui/accounts_window.ui.h:35
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -358,114 +363,103 @@ msgstr ""
 "de combinación da parte inferior da listaxe de contactos) cambiará o estado "
 "desta conta en consecuencia"
 
-#: ../data/gui/accounts_window.ui.h:32
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Se o porto por defecto para as mensaxes entrantes non é válido, pode "
-"seleccionar outro aquí.\n"
-"Podería considerar mudar algúns aspectos da configuración da protección."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-msgstr "A súa información, para se gardar no servidor"
-
-#: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:831
-msgid "Jabber ID:"
-msgstr "ID de Jabber:"
-
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Apelido(s):"
+msgid "Receive conversations from other resources (If server supports it)"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "_Combinar as contas"
+msgid "Use file transfer proxies"
+msgstr "Usar proxies para as transferencias de ficheiros"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Non se seleccionou ningunha chave"
+#: ../data/gui/accounts_window.ui.h:38
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Se isto está marcado, o Gajim tamén emitirá algúns IP máis agás desde o seu "
+"IP, para que a súa transferencia teña máis posibilidades de funcionar."
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Información persoal"
+#. nick choosen by contact
+#. FIXME: Ugly workaround.
+#. FIXME: Ugly workaround.
+#. Maybe we haven't been in any group (defaults to General)
+#. General group cannot be changed
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:42
+#: ../src/common/contacts.py:106 ../src/common/contacts.py:139
+#: ../src/dialogs.py:124 ../src/dialogs.py:136 ../src/roster_window.py:3028
+#: ../src/roster_window.py:4151 ../src/roster_window.py:5764
+msgid "General"
+msgstr "Xeral"
 
-#: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Pr_ioridade:"
+#: ../data/gui/accounts_window.ui.h:40
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
+
+#: ../data/gui/accounts_window.ui.h:41 ../data/gui/preferences_window.ui.h:140
+#, fuzzy
+msgid "_Manage..."
+msgstr "Xestionar..."
 
 #: ../data/gui/accounts_window.ui.h:42
-msgid ""
-"Priority is used in Jabber to determine who gets the events from the jabber "
-"server when two or more clients are connected using the same account; The "
-"client with the highest priority gets the events"
-msgstr ""
-"Jabber emprega a prioridade para determinar quen obtén os acontecementos do "
-"servidor cando dous ou máis clientes están conectados e usan a mesma conta. "
-"O cliente con maior prioridade recibe os acontecementos."
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Propiedades</b>"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "A prioridade mudará automaticamente segundo o seu estado."
+msgid "_Warn before using an insecure connection"
+msgstr ""
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Re_nomear"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:45
 #, fuzzy
-msgid "Resour_ce:"
-msgstr "Re_curso: "
+msgid "Send _keep-alive packets"
+msgstr "Enviar paquetes de mantemento de actividade"
 
 #: ../data/gui/accounts_window.ui.h:46
+#, fuzzy
 msgid ""
-"Resource is sent to the Jabber server in order to separate the same JID in "
-"two or more parts depending on the number of the clients connected in the "
-"same server with the same account. So you might be connected in the same "
-"account with resource 'Home' and 'Work' at the same time. The resource which "
-"has the highest priority will get the events. (see below)"
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
 msgstr ""
-"O recurso envíaselle ao servidor de Jabber para 'separar' o mesmo "
-"identificador en dous ou máis partes a depender do número de clientes que "
-"estiveren conectados no servidor coa mesma conta. Así pode estar conectado e "
-"empregar a mesma conta co recurso 'Casa' ou 'Traballo' ao mesmo tempo. O "
-"recurso que teña a prioridade máis alta será o que reciba os eventos (mire "
-"máis abaixo)."
+"Se isto está marcado, o Gajim enviará paquetes de mantemento de actividade "
+"para previr que expire a conexión"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Gravar as conversas para todos os contactos"
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Usa un nome de host e un porto personalizados"
+
+#: ../data/gui/accounts_window.ui.h:48
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Nome do host:"
 
 #: ../data/gui/accounts_window.ui.h:49
 #, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Enviar paquetes de mantemento de actividade"
+msgid "_Port: "
+msgstr "_Porto:"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Sinc_ronizar o estado da conta co estado global"
+#: ../data/gui/accounts_window.ui.h:50 ../data/gui/preferences_window.ui.h:143
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Varios</b>"
 
 #: ../data/gui/accounts_window.ui.h:51
-#, fuzzy
-msgid "Synchroni_ze account status with global status"
-msgstr "Sinc_ronizar o estado da conta co estado global"
+msgid "Connection"
+msgstr "Conexión"
 
-#: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Amosar os contactos desconectados"
+#: ../data/gui/accounts_window.ui.h:52 ../src/config.py:1853
+#: ../src/config.py:2467
+msgid "No key selected"
+msgstr "Non se seleccionou ningunha chave"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+msgid "Choose _Key..."
+msgstr "Elixir a _chave..."
 
 #: ../data/gui/accounts_window.ui.h:54
 msgid "Use G_PG Agent"
@@ -473,78 +467,131 @@ msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:55
 #, fuzzy
-msgid "Use cust_om hostname/port"
-msgstr "Usa un nome de host e un porto personalizados"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Se isto está marcado, o Gajim lembrará o contrasinal para esta conta"
 
 #: ../data/gui/accounts_window.ui.h:56
-#, fuzzy
-msgid "Use cust_om port:"
-msgstr "Usar o porto personalizado:"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Usar proxies para as transferencias de ficheiros"
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "_Editar a información persoal..."
 
 #: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+msgid "Information about you, as stored in the server"
+msgstr "A súa información, para se gardar no servidor"
 
 #: ../data/gui/accounts_window.ui.h:59
-#, fuzzy
-msgid "_Edit Personal Information..."
-msgstr "_Editar a información persoal..."
+msgid "<b>Personal Information</b>"
+msgstr "<b>Información persoal</b>"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-#, fuzzy
-msgid "_Enable"
-msgstr "Activar"
+#: ../data/gui/accounts_window.ui.h:60 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Información persoal"
 
 #: ../data/gui/accounts_window.ui.h:61
 #, fuzzy
-msgid "_Hostname: "
-msgstr "Nome do host:"
+msgid "Co_nnect on Gajim startup"
+msgstr "C_onectar ao inicio de Gajim"
 
-#: ../data/gui/accounts_window.ui.h:63
+#: ../data/gui/accounts_window.ui.h:62
 #, fuzzy
-msgid "_Manage..."
-msgstr "Xestionar..."
+msgid "Synchroni_ze account status with global status"
+msgstr "Sinc_ronizar o estado da conta co estado global"
 
-#: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/accounts_window.ui.h:63
 #, fuzzy
-msgid "_Port: "
-msgstr "_Porto:"
+msgid "Use cust_om port:"
+msgstr "Usar o porto personalizado:"
 
-#: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
+#: ../data/gui/accounts_window.ui.h:64
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
 msgstr ""
+"Se o porto por defecto para as mensaxes entrantes non é válido, pode "
+"seleccionar outro aquí.\n"
+"Podería considerar mudar algúns aspectos da configuración da protección."
+
+#: ../data/gui/accounts_window.ui.h:66
+#: ../data/gui/zeroconf_information_window.ui.h:7
+msgid "First Name:"
+msgstr "Nome:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "Last Name:"
+msgstr "Apelido(s):"
 
-#: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "_Conta:"
+#: ../data/gui/accounts_window.ui.h:68
+#: ../data/gui/archiving_313_preferences_item.ui.h:3
+#: ../data/gui/tooltip_gc_contact.ui.h:1
+#: ../data/gui/tooltip_roster_contact.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:9 ../src/config.py:1880
+#: ../src/dialogs.py:854
+msgid "Jabber ID:"
+msgstr "ID de Jabber:"
 
-#: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "Permitirlle a este contacto que vexa o meu estado"
+#: ../data/gui/accounts_window.ui.h:69
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "E-Mail:"
+msgstr "Correo electrónico:"
 
-#: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Engadir un contacto novo"
+#: ../data/gui/accounts_window.ui.h:70
+msgid "Mer_ge accounts"
+msgstr "_Combinar as contas"
 
-#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1339
+#: ../data/gui/add_new_contact_window.ui.h:1 ../src/common/helpers.py:1317
 msgid "I would like to add you to my contact list."
 msgstr "Gustaríame engadilo á miña listaxe de contactos."
 
+#: ../data/gui/add_new_contact_window.ui.h:2
+msgid "Add New Contact"
+msgstr "Engadir un contacto novo"
+
+#: ../data/gui/add_new_contact_window.ui.h:3
+msgid "A_ccount:"
+msgstr "_Conta:"
+
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_Protocol:"
+msgstr "_Protocolo:"
+
 #: ../data/gui/add_new_contact_window.ui.h:5
+msgid "_User ID:"
+msgstr "ID de _usuario:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Nickname:"
+msgstr "_Alcume:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "_Group:"
+msgstr "_Grupo:"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+msgid "Choose a group of type a new group"
+msgstr ""
+
+#: ../data/gui/add_new_contact_window.ui.h:9
+msgid "A_llow this contact to view my status"
+msgstr "Permitirlle a este contacto que vexa o meu estado"
+
+#: ../data/gui/add_new_contact_window.ui.h:10
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Subscrición"
+
+#: ../data/gui/add_new_contact_window.ui.h:11
 #, fuzzy
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
-"protocol. Click on register button to\n"
+"protocol. Click on Register button to\n"
 "proceed."
 msgstr ""
 "Ten que rexistrar este transporte\n"
@@ -552,7 +599,11 @@ msgstr ""
 "protocolo. Prema o botón Rexistrar\n"
 "para continuar."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:15
+msgid "_Register"
+msgstr "_Rexistrar"
+
+#: ../data/gui/add_new_contact_window.ui.h:16
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -560,110 +611,88 @@ msgstr ""
 "Debe estar conectado ao transporte para poder\n"
 "engadir un contacto deste protocolo."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Grupo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Alcume:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protocolo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Rexistrar"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Subscrición"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "ID de _usuario:"
-
-#: ../data/gui/adhoc_commands_window.ui.h:1
-#, fuzzy
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Produciuse un erro:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Comandos ad-hoc - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Elixa o comando para executar:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Por favor, agarde mentres se solicita a listaxe de comandos..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Comandos ad-hoc - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Elixa o comando para executar:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Comprobar mais unha vez"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Descrición do erro..."
-
-#: ../data/gui/adhoc_commands_window.ui.h:6
 #, fuzzy
-msgid "F_inish"
-msgstr "_Rematar"
-
-#: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Por favor, agarde mentres se solicita a listaxe de comandos..."
-
-#: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
+msgid "Please wait while the command is being sent..."
 msgstr "Por favor, agarde mentres se envía o comando..."
 
-#: ../data/gui/adhoc_commands_window.ui.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait..."
 msgstr "Por favor, agarde..."
 
-#: ../data/gui/adhoc_commands_window.ui.h:10
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "This jabber entity does not expose any commands."
 msgstr "Esta entidade de jabber non expón comandos."
 
+#: ../data/gui/adhoc_commands_window.ui.h:8
+#, fuzzy
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Produciuse un erro:</b>"
+
+#: ../data/gui/adhoc_commands_window.ui.h:9
+#, fuzzy
+msgid "F_inish"
+msgstr "_Rematar"
+
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Editor avanzado de configuración"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Descrición</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 #, fuzzy
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>NOTA:</b> Debe reiniciar o Gajim para que algúns cambios teñan efecto"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Editor avanzado de configuración"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filtro:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Restabelecer as cores predeterminadas"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Eliminar MDD"
+msgid "Show _XML Console"
+msgstr "Amosar a consola de _XML"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-msgstr "Elimina a mensaxe do día (MDD)"
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Edit Archi_ving Preferences"
 msgstr "_Preferencias"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Listaxes de _privacidade"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrador"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
 #, fuzzy
 msgid "Sends a message to users currently connected to this server"
@@ -672,281 +701,138 @@ msgstr ""
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
-msgid "Set MOTD..."
-msgstr "Definir a MDD"
+msgid "_Send Server Message..."
+msgstr "_Enviar a mensaxe do servidor"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Define a mensaxe do día"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Amosar a consola de _XML"
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Definir a MDD"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
+msgid "Updates Message of the Day"
+msgstr "Actualiza a mensaxe do día"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Actualizar a MDD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
-msgid "Updates Message of the Day"
-msgstr "Actualiza a mensaxe do día"
-
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administrador"
+msgid "Deletes Message of the Day"
+msgstr "Elimina a mensaxe do día (MDD)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "_Enviar a mensaxe do servidor"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " hai unha fiestra/separador aberto con este contacto "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Accións</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Condicións</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Sons</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Accións A_vanzadas"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Control de notificacións avanzadas"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Todos os estados"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Ausente"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Ocupado "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Un contacto cambiou o seu estado"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Contacto desconectado"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Non ten "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Transferencias"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Solicitude de transferencia de ficheiro"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Detívose a transferencia do ficheiro"
+msgid "Delete MOTD"
+msgstr "Eliminar MDD"
 
-#: ../data/gui/advanced_notifications_window.ui.h:16
+#: ../data/gui/archiving_313_preferences_item.ui.h:1
+#: ../data/gui/archiving_313_preferences_window.ui.h:1
+#: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Remarcado da mensaxe de grupo de charla"
+msgid "Always"
+msgstr "Ausente"
 
-#: ../data/gui/advanced_notifications_window.ui.h:17
+#: ../data/gui/archiving_313_preferences_item.ui.h:2
+#: ../data/gui/archiving_313_preferences_window.ui.h:3
+#: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Recibiuse unha mensaxe de grupo de charla"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Ten "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Invisíbel"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Enviar un comando"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Non dispoñíbel"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Un ou máis estados especiais..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "En liña / Libre para falar"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Reproducir un _son"
+msgid "Never"
+msgstr "_Nunca"
 
-#: ../data/gui/advanced_notifications_window.ui.h:25
+#: ../data/gui/archiving_313_preferences_item.ui.h:4
 #, fuzzy
-msgid "Receive a Message"
-msgstr "Mensaxe privada nova"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Cando"
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Activar o índice de urxencia do xestor de fiestras na barra de tarefas para "
-"realzar a fiestra de charla"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Desactivar a apertura automática de fiestras de charla"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Desactivar as fiestras emerxentes existentes"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Desactivar os sons existentes para este acontecemento"
+msgid "Preference:"
+msgstr "Preferencias"
 
-#: ../data/gui/advanced_notifications_window.ui.h:31
+#: ../data/gui/archiving_313_preferences_window.ui.h:2
 #, fuzzy
-msgid "_Disable showing event in notification area"
-msgstr "_Desactivar mostrar os eventos no roster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "_Desactivar mostrar os eventos no roster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Informarme cunha fiestra emerxente"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Abrir unha fiestra de charla con este usuario"
+msgid "Roster"
+msgstr "Amosar _listaxe"
 
-#: ../data/gui/advanced_notifications_window.ui.h:35
+#. holds jid
+#: ../data/gui/archiving_313_preferences_window.ui.h:4 ../src/dialogs.py:3576
+#: ../src/history_manager.py:168
 #, fuzzy
-msgid "_Show event in notification area"
-msgstr "_Mostrar o evento na listaxe de contactos"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "_Mostrar o evento na listaxe de contactos"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "e eu "
+msgid "Jabber ID"
+msgstr "ID de Jabber:"
 
-#: ../data/gui/advanced_notifications_window.ui.h:38
+#: ../data/gui/archiving_313_preferences_window.ui.h:5
 #, fuzzy
-msgid "contact(s)"
-msgstr "Contactos"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "para "
+msgid "Preference"
+msgstr "Preferencias"
 
-#: ../data/gui/advanced_notifications_window.ui.h:41
+#: ../data/gui/archiving_313_preferences_window.ui.h:6
 #, fuzzy
-msgid "group(s)"
-msgstr "Grupo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "cando eu estea en"
+msgid "Default:"
+msgstr "Por defecto"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "Ningún"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
-
-#: ../data/gui/archiving_preferences_window.ui.h:4
 #, fuzzy
-msgid "Auto"
-msgstr "Autoconectar"
+msgid "Prefer"
+msgstr "Preferencias"
 
-#: ../data/gui/archiving_preferences_window.ui.h:5
+#: ../data/gui/archiving_preferences_window.ui.h:4
 msgid "Concede"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:6
+#: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Forbid"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:7
+#: ../data/gui/archiving_preferences_window.ui.h:6
 #, fuzzy
-msgid "No"
-msgstr "Ningún"
+msgid "Auto"
+msgstr "Autoconectar"
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Preferencias"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Entrada:"
+msgid "New entry received"
+msgstr "Recibiuse unha entrada nova"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:129
+msgid "You have received new entry:"
+msgstr "Recibiu unha entrada nova:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Nome do feed:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Entrada:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Última modificación:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "Recibiuse unha entrada nova"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "Recibiu unha entrada nova:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
@@ -954,342 +840,389 @@ msgid "Blocked Contacts"
 msgstr "Contactos"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:606
+#: ../src/roster_window.py:5742 ../src/roster_window.py:5857
 msgid "_Unblock"
 msgstr ""
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-#, fuzzy
-msgid "<b>Message:</b> "
-msgstr "<b>Mensaxes de estado predefinidas</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/gui/change_mood_dialog.ui.h:1
+#: ../data/gui/change_activity_dialog.ui.h:3
 #, fuzzy
-msgid "<b>Message:</b>"
+msgid "<b>Message:</b> "
 msgstr "<b>Mensaxes de estado predefinidas</b>"
 
-#: ../data/gui/change_mood_dialog.ui.h:2
+#: ../data/gui/change_mood_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Mood:</b>"
 msgstr "<b>Sons</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:2
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Mensaxes de estado predefinidas</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Cambiar o contrasinal"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Insírao mais unha vez para confirmar:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Insira o contrasinal novo:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Insírao mais unha vez para confirmar:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Escriba a súa mensaxe nova de estado</b>"
+msgid "Save as Preset..."
+msgstr "Gardar como predefinido..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
+msgid "Preset messages:"
+msgstr "Mensaxes predefinidas:"
+
+#: ../data/gui/change_status_message_dialog.ui.h:3
+#: ../data/gui/tooltip_roster_contact.ui.h:7
 #, fuzzy
 msgid "Activity:"
 msgstr "Activo"
 
-#: ../data/gui/change_status_message_dialog.ui.h:3
+#: ../data/gui/change_status_message_dialog.ui.h:4
+#: ../data/gui/tooltip_roster_contact.ui.h:6
 #, fuzzy
 msgid "Mood:"
 msgstr "Sala:"
 
-#: ../data/gui/change_status_message_dialog.ui.h:4
-msgid "Preset messages:"
-msgstr "Mensaxes predefinidas:"
-
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Gardar como predefinido..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Escriba a súa mensaxe nova de estado</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Entrar nun grupo de charla"
+msgid "_Copy Link Location"
+msgstr "_Copiar o enderezo da ligazón"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Engadir á listaxe de contactos"
+msgid "_Open Link in Browser"
+msgstr "_Abrir a ligazón no navegador"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Copiar o enderezo"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Copiar o enderezo da ligazón"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Abrir o editor de correo"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Abrir a ligazón no navegador"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
 msgid "_Start Chat"
 msgstr "_Iniciar a charla"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "núm."
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Engadir á listaxe de contactos"
+
+#: ../data/gui/chat_control.ui.h:1
+#, fuzzy
+msgid "<b>1</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+#, fuzzy
+msgid "<b>2</b> abc"
+msgstr "<b>Sons</b>"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+#, fuzzy
+msgid "<b>3</b> def"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/chat_control.ui.h:4
-msgid "1"
-msgstr ""
+#, fuzzy
+msgid "<b>4</b> ghi"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/chat_control.ui.h:5
-msgid "2"
-msgstr ""
+#, fuzzy
+msgid "<b>5</b> jkl"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/chat_control.ui.h:6
-msgid "3"
-msgstr ""
+#, fuzzy
+msgid "<b>6</b> mno"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/chat_control.ui.h:7
-msgid "4"
+msgid "<b>7</b> pqrs"
 msgstr ""
 
 #: ../data/gui/chat_control.ui.h:8
-msgid "5"
-msgstr ""
+#, fuzzy
+msgid "<b>8</b> tuv"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/chat_control.ui.h:9
-msgid "6"
+msgid "<b>9</b> wxyz"
 msgstr ""
 
 #: ../data/gui/chat_control.ui.h:10
-msgid "7"
-msgstr ""
+#, fuzzy
+msgid "<b>*</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/chat_control.ui.h:11
-msgid "8"
-msgstr ""
+#, fuzzy
+msgid "<b>0</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/chat_control.ui.h:12
-msgid "9"
-msgstr ""
+#, fuzzy
+msgid "<b>#</b>"
+msgstr "<b>Sons</b>"
 
-#: ../data/gui/chat_control.ui.h:13
+#: ../data/gui/chat_control.ui.h:13 ../data/gui/gajim_themes_window.ui.h:10
+msgid "Bold"
+msgstr "Negra"
+
+#: ../data/gui/chat_control.ui.h:14 ../data/gui/gajim_themes_window.ui.h:11
+msgid "Italic"
+msgstr "Itálica"
+
+#: ../data/gui/chat_control.ui.h:15
 #, fuzzy
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Engade o contacto á listaxe"
+msgid "Underline"
+msgstr "nove"
 
-#: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
-msgid "Browse the chat history (Ctrl+H)"
+#: ../data/gui/chat_control.ui.h:16
+#, fuzzy
+msgid "Strike"
+msgstr "Alcume"
+
+#: ../data/gui/chat_control.ui.h:17 ../src/advanced_configuration_window.py:99
+msgid "Color"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:15
+#: ../data/gui/chat_control.ui.h:18
 #, fuzzy
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "está a prestar atención á conversa"
+msgid "Font"
+msgstr "_Letra:"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Clear formatting"
+msgstr "Información"
 
-#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:20 ../data/gui/groupchat_control.ui.h:1
 #, fuzzy
 msgid "Show a list of emoticons (Alt+M)"
 msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
-#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:21
 #, fuzzy
-msgid "Show a list of formattings"
-msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Engade o contacto á listaxe"
 
-#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:22
 #, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "está a prestar atención á conversa"
 
-#: ../data/gui/chat_control.ui.h:19
+#: ../data/gui/chat_control.ui.h:23
+#, fuzzy
+msgid "Show the contact&apos;s profile (Ctrl+I)"
+msgstr "Engade o contacto á listaxe"
+
+#: ../data/gui/chat_control.ui.h:24
 #, fuzzy
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Engade o contacto á listaxe"
 
-#: ../data/gui/chat_control.ui.h:20
-msgid "Toggle audio session"
+#: ../data/gui/chat_control.ui.h:25 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:21
-msgid "Toggle video session"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:26 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
-#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+#: ../data/gui/chat_control.ui.h:27
+msgid "#"
+msgstr "núm."
+
+#: ../data/gui/chat_control.ui.h:28 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:321
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:29 ../data/gui/groupchat_control.ui.h:9
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Enviar a mensaxe"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "Con_vidar"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:2
 #, fuzzy
-msgid "MUC server"
-msgstr "Observadores"
+msgid ""
+"You are now entering a groupchat.\n"
+"Select the contacts you want to invite"
+msgstr "JID do contacto co que quere conversar"
 
 #: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
 #: ../data/gui/chat_to_muc_window.ui.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
-msgstr ""
-
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Pregunta para ver o _seu estado"
-
-#: ../data/gui/contact_context_menu.ui.h:2
 #, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Engadir unha _notificación especial"
+msgid "MUC server"
+msgstr "Observadores"
 
-#: ../data/gui/contact_context_menu.ui.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:6
 #, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Asignar chave de OpenPGP"
+msgid "In_vite"
+msgstr "Con_vidar"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-#, fuzzy
-msgid "E_xecute Command..."
-msgstr "Executar o comando..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Iniciar a charla"
 
-#: ../data/gui/contact_context_menu.ui.h:5
+#. Send single message
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:4 ../src/gui_menu_builder.py:541
+msgid "Send Single _Message..."
+msgstr "Enviar unha _mensaxe..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
-msgid "Edit _Groups..."
-msgstr "Editar os grupos"
+msgid "Send _File..."
+msgstr "Enviar ficheiro"
 
-#. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5687
+#: ../src/roster_window.py:5832
 msgid "In_vite to"
 msgstr "Con_vidar"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Contactos"
 
-#: ../data/gui/contact_context_menu.ui.h:8
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Alternar a codificación OpenPGP"
+
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
-msgid "Remo_ve"
-msgstr "_Eliminar"
+msgid "Toggle End to End Encryption"
+msgstr "Alternar a codificación OpenPGP"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:554
+#: ../src/roster_window.py:5695
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Envía XML personalizado"
 
+#. Execute Command
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/gui_menu_builder.py:574
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Executar o comando..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Enviar unha _mensaxe..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "Renomear o contacto"
 
-#: ../data/gui/contact_context_menu.ui.h:11
+#. Rename
+#: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:595
+#: ../src/roster_window.py:5725
 #, fuzzy
-msgid "Send _File..."
-msgstr "Enviar ficheiro"
+msgid "_Rename..."
+msgstr "Renomear"
 
-#: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr ""
+#. Edit Groups
+#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5848
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Editar os grupos"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Iniciar a charla"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Asignar chave de OpenPGP"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-#, fuzzy
-msgid "Toggle End to End Encryption"
-msgstr "Alternar a codificación OpenPGP"
+msgid "Set Custom _Avatar..."
+msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Alternar a codificación OpenPGP"
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Engadir unha _notificación especial"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Subscrición"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "Permitirlle ver o meu estado"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "Permitirlle a este contacto que vexa o meu estado"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
-msgid "_Block"
-msgstr ""
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Pregunta para ver o _seu estado"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 msgstr "Prohibirlle ver o meu estado"
 
-#: ../data/gui/contact_context_menu.ui.h:20
-#: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Historial"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:609
+#: ../src/roster_window.py:5747 ../src/roster_window.py:5861
+msgid "_Block"
 msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
-msgid "_Manage Contact"
-msgstr "Renomear o contacto"
+msgid "_Unignore"
+msgstr "nove"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-#, fuzzy
-msgid "_Rename..."
-msgstr "Renomear"
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Subscrición"
+#. Remove
+#. Remove group
+#: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:617
+#: ../src/roster_window.py:5754
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Eliminar"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-#, fuzzy
-msgid "_Unignore"
-msgstr "nove"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:5927
+msgid "_History"
+msgstr "_Historial"
 
 #: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
@@ -1304,56 +1237,52 @@ msgid "Edit Groups"
 msgstr "Editar grupos"
 
 #: ../data/gui/esession_info_window.ui.h:1
-#, fuzzy
-msgid "(<b>ESession</b> info)"
-msgstr "<b>Descrición</b>"
-
-#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr ""
 
-#: ../data/gui/features_window.ui.h:2
-msgid "<b>List of possible features in Gajim:</b>"
-msgstr ""
-
-#: ../data/gui/features_window.ui.h:3
+#: ../data/gui/features_window.ui.h:1
 #, fuzzy
 msgid "Features"
 msgstr "Características dos servidores"
 
+#: ../data/gui/features_window.ui.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Listaxe de transferencias activas, rematadas e detidas"
+#, fuzzy
+msgid "Con_tinue"
+msgstr "_Continuar"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Cancelar a transferencia"
+msgid "_Pause"
+msgstr "_Pausa"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Cancela a transferencia seleccionada do ficheiro"
+#: ../data/gui/service_registration_window.ui.h:2
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr ""
-"Cancela a transferencia seleccionada do ficheiro e elimina o ficheiro "
-"incompleto"
+#: ../data/gui/filetransfers.ui.h:4 ../src/chat_control.py:2029
+#: ../src/filetransfers_window.py:214
+msgid "_Open Containing Folder"
+msgstr "_Abrir un cartafol de contido"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Limpar"
-
-#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Transferencias"
 
+#: ../data/gui/filetransfers.ui.h:6
+msgid "file transfers list"
+msgstr "listaxe de transferencias"
+
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Oculta a fiestra"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
 #: ../data/gui/filetransfers.ui.h:8
-msgid "Remove file transfer from the list."
-msgstr "Eliminar transferencias da listaxe"
+msgid "Clean _up"
+msgstr "Limpar"
 
 #: ../data/gui/filetransfers.ui.h:9
 #, fuzzy
@@ -1361,9 +1290,8 @@ msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Elimina da listaxe as transferencias rematadas, canceladas e erradas"
 
 #: ../data/gui/filetransfers.ui.h:10
-#, fuzzy
-msgid "Shows a list of file transfers between you and others"
-msgstr "Amosa unha listaxe de transferencias entre vostede e outra persoa"
+msgid "Remove file transfer from the list."
+msgstr "Eliminar transferencias da listaxe"
 
 #: ../data/gui/filetransfers.ui.h:11
 msgid ""
@@ -1374,82 +1302,94 @@ msgstr ""
 "activa, detense primeiro e elimínase despois"
 
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
-"Cando unha transferencia se completar, amosa unha notificación emerxente"
+"Cancela a transferencia seleccionada do ficheiro e elimina o ficheiro "
+"incompleto"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Continuar"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Cancelar a transferencia"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Notificarme cando rematar unha transferencia"
+msgid "Cancels the selected file transfer"
+msgstr "Cancela a transferencia seleccionada do ficheiro"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Abrir un cartafol de contido"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Oculta a fiestra"
 
 #: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pausa"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Notificarme cando rematar unha transferencia"
 
 #: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "listaxe de transferencias"
+msgid "When a file transfer is complete show a popup notification"
+msgstr ""
+"Cando unha transferencia se completar, amosa unha notificación emerxente"
 
-#: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Cores do separador para os estados da charla</b>"
+#: ../data/gui/filetransfers.ui.h:18
+#, fuzzy
+msgid "Shows a list of file transfers between you and others"
+msgstr "Amosa unha listaxe de transferencias entre vostede e outra persoa"
 
-#: ../data/gui/gajim_themes_window.ui.h:2
+#: ../data/gui/gajim_themes_window.ui.h:1
 #, fuzzy
 msgid "Account row"
 msgstr "Conta"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Negra"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Grupo"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Contacto"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "A compor"
+msgid "Gajim Themes Customization"
+msgstr "Personalización de temas do Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Contacto"
+msgid "Text _color:"
+msgstr "_Cor do texto:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Estilo:"
+msgid "_Background:"
+msgstr "_Fondo"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Personalización de temas do Gajim"
+msgid "Text _font:"
+msgstr "_Letra do texto:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Marchei"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Grupo"
+msgid "Font style:"
+msgstr "Estilo:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
-msgid "Italic"
-msgstr "Itálica"
-
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "A compor"
+
+#: ../data/gui/gajim_themes_window.ui.h:14
+msgid "Paused"
+msgstr "Pausado"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "Gone"
+msgstr "Marchei"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
 msgid ""
 "MUC\n"
 "Messages"
@@ -1457,7 +1397,7 @@ msgstr ""
 "MUC\n"
 "Mensaxes"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1465,21 +1405,9 @@ msgstr ""
 "Mensaxes dirixidas\n"
 "ás salas"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Pausado"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "_Cor do texto:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "_Letra do texto:"
-
 #: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Fondo"
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Cores do separador para os estados da charla</b>"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 #, fuzzy
@@ -1488,108 +1416,146 @@ msgstr "Cambiar o _alcume"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
 #, fuzzy
+msgid "_Manage Room"
+msgstr "Xestionar os marcadores"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
+#, fuzzy
 msgid "Change _Subject..."
 msgstr "Cambiar o _tema"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 #, fuzzy
 msgid "Configure _Room..."
 msgstr "Configurar a sala"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-#, fuzzy
-msgid "_Bookmark"
-msgstr "Engadir esta sala aos marcadores"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 #, fuzzy
 msgid "_Destroy Room"
 msgstr "Descrición: %s"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:6
+msgid "_Minimize on close"
+msgstr ""
+
 #: ../data/gui/gc_control_popup_menu.ui.h:7
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Xestionar os marcadores"
+msgid "_Request Voice"
+msgstr "_Voz"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:8
-msgid "_Minimize on close"
-msgstr ""
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1803
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Engadir esta sala aos marcadores"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:10 ../src/roster_window.py:5919
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Contacto desconectado"
 
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derador"
+msgid "_Send Private Message"
+msgstr "_Enviar unha mensaxe privada"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
+msgid "Send _File"
+msgstr "Enviar ficheiro"
+
+#: ../data/gui/gc_occupants_menu.ui.h:3
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Accións"
 
-#: ../data/gui/gc_occupants_menu.ui.h:3
-msgid "Send _File"
-msgstr "Enviar ficheiro"
-
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Engadir á listaxe de contactos"
+msgid "_Voice"
+msgstr "_Voz"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derador"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Membro"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Administrar"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Deshabilitar"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Propietario"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Expulsar"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Membro"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Propietario"
+msgid "_Ban"
+msgstr "_Deshabilitar"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Enviar unha mensaxe privada"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Voz"
+msgid "_Add to Roster"
+msgstr "_Engadir á listaxe de contactos"
 
-#: ../data/gui/groupchat_control.ui.h:1
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:365
 #, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Engadir esta sala aos marcadores"
+msgid "Show a list of formattings"
+msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Cambiar o _alcume"
+
+#: ../data/gui/groupchat_control.ui.h:4
 msgid "Change the room's subject (Alt+T)"
 msgstr ""
 
-#: ../data/gui/groupchat_control.ui.h:4
+#: ../data/gui/groupchat_control.ui.h:5
 #, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Cambiar o _alcume"
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Engadir esta sala aos marcadores"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Crear unha publicación nova"
 
 #: ../data/gui/groups_post_window.ui.h:2
-#: ../data/gui/single_message_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:1
 msgid "From:"
 msgstr "De:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Subject:"
 msgstr "Tema:"
 
 #: ../data/gui/history_manager.ui.h:1
 #, fuzzy
+msgid "_Export"
+msgstr "Exportar"
+
+#: ../data/gui/history_manager.ui.h:2
+msgid "Gajim History Logs Manager"
+msgstr "Xestor do Historial de Gajim"
+
+#: ../data/gui/history_manager.ui.h:3
+#, fuzzy
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "Xestor do Historial de Gajim"
+
+#: ../data/gui/history_manager.ui.h:4
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+
+#: ../data/gui/history_manager.ui.h:7
+#, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
 "If you plan to do massive deletions, please make sure Gajim is not running. "
@@ -1605,200 +1571,169 @@ msgstr ""
 "con que estiver\n"
 "a falar neste momento."
 
-#: ../data/gui/history_manager.ui.h:3
-#, fuzzy
-msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
-msgstr "Xestor do Historial de Gajim"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Eliminar"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Exportar"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Xestor do Historial de Gajim"
-
-#: ../data/gui/history_manager.ui.h:7
-msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
-"\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
-msgstr ""
-
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Buscar na base de datos"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Historias antigas"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
+#: ../data/gui/history_window.ui.h:1 ../src/history_window.py:337
 msgid "Conversation History"
 msgstr "Historial de conversas"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
-msgid "Enter JID or Contact name"
-msgstr "Nome de contacto"
+msgid "Search:"
+msgstr "Buscar"
+
+#: ../data/gui/history_window.ui.h:3
+msgid "_In date search"
+msgstr ""
 
 #: ../data/gui/history_window.ui.h:4
-#, fuzzy
-msgid "Groupchat Histories"
-msgstr "Grupos de charla"
+msgid "Searching only in the selected day "
+msgstr ""
 
 #: ../data/gui/history_window.ui.h:5
-#, fuzzy
-msgid "Search:"
-msgstr "Buscar"
-
-#: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "Historial de conversas"
 
+#: ../data/gui/history_window.ui.h:6
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Rexistrar os cambios de estado dos contactos"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "false"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#: ../src/common/connection_handlers.py:1221
+msgid "message"
+msgstr "mensaxe"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
+msgid "stream"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "concede"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+msgid "forbid"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
-#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "mensaxe"
+msgid "oppose"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-msgid "otr"
+msgid "require"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
-msgstr ""
+#: ../src/gajim-remote.py:231
+msgid "jid"
+msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
+msgid "otr"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "save"
 msgstr ""
 
-#: ../data/gui/join_groupchat_window.ui.h:2
-#, fuzzy
-msgid "Bro_wse Rooms"
-msgstr "_Navegar"
-
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2461
 msgid "Join Group Chat"
 msgstr "Entrar nunha sala de charlas"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Configurar o meu perfil ao me conectar"
+#: ../data/gui/join_groupchat_window.ui.h:3
+msgid "Recently:"
+msgstr "Recentemente:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:4
 msgid "Nickname:"
 msgstr "Alcume:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
-msgid "Password:"
-msgstr "Contrasinal: "
-
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Recentemente:"
-
-#: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:6 ../src/config.py:1870
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../data/gui/join_groupchat_window.ui.h:10
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Password:"
+msgstr "Contrasinal: "
+
+#: ../data/gui/join_groupchat_window.ui.h:8
 #, fuzzy
 msgid "_Bookmark this room"
 msgstr "Engadir esta sala aos marcadores"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:9
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Configurar o meu perfil ao me conectar"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Navegar"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:2060
+#: ../src/disco.py:1807
 msgid "_Join"
 msgstr "_Entrar"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Autoconectar"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Xestionar os marcadores"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+#, fuzzy
+msgid "_Title:"
+msgstr "Título:"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
+msgid "Roo_m:"
 msgstr ""
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
-msgstr "Amosar o estado:"
+#, fuzzy
+msgid "A_uto join"
+msgstr "Autoconectar"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "Minimi_ze on Auto Join"
+msgstr ""
 
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Título:"
+#, fuzzy
+msgid "Pr_int status:"
+msgstr "Amosar o estado:"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
@@ -1811,43 +1746,45 @@ msgid "_Configure"
 msgstr "_Continuar"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Propiedades</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr "Conectar con HTTP"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Configuración</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Conectar con HTTP"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Xestionar os perfís do proxy"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+#, fuzzy
+msgid "_Name:"
+msgstr "_Nome: "
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "_Contrasinal: "
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipo:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-#, fuzzy
-msgid "Proxy _Host:"
-msgstr "Proxy"
+msgid "<b>Properties</b>"
+msgstr "<b>Propiedades</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
-msgid "Proxy _Port:"
-msgstr "_Porto:"
+msgid "_BOSH URL:"
+msgstr "_URL"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proxy"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
@@ -1856,101 +1793,87 @@ msgstr "_Usar proxy"
 
 #: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
-msgid "Use proxy auth_entication"
-msgstr "Usar a autenticación"
+msgid "Proxy _Port:"
+msgstr "_Porto:"
 
 #: ../data/gui/manage_proxies_window.ui.h:12
 #, fuzzy
-msgid "_BOSH URL:"
-msgstr "_URL"
+msgid "Use proxy auth_entication"
+msgstr "Usar a autenticación"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-#, fuzzy
-msgid "_Name:"
-msgstr "_Nome: "
+msgid "_Username:"
+msgstr "_Nome de usuario:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-#, fuzzy
-msgid "_Type:"
-msgstr "Tipo:"
+msgid "Pass_word:"
+msgstr "_Contrasinal: "
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Nome de usuario:"
+msgid "<b>Settings</b>"
+msgstr "<b>Configuración</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Xestionar as contas"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Contrasinal"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "Au_torizar"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "En liñ_a"
+msgid "Version:"
+msgstr "Versión de GTK+:"
 
 #: ../data/gui/plugins_window.ui.h:5
 #, fuzzy
-msgid "Configure"
-msgstr "_Continuar"
+msgid "Authors:"
+msgstr "Au_torizar"
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Descrición: %s"
+msgid "Homepage:"
+msgstr "Páxina web:"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
-msgid "Homepage:"
-msgstr "Páxina web:"
+msgid "Description:"
+msgstr "Descrición: %s"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
+msgid "Configure"
+msgstr "_Continuar"
+
+#: ../data/gui/plugins_window.ui.h:10
+#, fuzzy
 msgid "Installed"
 msgstr "Atascado"
 
-#: ../data/gui/plugins_window.ui.h:10
+#: ../data/gui/plugins_window.ui.h:11
 msgid ""
 "Plug-in decription should be displayed here. This text will be erased during "
 "PluginsWindow initialization."
 msgstr ""
 
-#: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
-
-#: ../data/gui/plugins_window.ui.h:12
-msgid "Uninstall"
-msgstr ""
-
-#: ../data/gui/plugins_window.ui.h:13
-#, fuzzy
-msgid "Version:"
-msgstr "Versión de GTK+:"
-
-#: ../data/gui/plugins_window.ui.h:14
-msgid "button"
-msgstr ""
-
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
-msgstr ""
-
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1962,1142 +1885,1147 @@ msgid "Event desc"
 msgstr "Eventos"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Editor de configuración avanzada</b>"
+msgid "Use default applications"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Programas</b>"
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Personalizado</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Accións</b>"
+msgid "All chat states"
+msgstr "Todos os estados"
 
 #: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
-msgid "<b>Auto Status</b>"
-msgstr "<b>Accións</b>"
-
-#: ../data/gui/preferences_window.ui.h:5
-#, fuzzy
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Editar unha regra</b>"
+msgid "Composing only"
+msgstr "A compor"
 
-#: ../data/gui/preferences_window.ui.h:6
-#, fuzzy
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Cores do separador para os estados da charla</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:162
+#: ../src/config.py:654
+msgid "Disabled"
+msgstr "Desactivado"
 
 #: ../data/gui/preferences_window.ui.h:7
-#, fuzzy
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Notificacións visuais</b>"
+msgid "Only when pending events"
+msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:8
+#: ../data/gui/preferences_window.ui.h:9
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Condicións</b>"
+msgid "Pop it up"
+msgstr "_Emerxer"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:10
-msgid "<b>Custom</b>"
-msgstr "<b>Personalizado</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notificarmo"
 
 #: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
-msgid "<b>Font</b>"
-msgstr "<b>Sons</b>"
+msgid "Show only in roster"
+msgstr "Amosar só na _listaxe de contactos"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Opcións de GMail</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Mensaxes de estado predefinidas</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-#, fuzzy
-msgid "<b>Privacy</b>"
-msgstr "<i>Listaxe de privacidade</i>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
+msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:18
+#: ../data/gui/preferences_window.ui.h:17
 #, fuzzy
-msgid "<b>Status Messages</b>"
-msgstr "<b>Mensaxes de estado predefinidas</b>"
+msgid "Last state"
+msgstr "Último estado: %s"
+
+#: ../data/gui/preferences_window.ui.h:18
+msgid "Preferences"
+msgstr "Preferencias"
 
 #: ../data/gui/preferences_window.ui.h:19
-#, fuzzy
-msgid "<b>Themes</b>"
-msgstr "<b>Propiedades</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Amosar na listaxe os a_vatares dos contactos"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Engadir unha regra</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
+"listaxe e nos grupos de charla"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Notificacións visuais</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Amosar na listaxe as _mensaxes de estado dos contactos"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name, in roster window and in group chats"
 msgstr ""
+"Se isto está marcado, o Gajim amosará as mensaxes de estado dos contactos "
+"debaixo do nome do contacto na listaxe e en grupos de charla"
 
 #: ../data/gui/preferences_window.ui.h:23
-msgid "Advanced"
-msgstr "Avanzado"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Amosar na listaxe os a_vatares dos contactos"
 
 #: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
-msgid "Advanced..."
-msgstr "Avanzado"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
+"listaxe e nos grupos de charla"
 
 #: ../data/gui/preferences_window.ui.h:25
 #, fuzzy
-msgid "All chat states"
-msgstr "Todos os estados"
+msgid "Sort contacts by status"
+msgstr "Ordenar os contacto_s polo estado"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Permitir o envío de información sobre o sistema operativo"
+#, fuzzy
+msgid "in _roster"
+msgstr "Non está na listaxe"
 
 #: ../data/gui/preferences_window.ui.h:27
 #, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Permitir o envío de información sobre o sistema operativo"
+msgid "in _group chats"
+msgstr "Entrar nun grupo de charla"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgid "<b>Roster Appearance</b>"
 msgstr ""
-"Permitir as notificacións emerxentes cando estou _ausente, non dispoñíbel, "
-"ocupado ou invisíbel."
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
 msgstr ""
+"Se non está desactivado, o Gajim substituirá emoticonas ASCCI ':)' polo seu "
+"equivalente en iconas gráficas estáticas ou animadas"
 
 #: ../data/gui/preferences_window.ui.h:30
 #, fuzzy
-msgid "Always"
-msgstr "Ausente"
+msgid "_Emoticons:"
+msgstr "Emoticonas:"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Preguntar a mensaxe de estado cando estea: "
-
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
+msgid "_Window behavior:"
 msgstr ""
 
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Amosar _listaxe"
+
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "Unha soa fiestra de conversa"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Oculta os botóns nas fiestras de grupo de charla."
 
 #: ../data/gui/preferences_window.ui.h:35
 #, fuzzy
-msgid "Chat message:"
-msgstr "Men_saxe de estado:"
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignorar o contido adornado en mensaxes entrantes"
 
 #: ../data/gui/preferences_window.ui.h:36
-msgid "Check on startup if Gajim is the _default Jabber client"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
 msgstr ""
+"Algunhas mensaxes poden incluír un contido adornado (formato, cores etc). Se "
+"isto está marcado, o Gajim amosará a mensaxe en bruto."
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "A compor"
+msgid "_Highlight misspelled words"
+msgstr "_Marcar os erros ortográficos"
 
 #: ../data/gui/preferences_window.ui.h:38
-msgid "Configure color and font of the interface"
-msgstr "Configurar as cores e as fontes da interface"
+msgid ""
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Men_saxe de estado:"
+msgid "Show icon when your messages are received"
+msgstr "Son para reproducir cando chega calquera mensaxe MUC"
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Nome de contacto"
+msgid "Show avatar in chat tabs"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
-msgid "Custom"
-msgstr "<b>Personalizado</b>"
-
-#: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Editar unha regra</b>"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Cando se reciba un acontecemento novo"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Notificar cando un contacto: "
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Notificar cando un contacto: "
 
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Desactivado"
+#: ../data/gui/preferences_window.ui.h:46
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"O Gajim notificaralle cunha mensaxe emerxente na parte inferior dereita da "
+"pantalla cando un contacto se desconectar"
 
 #: ../data/gui/preferences_window.ui.h:47
-#, fuzzy
-msgid "Display _activity of contacts in roster"
-msgstr "Amosar na listaxe os a_vatares dos contactos"
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Permitir as notificacións emerxentes cando estou _ausente, non dispoñíbel, "
+"ocupado ou invisíbel."
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Amosar os detalles _extra nos correos electrónicos"
+#, fuzzy
+msgid "Allow popup/notifications when a chat window is opened"
+msgstr ""
+"Permitir as notificacións emerxentes cando estou _ausente, non dispoñíbel, "
+"ocupado ou invisíbel."
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Amosar na listaxe os a_vatares dos contactos"
+msgid "Notify on new _GMail email"
+msgstr "Notificar de novos correos de _GMail"
 
 #: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
-msgid "Display _tunes of contacts in roster"
-msgstr "Amosar na listaxe os a_vatares dos contactos"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Se isto está marcado, o Gajim tamén incluirá información sobre o remitente "
+"de correos electrónicos novos"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Amosar na listaxe os a_vatares dos contactos"
+msgid "Display _extra email details"
+msgstr "Amosar os detalles _extra nos correos electrónicos"
 
 #: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
-msgid "Display m_ood of contacts in roster"
-msgstr "Amosar na listaxe os a_vatares dos contactos"
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"Se isto está marcado, o Gajim tamén incluirá información sobre o remitente "
+"de correos electrónicos novos"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Amosar na listaxe as _mensaxes de estado dos contactos"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Opcións de GMail</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
-msgid ""
-"Gajim can send and receive meta-information related to a conversation you "
-"may have with a contact. Here you can specify which chatstates you want to "
-"display in chat windows."
-msgstr ""
-"O Gajim pode enviar e recibir metainformación relacionada cunha charla que "
-"estiver a manter cun contacto. Pode especificar aquí que estados de charla "
-"quere que se amosen nas fiestras."
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Usar a icona na á_rea de notificación"
 
 #: ../data/gui/preferences_window.ui.h:55
-msgid ""
-"Gajim can send and receive meta-information related to a conversation you "
-"may have with a contact. Here you can specify which chatstates you want to "
-"send to the other party."
-msgstr ""
-"O Gajim pode enviar e recibir metainformación relacionada cunha conversa que "
-"estiver a manter cun contacto. Pode especificar aquí que estados de charla "
-"quere enviarlle á outra persoa."
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Notificacións visuais</b>"
 
 #: ../data/gui/preferences_window.ui.h:56
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed out"
-msgstr ""
-"O Gajim notificaralle cunha mensaxe emerxente na parte inferior dereita da "
-"pantalla cando un contacto se desconectar"
+msgid "Play _sounds"
+msgstr "Reproducir _sons"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "Ma_nage..."
+msgstr "Xestio_nar..."
 
 #: ../data/gui/preferences_window.ui.h:58
-#, fuzzy
-msgid "Hide all buttons in chat windows"
-msgstr "Oculta os botóns nas fiestras de grupo de charla."
+msgid "Allow sound when I'm _busy"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:59
-#, fuzzy
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
+msgid "<b>Sounds</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"Se isto está marcado, o Gajim tamén incluirá información sobre o remitente "
-"de correos electrónicos novos"
+#, fuzzy
+msgid "Notifications"
+msgstr "Modificar a conta"
 
 #: ../data/gui/preferences_window.ui.h:61
 msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
 msgstr ""
+"O Gajim pode enviar e recibir metainformación relacionada cunha charla que "
+"estiver a manter cun contacto. Pode especificar aquí que estados de charla "
+"quere que se amosen nas fiestras."
 
 #: ../data/gui/preferences_window.ui.h:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Notificacións de estado nas charlas:"
 
 #: ../data/gui/preferences_window.ui.h:63
 msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
 msgstr ""
-"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
-"listaxe e nos grupos de charla"
+"O Gajim pode enviar e recibir metainformación relacionada cunha conversa que "
+"estiver a manter cun contacto. Pode especificar aquí que estados de charla "
+"quere enviarlle á outra persoa."
 
 #: ../data/gui/preferences_window.ui.h:64
-msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
-msgstr ""
-"Se isto está marcado, o Gajim amosará as mensaxes de estado dos contactos "
-"debaixo do nome do contacto na listaxe e en grupos de charla"
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Notificacións de estado nas charlas:"
 
 #: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
-"listaxe e nos grupos de charla"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Notificacións visuais</b>"
 
 #: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
-msgstr ""
-"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
-"listaxe e nos grupos de charla"
+msgid "Personal Events"
+msgstr "Información persoal"
 
 #: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
-"listaxe e nos grupos de charla"
+msgid "_Away after:"
+msgstr "Pór _ausente despois de:"
 
 #: ../data/gui/preferences_window.ui.h:68
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
-"listaxe e nos grupos de charla"
 
 #: ../data/gui/preferences_window.ui.h:69
-msgid ""
-"If checked, Gajim will highlight spelling errors in input fields of chat "
-"windows. If no language is explicitly set via right click on the input "
-"field, the default language will be used for this contact or group chat."
-msgstr ""
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Pór _non dispoñíbel despois de:"
 
 #: ../data/gui/preferences_window.ui.h:70
-#, fuzzy
 msgid ""
-"If checked, Gajim will ignore incoming events from unauthorized contacts. "
-"Use with caution, because it blocks all messages from any contact that is "
-"not in the roster"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Marque esta opción só se alguén que non ten na listaxe está a molestalo. "
-"Emprégueo con precaución xa que bloqueará todas as mensaxes de calquera "
-"contacto que non estiver na súa listaxe de contactos."
 
 #: ../data/gui/preferences_window.ui.h:71
-msgid ""
-"If checked, Gajim will keep logs for encrypted messages. Please note that "
-"when using E2E encryption the remote party has to agree on logging, else the "
-"messages will not be logged."
-msgstr ""
+msgid "minutes"
+msgstr "minutos"
 
 #: ../data/gui/preferences_window.ui.h:72
-#, fuzzy
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
-msgstr ""
-"Se isto está marcado, o Gajim tamén incluirá información sobre o remitente "
-"de correos electrónicos novos"
-
-#: ../data/gui/preferences_window.ui.h:73
 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, "
-"etc...)"
-msgstr ""
-"Se isto está marcado, o Gajim empregará iconas específicas para o protocolo- "
-"(por exemplo, un contacto de MSN terá a icona de MSN equivalente para o seu "
-"estado en liña, ausente, ocupado etc.)"
-
-#: ../data/gui/preferences_window.ui.h:74
-msgid ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
+"The auto away status message. If empty, Gajim will not change the current "
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:75
 msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
-msgstr ""
-"Se non está desactivado, o Gajim substituirá emoticonas ASCCI ':)' polo seu "
-"equivalente en iconas gráficas estáticas ou animadas"
-
-#: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:77
-#, fuzzy
-msgid "Ma_ke message windows compact"
-msgstr "Unha soa fiestra de conversa"
-
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Xestio_nar..."
+msgid "12"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
-msgid "Never"
-msgstr "_Nunca"
+msgid "20"
+msgstr "0"
 
 #: ../data/gui/preferences_window.ui.h:80
 #, fuzzy
-msgid "Notifications"
-msgstr "Modificar a conta"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Accións</b>"
 
 #: ../data/gui/preferences_window.ui.h:81
-#, fuzzy
-msgid "Notify me about contacts that sign _in"
-msgstr "Notificar cando un contacto: "
+msgid "Ask status message when I:"
+msgstr "Preguntar a mensaxe de estado cando estea: "
 
 #: ../data/gui/preferences_window.ui.h:82
-#, fuzzy
-msgid "Notify me about contacts that sign _out"
-msgstr "Notificar cando un contacto: "
+msgid "Sign _in"
+msgstr "Conectar"
 
 #: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Notificarmo"
+msgid "Sign _out"
+msgstr "_Desconectar"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Notificar de novos correos de _GMail"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr ""
+msgid "Status"
+msgstr "Estado"
 
 #: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
-msgid "Personal Events"
-msgstr "Información persoal"
+msgid "Default Message"
+msgstr "Mensaxes de estado por defecto"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Reproducir _sons"
+#, fuzzy
+msgid "Enabled"
+msgstr "Activar"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Emerxer"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Mensaxes de estado predefinidas</b>"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Preferencias"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Mensaxes de estado predefinidas</b>"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+#, fuzzy
+msgid "Chat message:"
+msgstr "Men_saxe de estado:"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "Use system _default"
+msgstr "Usar o pre_definido do sistema"
 
 #: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
-msgid "STUN server:"
-msgstr "Servidor:"
+msgid "<b>Font</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-#, fuzzy
-msgid "Show notification area icon:"
-msgstr "Usar a icona na á_rea de notificación"
+msgid "T_heme:"
+msgstr "Te_ma:"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Amosar só na _listaxe de contactos"
+msgid "Status _iconset:"
+msgstr "Conxunto de _iconas de estado por defecto:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "Conectar"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "_Usar as iconas do transporte"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "_Desconectar"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from ICQ will have the equivalent ICQ icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Se isto está marcado, o Gajim empregará iconas específicas para o protocolo- "
+"(por exemplo, un contacto de MSN terá a icona de MSN equivalente para o seu "
+"estado en liña, ausente, ocupado etc.)"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Configurar as cores e as fontes da interface"
 
 #: ../data/gui/preferences_window.ui.h:98
-msgid ""
-"Some messages may include rich content (formatting, colors etc). If checked, "
-"Gajim will just display the raw message text."
-msgstr ""
-"Algunhas mensaxes poden incluír un contido adornado (formato, cores etc). Se "
-"isto está marcado, o Gajim amosará a mensaxe en bruto."
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Propiedades</b>"
 
 #: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
-msgid "Sort contacts by status"
-msgstr "Ordenar os contacto_s polo estado"
+msgid "Contact's nickname:"
+msgstr "Nome de contacto"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Estado"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Men_saxe de estado:"
 
 #: ../data/gui/preferences_window.ui.h:101
-#, fuzzy
-msgid "Status _iconset:"
-msgstr "Conxunto de _iconas de estado por defecto:"
+msgid "_Status message:"
+msgstr "Men_saxe de estado:"
 
 #: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
-msgid "Style"
-msgstr "Atascado"
+msgid "Group chat highlight:"
+msgstr "Remarcado da mensaxe de grupo de charla"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "Te_ma:"
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Ant_es do alcume:"
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"The auto away status message. If empty, Gajim will not change the current "
-"status message\n"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-away timeout"
+#, fuzzy
+msgid "Your message:"
+msgstr "Mensaxe de erro: %s"
+
+#: ../data/gui/preferences_window.ui.h:105
+msgid "_URL highlight:"
 msgstr ""
 
+#: ../data/gui/preferences_window.ui.h:106
+msgid "_Reset to Default Colors"
+msgstr "_Restabelecer as cores predeterminadas"
+
 #: ../data/gui/preferences_window.ui.h:107
-msgid ""
-"The auto not available status message. If empty, Gajim will not change the "
-"current status message\n"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Cores do separador para os estados da charla</b>"
+
+#: ../data/gui/preferences_window.ui.h:108
+#, fuzzy
+msgid "Style"
+msgstr "Atascado"
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Audio input device"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:110
-#, fuzzy
-msgid "Use _transports icons"
-msgstr "_Usar as iconas do transporte"
+msgid "Audio output device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr ""
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Accións</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Usar o pre_definido do sistema"
+msgid "Video input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "Video output device"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
+msgid "Video framerate"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid "Video size"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
+msgid "View own video source"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
-msgid "When new event is received:"
-msgstr "Cando se reciba un acontecemento novo"
+msgid "<b>Video</b>"
+msgstr "<b>Engadir unha regra</b>"
 
 #: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
-msgid "Your message:"
-msgstr "Mensaxe de erro: %s"
+msgid "STUN server:"
+msgstr "Servidor:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "Ant_es do alcume:"
-
-#: ../data/gui/preferences_window.ui.h:120
-#, fuzzy
-msgid "_Away after:"
-msgstr "Pór _ausente despois de:"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:121
-msgid "_Browser:"
-msgstr "_Navegador:"
+msgid "<i>(example: stun.iptel.org)</i>"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:122
 #, fuzzy
-msgid "_Display chat state notifications:"
-msgstr "Notificacións de estado nas charlas:"
+msgid "<b>Connection</b>"
+msgstr "<b>Condicións</b>"
 
-#: ../data/gui/preferences_window.ui.h:123
-#, fuzzy
-msgid "_Emoticons:"
-msgstr "Emoticonas:"
+#: ../data/gui/preferences_window.ui.h:123 ../src/features_window.py:93
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "A_dministrador de ficheiros:"
+msgid "_Mail client:"
+msgstr "_Cliente de correo:"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "_Marcar os erros ortográficos"
+msgid "_Browser:"
+msgstr "_Navegador:"
 
 #: ../data/gui/preferences_window.ui.h:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr ""
-"_Ignorar as mensaxes de contactos que non estean na listaxe de contactos"
-
-#: ../data/gui/preferences_window.ui.h:127
-#, fuzzy
-msgid "_Ignore rich content in incoming messages"
-msgstr "Ignorar o contido adornado en mensaxes entrantes"
+msgid "_File manager:"
+msgstr "A_dministrador de ficheiros:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Rexistrar os cambios de estado dos contactos"
+msgid "<b>Custom</b>"
+msgstr "<b>Personalizado</b>"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Cliente de correo:"
+msgid "<b>Applications</b>"
+msgstr "<b>Programas</b>"
 
 #: ../data/gui/preferences_window.ui.h:130
-#, fuzzy
-msgid "_Not available after:"
-msgstr "Pór _non dispoñíbel despois de:"
+msgid "_Ignore events from contacts not in the roster"
+msgstr ""
+"_Ignorar as mensaxes de contactos que non estean na listaxe de contactos"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Abrir..."
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Marque esta opción só se alguén que non ten na listaxe está a molestalo. "
+"Emprégueo con precaución xa que bloqueará todas as mensaxes de calquera "
+"contacto que non estiver na súa listaxe de contactos."
 
 #: ../data/gui/preferences_window.ui.h:132
-msgid "_Reset to Default Colors"
-msgstr "_Restabelecer as cores predeterminadas"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Permitir o envío de información sobre o sistema operativo"
 
 #: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
-msgid "_Send chat state notifications:"
-msgstr "Notificacións de estado nas charlas:"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
 #: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "Men_saxe de estado:"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Permitir o envío de información sobre o sistema operativo"
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr ""
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
+msgid "Log _encrypted chat session"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:137
-#, fuzzy
-msgid "in _group chats"
-msgstr "Entrar nun grupo de charla"
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
-msgid "in _roster"
-msgstr "Non está na listaxe"
+msgid "Allow my _idle time to be sent"
+msgstr "Permitir o envío de información sobre o sistema operativo"
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "minutos"
+msgid "Global proxy:"
+msgstr ""
 
-#: ../data/gui/privacy_lists_window.ui.h:1
-msgid "Privacy Lists:"
-msgstr "Listaxes de privacidade:"
+#: ../data/gui/preferences_window.ui.h:141
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Listaxe de privacidade</i>"
+
+#: ../data/gui/preferences_window.ui.h:142
+msgid "_Log status changes of contacts"
+msgstr "_Rexistrar os cambios de estado dos contactos"
+
+#: ../data/gui/preferences_window.ui.h:144
+msgid "_Open..."
+msgstr "_Abrir..."
+
+#: ../data/gui/preferences_window.ui.h:145
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Editor de configuración avanzada</b>"
+
+#: ../data/gui/preferences_window.ui.h:146
+msgid "Advanced"
+msgstr "Avanzado"
 
 #: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Engadir / Editar unha regra</b>"
+#, fuzzy
+msgid "none"
+msgstr "unha"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Listaxe de regras</b>"
+#, fuzzy
+msgid "both"
+msgstr "Ambos"
 
 #: ../data/gui/privacy_list_window.ui.h:3
+#, fuzzy
+msgid "from"
+msgstr "De"
+
+#: ../data/gui/privacy_list_window.ui.h:4
+#, fuzzy
+msgid "to"
+msgstr "dúas"
+
+#: ../data/gui/privacy_list_window.ui.h:5 ../src/dialogs.py:4325
+msgid "Privacy List"
+msgstr "Listaxe de privacidade"
+
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "<i>Privacy List</i>"
 msgstr "<i>Listaxe de privacidade</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "Active for this session"
 msgstr "Activo para esta sesión"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Active on each startup"
 msgstr "Activo en cada inicio"
 
-#: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Todos"
+#: ../data/gui/privacy_list_window.ui.h:9
+msgid "<b>List of rules</b>"
+msgstr "<b>Listaxe de regras</b>"
 
-#: ../data/gui/privacy_list_window.ui.h:7
-#, fuzzy
-msgid "All (including subscription)"
-msgstr "todos por subscrición"
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Engadir / Editar unha regra</b>"
 
-#: ../data/gui/privacy_list_window.ui.h:8
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:12
 msgid "Deny"
 msgstr "Denegar"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "JabberID"
 msgstr "ID de Jabber:"
 
-#: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Orde:"
-
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Listaxe de privacidade"
-
-#: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "todos por subscrición"
-
 #: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "todos no grupo"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Ambos"
+msgid "all by subscription"
+msgstr "todos por subscrición"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "De"
+msgid "All"
+msgstr "Todos"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
-msgid "none"
-msgstr "unha"
-
-#: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "dúas"
-
-#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "para me enviar mensaxes"
 
-#: ../data/gui/privacy_list_window.ui.h:20
+#: ../data/gui/privacy_list_window.ui.h:18
 msgid "to send me queries"
 msgstr "para me enviar preguntas"
 
-#: ../data/gui/privacy_list_window.ui.h:21
+#: ../data/gui/privacy_list_window.ui.h:19
+msgid "to view my status"
+msgstr "para ver o meu estado"
+
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me status"
 msgstr "para me enviar o estado"
 
+#: ../data/gui/privacy_list_window.ui.h:21
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "todos por subscrición"
+
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "para ver o meu estado"
+msgid "Order:"
+msgstr "Orde:"
 
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-#, fuzzy
-msgid "<b>Address</b>"
-msgstr "<b>Engadir unha regra</b>"
+#: ../data/gui/privacy_lists_window.ui.h:1
+msgid "Privacy Lists:"
+msgstr "Listaxes de privacidade:"
 
 #: ../data/gui/profile_window.ui.h:2
+#: ../data/gui/vcard_information_window.ui.h:15
 #, fuzzy
-msgid "<b>Avatar:</b>"
-msgstr "Imaxe:"
+msgid "<b>Name:</b>"
+msgstr "<b>Personalizado</b>"
 
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:16
 #, fuzzy
-msgid "<b>Birthday:</b>"
-msgstr "Aniversario:"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-#, fuzzy
-msgid "<b>City:</b>"
-msgstr "<b>Personalizado</b>"
+msgid "<b>Nickname:</b>"
+msgstr "Alcume:"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-#, fuzzy
-msgid "<b>Company:</b>"
-msgstr "<b>Personalizado</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:30
 #, fuzzy
-msgid "<b>Country:</b>"
-msgstr "<b>Sons</b>"
+msgid "<b>Family:</b>"
+msgstr "Familia:"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
+#: ../data/gui/vcard_information_window.ui.h:36
 #, fuzzy
-msgid "<b>Department:</b>"
-msgstr "Departamento:"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-#, fuzzy
-msgid "<b>E-Mail:</b>"
-msgstr "Correo electrónico:"
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
-msgid "<b>Extra Address:</b>"
-msgstr "Segundo enderezo:"
+msgid "<b>Middle:</b>"
+msgstr "<b>Engadir unha regra</b>"
 
-#. Family Name
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:34
 #, fuzzy
-msgid "<b>Family:</b>"
-msgstr "Familia:"
+msgid "<b>Prefix:</b>"
+msgstr "<b>Propiedades</b>"
 
-#: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#. Suffix in Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:38
+#, fuzzy
+msgid "<b>Suffix:</b>"
+msgstr "<b>Sons</b>"
+
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:39
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Personalizado</b>"
 
-#. Given Name
-#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/profile_window.ui.h:15
 #: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
-msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "<b>Street:</b>"
+msgstr "<b>Configuración</b>"
 
-#: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:20
 #, fuzzy
-msgid "<b>Homepage:</b>"
-msgstr "Páxina web:"
+msgid "<b>Extra Address:</b>"
+msgstr "Segundo enderezo:"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:18
 #, fuzzy
-msgid "<b>Middle:</b>"
-msgstr "<b>Engadir unha regra</b>"
+msgid "<b>City:</b>"
+msgstr "<b>Personalizado</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
-msgid "<b>Name:</b>"
-msgstr "<b>Personalizado</b>"
+msgid "<b>Postal Code:</b>"
+msgstr "Código postal:"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
-msgid "<b>Nickname:</b>"
-msgstr "Alcume:"
+msgid "<b>State:</b>"
+msgstr "<b>Configuración</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:22
 #, fuzzy
-msgid "<b>Phone No.:</b>"
-msgstr "Teléfono:"
+msgid "<b>Country:</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
-msgid "<b>Position:</b>"
-msgstr "<b>Condicións</b>"
+msgid "<b>Address</b>"
+msgstr "<b>Engadir unha regra</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:24
 #, fuzzy
-msgid "<b>Postal Code:</b>"
-msgstr "Código postal:"
+msgid "<b>Homepage:</b>"
+msgstr "Páxina web:"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:25
+#, fuzzy
+msgid "<b>E-Mail:</b>"
+msgstr "Correo electrónico:"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
-msgid "<b>Prefix:</b>"
-msgstr "<b>Propiedades</b>"
+msgid "<b>Phone No.:</b>"
+msgstr "Teléfono:"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
 #, fuzzy
-msgid "<b>Role:</b>"
-msgstr "<b>Sons</b>"
+msgid "<b>Avatar:</b>"
+msgstr "Imaxe:"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-#, fuzzy
-msgid "<b>State:</b>"
-msgstr "<b>Configuración</b>"
+msgid "Click to set your avatar"
+msgstr "Prema para definir a súa circunstancia"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: AAAA-MM-DD"
+
+#: ../data/gui/profile_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
-msgid "<b>Street:</b>"
-msgstr "<b>Configuración</b>"
+msgid "<b>Birthday:</b>"
+msgstr "Aniversario:"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Información persoal"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
-msgid "<b>Suffix:</b>"
-msgstr "<b>Sons</b>"
+msgid "<b>Company:</b>"
+msgstr "<b>Personalizado</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Acerca de"
+#: ../data/gui/vcard_information_window.ui.h:43
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Departamento:"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Prema para definir a súa circunstancia"
+#: ../data/gui/vcard_information_window.ui.h:44
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Condicións</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: AAAA-MM-DD"
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Sons</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Información persoal"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Traballo"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Que quere facer?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Acerca de"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Eliminar a _conta unicamente do Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Eliminar a conta do Gajim e do _servidor"
 
-#. Remove group
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Que quere facer?</b>"
+
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5869
 msgid "_Remove"
 msgstr "_Eliminar"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
-msgid ""
-"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
-"your roster."
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/gui/roster_item_exchange_window.ui.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../data/gui/roster_window.ui.h:1
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/roster_window.ui.h:2
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Accións"
+
+#: ../data/gui/roster_window.ui.h:6
 #, fuzzy
 msgid "Add _Contact..."
 msgstr "_Engadir un contacto..."
 
-#: ../data/gui/roster_window.ui.h:2
-#, fuzzy
-msgid "Fea_tures"
-msgstr "Características dos servidores"
-
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "_Transferencias"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1518
+msgid "_Edit"
+msgstr "_Editar"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Preguntas frecuentes (en liña)"
+#: ../data/gui/roster_window.ui.h:10
+#, fuzzy
+msgid "_Accounts"
+msgstr "Contas"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Axuda en liña"
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Perfil, Ima_xe"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr ""
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "Perfil, Ima_xe"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "_Ver"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Amosar os contactos desconectados"
+
+#: ../data/gui/roster_window.ui.h:15
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Amosar os contactos desconectados"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Amosar os trans_portes"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Amosar os contactos desconectados"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:352
 msgid "Show _Roster"
 msgstr "Amosar _listaxe"
 
-#: ../data/gui/roster_window.ui.h:14
-#, fuzzy
-msgid "_Accounts"
-msgstr "Contas"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "_Transferencias"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:15
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "_Accións"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Axuda"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
+msgid "Help online"
+msgstr "Axuda en liña"
+
+#: ../data/gui/roster_window.ui.h:22
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Editar"
+#: ../data/gui/roster_window.ui.h:23
+msgid "Frequently Asked Questions (online)"
+msgstr "Preguntas frecuentes (en liña)"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:24
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Axuda"
+#: ../data/gui/roster_window.ui.h:25
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/roster_window.ui.h:23
+#: ../data/gui/roster_window.ui.h:26
 #, fuzzy
-msgid "_Send Single Message..."
-msgstr "Enviar unha _mensaxe..."
+msgid "Fea_tures"
+msgstr "Características dos servidores"
 
-#: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Ver"
+#: ../data/gui/search_window.ui.h:1 ../src/disco.py:1375
+msgid "Search"
+msgstr "Buscar"
 
-#: ../data/gui/search_window.ui.h:1
+#: ../data/gui/search_window.ui.h:2
 #, fuzzy
 msgid "Please wait while retrieving search form..."
 msgstr "Por favor, agarde mentres se solicita a listaxe de comandos..."
 
-#: ../data/gui/search_window.ui.h:2
-msgid "Search"
-msgstr "Buscar"
-
 #: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Engadir un _contacto"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/gui_menu_builder.py:627
 #, fuzzy
 msgid "_Information"
 msgstr "Información"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5
 msgid "_Search"
 msgstr "_Buscar"
 
 #: ../data/gui/service_discovery_window.ui.h:1
-msgid "G_o"
-msgstr "I_r"
-
-#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Enderezo:"
 
+#: ../data/gui/service_discovery_window.ui.h:2
+msgid "G_o"
+msgstr "I_r"
+
 #: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Rexistrar en"
 
-#: ../data/gui/service_registration_window.ui.h:2
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Responder esta mensaxe:"
+#: ../data/gui/single_message_window.ui.h:2
+msgid "To:"
+msgstr "A:"
 
 #: ../data/gui/single_message_window.ui.h:4
-msgid "Sen_d"
-msgstr "Enviar"
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Enviar a mensaxe"
+msgid "Sen_d"
+msgstr "Enviar"
 
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Enviar a mensaxe e pechar a fiestra"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Responder"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "A:"
+msgid "Reply to this message"
+msgstr "Responder esta mensaxe:"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Responder"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Enviar e pechar"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Enviar a mensaxe e pechar a fiestra"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "Au_torizar"
+msgid "Subscription Request"
+msgstr "Solicitude de subscrición"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-#, fuzzy
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Autorizar o contacto para que poida saber cando estou conectado"
+msgid "_Deny"
+msgstr "_Denegar"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 #, fuzzy
@@ -3108,198 +3036,235 @@ msgstr ""
 "Denegar a autorización do contacto para que non poida saber cando estou "
 "conectado"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Solicitude de subscrición"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "Au_torizar"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Denegar"
+#, fuzzy
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Autorizar o contacto para que poida saber cando estou conectado"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Amosar os contactos desconectados"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
+msgid "Synchronise : select contacts"
+msgstr ""
+
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 #, fuzzy
 msgid "Select the contacts you want to synchronise"
 msgstr "JID do contacto co que quere conversar"
 
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
-msgid "Synchronise : select contacts"
-msgstr ""
-
 #: ../data/gui/systray_context_menu.ui.h:1
+msgid "Sta_tus"
+msgstr "Es_tado"
+
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Amosar todos os _eventos pendentes"
+
+#: ../data/gui/systray_context_menu.ui.h:6
 msgid "Mute Sounds"
 msgstr "Sen sons"
 
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Enviar mensaxe"
+#: ../data/gui/tooltip_gc_contact.ui.h:2
+#: ../data/gui/tooltip_roster_contact.ui.h:2
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "Resource:"
+msgstr "Recurso:"
 
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Amosar todos os _eventos pendentes"
+#: ../data/gui/tooltip_roster_contact.ui.h:3
+#: ../data/gui/zeroconf_information_window.ui.h:4
+msgid "Status:"
+msgstr "Estado:"
 
-#: ../data/gui/systray_context_menu.ui.h:4
-msgid "Sta_tus"
-msgstr "Es_tado"
+#: ../data/gui/tooltip_roster_contact.ui.h:4
+#, fuzzy
+msgid "Idle since:"
+msgstr " desde %s"
 
-#: ../data/gui/systray_context_menu.ui.h:5
-msgid "_Group Chat"
-msgstr "_Grupos de charla"
+#: ../data/gui/tooltip_roster_contact.ui.h:5
+#, fuzzy
+msgid "Idle for:"
+msgstr "Consola XML para %s"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
+#: ../data/gui/tooltip_roster_contact.ui.h:8
 #, fuzzy
-msgid "<b>Ask:</b>"
-msgstr "<b>Accións</b>"
+msgid "Tune:"
+msgstr "Tipo:"
 
-#: ../data/gui/vcard_information_window.ui.h:6
+#: ../data/gui/tooltip_roster_contact.ui.h:9
 #, fuzzy
-msgid "<b>Client:</b>"
-msgstr "<b>Personalizado</b>"
+msgid "Location:"
+msgstr "Modificar a conta"
 
-#: ../data/gui/vcard_information_window.ui.h:8
+#: ../data/gui/tooltip_roster_contact.ui.h:10
 #, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Configuración</b>"
+msgid "OpenPGP:"
+msgstr "OpenPGP: "
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/tooltip_roster_contact.ui.h:11
+msgid "Subscription:"
+msgstr "Subscrición:"
+
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Información"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "ID de Jabber:"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Recurso:"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Configuración</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
-msgid "<b>Subscription:</b>"
-msgstr "<b>Descrición</b>"
+msgid "<b>Client:</b>"
+msgstr "<b>Personalizado</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Personalizado</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Comentarios"
+#: ../data/gui/vcard_information_window.ui.h:7
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Configuración</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "Imaxe:"
+
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
-msgid "Configured avatar:"
+msgid "<b>Configured avatar:</b>"
 msgstr "Configurar a sala"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:11
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Accións</b>"
+
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:13
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Descrición</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Información"
-
-#: ../data/gui/vcard_information_window.ui.h:46
-msgid "More"
-msgstr "Máis"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "button"
+msgstr ""
 
-#: ../data/gui/vcard_information_window.ui.h:48
-#, fuzzy
-msgid "User avatar:"
-msgstr "Imaxe:"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Comentarios"
 
 #: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Sons</b>"
-
-#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Tráfico de Jabber</b>"
 
+#. XML Console enable checkbutton
 #: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>Entrada de XML</b>"
+#, fuzzy
+msgid "_Enable"
+msgstr "Activar"
 
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Consulta"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Sons</b>"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../data/gui/xml_console_window.ui.h:13
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IC"
 
-#: ../data/gui/xml_console_window.ui.h:14
-msgid "_Message"
-msgstr "_Mensaxe"
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Consulta"
 
-#: ../data/gui/xml_console_window.ui.h:15
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_Presence"
 msgstr "_Presenza"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
-msgid "_Modify Account..."
-msgstr "_Modificar a conta..."
+#: ../data/gui/xml_console_window.ui.h:14
+msgid "_Message"
+msgstr "_Mensaxe"
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>Entrada de XML</b>"
+
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "JID local"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:11
 msgid "Personal"
 msgstr "Persoal"
 
-#: ../data/gui/zeroconf_information_window.ui.h:8
-msgid "Resource:"
-msgstr "Recurso:"
-
-#: ../data/gui/zeroconf_information_window.ui.h:9
-msgid "Status:"
-msgstr "Estado:"
+#: ../data/gajim-remote.desktop.in.in.h:1
+msgid "Open URI using Gajim"
+msgstr ""
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Un cliente de Jabber de GTK"
+#: ../data/gajim-remote.desktop.in.in.h:2 ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
+msgstr ""
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Mensaxaría Instantánea Gajim"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Cliente de MI de Jabber"
 
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "Un cliente de Jabber de GTK"
+
 #: ../src/adhoc_commands.py:323
 #, fuzzy
 msgid "Cancel confirmation"
@@ -3321,7 +3286,7 @@ msgid "The form is not filled correctly."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:414
 msgid "Service sent malformed data"
 msgstr ""
 
@@ -3329,307 +3294,250 @@ msgstr ""
 msgid "Service changed the session identifier."
 msgstr ""
 
+#: ../src/adhoc_commands.py:419
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Comandos ad-hoc - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:514
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:94
 #, fuzzy
 msgid "Activated"
 msgstr "Activo"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:94
 #, fuzzy
 msgid "Deactivated"
 msgstr "Inactivo"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:96
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:97
 #, fuzzy
 msgid "Integer"
 msgstr "No grupo"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:98
 msgid "Text"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
-msgid "Color"
-msgstr ""
-
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:110
 msgid "Preference Name"
 msgstr "Nome da opción"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:117
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:126
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:182
 msgid "(None)"
 msgstr "(Ningún)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:312
 msgid "Hidden"
 msgstr "Oculta"
 
-#: ../src/atom_window.py:123
-#, fuzzy, python-format
-msgid "You have received new entries (and %d not displayed):"
-msgid_plural "You have received new entries (and %d not displayed):"
-msgstr[0] "Recibiu unha entrada nova:"
-msgstr[1] "Recibiu unha entrada nova:"
-
-#. 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:76
-msgid "English"
-msgstr "Inglés"
-
-#: ../src/chat_control.py:76
+#: ../src/application.py:49
 #, fuzzy
-msgid "Belarusian"
-msgstr "Búlgaro"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Búlgaro"
+msgid "Show the application's version"
+msgstr "Usar a icona na á_rea de notificación"
 
-#: ../src/chat_control.py:76
+#: ../src/application.py:52
 #, fuzzy
-msgid "Breton"
-msgstr "Bretón"
+msgid "Show only critical errors"
+msgstr "Amosar só na _listaxe de contactos"
 
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Checo"
+#: ../src/application.py:55
+msgid "Separate profile files completely (even history db and plugins)"
+msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Alemán"
+#: ../src/application.py:59
+msgid "Print xml stanzas and other debug information"
+msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Grego"
+#: ../src/application.py:63
+msgid "Print stdout/stderr to the console on Windows"
+msgstr ""
 
-#: ../src/chat_control.py:76
+#: ../src/application.py:67
 #, fuzzy
-msgid "British"
-msgstr "Bretón"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Español"
+msgid "Use defined profile in configuration directory"
+msgstr "Editor avanzado de configuración"
 
-#: ../src/chat_control.py:76
+#: ../src/application.py:71
 #, fuzzy
-msgid "Basque"
-msgstr "Éuscaro"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Francés"
+msgid "Set configuration directory"
+msgstr "Configuración da sala"
 
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Croata"
+#: ../src/application.py:74
+msgid "Configure logging system"
+msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Italiano"
+#: ../src/application.py:119 ../src/chat_control.py:1671
+#: ../src/common/connection.py:550 ../src/common/connection_handlers.py:1079
+#: ../src/common/connection_handlers.py:1255
+#: ../src/common/connection_handlers_events.py:956 ../src/common/logger.py:1177
+#: ../src/session.py:110
+msgid "Database Error"
+msgstr ""
 
-#: ../src/chat_control.py:76
-#, fuzzy
-msgid "Norwegian (b)"
-msgstr "Noruegués b"
+#: ../src/application.py:121 ../src/common/connection.py:551
+#: ../src/common/connection_handlers.py:1080
+#: ../src/common/connection_handlers.py:1256
+#: ../src/common/connection_handlers_events.py:957 ../src/common/logger.py:1178
+#: ../src/session.py:111
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Holandés"
+#: ../src/atom_window.py:124
+#, fuzzy, python-format
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "Recibiu unha entrada nova:"
+msgstr[1] "Recibiu unha entrada nova:"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:307 ../src/chat_control.py:911
 #, fuzzy
-msgid "Norwegian"
-msgstr "Noruegués"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Polaco"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portugués"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Portugués do Brasil"
+msgid "OpenPGP encryption enabled"
+msgstr "Cifrado activado"
 
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Ruso"
+#: ../src/chat_control.py:369
+msgid "Formattings are not available when GPG is active"
+msgstr ""
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:372
 #, fuzzy
-msgid "Serbian"
-msgstr "Alemán"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Eslovaco"
-
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Sueco"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Chinés (Ch)"
-
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Idioma do corrector"
-
-#. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
-msgid "A connection is not available"
-msgstr "Non está dispoñíbel ningunha conexión"
-
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
-msgid "Your message can not be sent until you are connected."
-msgstr "A súa mensaxe non se enviará mentres non estiver conectado."
+msgid "This contact does not support HTML"
+msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
-#: ../src/chat_control.py:944
-#, fuzzy
-msgid "Underline"
-msgstr "nove"
+#. Add to roster
+#: ../src/chat_control.py:377 ../src/common/contacts.py:156
+#: ../src/common/contacts.py:277 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:282 ../src/dialogs.py:1121 ../src/dialogs.py:2352
+#: ../src/dialogs.py:2381 ../src/dialogs.py:3595 ../src/gui_interface.py:493
+#: ../src/gui_menu_builder.py:292 ../src/gui_menu_builder.py:446
+#: ../src/roster_window.py:791 ../src/roster_window.py:1757
+#: ../src/roster_window.py:1759 ../src/roster_window.py:2093
+#: ../src/roster_window.py:3556 ../src/roster_window.py:3583
+msgid "Not in Roster"
+msgstr "Non está na listaxe"
 
-#: ../src/chat_control.py:945
-#, fuzzy
-msgid "Strike"
-msgstr "Alcume"
+#. change tooltip text for audio and video buttons if farstream is
+#. not installed
+#: ../src/chat_control.py:402
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr ""
 
-#: ../src/chat_control.py:968
-#, fuzzy
-msgid "Font"
-msgstr "_Letra:"
+#: ../src/chat_control.py:403
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:405
 #, fuzzy
-msgid "Clear formating"
-msgstr "Información"
+msgid "Feature not available, see Help->Features"
+msgstr "A mensaxe de estado de non autodispoñíbel"
 
-#: ../src/chat_control.py:1055
-msgid "Really send file?"
-msgstr ""
-
-#: ../src/chat_control.py:1056
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
+#: ../src/chat_control.py:409
+msgid "Feature not supported by remote client"
 msgstr ""
 
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
+#: ../src/chat_control.py:422
 #, fuzzy
-msgid "GPG encryption enabled"
-msgstr "Cifrado activado"
-
-#. Add to roster
-#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
-#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
-#: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
-#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
-#: ../src/roster_window.py:3382
-msgid "Not in Roster"
-msgstr "Non está na listaxe"
+msgid "Send files"
+msgstr "Enviar ficheiro"
 
-#: ../src/chat_control.py:1575
+#: ../src/chat_control.py:428
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:431
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:549
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:649 ../src/profile_window.py:214 ../src/vcard.py:210
+#: ../src/vcard.py:576
+#, fuzzy
+msgid "Save _As"
+msgstr "Ten "
+
+#: ../src/chat_control.py:753
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da sala %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:891 ../src/dialogs.py:5403
+msgid "No OpenPGP key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:892
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:901
 #, fuzzy
-msgid "GPG encryption disabled"
+msgid "OpenPGP encryption disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:927
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:929
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:946
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:946
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:948
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:948
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:952
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar a autenticación"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:956
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar a autenticación"
@@ -3637,66 +3545,66 @@ msgstr "Usar a autenticación"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:2062
+#: ../src/chat_control.py:963
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:1102
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:1112
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:1114
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:1123
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:1126
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:1128
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:1133
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:1135
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:1184 ../src/chat_control.py:1198
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:1190
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2566
+#: ../src/chat_control.py:1488
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acaba de recibir unha mensaxe nova de \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:1490
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3704,152 +3612,474 @@ msgstr ""
 "Se pecha este separador e ten o historial desactivado, esta mensaxe "
 "perderase."
 
-#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
-#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
-#: ../src/gajim.py:159 ../src/session.py:138
-msgid "Database Error"
+#: ../src/chat_control.py:1521 ../src/groupchat_control.py:1390
+#, python-format
+msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:1672
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2962
+#: ../src/chat_control.py:1704
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Asunto: %s\n"
+"%s"
+
+#: ../src/chat_control.py:1883 ../src/gui_interface.py:1197
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/chat_control.py:1940
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
+#: ../src/chat_control.py:1999
+#, fuzzy
+msgid "File transfer"
+msgstr "Transferencias"
+
+#: ../src/chat_control.py:2002
+#, fuzzy
+msgid "Size"
+msgstr "Tamaño: %s"
+
+#: ../src/chat_control.py:2004
+#, fuzzy
+msgid "_Accept"
+msgstr "Aceptar"
+
+#: ../src/chat_control.py:2025 ../src/filetransfers_window.py:212
+msgid "File transfer completed"
+msgstr "Rematou a transferencia do ficheiro"
+
+#: ../src/chat_control.py:2057 ../src/dialogs.py:2983 ../src/dialogs.py:4830
+#: ../src/gui_interface.py:665 ../src/notify.py:289
+msgid "Groupchat Invitation"
+msgstr "Convite a grupo de charla"
+
+#: ../src/chat_control.py:2079 ../src/gui_interface.py:1040
+#: ../src/roster_window.py:2016
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Elimina o contacto da listaxe"
+
+#: ../src/chat_control.py:2081 ../src/gui_interface.py:1043
+#: ../src/roster_window.py:2018
+#, fuzzy
+msgid "Error opening file"
+msgstr "Erro ao ler o ficheiro:"
+
+#: ../src/chat_control.py:2083 ../src/filetransfers_window.py:247
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Detívose a transferencia do ficheiro"
+
+#: ../src/chat_control.py:2086 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:234
+#, fuzzy
+msgid "File transfer cancelled"
+msgstr "Cancelouse a transferencia do ficheiro"
+
+#: ../src/chat_control.py:2087 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:235
+msgid "Connection with peer cannot be established."
+msgstr "Non se puido estabelecer a conexión co cliente."
+
+#. Example string. Do not translate
+#: ../src/command_system/implementation/custom.py:106
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:72
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Uso: /%s, oculta os botóns de charla."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Uso: /%s, oculta os botóns de charla."
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "Non se encontrou %s"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:270
+#: ../src/tooltips.py:913
+msgid "Away"
+msgstr "Ausente"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "En liñ_a"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Uso: /%s, limpa o texto da fiestra."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Alternar a codificación OpenPGP"
+
+#: ../src/command_system/implementation/standard.py:195
+#: ../src/command_system/implementation/standard.py:415
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Enviarlle un ficheiro a un contacto"
+
+#: ../src/command_system/implementation/standard.py:198
+#: ../src/command_system/implementation/standard.py:418
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Prema aquí para ver as charlas anteriores con este contacto"
+
+#: ../src/command_system/implementation/standard.py:208
+#, python-format
+msgid "%s is not a valid tone"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Non está dispoñíbel ningunha conexión"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Conexión non dispoñíbel"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Cambiar o _alcume"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3439
+#: ../src/dialogs.py:2195
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "O nome de usuario non é válido"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Uso: /%s <alcume>, abre unha fiestra de charla co ocupante especificado."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Non se achou o alcume: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Uso: /%s <alcume>, abre unha fiestra de charla co ocupante especificado."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Preguntar antes de pechar unha fiestra/separador da sala de charla."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Enviar %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Está expulsado deste grupo de charla."
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "O nome de usuario non é válido"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "Afiliación:"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Uso: /%s , amosa os nomes dos ocupantes do grupo de charla."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:164 ../src/command_system/mapping.py:174
+#: ../src/command_system/mapping.py:194
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Non se atopa o argumento \"contact_jid\""
+
+#: ../src/command_system/mapping.py:261
+msgid "Excessive arguments"
+msgstr ""
+
 #: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "a crear a base de datos de rexistros"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:86
 #, fuzzy
 msgid "creating cache database"
 msgstr "a crear a base de datos de rexistros"
 
-#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
-#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
-#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
-#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
+#: ../src/common/check_paths.py:248
+#, fuzzy, python-format
+msgid "moving %s to %s"
+msgstr "Enviar %s"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:316 ../src/common/check_paths.py:323
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s é un ficheiro mais podería ser un directorio"
 
-#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
-#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
-#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
-#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
+#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
+#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:336 ../src/common/check_paths.py:344
 msgid "Gajim will now exit"
 msgstr "Gajim pecharase agora"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:343
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s é un directorio mais podería ser un ficheiro"
 
-#: ../src/common/check_paths.py:351
-#, python-format
-msgid "creating %s directory"
-msgstr "a crear un directorio %s"
-
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 #, fuzzy
 msgid "Change status information"
 msgstr "Información"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 #, fuzzy
 msgid "Change status"
 msgstr "Un contacto cambiou o seu estado"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 #, fuzzy
 msgid "Free for chat"
 msgstr "Libre para falar"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 #, fuzzy
 msgid "Online"
 msgstr "nove"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 #, fuzzy
 msgid "Do not disturb"
 msgstr "Non molestar."
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 #, fuzzy
 msgid "Presence description:"
 msgstr "Descrición do erro..."
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:329
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Novo grupo de charla"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s da sala %(room_name)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "%s entrou no grupo de charla"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:135
+#: ../src/common/helpers.py:73 ../src/roster_window.py:844
+#: ../src/roster_window.py:1761 ../src/roster_window.py:1763
+#: ../src/roster_window.py:2629 ../src/roster_window.py:5655
 #, fuzzy
 msgid "Groupchats"
 msgstr "Grupos de charla"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Xa está na sala %s"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d mensaxe sen ler"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "%d mensaxe sen ler"
 
+#: ../src/common/config.py:74
+msgid ""
+"Show desktop notification even when a chat window is opened for this contact "
+"and does not have focus"
+msgstr ""
+
 #: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
@@ -3872,7 +4102,7 @@ msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Ausente por inactividade"
 
 #: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
 #: ../src/common/config.py:84
@@ -3885,7 +4115,7 @@ msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Non dispoñíbel por inactividade"
 
 #: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
 #: ../src/common/config.py:88
@@ -3893,71 +4123,128 @@ msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:89
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:94
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "O nome de usuario non é válido"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:95
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:96
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:97
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:98
 #, fuzzy
 msgid "Status message text color."
 msgstr "texto da mensaxe de estado"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Mostrar o evento na listaxe de contactos"
+
+#. limegreen
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Mostrar o evento na listaxe de contactos"
+
+#. red
+#: ../src/common/config.py:103
+msgid "New message/email notification color."
+msgstr ""
+
+#. dodgerblue
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Solicitude de transferencia de ficheiro"
+
+#. khaki
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Cancelouse a transferencia do ficheiro"
+
+#. firebrick
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr ""
+"Cando unha transferencia se completar, amosa unha notificación emerxente"
+
+#. yellowgreen
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Convite a grupo de charla"
+
+#. tan1
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Background color of status changed notification"
+msgstr "Cor de fondo para os contactos que acaban de se conectar."
+
+#. thistle2
+#: ../src/common/config.py:109
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:110
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "O nome de usuario non é válido"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Cambiando o alcume"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:112
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:113
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:114
 #, fuzzy
 msgid "Status message text font."
 msgstr "texto da mensaxe de estado"
 
 # duda sobre collapsed
-#: ../src/common/config.py:105
+#: ../src/common/config.py:115
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Listaxe (separada por espazos) de filas (contas e grupos) que están caídas."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:505
-#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../src/common/config.py:116 ../src/common/config.py:537
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:500
+#: ../src/common/optparser.py:534 ../src/gui_interface.py:2850
 #, fuzzy
 msgid "default"
 msgstr "Por defecto"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:122
 msgid "Language used by speller"
 msgstr "Idioma que emprega o corrector"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:123
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3967,7 +4254,7 @@ msgstr ""
 "'ás veces' - amosar a hora cada print_ichat_every_foo_minutes minutos.\n"
 "'nunca' - nunca amosar a hora."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:124
 #, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
@@ -3978,18 +4265,18 @@ msgstr ""
 "0 para desactivar o fuzzyclock. 1 é o reloxo máis preciso, 4 o menos "
 "preciso. So se emprega se está conectado print_time 'ás veces'"
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:127
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Tratar os pares de * / _ como posíbeis caracteres de formato."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:128
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se é verdadeiro, non elimina */_ . Daquela, *abc* será negra, mais sen "
 "eliminar * *"
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:131
 #, fuzzy
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
@@ -3999,7 +4286,7 @@ msgstr ""
 "Usa a sintaxe de ReStructured para HTML, mais o formato ascii se está "
 "seleccionado (se quere usalo, instale o docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:140
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -4007,7 +4294,7 @@ msgstr ""
 "Carácter para engadir despois do alcume cando se usa o completado de alcume "
 "(tab) nos grupos de charla."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:141
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -4017,55 +4304,75 @@ msgstr ""
 
 #: ../src/common/config.py:159
 msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:165
+msgid "Place the roster on the right in single window mode"
+msgstr ""
+
+#: ../src/common/config.py:172
+msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Engadir * e [n] no título da listaxe?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Cantas liñas quere lembrar da última charla cando se volve abrir un "
 "separador/fiestra de charla"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Cantos minutos debe durar a última liña da conversa anterior."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4073,11 +4380,11 @@ msgstr ""
 "Envíe un mensaxe con Ctrl+Intro e con Intro faise unha liña nova (como o "
 "cliente de Mirabilis ICQ)"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Cantas liñas desexa almacenar para Ctrl+Arriba."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4086,12 +4393,12 @@ msgstr ""
 "URL personalizada con %s onde %s é a palabra/frase ou 'WIKTIONARY' que "
 "significa usar o wiktionary"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se está marcado, o Gajim pode controlarse remotamente ao usar o gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -4103,14 +4410,14 @@ msgstr ""
 "posto en Falso e sincronicen co estado global) baseados no estado daconexión "
 "da rede."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Enviáronse as notificacións de estado. Pode ser all, composing_only o "
 "disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -4118,7 +4425,7 @@ msgstr ""
 "As notificacións de estado móstranse nas fiestras de conversa. Poden ser "
 "todo, só_compor ou desactivado."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -4126,33 +4433,35 @@ msgstr ""
 "Cando non se amosa a hora en cada mensaxe (print_time==sometimes), móstraa "
 "cada x minutos."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Preguntar antes de pechar unha fiestra/separador da sala de charla."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Preguntar sempre antes de pechar a fiestra/separador dun grupo de charla "
 "nesta listaxe (separada por espazos) de ID de Jabber de grupos de charla."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Non preguntar nunca antes de pechar a fiestra/separador dun grupo de charla "
 "nesta listaxe (separada por espazos) de ID de Jabber de grupos de charla."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -4161,30 +4470,36 @@ msgstr ""
 "Elimínase o host que enviamos para a transferencia dun ficheiro caso de "
 "tradución do enderezo ou o redirección de portos."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Segundo o estándar IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notifica acontecementos na área de notificación."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Quere amosar o separador cando só hai unha conversa?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 "Quere amosar o bordo a pestanexar do caderno de notas nas fiestras charla?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Quere amosar o botón de pechar no tabulador?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -4192,18 +4507,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Separarase por ';'unha listaxe de palabras que serán resaltadas nos grupos "
 "de charla."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4213,13 +4528,7 @@ msgstr ""
 "fiestras. Esta preferencia só se activa se se usa a icona da área de "
 "notificación. "
 
-#: ../src/common/config.py:222
-#, fuzzy
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Se é verdadeiro, o Gajim rexistra xmpp:// en cada inicio."
-
-#: ../src/common/config.py:223
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4227,7 +4536,7 @@ msgstr ""
 "Se for verdadeiro, o Gajim amosará unha icona en cada separador que conteña "
 "mensaxes sen ler. A depender do tema, esta icona pode ser animada."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4235,11 +4544,11 @@ msgstr ""
 "Se é verdadeiro, o Gajim amosará a mensaxe de estado, se non está baleiro, "
 "para cada contacto baixo o seu nome de contacto na fiestra da listaxe."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:255
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:256
 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."
@@ -4248,7 +4557,7 @@ msgstr ""
 "non tivo unha circunstancia a última vez ou se ten gardada unha demasiada "
 "antiga."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:257
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -4256,10 +4565,10 @@ msgstr ""
 "Se é falso, o Gajim nunca máis amosará a liña de estado cando un contacto "
 "cambie o seu estado ou a súa mensaxe de estado"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:258
 #, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"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 "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
@@ -4271,30 +4580,34 @@ msgstr ""
 "mensaxes de estado. Se é \"in_and_out\", o Gajim só amosará as entradas e as "
 "saídas no grupo de conversa."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:260
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:261
 msgid "Background color of contacts when they just signed in."
 msgstr "Cor de fondo para os contactos que acaban de se conectar."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed out."
 msgstr "Cor de fondo para os contactos que acaban de se desconectar."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:264
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se é verdadeiro, as mensaxes restauradas usarán unha fonte máis pequena que "
 "a predefinida."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:265
 msgid "Don't show avatar for the transport itself."
 msgstr "Non amosar a circunstancia para o transporte en si mesmo"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:266
 msgid "Don't show roster in the system taskbar."
 msgstr "Non amosar a listaxe na barra de tarefas."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:267
 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 "
@@ -4303,7 +4616,7 @@ msgstr ""
 "Se é verdadeiro e as versións instaladas de GTK+ e PyGTK son, cando menos, "
 "2.8, resalta a fiestra cando hai eventos pendentes."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:269
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -4314,7 +4627,7 @@ msgstr ""
 "envío de información SHA no grupo de charla."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:272
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -4323,7 +4636,7 @@ msgid ""
 "along with the roster.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Controla a fiestra onde se colocan as novas mensaxes.\n"
@@ -4335,33 +4648,41 @@ msgstr ""
 "envíase a unha fiestra específica. Nota: cambie esta opción require "
 "reiniciar o Gajim para que os cambios teñan efecto."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:273
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:274
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Se é falso, non verá máis a circunstancia na fiestra de charla."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:275
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Se é verdadeiro, ao premer a tecla escape pecha unha fiestra/separador."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:276
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Oculta os botóns nas fiestras de grupo de charla."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:277
 msgid "Hides the banner in a group chat window"
 msgstr "Oculta o báner nunha fiestra de grupo de charla"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:278
 msgid "Hides the banner in two persons chat window"
 msgstr "Oculta o báner nunha fiestra de charla de dúas persoas."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:279
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Oculta os ocupantes nas fiestras de grupo de charla."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:280
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -4369,17 +4690,17 @@ msgstr ""
 "Nunha charla, amosa o alcume ao comezo nunha soa liña cando non é a mesma "
 "persoa a que enviou a última mensaxe."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:281
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Sangría cando se use unha combinación de alcumes consecutivos."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:282
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Enviar a mensaxe e pechar a fiestra"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:283
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -4388,13 +4709,13 @@ msgstr ""
 "Listaxe de cores que se empregarán para colorear o alcume nos grupos de "
 "charla."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:284
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab conduce ao próximo separador de composición cando ningún está sen "
 "ler."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:285
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4402,7 +4723,7 @@ msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:286
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4411,7 +4732,7 @@ msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:287
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4420,7 +4741,7 @@ msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:288
 #, fuzzy
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
@@ -4431,115 +4752,121 @@ msgstr ""
 "fiestra de modificación de conta. TEÑA COIDADO, cando está conectado cunha "
 "prioridade negativa, NON recibirá ningunha mensaxe do seu servidor."
 
-#: ../src/common/config.py:262
-msgid ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-msgstr ""
-
-#: ../src/common/config.py:263
-msgid ""
-"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
-"account passwords."
-msgstr ""
-
-#: ../src/common/config.py:264
+#: ../src/common/config.py:289
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:290
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:292
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:293
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:294
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:295
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:272
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr ""
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:296
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:297
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
-"accoutn is established. WARNING: This causes a lot of requests to be sent!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:298
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:299
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:304
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:305
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:306
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:309
 msgid ""
 "If True, Gajim will try to use a STUN server when using jingle. The one in "
 "\"stun_server\" option, or the one given by the jabber server."
 msgstr ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:310
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:311
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:312
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:313
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:314
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:315
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "Show a mini avatar in chat window tabs and in window icon"
+msgstr ""
+
+#: ../src/common/config.py:330
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4547,84 +4874,110 @@ msgstr ""
 "A prioridade cambiará automaticamente segundo o seu estado. As prioridades "
 "están definidas nas opcións de autoprioridade_*"
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:338
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:339
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:341
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:342
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Se é falso, non verá máis a circunstancia na fiestra de charla."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:345
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:347
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:348
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:349
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+msgid ""
+"List (space separated) of authentication mechanisms to try. Can contain "
+"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
+"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+msgstr ""
+
+#: ../src/common/config.py:353
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:354
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:355
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:358
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:364
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:365
+msgid ""
+"Download logs stored on server on Gajim startup if server supports XEP-0136 "
+"or XEP-0313"
+msgstr ""
+
+#: ../src/common/config.py:366
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:369
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:370
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:374
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:378
 msgid "Jabberd2 workaround"
 msgstr "Corrección Jabberd2"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:381
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4632,141 +4985,192 @@ msgstr ""
 "Se isto está marcado, o Gajim usará o seu IP e proxies que se definen na "
 "opción file_transfer_proxies para a súa transferencia."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:382
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:396
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:397
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:406
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
+
+#: ../src/common/config.py:407
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s quere enviarlle un ficheiro."
+
+#: ../src/common/config.py:408
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:411
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Por favor, cubra a información do contacto que quere engadir"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:412
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:413
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:414
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:415
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Usar a autenticación"
+
+#: ../src/common/config.py:416
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Usar a autenticación"
+
+#: ../src/common/config.py:417
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:418
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:419
+msgid "Last MAM id we are syncronized with"
+msgstr ""
+
+#: ../src/common/config.py:481
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Está o OpenPGP activado para este contacto?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:482
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:483 ../src/common/config.py:486
 msgid "Language for which we want to check misspelled words"
 msgstr "Lingua en que se comprobarán os erros ortográficos"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "estado separado por espazos ou all"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'si', 'non' ou 'ambos'"
+#: ../src/common/config.py:487
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:449 ../src/common/config.py:451
-#: ../src/common/config.py:452 ../src/common/config.py:455
-#: ../src/common/config.py:456
-msgid "'yes', 'no' or ''"
-msgstr "'si', 'non' ou ''"
+#: ../src/common/config.py:488
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:491
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: ../src/common/config.py:465 ../src/common/pep.py:157
+#: ../src/common/config.py:496 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "A durmir"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:497
 msgid "Back soon"
 msgstr "Volvo axiña"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:497
 msgid "Back in some minutes."
 msgstr "Volvo nuns minutos."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:498 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:498
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, déixeme unha mensaxe."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:499
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:499
 msgid "I'm watching a movie."
 msgstr "Estou a ver un filme."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:500 ../src/common/pep.py:186
 msgid "Working"
 msgstr "A traballar"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:500
 msgid "I'm working."
 msgstr "Estou a traballar."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:501
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:501
 msgid "I'm on the phone."
 msgstr "Estou a falar por teléfono."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:502
 msgid "Out"
 msgstr "Fóra"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:502
 msgid "I'm out enjoying life."
 msgstr "Estou fóra a gozar da vida."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:513
 msgid "I'm available."
 msgstr "Estou dispoñíbel."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:514
 msgid "I'm free for chat."
 msgstr "Estou libre para falar."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:515 ../src/config.py:1656
 msgid "Be right back."
 msgstr "Volvo axiña"
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:516
 msgid "I'm not available."
 msgstr "Non estou dispoñíbel."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:517
 msgid "Do not disturb."
 msgstr "Non molestar."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:518 ../src/common/config.py:519
 msgid "Bye!"
 msgstr "Adeus!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:530
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4775,427 +5179,559 @@ msgstr ""
 "palabras de muc_highlight_words, ou cuando unha mensaxe dun grupo de charla "
 "contén o teu alcume."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:531
 msgid "Sound to play when any MUC message arrives."
 msgstr "Son para reproducir cando chega calquera mensaxe MUC"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:540 ../src/common/optparser.py:318
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:544 ../src/common/optparser.py:304
 msgid "grocery"
 msgstr "ultramariño"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:548
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:552
 msgid "marine"
 msgstr "mariño"
 
-#: ../src/common/connection_handlers.py:94
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
-msgid "Unable to load idle module"
-msgstr "Non se pode cargar o módulo inactivo"
-
-#: ../src/common/connection_handlers.py:127
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "A información de rexistro para o transporte %s non chegou a tempo"
-
-#: ../src/common/connection_handlers.py:134
+#: ../src/common/config.py:559
 #, fuzzy
-msgid "Registration succeeded"
-msgstr "Rexistrar %s"
-
-#: ../src/common/connection_handlers.py:135
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:143
-#, fuzzy
-msgid "Registration failed"
-msgstr "Fallou a conexión"
-
-#: ../src/common/connection_handlers.py:143
-#, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:466
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
-#, fuzzy
-msgid "Invisibility not supported"
-msgstr "Extensión non admitida"
-
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
-#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
-#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
-msgid "Invalid Jabber ID"
-msgstr "A ID de Jabber non é válida"
-
-#: ../src/common/connection_handlers.py:1405
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
-#: ../src/gajim.py:160 ../src/session.py:139
-#, python-format
-msgid ""
-"The database file (%s) cannot be read. Try to repair it (see http://trac."
-"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
-msgstr ""
+msgid "Tor"
+msgstr "A"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:74
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:75
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:76
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:77
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:78
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:79
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:80
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:81
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:82
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:83
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:84
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:85
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:86
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:87
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:88
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:89
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:90
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:91
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:92
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:93
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:94
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:95
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:96
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:97
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:98
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:99
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:100
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:101
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:102
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:103
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:104
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:105
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:279 ../src/common/connection.py:289
+#: ../src/common/connection_handlers_events.py:1156
+#: ../src/common/connection_handlers_events.py:1202 ../src/config.py:2176
+#: ../src/config.py:2185 ../src/config.py:2253 ../src/config.py:3722
+#: ../src/dataforms_widget.py:642 ../src/dialogs.py:3302
+msgid "Invalid Jabber ID"
+msgstr "A ID de Jabber non é válida"
+
+#: ../src/common/connection.py:280 ../src/common/connection.py:290
+#: ../src/dialogs.py:3303
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Non se pode enviar ficheiros baleiros"
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:313
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:316
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:374
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensaxe está *cifrada* (Mira :JEP:`27`]"
 
-#: ../src/common/connection.py:441
-#, fuzzy, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
+#: ../src/common/connection.py:547 ../src/common/connection_handlers.py:340
+#: ../src/common/connection_handlers.py:1077
+#: ../src/common/connection_handlers.py:1253
+#: ../src/common/connection_handlers_events.py:953 ../src/common/logger.py:1175
+#: ../src/session.py:107
+msgid "Disk Write Error"
 msgstr ""
-"Asunto: %s\n"
-"%s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:978
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Perdeuse a conexión da conta \"%s\""
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:979
 msgid "Reconnect manually."
 msgstr "Reconectar manualmente."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:990
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
 
-#: ../src/common/connection.py:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:1032
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr ""
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1049
 msgid "Invalid answer"
 msgstr "A resposta non é válida"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1050
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
 
-#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
-#: ../src/common/connection.py:1792
-#: ../src/common/zeroconf/connection_zeroconf.py:192
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1177
+#, fuzzy
+msgid "Wrong Custom Hostname"
+msgstr "Usa un nome de host e un porto personalizados"
+
+#: ../src/common/connection.py:1359
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Non se pode conectar a \"%s\""
+
+#: ../src/common/connection.py:1362
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Non se pode conectar a \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1364 ../src/common/connection.py:1557
+#: ../src/gui_interface.py:551
 msgid "Check your connection or try again later."
 msgstr "Comprobe a súa conexión ou probe máis tarde."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1369
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Gardouse en: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1384
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Fallou a conexión"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1422 ../src/common/connection.py:1532
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Non se pode conectar a \"%s\""
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1423 ../src/common/connection.py:1533
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Perdeuse a conexión da conta \"%s\""
 
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1457
 #, python-format
-msgid "The authenticity of the %s certificate could be invalid."
+msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1460
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1462
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:1297
-msgid "Check your connection or try again later"
-msgstr "Comprobe a súa conexión ou probe máis tarde"
+#: ../src/common/connection.py:1508
+#, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr ""
+
+#: ../src/common/connection.py:1556 ../src/common/connection.py:2351
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Non se pode conectar a \"%s\""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1592
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Fallou a autenticación con \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1593
 msgid "Please check your login and password for correctness."
 msgstr ""
 "Por favor, comprobe que o seu nome de usuario e o seu contrasinal sexan os "
 "correctos."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1669
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1670
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1658
+#: ../src/common/connection.py:1863 ../src/common/connection.py:1977
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Extensión non admitida"
+
+#: ../src/common/connection.py:1864 ../src/common/connection.py:1978
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection.py:2215
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2218
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Contactos"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2368 ../src/common/connection.py:2390
 msgid "Not fetched because of invisible status"
 msgstr "Non se conseguiu debido ao estado invisíbel"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:3001
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Fallou a conexión"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:3002
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:551
+#: ../src/common/connection_handlers.py:89
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+msgid "Unable to load idle module"
+msgstr "Non se pode cargar o módulo inactivo"
+
+#: ../src/common/connection_handlers.py:124
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "A información de rexistro para o transporte %s non chegou a tempo"
+
+#: ../src/common/connection_handlers.py:132
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Rexistrar %s"
+
+#: ../src/common/connection_handlers.py:133
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:142
+#, fuzzy
+msgid "Registration failed"
+msgstr "Fallou a conexión"
+
+#: ../src/common/connection_handlers.py:143
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1948
+msgid "I would like to add you to my roster."
+msgstr "Gustaríame engadilo á miña listaxe de contactos"
+
+#: ../src/common/connection_handlers_events.py:393
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"A ID de Jabber %s non cumpre a norma RFC. Non se engadirá á súa listaxe de "
+"contactos. Use as ferramentas de xestión de listaxe de contactos roster como "
+"http://jru.jabberstudio.org/ para o eliminar"
+
+#: ../src/common/connection_handlers_events.py:871
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "solicitude de eliminación de subscrición de %s"
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:978
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Eliminouse a autorización"
+
+#: ../src/common/connection_handlers_events.py:986
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1157
+#: ../src/common/connection_handlers_events.py:1203
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1246 ../src/gui_interface.py:441
+#: ../src/gui_interface.py:455
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "produciuse un erro mentres se enviaba %s ( %s )"
+
+#: ../src/common/connection_handlers_events.py:1485
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1851
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:2483 ../src/dialogs.py:2973
+#: ../src/notify.py:277
+msgid "New Single Message"
+msgstr "Mensaxe nova"
+
+#: ../src/common/connection_handlers_events.py:2485
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Mensaxe nova de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2489 ../src/dialogs.py:2974
+#: ../src/notify.py:278
+msgid "New Private Message"
+msgstr "Mensaxe privada nova"
+
+#: ../src/common/connection_handlers_events.py:2491
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nova mensaxe privada desde o grupo de charlas %s"
+
+#: ../src/common/connection_handlers_events.py:2494
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2497
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Mensaxe nova de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2501 ../src/dialogs.py:2973
+#: ../src/notify.py:277
+msgid "New Message"
+msgstr "Mensaxe nova"
+
+#: ../src/common/connection_handlers_events.py:2503
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Mensaxe nova de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2669
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s cambiou o seu estado"
+
+#: ../src/common/connection_handlers_events.py:2671
+#: ../src/groupchat_control.py:215 ../src/groupchat_control.py:1909
+#: ../src/history_window.py:472
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s está agora %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2675 ../src/dialogs.py:2985
+#: ../src/notify.py:291
+msgid "Contact Changed Status"
+msgstr "Un contacto cambiou o seu estado"
+
+#: ../src/common/connection_handlers_events.py:2677
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s conectouse"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2681 ../src/dialogs.py:2969
+#: ../src/notify.py:273
+msgid "Contact Signed In"
+msgstr "Contacto conectado"
+
+#: ../src/common/connection_handlers_events.py:2683
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s desconectouse"
+
+#: ../src/common/connection_handlers_events.py:2687 ../src/dialogs.py:2971
+#: ../src/notify.py:275
+msgid "Contact Signed Out"
+msgstr "Contacto desconectado"
+
+#: ../src/common/contacts.py:133 ../src/common/helpers.py:73
+#: ../src/gui_interface.py:493
 msgid "Observers"
 msgstr "Observadores"
 
-#: ../src/common/contacts.py:139 ../src/common/contacts.py:366
-#: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1517 ../src/roster_window.py:854
-#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
-#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
-#: ../src/roster_window.py:2466
+#. Invite to
+#: ../src/common/contacts.py:137 ../src/common/contacts.py:365
+#: ../src/common/helpers.py:73 ../src/disco.py:129 ../src/disco.py:130
+#: ../src/disco.py:1514 ../src/roster_window.py:883
+#: ../src/roster_window.py:1643 ../src/roster_window.py:1753
+#: ../src/roster_window.py:1755 ../src/roster_window.py:1918
+#: ../src/roster_window.py:2597 ../src/roster_window.py:5685
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:373
 #, fuzzy
 msgid "Not in roster"
 msgstr "Non está na listaxe"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "As ligazóns D-Bus de python non se achan neste computador"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Non se poden empregar as capacidades D-Bus de Gajim"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus non está presente nesta máquina ou falta o módulo python"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus non está presente nesta máquina ou falta o módulo python"
@@ -5211,7 +5747,7 @@ msgstr ""
 "O servizo non está dispoñíbel: o Gajim non se está a executar, ou "
 "remote_control está en Falso"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:57
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus non está presente nesta máquina ou falta o módulo python"
 
@@ -5233,430 +5769,457 @@ msgstr ""
 "O bus da sesión non está dispoñíbel.\n"
 "Probe a ler http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "twelve"
 msgstr "doce"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "one"
 msgstr "unha"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "two"
 msgstr "dúas"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "three"
 msgstr "tres"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "four"
 msgstr "catro"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "five"
 msgstr "cinco"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "six"
 msgstr "seis"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "seven"
 msgstr "sete"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "eight"
 msgstr "oito"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "nine"
 msgstr "nove"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "ten"
 msgstr "dez"
 
-#: ../src/common/fuzzyclock.py:40
+#: ../src/common/fuzzyclock.py:39
 msgid "eleven"
 msgstr "once"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
 #. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:43
 #, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s en punto"
 
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:43
 #, python-format
 msgid "five past %(0)s"
 msgstr "%(0)s e cinco"
 
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:43
 #, python-format
 msgid "ten past %(0)s"
 msgstr "%(0)s e dez"
 
-#: ../src/common/fuzzyclock.py:45
+#: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "quarter past %(0)s"
 msgstr "%(0)s e cuarto"
 
-#: ../src/common/fuzzyclock.py:45
+#: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "twenty past %(0)s"
 msgstr "%(0)s e vinte"
 
-#: ../src/common/fuzzyclock.py:45
+#: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "twenty five past %(0)s"
 msgstr "%(0)s e vinte e cinco"
 
-#: ../src/common/fuzzyclock.py:46
+#: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "half past %(0)s"
 msgstr "%(0)s e media"
 
-#: ../src/common/fuzzyclock.py:46
+#: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "twenty five to %(1)s"
 msgstr "%(1)s menos vinte e cinco"
 
-#: ../src/common/fuzzyclock.py:46
+#: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "twenty to %(1)s"
 msgstr "%(1)s menos vinte"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "quarter to %(1)s"
 msgstr "%(1)s menos cuarto"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "ten to %(1)s"
 msgstr "%(1)s menos dez"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "five to %(1)s"
 msgstr "%(1)s menos cinco"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s en punto"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:50
 msgid "Night"
 msgstr "Noite"
 
-#: ../src/common/fuzzyclock.py:49
+#: ../src/common/fuzzyclock.py:48
 msgid "Early morning"
 msgstr "Madrugada"
 
-#: ../src/common/fuzzyclock.py:49
+#: ../src/common/fuzzyclock.py:48
 msgid "Morning"
 msgstr "Mañá"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Almost noon"
 msgstr "Media mañá"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Noon"
 msgstr "Mediodía"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Afternoon"
 msgstr "Tarde"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Evening"
 msgstr "Serán"
 
-#: ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:50
 msgid "Late evening"
 msgstr "Noite"
 
-#: ../src/common/fuzzyclock.py:53
+#: ../src/common/fuzzyclock.py:52
 msgid "Start of week"
 msgstr "Comezo da semana"
 
-#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:53
 msgid "Middle of week"
 msgstr "Metade de semana"
 
-#: ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:53
 msgid "End of week"
 msgstr "Final de semana"
 
-#: ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:53
 msgid "Weekend!"
 msgstr "Fin de semana!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:179
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:184
 msgid "Invalid character in username."
 msgstr "Hai un caracter non válido no nome de usuario."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:190
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:195
 msgid "Invalid character in hostname."
 msgstr "Carácter non válido no nome do host."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:197
 msgid "Server address required."
 msgstr "É necesario o enderezo do servidor."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:201
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:206
 msgid "Invalid character in resource."
 msgstr "Carácter non válido no recurso."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:246
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:248 ../src/tooltips.py:915
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:251
 msgid "_Not Available"
 msgstr "_Non dispoñíbel"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:253 ../src/tooltips.py:917
+msgid "Not Available"
+msgstr "Non dispoñíbel"
+
+#: ../src/common/helpers.py:256
 msgid "_Free for Chat"
 msgstr "_Libre para falar"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:258 ../src/tooltips.py:911
 msgid "Free for Chat"
 msgstr "Libre para falar"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:261
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Pausada"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:263 ../src/tooltips.py:909
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Pausada"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:265
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:268
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:273
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:275 ../src/tooltips.py:919
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:278
 msgid "_Invisible"
 msgstr "_Invisíbel"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:280
+msgid "Invisible"
+msgstr "Invisíbel"
+
+#: ../src/common/helpers.py:284
 msgid "?contact has status:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:286
 msgid "?contact has status:Has errors"
 msgstr "Ten erros"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:291
 msgid "?Subscription we already have:None"
 msgstr "Ningunha"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:293
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:295
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:297
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:305
 msgid "?Ask (for Subscription):None"
 msgstr "Ningunha"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:307
 msgid "Subscribe"
 msgstr "_Engadir"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:316
 msgid "?Group Chat Contact Role:None"
 msgstr "Ningún"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:319
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:321
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:324
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:326
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:329
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:331
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:337 ../src/tooltips.py:403
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ningún"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:339 ../src/tooltips.py:409
 msgid "Owner"
 msgstr "Propietario"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:341 ../src/tooltips.py:407
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:343 ../src/tooltips.py:405
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:382
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atención á conversa"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:384
 msgid "is doing something else"
 msgstr "está a facer algo máis"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:386
 msgid "is composing a message..."
 msgstr "está a escribir..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:389
 msgid "paused composing a message"
 msgstr "Parou de escribir"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:391
 msgid "has closed the chat window or tab"
 msgstr "pechou a fiestra de charla"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:597
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:600
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:604
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:607
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:611
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:614
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:617
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1069 ../src/common/helpers.py:1076
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Enviar a mensaxe"
 msgstr[1] "Enviar a mensaxe"
 
-#: ../src/common/helpers.py:1121
-#, python-format
-msgid " from room %s"
-msgstr ""
+#: ../src/common/helpers.py:1083
+#, fuzzy, python-format
+msgid "from room %s"
+msgstr "Estou %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1086 ../src/common/helpers.py:1103
 #, python-format
-msgid " from user %s"
+msgid "from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1126
-#, python-format
-msgid " from %s"
-msgstr ""
+#: ../src/common/helpers.py:1088
+#, fuzzy, python-format
+msgid "from %s"
+msgstr "De"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1095 ../src/common/helpers.py:1101
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1133
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1319
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1433 ../src/common/helpers.py:1442
+#: ../src/common/helpers.py:1501
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Non foi posíbel cargar a imaxe"
+
+#: ../src/common/helpers.py:1452 ../src/common/helpers.py:1499
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/common/helpers.py:1463
+msgid "PyCURL is not installed"
+msgstr ""
+
+#: ../src/common/helpers.py:1503
+#, fuzzy
+msgid "Error loading image"
+msgstr "Non foi posíbel cargar a imaxe"
+
+#: ../src/common/jingle_rtp.py:115
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configuración da sala"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:116
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5668,116 +6231,130 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:221
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:221
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Mensaxe de erro: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:355
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:358
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:415
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:422
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
-#: ../src/common/logging_helpers.py:33
+#: ../src/common/logging_helpers.py:32
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:40
 #, fuzzy
-msgid " Default device"
+msgid "Default device"
 msgstr "Mensaxes de estado por defecto"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:59
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:62
+#: ../src/common/multimedia_helpers.py:78
+#: ../src/common/multimedia_helpers.py:92
+#: ../src/common/multimedia_helpers.py:110
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:80
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Tamaño: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:82
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Ficheiro: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:76
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:89
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:94
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:97
+#, fuzzy
+msgid "Screen"
+msgstr "verde"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:104
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:107
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:109
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:55 ../src/gtkgui_helpers.py:215
+#: ../src/gtkgui_helpers.py:231
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "erro: non se pode abrir %s para lectura"
+msgid "Error: cannot open %s for reading"
+msgstr "Erro: non se pode abrir %s para lectura"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:313 ../src/common/optparser.py:314
 msgid "cyan"
 msgstr "ciano"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:393
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrando os rexistros da base de datos aos índices"
 
-#: ../src/common/passwords.py:123
+#: ../src/common/passwords.py:100
 #, fuzzy, python-format
 msgid "XMPP account %s@%s"
 msgstr "da conta %s"
@@ -6474,52 +7051,134 @@ msgstr ""
 msgid "Writing"
 msgstr "A traballar"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "Por defecto"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "mariño"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "A expulsar %s"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "País:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Conta"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Descrición"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Erro de Avahi"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "unha"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+#, fuzzy
+msgid "room"
+msgstr "De"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr ""
+
+#: ../src/common/pep.py:341
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:344
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:347
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:350
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Non se pode conectar ao porto %s."
-
-#: ../src/common/socks5.py:92
-#, fuzzy
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"É posíbel que outra instancia do Gajim estea a se executar. A transferencia "
-"cancelarase."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Erro de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6528,78 +7187,67 @@ msgstr ""
 "%s\n"
 "A mensaxaría de ligazón local podería non funcionar correctamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Por favor, comprobe se o Avahi está instalado."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Non foi posíbel iniciar o servizo local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Non foi posíbel ligar ao porto %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#: ../src/common/zeroconf/connection_zeroconf.py:286
-#: ../src/common/zeroconf/connection_zeroconf.py:297
-#: ../src/common/zeroconf/connection_zeroconf.py:311
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:306
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+#: ../src/common/zeroconf/connection_zeroconf.py:335
 msgid "Please check if avahi-daemon is running."
 msgstr "Por favor, comprobe se o avahi-daemon está en execución."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Non foi posíbel cambiar o estado da conta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:357
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "O contacto está desconectado. A súa mensaxe non se puido enviar."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "O contacto está desconectado. A súa mensaxe non se puido enviar."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:396
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Non foi posíbel estabelecer a conexión ao host: expirou cando enviaba a "
 "información."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:192
-#: ../src/common/zeroconf/zeroconf_bonjour.py:191
+#: ../src/common/zeroconf/zeroconf_avahi.py:221
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: ../src/config.py:397
-#, fuzzy
-msgid "Default Message"
-msgstr "Mensaxes de estado por defecto"
-
-#: ../src/config.py:406
-#, fuzzy
-msgid "Enabled"
-msgstr "Activar"
-
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:449 ../src/config.py:453 ../src/config.py:3218
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:724 ../src/dialogs.py:1530
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Non está dispoñíbel o dicionario para o idioma %s"
 
-#: ../src/config.py:734
+#: ../src/config.py:725
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6608,7 +7256,7 @@ msgstr ""
 "Ten que instalar o dicionario %s para usar o corrector ou elixir outra "
 "lingua e logo definir a opción speller_language."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1213
 msgid "status message title"
 msgstr "título da mensaxe de estado"
 
@@ -6617,63 +7265,63 @@ msgid "status message text"
 msgstr "texto da mensaxe de estado"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
-#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
-#: ../src/disco.py:2048 ../src/history_window.py:90
+#: ../src/config.py:1559 ../src/dialogs.py:2725 ../src/dialogs.py:2792
+#: ../src/dialogs.py:3579 ../src/disco.py:912 ../src/disco.py:1747
+#: ../src/disco.py:2035 ../src/history_window.py:94
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1666
 msgid "Relogin now?"
 msgstr "Quere reconectarse agora?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1667
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Se quere que se apliquen todos os cambios instantaneamente, debe "
 "reconectarse."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1827 ../src/config.py:1962
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP non se pode usar neste ordenador"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:2007 ../src/config.py:2057
 msgid "Unread events"
 msgstr "Acontecementos sen ler"
 
-#: ../src/config.py:1934
+#: ../src/config.py:2008
 msgid "Read all pending events before removing this account."
 msgstr "Lea todos os eventos pendentes antes de eliminar esta conta."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2038
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Comezou unha charla coa conta %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2039
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Todas as charlas e os grupos de charlas pecharanse. Desexa continuar?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2052 ../src/config.py:2628 ../src/config.py:2666
 msgid "You are currently connected to the server"
 msgstr "Está actualmente conectado ao servidor"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2053
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar o nome da conta, debe estar desconectado"
 
-#: ../src/config.py:1981
+#: ../src/config.py:2058
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Para cambiar o nome da conta, debe ler o resto de\n"
 "acontecementos pendentes"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2064
 msgid "Account Name Already Used"
 msgstr "O nome da conta xa está en uso"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2065
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6681,148 +7329,149 @@ msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2069 ../src/config.py:2074
 msgid "Invalid account name"
 msgstr "O nome da conta non é válido"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2070
 msgid "Account name cannot be empty."
 msgstr "O nome da conta non pode estar baleiro."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2075
 msgid "Account name cannot contain spaces."
 msgstr "O nome da conta non pode conter espazos."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2156
 #, fuzzy
 msgid "Rename Account"
 msgstr "Xestionar as contas"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2157
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2187
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Unha ID de Jabber debe estar na forma \"usuario@nomeservidor\"."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2425 ../src/config.py:3768
 msgid "Invalid entry"
 msgstr "A entrada non é válida"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2426 ../src/config.py:3769
 msgid "Custom port must be a port number."
 msgstr "O porto personalizado debe ser un número de porto"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2448
 msgid "Failed to get secret keys"
 msgstr "Produciuse un erro ao obter as chaves secretas"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2449
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Houbo un problema ao recuperar as súas chaves secretas de OpenPGP"
 
-#: ../src/config.py:2377
+#: ../src/config.py:2487
 msgid "OpenPGP Key Selection"
 msgstr "Selección da chave de OpenPGP"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2488
 msgid "Choose your OpenPGP key"
 msgstr "Elixa a súa chave de OpenPGP"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2496
 msgid "No such account available"
 msgstr "Non está dispoñíbel esta conta"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2497
 msgid "You must create your account before editing your personal information."
 msgstr "Debe crear unha conta antes de editar a súa información persoal"
 
-#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2504 ../src/dialogs.py:2412 ../src/dialogs.py:2713
+#: ../src/dialogs.py:2903 ../src/disco.py:529 ../src/profile_window.py:375
 msgid "You are not connected to the server"
 msgstr "Non está conectado ao servidor"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2505
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sen unha conexión, non pode editar a súa información persoal"
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2510
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "O seu servidor non admite o vCard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2511
 msgid "Your server can't save your personal information."
 msgstr "O seu servidor non pode gardar a súa información persoal."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2629 ../src/config.py:2667
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Para cambiar o nome da conta, debe estar desconectado"
 
-#: ../src/config.py:2517
+#: ../src/config.py:2636
 msgid "Account Local already exists."
 msgstr "A conta local xa existe."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2637
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Por favor, volva darlle nome ou elimíneo antes de habilitar a mensaxaría de "
 "ligazón local."
 
-#: ../src/config.py:2675
+#: ../src/config.py:2798
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2800
 #, python-format
 msgid "Register to %s"
 msgstr "Rexistrar %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2836
 msgid "Ban List"
 msgstr "Listaxe de expulsión"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2837
 msgid "Member List"
 msgstr "Listaxe de membros"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2837
 msgid "Owner List"
 msgstr "Listaxe de propietarios"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2838
 msgid "Administrator List"
 msgstr "Listaxe de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2902 ../src/disco.py:919 ../src/history_manager.py:219
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2912
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2919
 msgid "Nick"
 msgstr "Alcume"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2925
 msgid "Role"
 msgstr "Posto"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2952
 msgid "Banning..."
 msgstr "A expulsar..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2954
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6830,11 +7479,11 @@ msgstr ""
 "<b>A quen quere expulsar?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2956
 msgid "Adding Member..."
 msgstr "A engadir o membro..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2957
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6842,11 +7491,11 @@ msgstr ""
 "<b>A quen quere facer membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2959
 msgid "Adding Owner..."
 msgstr "A engadir un propietario..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2960
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6855,11 +7504,11 @@ msgstr ""
 "<b>A quen quere facer como propietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2962
 msgid "Adding Administrator..."
 msgstr "A engadir administrador..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2963
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6867,7 +7516,7 @@ msgstr ""
 "<b>A quen quere facer como administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2964
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6884,116 +7533,111 @@ msgstr ""
 "usuario@dominio, dominio/recurso ou enderezo que contén\n"
 "un subdominio."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3064
 #, python-format
 msgid "Removing %s account"
 msgstr "A eliminar a conta %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3079
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3080
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3093 ../src/gui_interface.py:290
+#: ../src/gui_interface.py:748
 msgid "Password Required"
 msgstr "É necesario o contrasinal"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3094 ../src/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza un contrasinal para a conta %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3095 ../src/gui_interface.py:748
 msgid "Save password"
 msgstr "Gardar o contrasinal"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3105
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3106
 msgid "If you remove it, the connection will be lost."
 msgstr "Se a elimina, perderase a conexión co servidor"
 
-#: ../src/config.py:2999
+#: ../src/config.py:3120
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Fallou a conexión"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3121
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Que quere facer?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3122
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Eliminar a _conta unicamente do Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3123
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3218
 msgid "?print_status:All"
 msgstr "Todos"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3219
 msgid "Enter and leave only"
 msgstr "Entrar e saír soamente"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3220
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Todos"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3280
 msgid "New Group Chat"
 msgstr "Novo grupo de charla"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3316
 msgid "This bookmark has invalid data"
 msgstr "Este marcador ten información que non é válida"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3317
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, asegúrese de cubrir os campos de servidor e de sala ou elimine "
 "este marcador."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "O nome de usuario non é válido"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3440 ../src/config.py:3456 ../src/config.py:3467
+#: ../src/config.py:3495
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Alcume non permitido: %s"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3455 ../src/config.py:3466 ../src/config.py:3744
 #, fuzzy
 msgid "Invalid server"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3494
 #, fuzzy
 msgid "Invalid room"
 msgstr "A entrada non é válida"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3658
 msgid "Account has been added successfully"
 msgstr "A conta engadiuse con éxito"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3659 ../src/config.py:3665
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -7003,34 +7647,34 @@ msgstr ""
 "Pode configurar opcións avanzadas da conta se preme o botón Avanzado, ou "
 "máis tarde mediante o submenú Contas do menú Editar da fiestra principal."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3664
 msgid "Your new account has been created successfully"
 msgstr "A súa conta nova creouse con éxito"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3702
 msgid "Invalid username"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3704
 msgid "You must provide a username to configure this account."
 msgstr "Debe pórlle un nome para configurar esta conta."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3745
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Especifique o novo alcume que quere usar:"
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3801 ../src/gui_interface.py:1351
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "O contacto xa está na listaxe"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3802 ../src/gui_interface.py:1352
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3734
+#: ../src/config.py:3895
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -7040,90 +7684,91 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3901 ../src/gui_interface.py:1382
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
+"%s\n"
+"SHA256 fingerprint of the certificate:\n"
 "%s"
 msgstr ""
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3934 ../src/config.py:3968
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Produciuse un erro durante a creación da conta"
 
-#: ../src/config.py:3871
+#: ../src/config.py:4033
 msgid "Account name is in use"
 msgstr "O nome da conta está en uso"
 
-#: ../src/config.py:3872
+#: ../src/config.py:4034
 msgid "You already have an account using this name."
 msgstr "Xa ten unha conta en que emprega este nome"
 
-#: ../src/config.py:3991
+#: ../src/config.py:4164
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/config.py:3992
+#: ../src/config.py:4165
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
-#: ../src/config.py:4036
-msgid "Active"
-msgstr "Activo"
+#: ../src/config.py:4193
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Continuar"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4218
 msgid "Event"
 msgstr "Acontecemento"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4252
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Recibiuse a primeira mensaxe"
+
+#: ../src/config.py:4253
 msgid "First Message Received"
 msgstr "Recibiuse a primeira mensaxe"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4254
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Recibiuse unha mensaxe nova"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4256
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Recibiuse unha mensaxe nova"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4257
 msgid "Contact Connected"
 msgstr "Nome de contacto"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4258
 msgid "Contact Disconnected"
 msgstr "Contacto desconectado"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4259
 msgid "Message Sent"
 msgstr "Enviouse a mensaxe"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4260
 msgid "Group Chat Message Highlight"
 msgstr "Remarcado da mensaxe de grupo de charla"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4261
 msgid "Group Chat Message Received"
 msgstr "Recibiuse unha mensaxe de grupo de charla"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4262
 msgid "GMail Email Received"
 msgstr "Recibiuse un correo de GMail"
 
-#: ../src/conversation_textview.py:601
-msgid ""
-"This icon indicates that this message has not yet\n"
-"been received by the remote end. If this icon stays\n"
-"for a long time, it's likely the message got lost."
-msgstr ""
-
-#: ../src/conversation_textview.py:620
+#: ../src/conversation_textview.py:351
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -7132,136 +7777,152 @@ msgstr ""
 "O texto que está debaixo desta liña foi o que se dixo desde a última vez que "
 "lle prestou atención a esta sala de charla"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:657
+msgid ""
+"This icon indicates that this message has not yet\n"
+"been received by the remote end. If this icon stays\n"
+"for a long time, it's likely the message got lost."
+msgstr ""
+
+#. show clear
+#: ../src/conversation_textview.py:761 ../src/profile_window.py:220
+msgid "_Clear"
+msgstr ""
+
+#: ../src/conversation_textview.py:772
 #, fuzzy
 msgid "_Quote"
 msgstr "_Saír"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:780
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Accións para \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:794
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:799
 msgid "Look it up in _Dictionary"
 msgstr "Buscalo no _Dicionario"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:816
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta un \"%s\" no URL do dicionario e non está no WIKTIONARY"
 
-#. we must have %s in the url
-#: ../src/conversation_textview.py:795
+#: ../src/conversation_textview.py:830
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" no URL da busca web"
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:833
 msgid "Web _Search for it"
 msgstr "_Buscalo na rede"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:839
 msgid "Open as _Link"
 msgstr "_Abrir como ligazón"
 
+#: ../src/conversation_textview.py:1221
+#, fuzzy
+msgid "Invalid URL"
+msgstr "A ID de Jabber non é válida"
+
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1444
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Onte"
 msgstr[1] "Onte"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1532 ../src/history_window.py:507
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Asunto: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:587
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Extensión non admitida"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:602
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:646
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Cliente de MI de Jabber"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:647
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:661 ../src/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:93
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do contacto : <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:95
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID de Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:209
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:216
 msgid "In the group"
 msgstr "No grupo"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:309
 msgid "KeyID"
 msgstr "Chave ID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:314
 msgid "Contact name"
 msgstr "Nome de contacto"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:492
 #, fuzzy
 msgid "Set Mood"
 msgstr "Definir a MDD"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:613
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaxe de estado %s"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:627
 msgid "Status Message"
 msgstr "Mensaxe de estado"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:817
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Mensaxe de estado"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:818
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -7269,108 +7930,116 @@ msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:826
 msgid "Save as Preset Status Message"
 msgstr "Gardar como mensaxe de estado predefinido"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:827
 msgid "Please type a name for this status message"
 msgstr "Escriba un nome para esta mensaxe de estado"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:855
 msgid "AIM Address:"
 msgstr "Enderezo de AIM:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:856
 msgid "GG Number:"
 msgstr "Número de GG:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:857
 msgid "ICQ Number:"
 msgstr "Número de ICQ:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:858
 msgid "MSN Address:"
 msgstr "Enderezo de MSN:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:859
 msgid "Yahoo! Address:"
 msgstr "Enderezo de Yahoo!:"
 
-#: ../src/dialogs.py:873
-#, python-format
-msgid "Please fill in the data of the contact you want to add in account %s"
+#: ../src/dialogs.py:896
+#, fuzzy, python-format
+msgid ""
+"Please fill in the data of the contact you want\n"
+"to add to your account <b>%s</b>"
 msgstr ""
 "Por favor, introduza a información do contacto que quere engadir á conta %s"
 
-#: ../src/dialogs.py:876
+#: ../src/dialogs.py:899
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor, cubra a información do contacto que quere engadir"
 
-#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1096 ../src/dialogs.py:1102 ../src/dialogs.py:1107
+#: ../src/dialogs.py:3814
 msgid "Invalid User ID"
 msgstr "A ID de usuario non é válida"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1103
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario non contén un recurso."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1108
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1122
 msgid "Contact already in roster"
 msgstr "O contacto xa está na listaxe"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1123
 msgid "This contact is already listed in your roster."
 msgstr "Xa engadiu este contacto á súa listaxe."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1176 ../src/dialogs.py:1210
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "Un cliente de Jabber en GTK"
+#: ../src/dialogs.py:1308
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "Un cliente de Jabber de GTK"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1309
 msgid "GTK+ Version:"
 msgstr "Versión de GTK+:"
 
-#: ../src/dialogs.py:1191
-msgid "PyGTK Version:"
+#: ../src/dialogs.py:1309
+#, fuzzy
+msgid "PyGobject Version:"
 msgstr "Versión de PyGTK:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1310
+msgid "python-nbxmpp Version:"
+msgstr ""
+
+#: ../src/dialogs.py:1321
 msgid "Current Developers:"
 msgstr "Desenvolvedores actuais:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1323
 msgid "Past Developers:"
 msgstr "Desenvolvedores anteriores:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1329
 msgid "THANKS:"
 msgstr "AGRADECEMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1335
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Por último mais non menos importante, queremos agradecerlles a todos os "
 "mantedores de paquetes."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1227
+#: ../src/dialogs.py:1347
 msgid "translator-credits"
 msgstr "Fran Alburquerque <membriskhan@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1531
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7381,110 +8050,165 @@ msgstr ""
 "Ten que instalar o dicionario %s para usar o corrector ou elixir outra "
 "lingua e logo definir a opción speller_language."
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
+#: ../src/dialogs.py:1876 ../src/dialogs.py:1892 ../src/gui_interface.py:1502
+#: ../src/gui_interface.py:1544
 #, fuzzy
-msgid "The nickname has not allowed characters."
+msgid "Insecure connection"
+msgstr "Conexión"
+
+#: ../src/dialogs.py:1877
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
+
+#: ../src/dialogs.py:1883 ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1547
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/dialogs.py:1884
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1885 ../src/groupchat_control.py:2187
+#: ../src/gui_interface.py:725 ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1548 ../src/message_window.py:240
+#: ../src/roster_window.py:2986 ../src/roster_window.py:3666
+#: ../src/roster_window.py:4495
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_Non me preguntar outra vez"
+
+#: ../src/dialogs.py:1984
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1992
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2196 ../src/dialogs.py:2661
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2319
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Solicitude de subscrición para a conta %s de %s"
 
-#: ../src/dialogs.py:2072
+#: ../src/dialogs.py:2322
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitude de subscrición de %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2407 ../src/gui_interface.py:2143
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Xa está na sala %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2413
 msgid "You can not join a group chat unless you are connected."
 msgstr "Non pode entrar nunha sala de charla até que non se conecte."
 
-#: ../src/dialogs.py:2194
+#: ../src/dialogs.py:2459
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar nun grupo de charla coa conta %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2597 ../src/dialogs.py:2608
+#, fuzzy
+msgid "Wrong server"
+msgstr "Host errado"
+
+#: ../src/dialogs.py:2597 ../src/dialogs.py:2608
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Isto non é un grupo de charla"
+
+#: ../src/dialogs.py:2648
 #, fuzzy
 msgid "Invalid Account"
 msgstr "O nome da conta non é válido"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2649
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Debe crear unha conta antes de poder conversar con outros contactos."
 
-#: ../src/dialogs.py:2337
+#: ../src/dialogs.py:2660
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2665 ../src/dialogs.py:2671
+#: ../src/groupchat_control.py:2260
 msgid "Invalid group chat Jabber ID"
 msgstr "A ID de Jabber non é válida para o grupo de charla"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2666
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2672
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2677 ../src/gui_interface.py:2123
 msgid "This is not a group chat"
 msgstr "Isto non é un grupo de charla"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2678 ../src/gui_interface.py:2124
 #, python-format
-msgid "%s is not the name of a group chat."
-msgstr "%s non é o nome dun grupo de charla."
+msgid ""
+"%s is already in your roster. Please check if %s is a correct group chat "
+"name. If it is, delete it from your roster and try joining the group chat "
+"again."
+msgstr ""
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2714
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2728
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2764
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2765
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Non pode entrar nunha sala de charla até que non se conecte."
 
-#: ../src/dialogs.py:2462
+#: ../src/dialogs.py:2790
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2851
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar a charla coa conta %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2853
 msgid "Start Chat"
 msgstr "Iniciar a charla"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2854
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7492,169 +8216,144 @@ msgstr ""
 "Introduza o alcume ou a ID de Jabber do contacto a que quere\n"
 "enviar unha mensaxe de charla:"
 
+#: ../src/dialogs.py:2856
+#, fuzzy
+msgid "Nickname / Jabber ID"
+msgstr "ID de Jabber duplicada"
+
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2882 ../src/dialogs.py:3271 ../src/dialogs.py:3493
 msgid "Connection not available"
 msgstr "Conexión non dispoñíbel"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2883 ../src/dialogs.py:3272 ../src/dialogs.py:3494
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrese de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2892 ../src/dialogs.py:2895
 msgid "Invalid JID"
 msgstr "A ID de Jabber non é válida"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2895
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Non se pode analizar \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2904
 msgid "Without a connection, you can not change your password."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2924
 msgid "Invalid password"
 msgstr "O contrasinal non é válido"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2924
 msgid "You must enter a password."
 msgstr "Debe introducir un contrasinal."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2928
 msgid "Passwords do not match"
 msgstr "Os contrasinais non coinciden"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2929
 msgid "The passwords typed in both fields must be identical."
 msgstr "Os contrasinais escritos nos dous campos deben ser idénticos."
 
-#. default value
-#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Contacto conectado"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Contacto desconectado"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Mensaxe nova"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "Mensaxe nova"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Mensaxe privada nova"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2974 ../src/gui_interface.py:898 ../src/notify.py:287
 msgid "New E-mail"
 msgstr "Correo electrónico novo"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2976 ../src/gui_interface.py:962 ../src/notify.py:280
 msgid "File Transfer Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2978 ../src/gui_interface.py:860
+#: ../src/gui_interface.py:927 ../src/notify.py:282
 msgid "File Transfer Error"
 msgstr "Produciuse un erro na transferencia do ficheiro"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2980 ../src/gui_interface.py:1057
+#: ../src/gui_interface.py:1086 ../src/gui_interface.py:1107
+#: ../src/notify.py:284
 msgid "File Transfer Completed"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2981 ../src/gui_interface.py:1061
+#: ../src/gui_interface.py:1090 ../src/gui_interface.py:1111
+#: ../src/notify.py:285
 msgid "File Transfer Stopped"
 msgstr "Detívose a transferencia do ficheiro"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Convite a grupo de charla"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Un contacto cambiou o seu estado"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3190
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensaxe nova coa conta %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3192
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Entrou unha mensaxe nova na conta %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3194
 msgid "Single Message"
 msgstr "Mensaxe:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3197
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3220
 #, python-format
 msgid "Received %s"
 msgstr "Recibida %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3243
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Estou %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2984
+#: ../src/dialogs.py:3326
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3327
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribiu:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3387
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3389
 msgid "XML Console"
 msgstr "Consola XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3522
 #, fuzzy
 msgid "add"
 msgstr "Atascado"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3522
 #, fuzzy
 msgid "modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3523
 #, fuzzy
 msgid "remove"
 msgstr "_Eliminar"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3552
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7662,193 +8361,210 @@ msgid ""
 msgstr "Gustaríame engadilo á miña listaxe de contactos."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
-#, fuzzy
-msgid "Add"
-msgstr "Enderezo"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3570 ../src/dialogs.py:3645
 #, fuzzy
 msgid "Modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:3228
-#, fuzzy
-msgid "Jabber ID"
-msgstr "ID de Jabber:"
-
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3582
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
-#. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#. remote_jid = model[iter_][1]
+#: ../src/dialogs.py:3690
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3704
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Engadir un _contacto"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Engadir un _contacto"
+msgstr[1] "Engadir un _contacto"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3742
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Elimina o contacto da listaxe"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Elimina o contacto da listaxe"
+msgstr[1] "Elimina o contacto da listaxe"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3783 ../src/dialogs.py:3960 ../src/dialogs.py:4131
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3823
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3824
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3871
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4091
 msgid "There is an error"
 msgstr ""
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4165
+msgid "Success!"
+msgstr ""
+
+#: ../src/dialogs.py:4165
+#, fuzzy
+msgid "Your Archiving Preferences have been saved!"
+msgstr "_Preferencias"
+
+#: ../src/dialogs.py:4181
+msgid "We got no response from the Server"
+msgstr ""
+
+#: ../src/dialogs.py:4183
+#, fuzzy
+msgid "We received an error: {}"
+msgstr "Recibiu unha entrada nova:"
+
+#: ../src/dialogs.py:4187
+#, fuzzy
+msgid "Error!"
+msgstr "Erro de Avahi"
+
+#: ../src/dialogs.py:4246
+#, fuzzy
+msgid "Add Jabber ID"
+msgstr "ID de Jabber:"
+
+#: ../src/dialogs.py:4319
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Listaxe de privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4323
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Listaxe de privacidade para %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4392
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Orde: %s, acción: %s, tipo: %s, valor: %s"
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4397
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orde: %s, acción: %s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4451
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar unha regra</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4563
 msgid "<b>Add a rule</b>"
 msgstr "<b>Engadir unha regra</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4664
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listaxes de privacidade para %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4666
 msgid "Privacy Lists"
 msgstr "Listaxes de privacidade"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4756
 msgid "Invalid List Name"
 msgstr "O nome de listaxe non é válido"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4757
 msgid "You must enter a name to create a privacy list."
 msgstr "Debe introducir un nome para crear unha listaxe de privacidade."
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4793
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Está expulsado deste grupo de charla."
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4796
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4798
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
 
-#: ../src/dialogs.py:4234
+#: ../src/dialogs.py:4807
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4809
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4828
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4877
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4888 ../src/dialogs.py:4930 ../src/dialogs.py:4978
+#: ../src/dialogs.py:5067
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4893
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4919
 msgid "Choose Sound"
 msgstr "Elixir un son"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4935
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4965
 msgid "Choose Image"
 msgstr "Elixir unha imaxe"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4983
 msgid "Images"
 msgstr "Imaxes"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:5053
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Elixir unha imaxe"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:5072
 #, fuzzy
 msgid "Zip files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:5098
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cando %s estea:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:5100
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Engadir unha notificación especial para %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Condición"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "cando estea "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5322
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7856,38 +8572,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5325
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5331 ../src/dialogs.py:5416
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5337
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5342
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5345 ../src/dialogs.py:5397 ../src/dialogs.py:5410
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5350
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5361
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5362
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7897,77 +8613,129 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5363
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5398
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5404
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5411
 msgid ""
-"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
-"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5417
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5483
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5485
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5487
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5491
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5596 ../src/dialogs.py:5632
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "para a conta %s"
+
+#: ../src/dialogs.py:5596
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s\n"
+"\n"
+"SHA256 Fingerprint: %(sha256)s\n"
+msgstr ""
+
+#: ../src/dialogs.py:5643 ../src/gui_interface.py:1396
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Engadir unha notificación especial para %s"
+
+#: ../src/dialogs.py:5644 ../src/dialogs.py:5661
+msgid "View cert..."
+msgstr ""
+
+#: ../src/disco.py:68
+msgid "This service has not yet responded with detailed information"
+msgstr "Este servizo non respondeu aínda con información detallada"
+
+#: ../src/disco.py:69
+msgid ""
+"This service could not respond with detailed information.\n"
+"It is most likely legacy or broken"
+msgstr ""
+"Este servizo podería non responder con información detallada.\n"
+"Posibelmente é antigo ou está roto"
+
+#: ../src/disco.py:128
 msgid "Others"
 msgstr "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:132
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:530
 msgid "Without a connection, you can not browse available services"
 msgstr "Sen unha conexión non pode navegar polos servizos dispoñíbeis"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:616
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Xestión de servizos coa conta %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:618
 msgid "Service Discovery"
 msgstr "Xestión de servizos"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:779
 msgid "The service could not be found"
 msgstr "O servizo non se achou"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:780
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7975,102 +8743,108 @@ msgstr ""
 "Non hai servizo neste enderezo ou non está a responder. Comprobe o enderezo "
 "e ténteo máis tarde."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:786 ../src/disco.py:1138
 msgid "The service is not browsable"
 msgstr "O servizo non é navegábel"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:787
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de servizo non contén ningún elemento para navegar."
 
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:828 ../src/disco.py:838
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:896
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar %s coa conta %s"
 
-#: ../src/disco.py:912
-msgid "_Browse"
+#: ../src/disco.py:943
+#, fuzzy
+msgid "Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1139
 msgid "This service does not contain any items to browse."
 msgstr "Este servizo non contén elementos para navegar."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1351
 #, fuzzy
-msgid "_Execute Command"
+msgid "Execute Command"
 msgstr "Executar o _comando..."
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1355 ../src/disco.py:1520
 msgid "Re_gister"
 msgstr "_Subscribir"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1366
+#, fuzzy
+msgid "Join"
+msgstr "_Entrar"
+
+#: ../src/disco.py:1561
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Escaneando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1757
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1765
 msgid "Description"
 msgstr "Descrición"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1773
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1837 ../src/gui_interface.py:2629
 msgid "Bookmark already set"
 msgstr "O marcador xa se definiu"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1838 ../src/gui_interface.py:2630
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "A sala \"%s\" xa está nos seus marcadores."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1848 ../src/gui_interface.py:2644
 msgid "Bookmark has been added successfully"
 msgstr "O marcador engadiuse con éxito"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1849 ../src/gui_interface.py:2645
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Pode xestionar os seus marcadores mediante o menú Accións da súa listaxe"
 
-#: ../src/disco.py:2057
+#: ../src/disco.py:2044
 msgid "Subscribed"
 msgstr "Engadiuse"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2053
 #, fuzzy
 msgid "Node"
 msgstr "Ningún"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2120
 msgid "New post"
 msgstr "Publicación nova"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2126
 msgid "_Subscribe"
 msgstr "_Engadir"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2132
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
 #: ../src/features_window.py:49
-msgid "SSL certificat validation"
+msgid "SSL certificate validation"
 msgstr ""
 
 #: ../src/features_window.py:50
@@ -8079,7 +8853,7 @@ msgid ""
 msgstr ""
 
 #: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr ""
 
 #: ../src/features_window.py:53
@@ -8095,7 +8869,9 @@ msgid "Requires python-avahi."
 msgstr ""
 
 #: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 msgstr ""
 
 #: ../src/features_window.py:57
@@ -8111,25 +8887,29 @@ msgstr ""
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88 ../src/features_window.py:108
+#: ../src/features_window.py:60 ../src/features_window.py:68
+#: ../src/features_window.py:72 ../src/features_window.py:80
+#: ../src/features_window.py:96 ../src/features_window.py:100
+#: ../src/features_window.py:104
 msgid "Feature not available under Windows."
 msgstr ""
 
 #: ../src/features_window.py:61
 #, fuzzy
-msgid "OpenGPG message encryption"
+msgid "OpenPGP message encryption"
 msgstr "Cifrado OpenPGP"
 
 #: ../src/features_window.py:62
 #, fuzzy
-msgid "Encrypting chat messages with gpg keys."
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Mens_axe entrante:"
 
 #: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
+
+#: ../src/features_window.py:64
+msgid "Requires gpg.exe in PATH."
 msgstr ""
 
 #: ../src/features_window.py:65
@@ -8147,305 +8927,288 @@ msgstr ""
 
 #: ../src/features_window.py:69
 #, fuzzy
-msgid "Session Management"
-msgstr "Enviouse a mensaxe"
-
-#: ../src/features_window.py:70
-msgid "Gajim session is stored on logout and restored on login."
-msgstr ""
-
-#: ../src/features_window.py:71
-msgid "Requires python-gnome2."
-msgstr ""
-
-#: ../src/features_window.py:73
-#, fuzzy
 msgid "Password encryption"
 msgstr "Os contrasinais non coinciden"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:70
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:75
-msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr ""
-
-#: ../src/features_window.py:77
-msgid "SRV"
-msgstr ""
-
-#: ../src/features_window.py:78
-msgid "Ability to connect to servers which are using SRV records."
-msgstr ""
-
-#: ../src/features_window.py:79
-msgid "Requires dnsutils."
-msgstr ""
-
-#: ../src/features_window.py:80
-msgid "Requires nslookup to use SRV records."
+#: ../src/features_window.py:71
+msgid ""
+"Requires libsecret and a provider (such as GNOME Keyring and KSecretService)."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:73
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:74
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:75
 msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:76
+msgid "Requires libgtkspell and libenchant."
+msgstr ""
+
+#: ../src/features_window.py:77
 #, fuzzy
 msgid "Notification"
 msgstr "Modificar a conta"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:78
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:79
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:81
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Adaptar ao estado"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:82
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:83
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:84
 msgid "Requires python2.5."
 msgstr ""
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr ""
-
-#: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
-
-#: ../src/features_window.py:95
-msgid ""
-"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
-msgstr ""
-
-#: ../src/features_window.py:96
-msgid ""
-"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
-"You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr ""
-
-#: ../src/features_window.py:97
+#: ../src/features_window.py:85
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Cifrado OpenPGP"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:86
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Mens_axe entrante:"
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:87 ../src/features_window.py:88
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:89
 #, fuzzy
 msgid "RST Generator"
 msgstr "Xeral"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:90
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:91 ../src/features_window.py:92
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:94
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:107
-msgid "Requires python-farsight."
+#: ../src/features_window.py:95
+msgid ""
+"Requires gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav and "
+"gstreamer1.0-plugins-ugly."
 msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:97
+msgid "UPnP-IGD"
+msgstr ""
+
+#: ../src/features_window.py:98
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "Requires python-gupnp-igd."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:103
+msgid "Requires upower and python-dbus."
+msgstr ""
+
+#: ../src/features_window.py:111
 #, fuzzy
 msgid "?features:Available"
 msgstr "En líña"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:118
 #, fuzzy
 msgid "Feature"
 msgstr "Características dos servidores"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:85
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:100
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:112
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:243
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:450
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaño: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:197 ../src/filetransfers_window.py:207
+#: ../src/history_manager.py:550
 msgid "You"
 msgstr "Vostede"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:198
 #, python-format
 msgid "Sender: %s"
 msgstr "Remitente: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:199 ../src/filetransfers_window.py:731
+#: ../src/tooltips.py:845
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:210
 #, python-format
 msgid "Saved in: %s"
 msgstr "Gardouse en: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Rematou a transferencia do ficheiro"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-#, fuzzy
-msgid "File transfer cancelled"
-msgstr "Cancelouse a transferencia do ficheiro"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Non se puido estabelecer a conexión co cliente."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinatario: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensaxe de erro: %s"
 
-#: ../src/filetransfers_window.py:238
-#, fuzzy
-msgid "File transfer stopped"
-msgstr "Detívose a transferencia do ficheiro"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:311
 msgid "Choose File to Send..."
 msgstr "Elixa un ficheiro para enviar..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:328 ../src/tooltips.py:880
 #, fuzzy
 msgid "Description: "
 msgstr "Descrición: %s"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:341
 msgid "Gajim cannot access this file"
 msgstr "O Gajim non pode acceder a este ficheiro"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:342
 msgid "This file is being used by another process."
 msgstr "Outro proceso está a usar este ficheiro."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Ficheiro: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Tipo: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Descrición: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s quere enviarlle un ficheiro:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:386 ../src/gtkgui_helpers.py:784
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Non se pode sobrescribir o ficheiro existente \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:387 ../src/gtkgui_helpers.py:785
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Xa existe un ficheiro con este nome e non ten permiso para o sobreescribir"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:404 ../src/gtkgui_helpers.py:789
 msgid "This file already exists"
 msgstr "Este ficheiro xa existe"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:404 ../src/gtkgui_helpers.py:789
 msgid "What do you want to do?"
 msgstr "Que quere facer?"
 
-#. read-only bit is used to mark special folder under windows,
-#. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
+#. read-only bit is used to mark special folder under
+#. windows, not to mark that a folder is read-only.
+#. See ticket #3587
+#: ../src/filetransfers_window.py:415 ../src/gtkgui_helpers.py:796
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Non se pode escribir no directorio \"%s\""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:416 ../src/gtkgui_helpers.py:797
 msgid "You do not have permission to create files in this directory."
 msgstr "Non ten autorización para crear ficheiros neste directorio."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:427
 msgid "Save File as..."
 msgstr "Gardar o ficheiro como..."
 
+#: ../src/filetransfers_window.py:447
+#, python-format
+msgid "File: %s"
+msgstr "Ficheiro: %s"
+
+#: ../src/filetransfers_window.py:453
+#, python-format
+msgid "Type: %s"
+msgstr "Tipo: %s"
+
+#: ../src/filetransfers_window.py:455
+#, python-format
+msgid "Description: %s"
+msgstr "Descrición: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s quere enviarlle un ficheiro:"
+
+#: ../src/filetransfers_window.py:497
+#, fuzzy
+msgid "Checking file..."
+msgstr "A enviar o perfil..."
+
+#: ../src/filetransfers_window.py:511
+#, fuzzy
+msgid "File error"
+msgstr "Produciuse un erro na transferencia do ficheiro"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:548
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8453,114 +9216,62 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:641
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:697 ../src/filetransfers_window.py:700
 msgid "Invalid File"
 msgstr "O ficheiro non é válido"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:697
 msgid "File: "
 msgstr "Ficheiro: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:701
 msgid "It is not possible to send empty files"
 msgstr "Non se pode enviar ficheiros baleiros"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:727 ../src/tooltips.py:836
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:729 ../src/tooltips.py:839
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:896
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:142
-#, fuzzy
-msgid "Gajim needs X server to run. Quiting..."
-msgstr "O Gajim precisa o Xserver para funcionar. A abortar..."
-
-#: ../src/gajim.py:144
-#, python-format
-msgid "importing PyGTK failed: %s"
-msgstr ""
-
-#: ../src/gajim.py:186
-#, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
-msgstr "O Gajim precisa un PyGTK 2.6 ou superior"
-
-#: ../src/gajim.py:187
-#, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
-msgstr "O Gajim precisa un PyGTK 2.6 ou superior para funcionar. A abortar..."
-
-#: ../src/gajim.py:189
-#, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
-msgstr "O Gajim precisa un GTK 2.6 ou superior"
-
-#: ../src/gajim.py:190
-#, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
-msgstr "O Gajim precisa un GTK 2.6 ou superior para funcionar. A abortar..."
-
-#: ../src/gajim.py:199
-msgid "Gajim needs pywin32 to run"
-msgstr "O Gajim precisa un pywin32 para funcionar"
-
-#: ../src/gajim.py:200
-#, python-format
-msgid ""
-"Please make sure that Pywin32 is installed on your system. You can get it at "
-"%s"
-msgstr ""
-"Por favor, asegúrese de que Pywin32 está instalado no seu sistema. Pode "
-"obtelo en %s"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
-msgid "Gajim is already running"
-msgstr "O Gajim xa está a se executar"
-
-#: ../src/gajim.py:317
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-"Outra instancia dO Gajim semella estar xa en execución\n"
-"Quere executar unha outra?"
+#: ../src/filetransfers_window.py:907
+msgid "_Continue"
+msgstr "_Continuar"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Amosa axuda sobre un comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "amosar axuda sobre un comando"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:91
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Amosa unha fiestra emerxente co seguinte acontecemento pendente"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:95
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8569,53 +9280,57 @@ msgstr ""
 "Amosa unha listaxe de todos os contactos na listaxe. Cada contacto aparece "
 "nunha liña distinta"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
-#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
-#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
-#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
-#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
-#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
-#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
-#: ../src/gajim-remote.py:291
-msgid "account"
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:149 ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:172 ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:223 ../src/gajim-remote.py:232
+#: ../src/gajim-remote.py:239 ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:257 ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:293
+#, fuzzy
+msgid "?CLI:account"
 msgstr "conta"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "amosar só contactos da conta especificada"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Amosa unha listaxe de contas que están rexistradas"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Cambia o estado dunha ou de varias contas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:111
+#, fuzzy
+msgid "?CLI:status"
 msgstr "estado"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:111
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
 "un de: desconectado, en liña, libre para falar, ausente, non dispoñíbel, "
 "ocupado, invisíbel"
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:284
+#, fuzzy
+msgid "?CLI:message"
+msgstr "mensaxe"
+
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "mensaxe de estado"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8624,20 +9339,48 @@ msgstr ""
 "o estado de todas as contas que teñen a opción \"sync with global status\" "
 "activada"
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Cambia o estado dunha ou de varias contas"
+
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Pr_ioridade:"
+
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Quero _rexistrar unha conta nova de Jabber"
+
+#: ../src/gajim-remote.py:123
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"cambia o estado da conta \"account\". Se non se especifica, probe a cambiar "
+"o estado de todas as contas que teñen a opción \"sync with global status\" "
+"activada"
+
+#: ../src/gajim-remote.py:129
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Amosa o diálogo de charla para enviarlle mensaxes a un contacto"
 
-#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:131
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contacto co que quere conversar"
 
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:223
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "se se especifica, o contacto obtense da listaxe desta conta"
 
-#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:136
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:141
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8647,34 +9390,29 @@ msgstr ""
 "OpenPGP como a conta son opcionais. Se quere definir só 'conta' sen 'chave "
 "pgp', só defina 'chave pgp' a ''."
 
-#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
-#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:171
 msgid "message contents"
 msgstr "contido da mensaxe"
 
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "se se especifica, a mensaxe cifrarase mediante a súa chave pública"
 
-#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
-#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:149 ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:172
 msgid "if specified, the message will be sent using this account"
 msgstr "se se especifica, a mensaxe enviarase a través desta conta"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:154
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8684,139 +9422,136 @@ msgstr ""
 "OpenPGP como a conta son optativas. Se quere definir só 'conta' sen 'chave "
 "pgp', só defina 'chave pgp' a ''."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "message subject"
 msgstr "tema da mensaxe"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:168
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:170
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:177
 msgid "Gets detailed info on a contact"
 msgstr "Obter información detallada dun contacto"
 
-#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
-#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
-#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:179 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:183
 msgid "Gets detailed info on a account"
 msgstr "Obter información detallada dunha conta"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:185
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:189
 msgid "Sends file to a contact"
 msgstr "Enviarlle un ficheiro a un contacto"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "file"
 msgstr "ficheiro"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "File path"
 msgstr "Camiño do ficheiro"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "if specified, file will be sent using this account"
 msgstr "se se especifica, o ficheiro enviarase mediante esta conta"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Lists all preferences and their values"
 msgstr "Nomea todas as preferencias e os seus valores"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:202
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'entrada' a 'valor'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "a 'entrada' é o nome da preferencia, o 'valor' é o do valor para definir"
 
-#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:211
 msgid "key"
 msgstr "entrada"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:211
 msgid "name of the preference to be deleted"
 msgstr "nome da preferencia para eliminar"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:215
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escribe o estado actual da preferencias do Gajim para o ficheiro de "
 "configuración"
 
-#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "Removes contact from roster"
 msgstr "Elimina o contacto da listaxe"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:229
 msgid "Adds contact to roster"
 msgstr "Engade o contacto á listaxe"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:232
 msgid "Adds new contact to this account"
 msgstr "Engade un contacto novo a esta conta."
 
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:237
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Devolve o estado actual (o global se non se especificar unha conta)"
 
-#: ../src/gajim-remote-plugin.py:226
-#, fuzzy
+#: ../src/gajim-remote.py:244
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Devolve a mensaxe de estado actual (o global se non se especificar unha "
 "conta)"
 
-#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:251
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Devolve o número de mensaxes sen ler"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:255
 msgid "Opens 'Start Chat' dialog"
 msgstr "Abre o diálogo de iniciar charla"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:257
 msgid "Starts chat, using this account"
 msgstr "Iniciar unha charla con esta conta"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:263
 msgid "XML to send"
 msgstr "XML para enviar"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:264
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8824,49 +9559,99 @@ msgstr ""
 "Conta a que se lle enviará; se non se especificar nada, o xml enviaráselles "
 "a todas as contas"
 
-#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:270
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Un contacto cambiou o seu estado"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid "Picture to use"
+msgstr "Non se achou o alcume: %s"
+
+#: ../src/gajim-remote.py:273
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Conta a que se lle enviará; se non se especificar nada, o xml enviaráselles "
+"a todas as contas"
+
+#: ../src/gajim-remote.py:279
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
-msgid "uri"
+#: ../src/gajim-remote.py:281
+msgid "?CLI:uri"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:281
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:282
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:284
+#, fuzzy
+msgid "Message content"
+msgstr "contido da mensaxe"
+
+#: ../src/gajim-remote.py:288
 msgid "Join a MUC room"
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:290
 #, fuzzy
-msgid "room"
+msgid "?CLI:room"
 msgstr "De"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "Room JID"
+msgstr "Sala:"
+
+#: ../src/gajim-remote.py:291
 #, fuzzy
-msgid "nick"
+msgid "?CLI:nick"
 msgstr "Alcume"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Non se achou o alcume: %s"
+
+#: ../src/gajim-remote.py:292
 #, fuzzy
-msgid "password"
+msgid "?CLI:password"
 msgstr "Contrasinal: "
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Os contrasinais non coinciden"
+
+#: ../src/gajim-remote.py:293
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:298
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Por favor, comprobe se o avahi-daemon está en execución."
 
-#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:302
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:330
 msgid "Missing argument \"contact_jid\""
 msgstr "Non se atopa o argumento \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:352
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8875,168 +9660,42 @@ msgstr ""
 "'%s' non está na súa listaxe de contactos.\n"
 "Por favor, especifique unha conta para enviar a mensaxe."
 
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:355
 msgid "You have no active account"
 msgstr "Non ten contas activas"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:402
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:429
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Modo de uso: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:433
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:437
 #, python-format
 msgid "%s not found"
 msgstr "Non se encontrou %s"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:443
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando é un de:\n"
 
-#: ../src/gajim-remote-plugin.py:496
-#, fuzzy, python-format
-msgid ""
-"Too many arguments. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"O argumento \"%s\" non se especificou. \n"
-"Escriba \"%s help %s\" para máis información"
-
-#: ../src/gajim-remote-plugin.py:500
-#, fuzzy, python-format
-msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"O argumento \"%s\" non se especificou. \n"
-"Escriba \"%s help %s\" para máis información"
-
-#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
-#, fuzzy
-msgid "Wrong uri"
-msgstr "Host errado"
-
-#: ../src/gajim-remote.py:109
-#, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"account's previous status"
-msgstr ""
-"un de: desconectado, en liña, libre para falar, ausente, non dispoñíbel, "
-"ocupado, invisíbel"
-
-#: ../src/gajim-remote.py:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "Cambia o estado dunha ou de varias contas"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority"
-msgstr "Pr_ioridade:"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "Quero _rexistrar unha conta nova de Jabber"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"cambia o estado da conta \"account\". Se non se especifica, probe a cambiar "
-"o estado de todas as contas que teñen a opción \"sync with global status\" "
-"activada"
-
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:242
-msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr ""
-"Devolve a mensaxe de estado actual (o global se non se especificar unha "
-"conta)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Un contacto cambiou o seu estado"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Non se achou o alcume: %s"
-
-#: ../src/gajim-remote.py:271
-#, fuzzy
-msgid ""
-"Account in which the avatar will be set; if not specified, the avatar will "
-"be set for all accounts"
-msgstr ""
-"Conta a que se lle enviará; se non se especificar nada, o xml enviaráselles "
-"a todas as contas"
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr ""
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr ""
-
-#: ../src/gajim-remote.py:282
-#, fuzzy
-msgid "Message content"
-msgstr "contido da mensaxe"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "Room JID"
-msgstr "Sala:"
-
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "Nickname to use"
-msgstr "Non se achou o alcume: %s"
-
-#: ../src/gajim-remote.py:290
-#, fuzzy
-msgid "Password to enter the room"
-msgstr "Os contrasinais non coinciden"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr ""
-
-#: ../src/gajim-remote.py:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:513
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -9045,7 +9704,7 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:518
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -9054,512 +9713,495 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:537
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim-remote.py:539
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Host errado"
+
+#: ../src/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Tema"
 
-#: ../src/gajim_themes_window.py:97
+#: ../src/gajim_themes_window.py:98
 #, fuzzy
 msgid "You cannot make changes to the default theme"
 msgstr "Non pode eliminar o tema actual"
 
-#: ../src/gajim_themes_window.py:98
+#: ../src/gajim_themes_window.py:99
 msgid "Please create a clean new theme with your desired name."
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:169
+#: ../src/gajim_themes_window.py:170
 msgid "theme name"
 msgstr "nome do tema"
 
-#: ../src/gajim_themes_window.py:186
+#: ../src/gajim_themes_window.py:187
 msgid "You cannot delete your current theme"
 msgstr "Non pode eliminar o tema actual"
 
-#: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#: ../src/gajim_themes_window.py:188
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Por favor, primeiro elixa outro distinto como tema actual."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:189 ../src/groupchat_control.py:1699
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s coñéceselle como %s"
+
+#: ../src/groupchat_control.py:244
 msgid "Sending private message failed"
 msgstr "O envío da mensaxe privada fallou"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:246
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Quer xa non está no grupo de charla \"%s\" quer \"%s\" esta xa non existe."
 
-#: ../src/groupchat_control.py:455
+#: ../src/groupchat_control.py:637
 msgid "Insert Nickname"
 msgstr "Introducir alcume"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:827
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historial de conversas"
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:829
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Conexión"
 
+#: ../src/groupchat_control.py:1311
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(nick)s foi expulsado por %(reason)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1329 ../src/groupchat_control.py:1641
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
+#: ../src/groupchat_control.py:1332
+msgid "Room now shows unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1334
+msgid "Room now does not show unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1336
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1340
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1342
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1344
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1347
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1350
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1634 ../src/groupchat_control.py:2303
+#: ../src/gui_interface.py:623 ../src/roster_window.py:3262
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1646
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1648
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A súa conta nova creouse con éxito"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1651
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1657
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1660
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1672
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1683 ../src/groupchat_control.py:1799
 #, python-format
 msgid "You are now known as %s"
 msgstr "Coñéceselle como %s"
 
-#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s coñéceselle como %s"
-
-#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1753 ../src/groupchat_control.py:1758
+#: ../src/groupchat_control.py:1764
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1755
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Afiliación:"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1760
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1766
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1849
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1868
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1872
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1530
+#: ../src/groupchat_control.py:1902
 #, python-format
 msgid "%s has left"
 msgstr "%s saíu"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1907
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou no grupo de charla"
 
-#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
-#: ../src/history_window.py:447 ../src/notify.py:234
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s está agora %(status)s"
-
-#: ../src/groupchat_control.py:1774
+#: ../src/groupchat_control.py:2181
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:2183
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se pecha esta fiestra, desconectaráselle deste grupo de charla."
 
-#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
-#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
-#: ../src/gui_interface.py:1853 ../src/message_window.py:224
-#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
-#: ../src/roster_window.py:4195
-#, fuzzy
-msgid "_Do not ask me again"
-msgstr "_Non me preguntar outra vez"
-
-#: ../src/groupchat_control.py:1814
+#: ../src/groupchat_control.py:2222
 msgid "Changing Subject"
 msgstr "Cambiando o asunto"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2223
 msgid "Please specify the new subject:"
 msgstr "Especifique o asunto novo:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2235
 msgid "Changing Nickname"
 msgstr "Cambiando o alcume"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2236
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifique o novo alcume que quere usar:"
 
+#: ../src/groupchat_control.py:2261
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr ""
+"A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2267
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Descrición: %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2268
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2270
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2452
 #, python-format
 msgid "Kicking %s"
 msgstr "A expulsar %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2453 ../src/groupchat_control.py:2734
 msgid "You may specify a reason below:"
 msgstr "Debe especificar un motivo debaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2733
 #, python-format
 msgid "Banning %s"
 msgstr "A expulsar %s"
 
-#: ../src/gtkexcepthook.py:46
-msgid "A programming error has been detected"
-msgstr "Detectouse un erro de programación"
-
-#: ../src/gtkexcepthook.py:47
-msgid ""
-"It probably is not fatal, but should be reported to the developers "
-"nonetheless."
-msgstr ""
-"Probabelmente non é crítico mais, porén, debe informarse aos desenvolvedores."
-
-#: ../src/gtkexcepthook.py:54
-msgid "_Report Bug"
-msgstr "_Informar do erro"
-
-#: ../src/gtkexcepthook.py:76
-msgid "Details"
-msgstr "Detalles"
-
-#. we talk about file
-#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
-#, python-format
-msgid "Error: cannot open %s for reading"
-msgstr "Erro: non se pode abrir %s para lectura"
-
-#: ../src/gtkgui_helpers.py:404
+#: ../src/gtkgui_helpers.py:392
 msgid "Error reading file:"
 msgstr "Erro ao ler o ficheiro:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:395
 msgid "Error parsing file:"
 msgstr "Erro ao analizar o ficheiro:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:448
+#: ../src/gtkgui_helpers.py:436
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Non se pode escribir en %s. O soporte de manexo de sesión non funcionará"
 
-#. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:822
-msgid "Gajim is not the default Jabber client"
-msgstr ""
-
-#: ../src/gtkgui_helpers.py:823
-msgid "Would you like to make Gajim the default Jabber client?"
-msgstr ""
-
-#: ../src/gtkgui_helpers.py:824
-msgid "Always check to see if Gajim is the default Jabber client on startup"
-msgstr ""
-
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:770
 msgid "Extension not supported"
 msgstr "Extensión non admitida"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:771
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "A imaxe non se puido gardar no formato %(type)s. Desexa gardar como "
 "%(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:928
+#: ../src/gtkgui_helpers.py:806
 msgid "Save Image as..."
 msgstr "Gardar a imaxe como..."
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
-#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
-#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
-#: ../src/gui_interface.py:348
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:305
+#: ../src/gui_interface.py:314 ../src/gui_interface.py:320
+#: ../src/gui_interface.py:323 ../src/gui_interface.py:326
+#: ../src/gui_interface.py:331
 msgid "Unable to join group chat"
 msgstr "Non se puido entrar no grupo de charla"
 
 #: ../src/gui_interface.py:138
 #, fuzzy, python-format
 msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
+"Your desired nickname in group chat\n"
+"<b>%s</b>\n"
+"is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 "O seu alcume da súa preferencia está en uso ou rexistrado por outro "
 "ocupante. \n"
 "Por favor, especifique outro alcume abaixo:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:159
 msgid "Do you accept this request?"
 msgstr "Acepta esta solicitude?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:161
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Acepta esta solicitude?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:164
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorización HTTP (%s) para %s (id: %s)"
 
-#: ../src/gui_interface.py:209 ../src/notify.py:493
+#: ../src/gui_interface.py:207 ../src/notify.py:293
 msgid "Connection Failed"
 msgstr "Fallou a conexión"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:291
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "É necesario un contrasinal para entrar a este grupo de charla."
 
-#: ../src/gui_interface.py:324
+#: ../src/gui_interface.py:306
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
+#: ../src/gui_interface.py:315
 #, fuzzy, python-format
-msgid "You are banned from group chat %s."
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Está expulsado deste grupo de charla."
 
-#: ../src/gui_interface.py:338
+#: ../src/gui_interface.py:321
 #, fuzzy, python-format
-msgid "Group chat %s does not exist."
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Non existe o grupo de charla."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:324
 msgid "Group chat creation is restricted."
 msgstr "A creación de grupos de charla está restrinxida."
 
-#: ../src/gui_interface.py:344
+#: ../src/gui_interface.py:327
 #, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "É necesario usar o alcume rexistrado."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:332
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Non está na listaxe de membros"
 
-#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
+#: ../src/gui_interface.py:426 ../src/gui_interface.py:430
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "produciuse un erro mentres se enviaba %s ( %s )"
-
-#: ../src/gui_interface.py:540 ../src/notify.py:495
+#: ../src/gui_interface.py:482 ../src/notify.py:295
 #, fuzzy
 msgid "Subscription request"
 msgstr "Solicitude de subscrición"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:507
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contacto \"%s\" autorizouno para ver o seu estado."
 
-#: ../src/gui_interface.py:579
+#: ../src/gui_interface.py:516
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "O contacto \"%s\" eliminou a súa subscrición"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:517
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 msgstr ""
 
-#: ../src/gui_interface.py:604 ../src/notify.py:497
+#: ../src/gui_interface.py:539 ../src/notify.py:297
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Eliminar"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:550
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non foi posíbel estabelecer o contacto con \"%s\""
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:643
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gui_interface.py:930
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:934
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
+#: ../src/gui_interface.py:647
+#, python-format
+msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:677
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:680 ../src/gui_interface.py:688
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está actualmente conectado sen a súa chave de GPG"
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:682
 msgid "Your passphrase is incorrect"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:687
 #, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:700
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "É necesario o contrasinal"
+
+#: ../src/gui_interface.py:701
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Introduza o contrasinal GPG para a conta %s"
+
+#: ../src/gui_interface.py:723
+msgid "OpenPGP key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:723
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:769
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:772
+msgid "Oauth2 Credentials"
 msgstr ""
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:871
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Hai un correo novo en %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:873
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Ten %d nova conversa de correo"
 msgstr[1] "Ten %d novas conversas de correo"
 
-#: ../src/gui_interface.py:1146
+#: ../src/gui_interface.py:886
 #, python-format
 msgid ""
 "\n"
@@ -9569,103 +10211,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:960
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Elimina o contacto da listaxe"
+#: ../src/gui_interface.py:1048 ../src/gui_interface.py:1424
+msgid "SSL certificate error"
+msgstr ""
 
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
+#: ../src/gui_interface.py:1065
 #, fuzzy
-msgid "Error opening file"
-msgstr "Erro ao ler o ficheiro:"
+msgid "File Transfer Failed"
+msgstr "Transferencias"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1087
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Recibiu con éxito o ficheiro %(filename)s de %(name)s."
 
-#. ft stopped
-#: ../src/gui_interface.py:1291
+#: ../src/gui_interface.py:1091
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
 
-#: ../src/gui_interface.py:1304
+#. ft hash error
+#: ../src/gui_interface.py:1095
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
+
+#: ../src/gui_interface.py:1108
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Envioulle con éxito o ficheiro %(filename)s a %(name)s."
 
-#. ft stopped
-#: ../src/gui_interface.py:1308
+#: ../src/gui_interface.py:1112
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Detívose a transferencia de %(filename)s a %(name)s."
 
-#: ../src/gui_interface.py:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
+#. ft hash error
+#: ../src/gui_interface.py:1116
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Detívose a transferencia de %(filename)s a %(name)s."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1199
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "En cada _mensaxe"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1211
 msgid "Username Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1212
 msgid "Please type a new username for your local account"
 msgstr "Por favor, escriba un nome de usuario novo para a súa conta local"
 
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr ""
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1227
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1228
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1604
+#: ../src/gui_interface.py:1285
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1288
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1377
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1378
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9673,51 +10304,36 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1388
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1745
-msgid "SSL certificate error"
+#: ../src/gui_interface.py:1401
+msgid "Non Anonymous Server"
 msgstr ""
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1425
 #, python-format
 msgid ""
-"It seems the SSL certificate of account %(account)s has changed or your "
-"connection is being hacked.\n"
-"Old fingerprint: %(old)s\n"
-"New fingerprint: %(new)s\n"
+"It seems the SSL certificate of account %(account)s has changed and is not "
+"valid or your connection is being hacked.\n"
+"\n"
+"Old SHA-1 fingerprint: %(old_sha1)s\n"
+"Old SHA-256 fingerprint: %(old_sha256)s\n"
+"\n"
+"New SHA-1 fingerprint: %(new_sha1)s\n"
+"New SHA-256 fingerprint: %(new_sha256)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
-#: ../src/gui_interface.py:1849
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Conexión"
-
-#: ../src/gui_interface.py:1777
-#, fuzzy
-msgid ""
-"You are about to connect to the server with an insecure connection. This "
-"means all your conversations will be exchanged unencrypted. Are you sure you "
-"want to do that?"
-msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
-
-#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
-#: ../src/gui_interface.py:1852
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gui_interface.py:1814
+#: ../src/gui_interface.py:1503
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: ../src/gui_interface.py:1850
+#: ../src/gui_interface.py:1545
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9725,102 +10341,132 @@ msgid ""
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:2070 ../src/gui_interface.py:2077
+#: ../src/gui_interface.py:2101
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:2071
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2078 ../src/gui_interface.py:2102
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2150 ../src/roster_window.py:3832
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Non pode entrar nun grupo de charlas se está invisíbel"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gui_interface.py:2871
+#: ../src/gui_interface.py:2506
 msgid "Could not save your settings and preferences"
 msgstr "Non se poden gardar as preferencias"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3105
 msgid "Passphrase Required"
 msgstr "É necesario o contrasinal"
 
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:3106
 #, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Introduza o contrasinal GPG para a conta %s"
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
-msgstr ""
+#: ../src/gui_interface.py:3120
+#, fuzzy
+msgid "OpenPGP key expired"
+msgstr "Selección da chave de OpenPGP"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3121
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Conectarase a %s sen o OpenPGP"
 
 #. ask again
-#: ../src/gui_interface.py:3436
+#: ../src/gui_interface.py:3130
 msgid "Wrong Passphrase"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3131
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Por favor, volva escribir o seu contrasinal de GPG ou prema Cancelar."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:96
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Novo grupo de charla"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:461
 msgid "I would like to add you to my roster"
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: ../src/history_manager.py:114
+#. Manage Transport submenu
+#: ../src/gui_menu_builder.py:582
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Transportes"
+
+#. Modify Transport
+#: ../src/gui_menu_builder.py:588
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Amosar os trans_portes"
+
+#: ../src/history_manager.py:76
+#, fuzzy
+msgid "Usage:"
+msgstr "mensaxe"
+
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Options:"
+msgstr "Emoticonas:"
+
+#: ../src/history_manager.py:80
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/history_manager.py:81
+#, fuzzy
+msgid "Set logs directory"
+msgstr "a crear un directorio %s"
+
+#: ../src/history_manager.py:128
 msgid "Cannot find history logs database"
 msgstr "Non se pode achar a base de datos do historial"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Contactos"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:181 ../src/history_manager.py:225
+#: ../src/history_window.py:102
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:188 ../src/history_manager.py:244
 msgid "Nickname"
 msgstr "Alcume"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:197 ../src/history_manager.py:232
+#: ../src/history_window.py:110
 msgid "Message"
 msgstr "Mensaxe"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:205 ../src/history_manager.py:238
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:264
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9828,7 +10474,7 @@ msgstr ""
 "Quere limpar a base de datos? (TOTALMENTE DESACONSELLADO SE GAJIM ESTÁ EN "
 "EXECUCIÓN)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:266
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9842,98 +10488,110 @@ msgstr ""
 "\n"
 "Caso de elixir SI, por favor, agarde..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:271
+msgid "Database Cleanup"
+msgstr ""
+
+#: ../src/history_manager.py:486
 msgid "Exporting History Logs..."
 msgstr "A exportar o historial..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:562
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s - %(time)s dixo: %(message)s\n"
 
-#: ../src/history_manager.py:572
-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?"
-msgstr[0] ""
+#: ../src/history_manager.py:600
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
+
+#: ../src/history_manager.py:604
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr ""
 "Está seguro de que quere eliminar o historial do contacto que seleccionou?"
-msgstr[1] ""
-"Está seguro de que quere eliminar o historial dos contactos que seleccionou?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:606 ../src/history_manager.py:645
 msgid "This is an irreversible operation."
 msgstr "Esta é unha operación irreversíbel"
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Información"
+
+#: ../src/history_manager.py:642
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 msgstr[1] "Está seguro de que quere eliminar as mensaxes que seleccionou?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:319
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historial de conversas con %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:369
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:468
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:479
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Mensaxe de erro: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:481
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:483
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s "
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:486
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "O estado é agora: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:559
 #, fuzzy
-msgid "Timeout loading image"
-msgstr "Non foi posíbel cargar a imaxe"
+msgid "Loading"
+msgstr "A compor"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
 msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:238
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Non está conectado ao servidor"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:239
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:529
 msgid "Chats"
 msgstr "Charlas"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:531
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:533
 msgid "Private Chats"
 msgstr "Charlas privadas"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:539
 msgid "Messages"
 msgstr "Mensaxes"
 
@@ -9945,103 +10603,114 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s cambiou o seu estado"
+#: ../src/notify.py:335
+#, fuzzy
+msgid "Ignore"
+msgstr "nove"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s conectouse"
+#: ../src/plugins/gui.py:81
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s desconectouse"
+#: ../src/plugins/gui.py:150
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "A expulsar %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Mensaxe nova de %(nickname)s"
+#: ../src/plugins/gui.py:207
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Fallou a conexión"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nova mensaxe privada desde o grupo de charlas %s"
+#: ../src/plugins/gui.py:252
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:260 ../src/plugins/pluginmanager.py:566
+#: ../src/plugins/pluginmanager.py:574
+msgid "Archive is malformed"
+msgstr ""
 
-#: ../src/notify.py:273
-#, fuzzy, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Mensaxe nova de %(nickname)s"
+#: ../src/plugins/gui.py:284 ../src/plugins/gui.py:292
+#: ../src/plugins/pluginmanager.py:582
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Este ficheiro xa existe"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Mensaxe nova de %(nickname)s"
+#: ../src/plugins/gui.py:284
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
+#: ../src/plugins/gui.py:316
 #, fuzzy
-msgid "Ignore"
-msgstr "nove"
+msgid "Configuration"
+msgstr "Configuración da sala"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:552 ../src/plugins/pluginmanager.py:558
+msgid "Archive corrupted"
+msgstr ""
 
-#: ../src/profile_window.py:58
+#: ../src/plugins/pluginmanager.py:554
+#, fuzzy
+msgid "Archive empty"
+msgstr "Camiño do ficheiro"
+
+#: ../src/profile_window.py:63
 msgid "Retrieving profile..."
 msgstr "A recuperar o perfil..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:132 ../src/roster_window.py:3131
 #, fuzzy
 msgid "File is empty"
 msgstr "Camiño do ficheiro"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:135 ../src/roster_window.py:3134
 #, fuzzy
 msgid "File does not exist"
 msgstr "Non existe o grupo de charla."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:149 ../src/profile_window.py:166
+#: ../src/roster_window.py:3136 ../src/roster_window.py:3147
 msgid "Could not load image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:239
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Información"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:240
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:298
 msgid "Information received"
 msgstr "Información recibida"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:376
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "Sen unha conexión non pode publicar a súa información de contacto."
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:389
 msgid "Sending profile..."
 msgstr "A enviar o perfil..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:408
 msgid "Information NOT published"
 msgstr "Información NON publicada"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:415
 msgid "vCard publication failed"
 msgstr "Fallou a publicación da vCard"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:416
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -10049,51 +10718,52 @@ msgstr ""
 "Produciuse un erro mentres se publicaba a súa información persoal, probe de "
 "novo máis tarde."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:258 ../src/roster_window.py:1059
 msgid "Merged accounts"
 msgstr "Contas combinadas"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2070
 msgid "Authorization has been sent"
 msgstr "Enviouse a autorización"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2071
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" poderá saber o seu estado."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2094
 msgid "Subscription request has been sent"
 msgstr "Enviouse a solicitude de subscrición"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2095
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" acepta esta solicitude, poderá saber o seu estado."
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2109
 msgid "Authorization has been removed"
 msgstr "Eliminouse a autorización"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2110
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
-msgstr ""
+#: ../src/roster_window.py:2137
+#, fuzzy
+msgid "OpenPGP is not usable"
+msgstr "OpenPGP non se pode usar neste ordenador"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2138
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Conectarase a %s sen o OpenPGP"
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2345 ../src/roster_window.py:3762
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar nun ou máis grupos de charlas"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2346 ../src/roster_window.py:3763
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10101,39 +10771,39 @@ msgstr ""
 "Ao cambiar o seu estado a invisíbel provocará a súa desconexión dos grupos "
 "de charla. Está seguro de que quere ser invisíbel?"
 
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2373
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2438
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2439
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2440
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2527
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancelar a transferencia"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2528
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2559 ../src/roster_window.py:2917
 msgid "You have unread messages"
 msgstr "Ten mensaxes sen ler"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2560
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -10142,16 +10812,16 @@ msgstr ""
 "As mensaxes só estarán dispoñíbeis para a súa lectura posterior se ten o "
 "historial activado"
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2918
 msgid "You must read them before removing this transport."
 msgstr "Debe lelas antes de eliminar este transporte."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2921
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Eliminarase o transporte \"%s\""
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2922
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -10159,11 +10829,11 @@ msgid ""
 msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde este transporte"
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2925
 msgid "Transports will be removed"
 msgstr "Eliminaranse os transportes"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:2930
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10172,69 +10842,69 @@ msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde estes transportes: "
 "%s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2981
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: ../src/roster_window.py:2802
+#: ../src/roster_window.py:2983
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3023
 msgid "Rename Contact"
 msgstr "Renomear o contacto"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3024
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza un alcume novo para o contacto %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3031
 msgid "Rename Group"
 msgstr "Renomear o grupo"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3032
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3077
 msgid "Remove Group"
 msgstr "Eliminar o grupo"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3078
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Quere eliminar o grupo %s da listaxe?"
 
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3079
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Eliminar da listaxe tamén todos os contactos dentro do grupo"
 
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3118
 msgid "Assign OpenPGP Key"
 msgstr "Asignar chave de OpenPGP"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3119
 msgid "Select a key to apply to the contact"
 msgstr "Seleccione unha chave para lle aplicar ao contacto"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3573
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Eliminarase o contacto \"%s\" da súa listaxe"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3575
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3580
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10243,12 +10913,12 @@ msgstr ""
 "ela sempre o/a verá desconectado."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3586
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Que quere facer?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3590
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10256,16 +10926,16 @@ msgstr ""
 "Ao eliminar este contacto tamén se eliminará a autorización. Este contacto "
 "sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3593
 msgid "I want this contact to know my status after removal"
 msgstr "Quero que este contacto coñeza o meu estado despois da eliminación"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3396
+#: ../src/roster_window.py:3597
 msgid "Contacts will be removed from your roster"
 msgstr "Os contactos eliminaranse da súa listaxe"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3602
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10275,46 +10945,46 @@ msgstr ""
 "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
 "desconectado."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3660
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: ../src/roster_window.py:3461
+#: ../src/roster_window.py:3662
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3480
+#: ../src/roster_window.py:3681
 msgid "No account available"
 msgstr "A conta non está dispoñíbel"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3682
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Debe crear unha conta antes de poder conversar con outros contactos."
 
-#: ../src/roster_window.py:4095
+#: ../src/roster_window.py:4391
 msgid "Metacontacts storage not supported by your server"
 msgstr "O teu servidor non admite o almacenamento de metacontactos"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4393
 #, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "O seu servidor non admite almacenar información de metacontactos. Por tanto, "
 "toda a información referente non se gardará na próxima reconexión."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4489
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: ../src/roster_window.py:4191
+#: ../src/roster_window.py:4491
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -10325,206 +10995,155 @@ msgstr ""
 "Xeralmente se usan cando a mesma persoa ten varias contas de Jabber ou "
 "contas de transportes."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4613
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "O ficheiro non é válido"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4625
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s quere enviarlle un ficheiro:"
 msgstr[1] "%s quere enviarlle un ficheiro:"
 
-#: ../src/roster_window.py:4433
+#: ../src/roster_window.py:4764
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4777
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Facer %s e %s metacontactos"
+
+#: ../src/roster_window.py:4782
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Facer %s e %s metacontactos"
 
-#. new chat
-#. single message
-#. for chat_with
-#. for single message
-#. join gc
-#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
-#: ../src/roster_window.py:4970 ../src/statusicon.py:263
-#: ../src/statusicon.py:310 ../src/statusicon.py:316
+#: ../src/roster_window.py:5246 ../src/roster_window.py:5301
+#: ../src/roster_window.py:5311 ../src/statusicon.py:270
+#: ../src/statusicon.py:318 ../src/statusicon.py:325
 #, python-format
 msgid "using account %s"
 msgstr "a usar a conta %s"
 
-#. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5320
 #, python-format
 msgid "to %s account"
 msgstr "á conta %s"
 
-#. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5327
 #, python-format
 msgid "using %s account"
 msgstr "a usar a conta %s"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5366 ../src/statusicon.py:335
 msgid "_Manage Bookmarks..."
 msgstr "Xestionar _marcadores..."
 
-#. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5384
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5426
 #, python-format
 msgid "for account %s"
 msgstr "para a conta %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5480 ../src/roster_window.py:5581
 msgid "_Change Status Message"
 msgstr "_Cambiar a mensaxe de estado"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5510
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5512
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5516
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Descubrir os servizos..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5657
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5664 ../src/roster_window.py:5826
 msgid "Send Group M_essage"
 msgstr "Enviar mensaxe ao grupo"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5671
 msgid "To all users"
 msgstr "A todos os usuarios"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5675
 msgid "To all online users"
 msgstr "A todos os usuarios en liña"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5842
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomear o contacto"
 
-#. Edit Groups
-#: ../src/roster_window.py:5537
-msgid "Edit _Groups"
-msgstr "Editar os grupos"
-
-#. Send single message
-#: ../src/roster_window.py:5592
-#, fuzzy
-msgid "Send Single Message"
-msgstr "_Enviar mensaxe"
-
-#. Execute Command
-#: ../src/roster_window.py:5639
-msgid "Execute Command..."
-msgstr "Executar o comando..."
-
-#. Manage Transport submenu
-#: ../src/roster_window.py:5649
-#, fuzzy
-msgid "_Manage Transport"
-msgstr "Transportes"
-
-#. Modify Transport
-#: ../src/roster_window.py:5658
-#, fuzzy
-msgid "_Modify Transport"
-msgstr "Amosar os trans_portes"
-
-#. Rename
-#: ../src/roster_window.py:5668
-msgid "_Rename"
-msgstr "Renomear"
-
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:5914
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contacto desconectado"
 
-#: ../src/roster_window.py:5744
-#, fuzzy
-msgid "_Disconnect"
-msgstr "Contacto desconectado"
-
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6004
 msgid "History Manager"
 msgstr "Historial"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6012
 msgid "_Join New Group Chat"
 msgstr "_Entrar nun outro grupo de charla"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6299
 msgid "Change Status Message..."
 msgstr "Cambiar a mensaxe de estado..."
 
-#: ../src/search_window.py:105
+#: ../src/search_window.py:108
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:143 ../src/search_window.py:220
+#: ../src/search_window.py:146 ../src/search_window.py:224
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:177 ../src/search_window.py:212
+#: ../src/search_window.py:181 ../src/search_window.py:216
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr ""
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Asunto: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:429 ../src/session.py:489
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:448
+#: ../src/session.py:431
 #, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:492
+#: ../src/session.py:491
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10534,184 +11153,130 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:494
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Está o OpenPGP activado para este contacto?"
+
+#: ../src/statusicon.py:235
 msgid "_Change Status Message..."
 msgstr "_Cambiar a mensaxe de estado..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:348
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Non está na listaxe"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:360
 msgid "Hide this menu"
 msgstr "Ocultar este menú"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
-msgid "Jabber ID: "
-msgstr "ID de Jabber:"
-
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
-msgid "Resource: "
-msgstr "Recurso: "
-
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:376
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s deste grupo de charla"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:565
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:569
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
-msgid "Status: "
-msgstr "Estado: "
-
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:768
 #, python-format
 msgid "Last status: %s"
 msgstr "Último estado: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:770
 #, python-format
 msgid " since %s"
 msgstr " desde %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:787
 #, fuzzy
 msgid "Connected"
 msgstr "Conexión"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:789
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contacto desconectado"
 
-#. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
-msgid "Subscription: "
-msgstr "Subscrición: "
-
-#: ../src/tooltips.py:625
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:646
-#, fuzzy, python-format
-msgid "Idle since %s"
-msgstr " desde %s"
-
-#: ../src/tooltips.py:647
-#, fuzzy, python-format
-msgid "Idle for %s"
-msgstr "Consola XML para %s"
-
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
-msgstr "Sala:"
-
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
-msgstr "Activo"
-
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
-msgstr "Tipo:"
-
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
-msgstr "Modificar a conta"
-
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:838
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:844
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:851
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:857
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:860 ../src/tooltips.py:877
 msgid "Not started"
 msgstr "Non iniciado"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:862
 msgid "Stopped"
 msgstr "Detido"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:864 ../src/tooltips.py:867
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:870
 msgid "?transfer status:Paused"
 msgstr "Pausada"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:873
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:875
 msgid "Transferring"
 msgstr "A transferir"
 
-#: ../src/tooltips.py:812
-msgid "This service has not yet responded with detailed information"
-msgstr "Este servizo non respondeu aínda con información detallada"
-
-#: ../src/tooltips.py:815
-msgid ""
-"This service could not respond with detailed information.\n"
-"It is most likely legacy or broken"
-msgstr ""
-"Este servizo podería non responder con información detallada.\n"
-"Posibelmente é antigo ou está roto"
+#: ../src/tooltips.py:878
+msgid "Status: "
+msgstr "Estado: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:328 ../src/vcard.py:335
 msgid "?Client:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:332 ../src/vcard.py:337
 msgid "?OS:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:366 ../src/vcard.py:369
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:397 ../src/vcard.py:406 ../src/vcard.py:614
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:429
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:433
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programas</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:441
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10719,7 +11284,7 @@ msgstr ""
 "Este contacto está interesado na información da súa presenza, mais vostede "
 "non o está na súa"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:443
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10727,14 +11292,14 @@ msgstr ""
 "Está interesado na información da presenza do contacto, mais el/ela non o "
 "está en vostede"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:445
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Tanto vostede como o contacto están interesados na información da presenza "
 "do outro"
 
 #. None
-#: ../src/vcard.py:363
+#: ../src/vcard.py:447
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10742,19 +11307,519 @@ msgstr ""
 "Non está interesado na presenza do contacto e el/ela tampouco o está en "
 "vostede"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:454
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Está a agardar a resposta do contacto sobre a súa solicitude de subscrición"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:456
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:461 ../src/vcard.py:515 ../src/vcard.py:637
 msgid " resource with priority "
 msgstr " recurso con prioridade "
 
+#~ msgid "Error description..."
+#~ msgstr "Descrición do erro..."
+
+#, fuzzy
+#~ msgid "View contact information (Ctrl+I)"
+#~ msgstr "está a prestar atención á conversa"
+
+#, fuzzy
+#~ msgid "(<b>ESession</b> info)"
+#~ msgstr "<b>Descrición</b>"
+
+#, fuzzy
+#~ msgid "Enter JID or Contact name"
+#~ msgstr "Nome de contacto"
+
+#, fuzzy
+#~ msgid "Groupchat Histories"
+#~ msgstr "Grupos de charla"
+
+#, fuzzy
+#~ msgid "All Chat Histories"
+#~ msgstr "Historias antigas"
+
+#~ msgid "More"
+#~ msgstr "Máis"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Non está dispoñíbel ningunha conexión"
+
+#~ msgid "Your message can not be sent until you are connected."
+#~ msgstr "A súa mensaxe non se enviará mentres non estiver conectado."
+
+#~ msgid "creating %s directory"
+#~ msgstr "a crear un directorio %s"
+
+#, fuzzy
+#~ msgid "Please check if avahi/bonjour-daemon is running."
+#~ msgstr "Por favor, comprobe se o avahi-daemon está en execución."
+
+#~ msgid "%s is not the name of a group chat."
+#~ msgstr "%s non é o nome dun grupo de charla."
+
+#, fuzzy
+#~ msgid "Session Management"
+#~ msgstr "Enviouse a mensaxe"
+
+#, fuzzy
+#~ msgid "Gajim needs X server to run. Quiting..."
+#~ msgstr "O Gajim precisa o Xserver para funcionar. A abortar..."
+
+#, fuzzy
+#~ msgid "Gajim needs PyGTK 2.22 or above"
+#~ msgstr "O Gajim precisa un PyGTK 2.6 ou superior"
+
+#, fuzzy
+#~ msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
+#~ msgstr ""
+#~ "O Gajim precisa un PyGTK 2.6 ou superior para funcionar. A abortar..."
+
+#, fuzzy
+#~ msgid "Gajim needs GTK 2.22 or above"
+#~ msgstr "O Gajim precisa un GTK 2.6 ou superior"
+
+#, fuzzy
+#~ msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
+#~ msgstr "O Gajim precisa un GTK 2.6 ou superior para funcionar. A abortar..."
+
+#~ msgid "Gajim needs pywin32 to run"
+#~ msgstr "O Gajim precisa un pywin32 para funcionar"
+
+#~ msgid ""
+#~ "Please make sure that Pywin32 is installed on your system. You can get it "
+#~ "at %s"
+#~ msgstr ""
+#~ "Por favor, asegúrese de que Pywin32 está instalado no seu sistema. Pode "
+#~ "obtelo en %s"
+
+#~ msgid "Gajim is already running"
+#~ msgstr "O Gajim xa está a se executar"
+
+#~ msgid ""
+#~ "Another instance of Gajim seems to be running\n"
+#~ "Run anyway?"
+#~ msgstr ""
+#~ "Outra instancia dO Gajim semella estar xa en execución\n"
+#~ "Quere executar unha outra?"
+
+#~ msgid "A programming error has been detected"
+#~ msgstr "Detectouse un erro de programación"
+
+#~ msgid ""
+#~ "It probably is not fatal, but should be reported to the developers "
+#~ "nonetheless."
+#~ msgstr ""
+#~ "Probabelmente non é crítico mais, porén, debe informarse aos "
+#~ "desenvolvedores."
+
+#~ msgid "_Report Bug"
+#~ msgstr "_Informar do erro"
+
+#~ msgid "Details"
+#~ msgstr "Detalles"
+
+#~ msgid "Jabber ID: "
+#~ msgstr "ID de Jabber:"
+
+#~ msgid "Resource: "
+#~ msgstr "Recurso: "
+
+#~ msgid "Subscription: "
+#~ msgstr "Subscrición: "
+
+#, fuzzy
+#~ msgid "Mood: "
+#~ msgstr "Sala:"
+
+#, fuzzy
+#~ msgid "Activity: "
+#~ msgstr "Activo"
+
+#, fuzzy
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Entrar nun grupo de charla"
+
+#, fuzzy
+#~ msgid "_Modify Account"
+#~ msgstr "Modificar conta"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Grupos de charla"
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Enviar mensaxe"
+
+#, fuzzy
+#~ msgid ""
+#~ "If True, Gajim will check if it's the default jabber client on each "
+#~ "startup."
+#~ msgstr "Se é verdadeiro, o Gajim rexistra xmpp:// en cada inicio."
+
+#, fuzzy
+#~ msgid "Certificate"
+#~ msgstr "O nome de usuario non é válido"
+
+#~ msgid "Edit _Groups"
+#~ msgstr "Editar os grupos"
+
+#, fuzzy
+#~ msgid "Send Single Message"
+#~ msgstr "_Enviar mensaxe"
+
+#~ msgid "Execute Command..."
+#~ msgstr "Executar o comando..."
+
+#~ msgid "_Rename"
+#~ msgstr "Renomear"
+
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Elixa un ficheiro para enviar..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " hai unha fiestra/separador aberto con este contacto "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Accións</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Condicións</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Accións A_vanzadas"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Control de notificacións avanzadas"
+
+#~ msgid "All statuses"
+#~ msgstr "Todos os estados"
+
+#~ msgid "Busy "
+#~ msgstr "Ocupado "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Un contacto cambiou o seu estado"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Contacto desconectado"
+
+#~ msgid "Don't have "
+#~ msgstr "Non ten "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Detívose a transferencia do ficheiro"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Remarcado da mensaxe de grupo de charla"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Recibiuse unha mensaxe de grupo de charla"
+
+#~ msgid "Launch a command"
+#~ msgstr "Enviar un comando"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Un ou máis estados especiais..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "En liña / Libre para falar"
+
+#~ msgid "Play a sound"
+#~ msgstr "Reproducir un _son"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Mensaxe privada nova"
+
+#~ msgid "When "
+#~ msgstr "Cando"
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Activar o índice de urxencia do xestor de fiestras na barra de tarefas "
+#~ "para realzar a fiestra de charla"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Desactivar a apertura automática de fiestras de charla"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Desactivar as fiestras emerxentes existentes"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Desactivar os sons existentes para este acontecemento"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Desactivar mostrar os eventos no roster"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Desactivar mostrar os eventos no roster"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Informarme cunha fiestra emerxente"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Abrir unha fiestra de charla con este usuario"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Mostrar o evento na listaxe de contactos"
+
+#~ msgid "and I "
+#~ msgstr "e eu "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Contactos"
+
+#~ msgid "for "
+#~ msgstr "para "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Grupo"
+
+#~ msgid "when I'm in"
+#~ msgstr "cando eu estea en"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "Permitirlle ver o meu estado"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Descrición: %s"
+
+#, fuzzy
+#~ msgid "Advanced..."
+#~ msgstr "Avanzado"
+
+#, fuzzy
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Amosar na listaxe os a_vatares dos contactos"
+
+#, fuzzy
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Amosar na listaxe os a_vatares dos contactos"
+
+#, fuzzy
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Amosar na listaxe os a_vatares dos contactos"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
+#~ "listaxe e nos grupos de charla"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
+#~ "listaxe e nos grupos de charla"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
+#~ "listaxe e nos grupos de charla"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Enviar unha _mensaxe..."
+
+#, fuzzy
+#~ msgid "User avatar:"
+#~ msgstr "Imaxe:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Mensaxaría Instantánea Gajim"
+
+#~ msgid "English"
+#~ msgstr "Inglés"
+
+#, fuzzy
+#~ msgid "Belarusian"
+#~ msgstr "Búlgaro"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Búlgaro"
+
+#, fuzzy
+#~ msgid "Breton"
+#~ msgstr "Bretón"
+
+#~ msgid "Czech"
+#~ msgstr "Checo"
+
+#~ msgid "German"
+#~ msgstr "Alemán"
+
+#~ msgid "Greek"
+#~ msgstr "Grego"
+
+#, fuzzy
+#~ msgid "British"
+#~ msgstr "Bretón"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Español"
+
+#, fuzzy
+#~ msgid "Basque"
+#~ msgstr "Éuscaro"
+
+#~ msgid "French"
+#~ msgstr "Francés"
+
+#~ msgid "Croatian"
+#~ msgstr "Croata"
+
+#~ msgid "Italian"
+#~ msgstr "Italiano"
+
+#, fuzzy
+#~ msgid "Norwegian (b)"
+#~ msgstr "Noruegués b"
+
+#~ msgid "Dutch"
+#~ msgstr "Holandés"
+
+#, fuzzy
+#~ msgid "Norwegian"
+#~ msgstr "Noruegués"
+
+#~ msgid "Polish"
+#~ msgstr "Polaco"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugués"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Portugués do Brasil"
+
+#~ msgid "Russian"
+#~ msgstr "Ruso"
+
+#, fuzzy
+#~ msgid "Serbian"
+#~ msgstr "Alemán"
+
+#~ msgid "Slovak"
+#~ msgstr "Eslovaco"
+
+#~ msgid "Swedish"
+#~ msgstr "Sueco"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Chinés (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Idioma do corrector"
+
+#~ msgid "all or space separated status"
+#~ msgstr "estado separado por espazos ou all"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'si', 'non' ou 'ambos'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'si', 'non' ou ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Comprobe a súa conexión ou probe máis tarde"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "erro: non se pode abrir %s para lectura"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Non se pode conectar ao porto %s."
+
+#, fuzzy
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "É posíbel que outra instancia do Gajim estea a se executar. A "
+#~ "transferencia cancelarase."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Un cliente de Jabber en GTK"
+
+#~ msgid "Condition"
+#~ msgstr "Condición"
+
+#~ msgid "when I am "
+#~ msgstr "cando estea "
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr ""
+#~ "un de: desconectado, en liña, libre para falar, ausente, non dispoñíbel, "
+#~ "ocupado, invisíbel"
+
+#, fuzzy
+#~ msgid ""
+#~ "Returns current status message(the global one unless account is specified)"
+#~ msgstr ""
+#~ "Devolve a mensaxe de estado actual (o global se non se especificar unha "
+#~ "conta)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Modo de uso: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Too many arguments. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "O argumento \"%s\" non se especificou. \n"
+#~ "Escriba \"%s help %s\" para máis información"
+
+#, fuzzy
+#~ msgid ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "O argumento \"%s\" non se especificou. \n"
+#~ "Escriba \"%s help %s\" para máis información"
+
+#~ msgid "Contacts"
+#~ msgstr "Contactos"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Asunto: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Sala:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Activo"
+
 #~ msgid "_Disable showing event in systray"
 #~ msgstr "_Desactivar mostrar os eventos na área de notificación"
 
@@ -10772,30 +11837,12 @@ msgstr " recurso con prioridade "
 #~ msgid "Nickname not allowed: %s"
 #~ msgstr "Alcume non permitido: %s"
 
-#, fuzzy
-#~ msgid "Room has been destroyed"
-#~ msgstr "Eliminouse a autorización"
-
-#~ msgid "I would like to add you to my roster."
-#~ msgstr "Gustaríame engadilo á miña listaxe de contactos"
-
 #~ msgid "we are now subscribed to %s"
 #~ msgstr "estamos agora subscritos a %s"
 
-#~ msgid "unsubscribe request from %s"
-#~ msgstr "solicitude de eliminación de subscrición de %s"
-
 #~ msgid "we are now unsubscribed from %s"
 #~ msgstr "xa non estamos subscritos a %s"
 
-#~ msgid ""
-#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
-#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
-#~ msgstr ""
-#~ "A ID de Jabber %s non cumpre a norma RFC. Non se engadirá á súa listaxe "
-#~ "de contactos. Use as ferramentas de xestión de listaxe de contactos "
-#~ "roster como http://jru.jabberstudio.org/ para o eliminar"
-
 #~ msgid "Account Modification"
 #~ msgstr "Modificar a conta"
 
@@ -10882,9 +11929,6 @@ msgstr " recurso con prioridade "
 #~ "Contacto\n"
 #~ "Báner"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Xestionar as contas"
-
 #, fuzzy
 #~ msgid "gtk-delete"
 #~ msgstr "Eliminar"
@@ -10991,9 +12035,6 @@ msgstr " recurso con prioridade "
 #~ "Non está conectado ou está invisíbel aos máis. A súa mensaxe non se puido "
 #~ "enviar "
 
-#~ msgid "[This message is encrypted]"
-#~ msgstr "[Esta mensaxe está cifrada]"
-
 #~ msgid "%i days ago"
 #~ msgstr "hai %i días"
 
@@ -11006,12 +12047,6 @@ msgstr " recurso con prioridade "
 #~ msgid "Commands: %s"
 #~ msgstr "Comandos: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Uso: /%s, limpa o texto da fiestra."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Uso: /%s, oculta os botóns de charla."
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -11020,10 +12055,6 @@ msgstr " recurso con prioridade "
 #~ "Uso: /%s <acción>, envíalle unha acción ao grupo de charla actual. Usa a "
 #~ "terceira persoa. (por exemplo /%s berra.)"
 
-#, fuzzy
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Uso: /%s, oculta os botóns de charla."
-
 #~ msgid "No help info for /%s"
 #~ msgstr "Non hai información de axuda para /%s"
 
@@ -11040,10 +12071,6 @@ msgstr " recurso con prioridade "
 #~ msgstr "%(contact_jid)s convidouse a %(room_jid)s."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Non se achou o alcume: %s"
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
@@ -11054,13 +12081,6 @@ msgstr " recurso con prioridade "
 #~ "JID está actualmente no grupo de charla, el/ela será tamén expulsado. NON "
 #~ "se admiten espazos no alcume."
 
-#, fuzzy
-#~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Uso: /%s <alcume>, abre unha fiestra de charla co ocupante especificado."
-
 #~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
@@ -11102,9 +12122,6 @@ msgstr " recurso con prioridade "
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ msgstr "Uso: /%s <alcume>, cambia o seu alcume na sala actual."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Uso: /%s , amosa os nomes dos ocupantes do grupo de charla."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr "Uso: /%s [tema], amosa ou actualiza o asunto actual da sala."
@@ -11137,10 +12154,6 @@ msgstr " recurso con prioridade "
 #~ msgid "_Host:"
 #~ msgstr "_Porto:"
 
-#, fuzzy
-#~ msgid "Show _roster"
-#~ msgstr "Amosar _listaxe"
-
 #~ msgid "Modify Account"
 #~ msgstr "Modificar conta"
 
@@ -11153,9 +12166,6 @@ msgstr " recurso con prioridade "
 #~ msgid "Gajim account %s"
 #~ msgstr "Conta de Gajim %s"
 
-#~ msgid "Duplicate Jabber ID"
-#~ msgstr "ID de Jabber duplicada"
-
 #~ msgid "This account is already configured in Gajim."
 #~ msgstr "Esta conta xa está configurada no Gajim."
 
@@ -11235,9 +12245,6 @@ msgstr " recurso con prioridade "
 #~ msgid "Soliloquy"
 #~ msgstr "Soliloquio"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Prema aquí para ver as charlas anteriores con este contacto"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "Vista _compacta    Alt+C"
 
@@ -11250,9 +12257,6 @@ msgstr " recurso con prioridade "
 #~ msgid "Query Builder..."
 #~ msgstr "Construtor de consultas..."
 
-#~ msgid "Accept"
-#~ msgstr "Aceptar"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Recibiuse un convite"
 
@@ -11347,9 +12351,6 @@ msgstr " recurso con prioridade "
 #~ msgid "The auto away status message"
 #~ msgstr "A mensaxe de estado de autoausencia"
 
-#~ msgid "The auto not available status message"
-#~ msgstr "A mensaxe de estado de non autodispoñíbel"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -11386,9 +12387,6 @@ msgstr " recurso con prioridade "
 #~ msgid "Company:"
 #~ msgstr "Empresa:"
 
-#~ msgid "Country:"
-#~ msgstr "País:"
-
 #~ msgid "Given:"
 #~ msgstr "Nome:"
 
@@ -11431,9 +12429,6 @@ msgstr " recurso con prioridade "
 #~ msgid "OS:"
 #~ msgstr "SO:"
 
-#~ msgid "Subscription:"
-#~ msgstr "Subscrición:"
-
 #~ 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 "