update translations

1 files changed, 7535 insertions, 6265 deletions

diff --git a/po/gl.po b/po/gl.po
index dce0edbcd..aec7d2b60 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-17 03:05+0000\n"
+"POT-Creation-Date: 2019-07-02 02: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"
@@ -21,491 +21,123 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: gajim/chat_control_base.py:199
-msgid "Ping?"
-msgstr ""
-
-#: gajim/chat_control_base.py:204
-#, fuzzy
-msgid "Error."
-msgstr "Erro de Avahi"
-
-#: gajim/chat_control_base.py:569
+#: gajim/chat_control_base.py:550
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
-#: gajim/conversation_textview.py:550
+#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1167
-msgid "Really send file?"
-msgstr ""
-
-#: gajim/chat_control_base.py:1168
-#, python-format
-msgid "If you send a file to %s, he/she will know your real JID."
-msgstr ""
-
-#: gajim/session.py:446 gajim/session.py:506
-msgid "Confirm these session options"
-msgstr ""
-
-#: gajim/session.py:448
-#, python-format
-msgid ""
-"The remote client wants to negotiate a session with these features:\n"
-"\n"
-"%s\n"
-"\n"
-"Are these options acceptable?"
-msgstr ""
-
-#: gajim/session.py:508
-#, python-format
-msgid ""
-"The remote client selected these options:\n"
-"\n"
-"%s\n"
-"\n"
-"Continue with the session?"
+#: gajim/chat_control_base.py:563
+msgid "Paste as quote"
 msgstr ""
 
-#: gajim/session.py:511
+#: gajim/chat_control_base.py:613
 #, fuzzy
-msgid "Always accept for this contact"
-msgstr "Está o OpenPGP activado para este contacto?"
-
-#: gajim/filetransfers_window.py:89
-msgid "File"
-msgstr "Ficheiro"
-
-#: gajim/filetransfers_window.py:104
-msgid "Time"
-msgstr "Hora"
-
-#: gajim/filetransfers_window.py:116
-msgid "Progress"
-msgstr "Progreso"
-
-#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
-#, python-format
-msgid "Filename: %s"
-msgstr "Nome do ficheiro: %s"
-
-#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
-#, python-format
-msgid "Size: %s"
-msgstr "Tamaño: %s"
-
-#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
-#: gajim/history_manager.py:526
-msgid "You"
-msgstr "Vostede"
-
-#: gajim/filetransfers_window.py:234
-#, python-format
-msgid "Sender: %s"
-msgstr "Remitente: %s"
-
-#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
-#: gajim/tooltips.py:654
-msgid "Recipient: "
-msgstr "Destinatario: "
-
-#: gajim/filetransfers_window.py:246
-#, python-format
-msgid "Saved in: %s"
-msgstr "Gardouse en: %s"
-
-#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
-msgid "File transfer completed"
-msgstr "Rematou a transferencia do ficheiro"
-
-#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
-#, fuzzy
-msgid "Open _Containing Folder"
-msgstr "_Abrir un cartafol de contido"
+msgid "Paste Image"
+msgstr "Elixir unha imaxe"
 
-#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
-#: gajim/chat_control.py:1659
+#: gajim/chat_control_base.py:614
 #, fuzzy
-msgid "File transfer cancelled"
-msgstr "Cancelouse a transferencia do ficheiro"
-
-#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
-#: gajim/chat_control.py:1660
-msgid "Connection with peer cannot be established."
-msgstr "Non se puido estabelecer a conexión co cliente."
-
-#: gajim/filetransfers_window.py:280
-#, python-format
-msgid "Recipient: %s"
-msgstr "Destinatario: %s"
-
-#: gajim/filetransfers_window.py:282
-#, python-format
-msgid "Error message: %s"
-msgstr "Mensaxe de erro: %s"
+msgid "You are trying to paste an image"
+msgstr "Non está conectado ao servidor"
 
-#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
+#: gajim/chat_control_base.py:615
 #, fuzzy
-msgid "File transfer stopped"
-msgstr "Detívose a transferencia do ficheiro"
-
-#: gajim/filetransfers_window.py:319
-#, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
-"Do you want to download it again?"
-msgstr ""
-
-#: gajim/filetransfers_window.py:345
-#, fuzzy
-msgid "Choose File to Send…"
-msgstr "Elixa un ficheiro para enviar..."
-
-#: gajim/filetransfers_window.py:355
-msgid "_Send"
-msgstr "_Enviar"
-
-#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
-#, fuzzy
-msgid "Description: "
-msgstr "Descrición: %s"
+"Are you sure you want to paste your clipboard's image into the chat window?"
+msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: gajim/filetransfers_window.py:375
+#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
+#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
+#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
 #, fuzzy
-msgid "Gajim can not read this file"
-msgstr "O Gajim non pode acceder a este ficheiro"
+msgid "_Do not ask me again"
+msgstr "_Non me preguntar outra vez"
 
-#: gajim/filetransfers_window.py:376
-msgid "Another process is using this file."
+#: gajim/chat_control_base.py:620
+msgid "_Paste"
 msgstr ""
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
-#, python-format
-msgid "Cannot overwrite existing file \"%s\""
-msgstr "Non se pode sobrescribir o ficheiro existente \"%s\""
-
-#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
-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"
-
-#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
-msgid "This file already exists"
-msgstr "Este ficheiro xa existe"
-
-#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
-msgid "What do you want to do?"
-msgstr "Que quere facer?"
-
-#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
-#, python-format
-msgid "Directory \"%s\" is not writable"
-msgstr "Non se pode escribir no directorio \"%s\""
-
-#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
-msgid "You do not have permission to create files in this directory."
-msgstr "Non ten autorización para crear ficheiros neste directorio."
-
-#: gajim/filetransfers_window.py:462
-#, fuzzy
-msgid "Save File as…"
-msgstr "Gardar o ficheiro como..."
-
-#: gajim/filetransfers_window.py:482
-#, python-format
-msgid "File: %s"
-msgstr "Ficheiro: %s"
-
-#: gajim/filetransfers_window.py:488
-#, python-format
-msgid "Type: %s"
-msgstr "Tipo: %s"
-
-#: gajim/filetransfers_window.py:490
-#, python-format
-msgid "Description: %s"
-msgstr "Descrición: %s"
-
-#: gajim/filetransfers_window.py:491
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s quere enviarlle un ficheiro:"
-
-#: gajim/filetransfers_window.py:532
+#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
 #, fuzzy
-msgid "Checking file…"
-msgstr "A enviar o perfil..."
+msgid "Privacy"
+msgstr "Listaxe de privacidade"
 
-#: gajim/filetransfers_window.py:546
+#: gajim/chat_control_base.py:1163
 #, fuzzy
-msgid "File error"
-msgstr "Produciuse un erro na transferencia do ficheiro"
-
-#: gajim/filetransfers_window.py:583
-#, python-format
-msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
-msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
+msgid "Warning"
+msgstr "A expulsar %s"
 
-#: gajim/filetransfers_window.py:676
+#: gajim/chat_control_base.py:1164
 #, python-format
-msgid "(%(filesize_unit)s/s)"
-msgstr "(%(filesize_unit)s/s)"
-
-#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
-msgid "Invalid File"
-msgstr "O ficheiro non é válido"
-
-#: gajim/filetransfers_window.py:729
-msgid "File: "
-msgstr "Ficheiro: "
-
-#: gajim/filetransfers_window.py:733
-msgid "It is not possible to send empty files"
-msgstr "Non se pode enviar ficheiros baleiros"
-
-#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
-msgid "Name: "
-msgstr "Nome: "
-
-#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
-msgid "Sender: "
-msgstr "Remitente: "
-
-#: gajim/filetransfers_window.py:888
-msgid "Pause"
-msgstr "Pausa"
-
-#: gajim/filetransfers_window.py:899
-msgid "_Continue"
-msgstr "_Continuar"
-
-#: gajim/features_window.py:48
-msgid "Bonjour / Zeroconf"
-msgstr ""
-
-#: gajim/features_window.py:49
-msgid "Serverless chatting with autodetected clients in a local network."
-msgstr ""
-
-#: gajim/features_window.py:50
-msgid "Requires python-avahi."
-msgstr ""
-
-#: gajim/features_window.py:51
-msgid ""
-"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
-"opensource/)."
-msgstr ""
-
-#: gajim/features_window.py:52
-#, fuzzy
-msgid "Command line"
-msgstr "Comandos: %s"
-
-#: gajim/features_window.py:53
-msgid "A script to control Gajim via commandline."
-msgstr ""
-
-#: gajim/features_window.py:54
-msgid "Requires python-dbus."
-msgstr ""
-
-#: gajim/features_window.py:55 gajim/features_window.py:83
-#: gajim/features_window.py:87
-msgid "Feature not available under Windows."
-msgstr ""
-
-#: gajim/features_window.py:56
-#, fuzzy
-msgid "OpenPGP message encryption"
-msgstr "Cifrado OpenPGP"
-
-#: gajim/features_window.py:57
-#, fuzzy
-msgid "Ability to encrypting chat messages with OpenPGP."
-msgstr "Mens_axe entrante:"
-
-#: gajim/features_window.py:58
-msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
-msgstr ""
-
-#: gajim/features_window.py:59
-msgid "Requires gpg.exe in PATH."
-msgstr ""
-
-#: gajim/features_window.py:60
-#, fuzzy
-msgid "Password encryption"
-msgstr "Os contrasinais non coinciden"
-
-#: gajim/features_window.py:61
-msgid "Passwords can be stored securely and not just in plaintext."
-msgstr ""
-
-#: gajim/features_window.py:62
-msgid ""
-"Requires libsecret and a provider (such as GNOME Keyring and KSecretService)."
-msgstr ""
-
-#: gajim/features_window.py:63
-msgid "On Windows the Windows Credential Vault is used."
-msgstr ""
-
-#: gajim/features_window.py:64
-msgid "Spell Checker"
-msgstr ""
-
-#: gajim/features_window.py:65
-msgid "Spellchecking of composed messages."
-msgstr ""
-
-#: gajim/features_window.py:66 gajim/features_window.py:67
-msgid "Requires Gspell"
-msgstr ""
-
-#: gajim/features_window.py:68
-#, fuzzy
-msgid "Automatic status"
-msgstr "_Adaptar ao estado"
-
-#: gajim/features_window.py:69
-msgid "Ability to measure idle time, in order to set auto status."
+msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 
-#: gajim/features_window.py:70
-msgid "Requires libxss library."
-msgstr ""
-
-#: gajim/features_window.py:71
-msgid "Requires python2.5."
-msgstr ""
-
-#: gajim/features_window.py:72
-#, fuzzy
-msgid "End to End message encryption"
-msgstr "Cifrado OpenPGP"
-
-#: gajim/features_window.py:73
-#, fuzzy
-msgid "Encrypting chat messages."
-msgstr "Mens_axe entrante:"
-
-#: gajim/features_window.py:74 gajim/features_window.py:75
-msgid "Requires python-crypto."
-msgstr ""
-
-#: gajim/features_window.py:76
+#: gajim/chat_control_base.py:1169
 #, fuzzy
-msgid "RST Generator"
-msgstr "Xeral"
-
-#: gajim/features_window.py:77
-msgid ""
-"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
-"docs/ref/rst/restructuredtext.html)."
-msgstr ""
-
-#: gajim/features_window.py:78 gajim/features_window.py:79
-msgid "Requires python-docutils."
-msgstr ""
-
-#: gajim/features_window.py:80 gajim/data/gui/preferences_window.ui:2421
-msgid "Audio / Video"
-msgstr ""
+msgid "Continue"
+msgstr "_Continuar"
 
-#: gajim/features_window.py:81
-msgid "Ability to start audio and video chat."
-msgstr ""
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#, fuzzy, python-format
+msgid "Cannot overwrite existing file '%s'"
+msgstr "Non se pode sobrescribir o ficheiro existente \"%s\""
 
-#: gajim/features_window.py:82
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
 msgid ""
-"Requires gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav and "
-"gstreamer1.0-plugins-ugly."
-msgstr ""
-
-#: gajim/features_window.py:84
-msgid "UPnP-IGD"
-msgstr ""
-
-#: gajim/features_window.py:85
-msgid "Ability to request your router to forward port for file transfer."
-msgstr ""
-
-#: gajim/features_window.py:86
-msgid "Requires gir1.2-gupnpigd-1.0."
+"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"
 
-#: gajim/features_window.py:94
-#, fuzzy
-msgid "?features:Available"
-msgstr "En líña"
-
-#: gajim/features_window.py:101
+#: gajim/gtkgui_helpers.py:196
 #, fuzzy
-msgid "Feature"
-msgstr "Características dos servidores"
-
-#: gajim/gtkgui_helpers.py:259
-msgid "Error reading file:"
-msgstr "Erro ao ler o ficheiro:"
-
-#: gajim/gtkgui_helpers.py:262
-msgid "Error parsing file:"
-msgstr "Erro ao analizar o ficheiro:"
+msgid "Error While Saving"
+msgstr "Erro ao engadir o servizo. %s"
 
-#: gajim/gtkgui_helpers.py:471
+#: gajim/gtkgui_helpers.py:197
 msgid "Extension not supported"
 msgstr "Extensión non admitida"
 
-#: gajim/gtkgui_helpers.py:472
-#, python-format
-msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
+#: gajim/gtkgui_helpers.py:198
+#, fuzzy, python-format
+msgid ""
+"Image cannot be saved in %(type)s format.\n"
+"Save as %(new_filename)s?"
 msgstr ""
 "A imaxe non se puido gardar no formato %(type)s. Desexa gardar como "
 "%(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:507
-#, fuzzy
-msgid "Save Image as…"
-msgstr "Gardar a imaxe como..."
-
-#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
-#: gajim/chat_control.py:578
+#: gajim/gtkgui_helpers.py:204
 #, fuzzy
-msgid "Save _As"
+msgid "_Save"
 msgstr "Ten "
 
-#: gajim/vcard.py:289 gajim/vcard.py:296
+#: gajim/vcard.py:278
 msgid "?Client:Unknown"
 msgstr "Descoñecido"
 
-#: gajim/vcard.py:293 gajim/vcard.py:298
+#: gajim/vcard.py:283
 msgid "?OS:Unknown"
 msgstr "Descoñecido"
 
-#: gajim/vcard.py:327 gajim/vcard.py:330
+#: gajim/vcard.py:313 gajim/vcard.py:316
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Descoñecido"
 
-#: gajim/vcard.py:381
+#: gajim/vcard.py:367
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:371
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programas</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:378
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -514,7 +146,7 @@ msgstr ""
 "Este contacto está interesado na información da súa presenza, mais vostede "
 "non o está na súa"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:380
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -523,14 +155,14 @@ msgstr ""
 "Está interesado na información da presenza do contacto, mais el/ela non o "
 "está en vostede"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:382
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "Tanto vostede como o contacto están interesados na información da presenza "
 "do outro"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:384
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -539,374 +171,465 @@ msgstr ""
 "Tanto vostede como o contacto están interesados na información da presenza "
 "do outro"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:390
 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"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:392
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:397 gajim/vcard.py:447 gajim/vcard.py:554
 msgid " resource with priority "
 msgstr " recurso con prioridade "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
-#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
-msgid "All files"
-msgstr "Todos os ficheiros"
-
-#: gajim/options_dialog.py:392
-#, fuzzy
-msgid "Clear File"
-msgstr "Serán"
-
-#: gajim/options_dialog.py:474
-#, fuzzy
-msgid "Manage Proxies"
-msgstr "Xestionar os perfís do proxy"
-
-#: gajim/options_dialog.py:484 gajim/options_dialog.py:552
-#: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
-#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
-#: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
-#: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
-#: gajim/data/gui/account_creation_wizard_window.ui:22
-#: gajim/data/gui/change_mood_dialog.ui:98
-msgid "None"
-msgstr "Ningún"
-
-#: gajim/options_dialog.py:506
-#, fuzzy
-msgid "Adjust to Status"
-msgstr "_Adaptar ao estado"
-
-#: gajim/options_dialog.py:518
-msgid "On"
-msgstr ""
-
-#: gajim/options_dialog.py:518
-#, fuzzy
-msgid "Off"
-msgstr "Desconectado"
-
-#: gajim/options_dialog.py:556
-msgid "Failed to get secret keys"
-msgstr "Produciuse un erro ao obter as chaves secretas"
-
-#: gajim/options_dialog.py:557
-#, fuzzy
-msgid "There is no OpenPGP secret key available."
-msgstr "Houbo un problema ao recuperar as súas chaves secretas de OpenPGP"
-
-#: gajim/options_dialog.py:562
-msgid "OpenPGP Key Selection"
-msgstr "Selección da chave de OpenPGP"
-
-#: gajim/options_dialog.py:562
-msgid "Choose your OpenPGP key"
-msgstr "Elixa a súa chave de OpenPGP"
-
-#: gajim/gui_menu_builder.py:100
+#: gajim/gui_menu_builder.py:96
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Novo grupo de charla"
 
-#: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
-#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
-#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
-#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
-#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
-#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
-#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
+#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
+#: gajim/chat_control.py:303 gajim/roster_window.py:786
+#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
+#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
+#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
+#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
+#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
+#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
+#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
 msgid "Not in Roster"
 msgstr "Non está na listaxe"
 
-#: gajim/gui_menu_builder.py:431
+#: gajim/gui_menu_builder.py:393
 msgid "I would like to add you to my roster"
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: gajim/gui_menu_builder.py:508
+#: gajim/gui_menu_builder.py:471
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Enviar mensaxe"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
-#: gajim/data/gui/contact_context_menu.ui:58
-#, fuzzy
-msgid "Send Cus_tom Status"
-msgstr "Envía XML personalizado"
-
-#: gajim/gui_menu_builder.py:541
+#: gajim/gui_menu_builder.py:486
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "Executar o _comando..."
 
-#: gajim/gui_menu_builder.py:549
+#: gajim/gui_menu_builder.py:494
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
-#: gajim/gui_menu_builder.py:555
+#: gajim/gui_menu_builder.py:500
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Amosar os trans_portes"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
+#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
 #, fuzzy
 msgid "_Rename…"
 msgstr "Renomear"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
-#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
+#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
-#: gajim/data/gui/contact_context_menu.ui:166
+#: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
-#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
-#: gajim/data/gui/contact_context_menu.ui:174
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
+#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
-#: gajim/data/gui/contact_context_menu.ui:204
+#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Eliminar"
 
-#: gajim/gui_menu_builder.py:594 gajim/data/gui/search_window.ui:98
+#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Información"
 
-#: gajim/gui_menu_builder.py:611
+#: gajim/gui_menu_builder.py:552
+#, fuzzy
+msgid "Save _As"
+msgstr "Ten "
+
+#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
+#: gajim/chat_control.py:340
 #, fuzzy
-msgid "Send File..."
+msgid "Send File…"
 msgstr "Enviar ficheiro"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:565
+#, fuzzy
+msgid "Upload File…"
+msgstr "Gardar o ficheiro como..."
+
+#: gajim/gui_menu_builder.py:566
+#, fuzzy
+msgid "Send File Directly…"
+msgstr "Gardar o ficheiro como..."
+
+#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#, fuzzy
+msgid "Send Chatstate"
+msgstr "Último estado: %s"
+
+#: gajim/gui_menu_builder.py:569
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Contactos"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:570
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Engadir á listaxe de contactos"
 
-#: gajim/gui_menu_builder.py:617
+#: gajim/gui_menu_builder.py:571
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:618
+#: gajim/gui_menu_builder.py:572
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:619
+#: gajim/gui_menu_builder.py:573
 #, fuzzy
 msgid "Information"
 msgstr "Información"
 
-#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
+#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historial"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/data/gui/preferences_window.ui:1823
+msgid "Disabled"
+msgstr "Desactivado"
+
+#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#, fuzzy
+msgid "Composing only"
+msgstr "A compor"
+
+#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#, fuzzy
+msgid "All chat states"
+msgstr "Todos os estados"
+
+#: gajim/gui_menu_builder.py:620
 #, fuzzy
 msgid "Manage Room"
 msgstr "Xestionar os marcadores"
 
-#: gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:621
 #, fuzzy
 msgid "Change Subject"
 msgstr "Cambiar o _tema"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:622
 #, fuzzy
 msgid "Configure Room"
 msgstr "Configurar a sala"
 
-#: gajim/gui_menu_builder.py:647
+#: gajim/gui_menu_builder.py:623
+#, fuzzy
+msgid "Upload Avatar…"
+msgstr "Elixir unha imaxe"
+
+#: gajim/gui_menu_builder.py:624
 #, fuzzy
 msgid "Destroy Room"
 msgstr "Descrición: %s"
 
-#: gajim/gui_menu_builder.py:649
+#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
-msgid "Change Nick"
-msgstr "Cambiar o _alcume"
+msgid "Chat Settings"
+msgstr "Fallou a conexión"
 
-#: gajim/gui_menu_builder.py:650
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Engadir esta sala aos marcadores"
+#: gajim/gui_menu_builder.py:627
+msgid "Show join/leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:651
+#: gajim/gui_menu_builder.py:628
 #, fuzzy
-msgid "Request Voice"
-msgstr "_Voz"
+msgid "Show status changes"
+msgstr "_Rexistrar os cambios de estado dos contactos"
 
-#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Mensaxes predefinidas:"
 
-#: gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:630
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#: gajim/gui_menu_builder.py:631
+msgid "Minimize on autojoin"
+msgstr ""
+
+#: gajim/gui_menu_builder.py:634
+msgid "Sync Threshold"
+msgstr ""
+
+#: gajim/gui_menu_builder.py:635
+#, fuzzy
+msgid "Change Nick"
+msgstr "Cambiar o _alcume"
+
+#: gajim/gui_menu_builder.py:636
+#, fuzzy
+msgid "Bookmark Room"
+msgstr "Engadir esta sala aos marcadores"
+
+#: gajim/gui_menu_builder.py:637
+#, fuzzy
+msgid "Request Voice"
+msgstr "_Voz"
+
+#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
 #, fuzzy
 msgid "Execute command"
 msgstr "Executar o _comando..."
 
-#: gajim/gui_menu_builder.py:656
+#: gajim/gui_menu_builder.py:640
 #, fuzzy
 msgid "Disconnect"
 msgstr "Contacto desconectado"
 
-#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
+#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+msgid "No threshold"
+msgstr ""
+
+#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#, fuzzy, python-format
+msgid "%i day"
+msgid_plural "%i days"
+msgstr[0] "hai %i días"
+msgstr[1] "hai %i días"
+
+#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
+#: gajim/gtk/join_groupchat.py:43
 msgid "Join Group Chat"
 msgstr "Entrar nunha sala de charlas"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:746
 #, fuzzy
-msgid "Add Contact..."
+msgid "Add Contact…"
 msgstr "_Engadir un contacto..."
 
-#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
-#: gajim/accounts_window.py:554 gajim/accounts_window.py:593
+#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
 #, fuzzy
 msgid "Profile"
 msgstr "ficheiro"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:749
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Descubrir os servizos"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:750
 #, fuzzy
-msgid "Send Single Message..."
-msgstr "Enviar unha _mensaxe..."
+msgid "Send Single Message…"
+msgstr "Enviar mensaxe"
 
-#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Preferencias"
 
-#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:753
+#, fuzzy
+msgid "Blocking List"
+msgstr "Listaxe de expulsión"
+
+#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Amosar os contactos desconectados"
 
-#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
+#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Listaxes de privacidade"
 
-#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
 #, fuzzy
 msgid "Server Info"
 msgstr "Servidor"
 
-#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
+#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: gajim/gui_menu_builder.py:743
+#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Administrar"
 
-#: gajim/gui_menu_builder.py:744
+#: gajim/gui_menu_builder.py:760
 #, fuzzy
-msgid "Send Server Message..."
+msgid "Send Server Message…"
 msgstr "_Enviar a mensaxe do servidor"
 
-#: gajim/gui_menu_builder.py:745
+#: gajim/gui_menu_builder.py:761
 #, fuzzy
-msgid "Set MOTD..."
+msgid "Set MOTD…"
 msgstr "Definir a MDD"
 
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:762
 #, fuzzy
-msgid "Update MOTD..."
+msgid "Update MOTD…"
 msgstr "Actualizar a MDD"
 
-#: gajim/gui_menu_builder.py:747
+#: gajim/gui_menu_builder.py:763
 #, fuzzy
-msgid "Delete MOTD..."
+msgid "Delete MOTD…"
 msgstr "Eliminar MDD"
 
-#: gajim/gui_menu_builder.py:787
+#: gajim/gui_menu_builder.py:812
 #, fuzzy
 msgid "No Accounts available"
 msgstr "A conta non está dispoñíbel"
 
-#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
+#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
+#: gajim/gtk/accounts.py:58
 msgid "Accounts"
 msgstr "Contas"
 
-#: gajim/history_manager.py:56
+#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#, fuzzy
+msgid "Copy JID"
+msgstr "Sala:"
+
+#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#, fuzzy
+msgid "Join Groupchat"
+msgstr "Entrar nunha sala de charlas"
+
+#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
+#: gajim/data/gui/application_menu.ui:76
+#: gajim/data/gui/subscription_request_window.ui:106
+msgid "Start Chat"
+msgstr "Iniciar a charla"
+
+#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#, fuzzy
+msgid "Add to Roster…"
+msgstr "_Engadir á listaxe de contactos"
+
+#: gajim/gui_menu_builder.py:893
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "_Copiar o enderezo da ligazón"
+
+#: gajim/gui_menu_builder.py:894
+#, fuzzy
+msgid "Open Link in Browser"
+msgstr "_Abrir a ligazón no navegador"
+
+#: gajim/gui_menu_builder.py:899
+#, fuzzy
+msgid "Copy Email Address"
+msgstr "_Copiar o enderezo"
+
+#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#, fuzzy
+msgid "Open Email Composer"
+msgstr "_Abrir o editor de correo"
+
+#: gajim/gui_menu_builder.py:905
+#, fuzzy
+msgid "Copy Location"
+msgstr "_Copiar o enderezo da ligazón"
+
+#: gajim/gui_menu_builder.py:906
+#, fuzzy
+msgid "Show Location"
+msgstr "Modificar a conta"
+
+#: gajim/gui_menu_builder.py:911
+#, fuzzy
+msgid "Copy JID/Email"
+msgstr "_Copiar o enderezo"
+
+#: gajim/gui_menu_builder.py:945
+#, fuzzy
+msgid "Copy"
+msgstr "Sala:"
+
+#: gajim/history_manager.py:70
 #, fuzzy
 msgid "Usage:"
 msgstr "mensaxe"
 
-#: gajim/history_manager.py:58
+#: gajim/history_manager.py:72
 #, fuzzy
 msgid "Options:"
 msgstr "Emoticonas:"
 
-#: gajim/history_manager.py:60
+#: gajim/history_manager.py:74
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:75
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:104
+#: gajim/history_manager.py:107
 msgid "Cannot find history logs database"
 msgstr "Non se pode achar a base de datos do historial"
 
-#: gajim/history_manager.py:144 gajim/history_manager.py:195
-#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:108
+#, fuzzy, python-format
+msgid "%s does not exist."
+msgstr "Non existe o grupo de charla."
+
+#: gajim/history_manager.py:141 gajim/history_manager.py:195
+#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:108
+#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:164 gajim/history_manager.py:220
-#: gajim/data/gui/join_groupchat_window.ui:131
+#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/data/gui/join_groupchat_window.ui:208
+#: gajim/data/gui/profile_window.ui:214
+#: gajim/data/gui/vcard_information_window.ui:443
 msgid "Nickname"
 msgstr "Alcume"
 
-#: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/data/gui/preferences_window.ui:1344
+#: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Mensaxe"
 
-#: gajim/history_manager.py:181 gajim/history_manager.py:214
+#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/data/gui/groups_post_window.ui:49
+#: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Asunto"
 
-#: gajim/history_manager.py:240
+#: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -914,7 +637,7 @@ msgstr ""
 "Quere limpar a base de datos? (TOTALMENTE DESACONSELLADO SE GAJIM ESTÁ EN "
 "EXECUCIÓN)"
 
-#: gajim/history_manager.py:242
+#: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -929,1258 +652,575 @@ msgstr ""
 "\n"
 "Caso de elixir SI, por favor, agarde..."
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:255
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:462
-#, fuzzy
-msgid "Exporting History Logs…"
-msgstr "A exportar o historial..."
+#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
+#: gajim/gtk/filetransfer.py:248
+msgid "You"
+msgstr "Vostede"
 
-#: gajim/history_manager.py:538
+#: gajim/history_manager.py:531
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s - %(time)s dixo: %(message)s\n"
 
-#: gajim/history_manager.py:576
-#, fuzzy, python-format
-msgid "Do you wish to delete all correspondence with %(jid)s?"
-msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
-
-#: gajim/history_manager.py:580
-#, fuzzy
-msgid "Do you wish to delete all correspondence with the selected contacts?"
-msgstr ""
-"Está seguro de que quere eliminar o historial do contacto que seleccionou?"
+#: gajim/history_manager.py:568 gajim/history_manager.py:607
+#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
+msgid "Delete"
+msgstr "Eliminar"
 
-#: gajim/history_manager.py:582
+#: gajim/history_manager.py:569
 #, fuzzy
-msgid "This can not be undone."
-msgstr "O servizo non se achou"
+msgid "Delete Conversation"
+msgid_plural "Delete Conversations"
+msgstr[0] "Información"
+msgstr[1] "Información"
 
-#: gajim/history_manager.py:584 gajim/history_manager.py:623
-#, fuzzy
-msgid "Deletion Confirmation"
-msgstr "Información"
-
-#: gajim/history_manager.py:618
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
+#: gajim/history_manager.py:570
+#, fuzzy, python-format
+msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
+msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Está seguro de que quere eliminar a mensaxe que seleccionou?"
-msgstr[1] "Está seguro de que quere eliminar as mensaxes que seleccionou?"
-
-#: gajim/history_manager.py:621
-msgid "This is an irreversible operation."
-msgstr "Esta é unha operación irreversíbel"
+msgstr[1] "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 
-#: gajim/profile_window.py:63
+#: gajim/history_manager.py:608
 #, fuzzy
-msgid "Retrieving profile…"
-msgstr "A recuperar o perfil..."
-
-#: gajim/profile_window.py:128
-msgid "Could not load image"
-msgstr "Non foi posíbel cargar a imaxe"
-
-#: gajim/profile_window.py:200
-#, fuzzy
-msgid "Wrong date format"
-msgstr "Información"
+msgid "Delete Message"
+msgid_plural "Delete Messages"
+msgstr[0] "Mensaxes de estado por defecto"
+msgstr[1] "Mensaxes de estado por defecto"
 
-#: gajim/profile_window.py:201
+#: gajim/history_manager.py:609
 #, fuzzy
-msgid "Format of the date must be YYYY-MM-DD"
-msgstr "Formato: AAAA-MM-DD"
-
-#: gajim/profile_window.py:261
-msgid "Information received"
-msgstr "Información recibida"
-
-#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
-#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
-#: gajim/dialog_messages.py:32
-msgid "You are not connected to the server"
-msgstr "Non está conectado ao servidor"
-
-#: gajim/profile_window.py:335
-#, 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."
-
-#: gajim/profile_window.py:349
-#, fuzzy
-msgid "Sending profile…"
-msgstr "A enviar o perfil..."
-
-#: gajim/profile_window.py:368
-msgid "Information NOT published"
-msgstr "Información NON publicada"
-
-#: gajim/profile_window.py:375
-msgid "vCard publication failed"
-msgstr "Fallou a publicación da vCard"
-
-#: gajim/profile_window.py:376
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
-msgstr ""
-"Produciuse un erro mentres se publicaba a súa información persoal, probe de "
-"novo máis tarde."
+msgid "Do you want to permanently delete this message"
+msgid_plural "Do you want to permanently delete these 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?"
 
-#: gajim/dialogs.py:95
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do contacto : <i>%s</i>"
 
-#: gajim/dialogs.py:97
+#: gajim/dialogs.py:84
 #, fuzzy, python-format
 msgid "JID: <i>%s</i>"
 msgstr "ID de Jabber : <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
-#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
-#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
-#: gajim/data/gui/shortcuts_window.ui:176
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
+#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/data/gui/preferences_window.ui:558
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
 msgid "General"
 msgstr "Xeral"
 
-#: gajim/dialogs.py:211
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Grupo"
 
-#: gajim/dialogs.py:218
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "No grupo"
 
-#: gajim/dialogs.py:311
-msgid "KeyID"
-msgstr "Chave ID"
-
-#: gajim/dialogs.py:316
-msgid "Contact name"
-msgstr "Nome de contacto"
-
-#: gajim/dialogs.py:494
+#: gajim/dialogs.py:356
 #, fuzzy
 msgid "Set Mood"
 msgstr "Definir a MDD"
 
-#: gajim/dialogs.py:614
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
+#: gajim/data/gui/account_creation_wizard_window.ui:22
+#: gajim/data/gui/change_mood_dialog.ui:98 gajim/gtk/account_wizard.py:266
+#: gajim/gtk/account_wizard.py:345
+msgid "None"
+msgstr "Ningún"
+
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaxe de estado %s"
 
-#: gajim/dialogs.py:628
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Mensaxe de estado"
 
-#: gajim/dialogs.py:818
+#: gajim/dialogs.py:697
+msgid "Overwrite"
+msgstr ""
+
+#: gajim/dialogs.py:698
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Mensaxe de estado"
 
-#: gajim/dialogs.py:819
+#: gajim/dialogs.py:699
 #, fuzzy
-msgid ""
-"This name is already used. Do you want to overwrite this status message?"
+msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: gajim/dialogs.py:827
+#: gajim/dialogs.py:703
+msgid "_Overwrite"
+msgstr ""
+
+#: gajim/dialogs.py:712
 msgid "Save as Preset Status Message"
 msgstr "Gardar como mensaxe de estado predefinido"
 
-#: gajim/dialogs.py:828
+#: gajim/dialogs.py:713
 msgid "Please type a name for this status message"
 msgstr "Escriba un nome para esta mensaxe de estado"
 
-#: gajim/dialogs.py:855
-#, fuzzy
-msgid "JID:"
-msgstr "O seu identificador JID"
-
-#: gajim/dialogs.py:856
-msgid "AIM Address:"
-msgstr "Enderezo de AIM:"
-
-#: gajim/dialogs.py:857
-msgid "GG Number:"
-msgstr "Número de GG:"
-
-#: gajim/dialogs.py:858
-msgid "ICQ Number:"
-msgstr "Número de ICQ:"
-
-#: gajim/dialogs.py:859
-msgid "MSN Address:"
-msgstr "Enderezo de MSN:"
-
-#: gajim/dialogs.py:860
-msgid "Yahoo! Address:"
-msgstr "Enderezo de Yahoo!:"
-
-#: gajim/dialogs.py:897
-#, fuzzy, python-format
-msgid ""
-"Please fill in the data of the contact you want to add to your account <b>"
-"%s</b>"
-msgstr ""
-"Por favor, introduza a información do contacto que quere engadir á conta %s"
-
-#: gajim/dialogs.py:900
-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"
-
-#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
-msgid "Invalid User ID"
-msgstr "A ID de usuario non é válida"
-
-#: gajim/dialogs.py:1099
-msgid "The user ID must not contain a resource."
-msgstr "Esta ID de usuario non contén un recurso."
-
-#: gajim/dialogs.py:1104
-#, fuzzy
-msgid "You cannot add yourself to your roster."
-msgstr "Gustaríame engadilo á miña listaxe de contactos"
-
-#: gajim/dialogs.py:1118
-msgid "Contact already in roster"
-msgstr "O contacto xa está na listaxe"
-
-#: gajim/dialogs.py:1119
-msgid "This contact is already listed in your roster."
-msgstr "Xa engadiu este contacto á súa listaxe."
-
-#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
-msgid "User ID:"
-msgstr "ID de usuario:"
-
-#: gajim/dialogs.py:1272
-#, fuzzy
-msgid "Error while adding transport contact"
-msgstr "Erro ao engadir o servizo. %s"
-
-#: gajim/dialogs.py:1273
-#, python-format
-msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
-"\n"
-"%(error)s"
-msgstr ""
-
-#: gajim/dialogs.py:1305
-#, fuzzy
-msgid "A GTK+ XMPP client"
-msgstr "Un cliente de Jabber de GTK"
-
-#: gajim/dialogs.py:1306
-#, fuzzy, python-format
-msgid "GTK+ Version: %s"
-msgstr "Versión de GTK+:"
-
-#: gajim/dialogs.py:1307
-#, fuzzy, python-format
-msgid "PyGObject Version: %s"
-msgstr "Versión de PyGTK:"
-
-#: gajim/dialogs.py:1308
-#, python-format
-msgid "python-nbxmpp Version: %s"
-msgstr ""
-
-#: gajim/dialogs.py:1311
-#, fuzzy
-msgid "Current Developers"
-msgstr "Desenvolvedores actuais:"
-
-#: gajim/dialogs.py:1312
-#, fuzzy
-msgid "Past Developers"
-msgstr "Desenvolvedores anteriores:"
-
-#: gajim/dialogs.py:1313
-msgid "Artists"
-msgstr ""
-
-#: gajim/dialogs.py:1317
-msgid "Last but not least"
-msgstr ""
-
-#: gajim/dialogs.py:1318
-#, fuzzy
-msgid "we would like to thank all the package maintainers."
-msgstr ""
-"Por último mais non menos importante, queremos agradecerlles a todos os "
-"mantedores de paquetes."
-
-#: gajim/dialogs.py:1319
-msgid "Thanks"
-msgstr ""
-
-#: gajim/dialogs.py:1321
-msgid "translator-credits"
-msgstr "Fran Alburquerque <membriskhan@gmail.com>"
-
-#: gajim/dialogs.py:1485
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Non está dispoñíbel o dicionario para o idioma %s"
-
-#: gajim/dialogs.py:1486
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Ten que instalar o dicionario %s para usar o corrector ou elixir outra "
-"lingua e logo definir a opción speller_language."
-
-#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
-#: gajim/gui_interface.py:1550
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Conexión"
-
-#: gajim/dialogs.py:1834
-#, fuzzy, python-format
-msgid ""
-"You are about to connect to the account %(account)s (%(server)s) insecurely. "
-"This means conversations will not be encrypted, and is strongly "
-"discouraged.\n"
-"Are you sure you want to do that?"
-msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
-
-#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
-#: gajim/gui_interface.py:1553
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: gajim/dialogs.py:1840
-msgid "Gajim will NOT connect unless you check this box"
-msgstr ""
-
-#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
-#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
-#: gajim/roster_window.py:4282 gajim/message_window.py:247
-#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
-#: gajim/gui_interface.py:1554
-#, fuzzy
-msgid "_Do not ask me again"
-msgstr "_Non me preguntar outra vez"
-
-#: gajim/dialogs.py:1941
-msgid "_Resume"
-msgstr ""
-
-#: gajim/dialogs.py:1949
-msgid "Re_place"
-msgstr ""
-
-#: gajim/dialogs.py:2152 gajim/config.py:2174
-#: gajim/command_system/implementation/standard.py:261
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "O nome de usuario non é válido"
-
-#: gajim/dialogs.py:2153
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr ""
-"A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
-
-#: gajim/dialogs.py:2275
-msgid "Subscription Request"
-msgstr "Solicitude de subscrición"
-
-#: gajim/dialogs.py:2284
-#, fuzzy, python-format
-msgid "Subscription request for account %(account)s from %(jid)s"
-msgstr "Solicitude de subscrición para a conta %s de %s"
-
-#: gajim/dialogs.py:2287
-#, python-format
-msgid "Subscription request from %s"
-msgstr "Solicitude de subscrición de %s"
-
-#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
-#, fuzzy
-msgid "Join Groupchat"
-msgstr "Entrar nunha sala de charlas"
-
-#: gajim/dialogs.py:2500
-#, fuzzy
-msgid "Invalid Room"
-msgstr "A entrada non é válida"
-
-#: gajim/dialogs.py:2501
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
-#, fuzzy
-msgid "Invalid Nickname"
-msgstr "O nome de usuario non é válido"
-
-#: gajim/dialogs.py:2514
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Crear unha publicación nova"
-
-#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
-#: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
-msgid "Invalid JID"
-msgstr "A ID de Jabber non é válida"
-
-#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
-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."
-
-#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
-#, fuzzy
-msgid "Wrong server"
-msgstr "Host errado"
-
-#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Isto non é un grupo de charla"
+#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
+#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
+#: gajim/gtk/join_groupchat.py:234
+msgid "You are not connected to the server"
+msgstr "Non está conectado ao servidor"
 
-#: gajim/dialogs.py:2620
+#: gajim/dialogs.py:741
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
-#: gajim/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
-#: gajim/disco.py:1977
+#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
+#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
+#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nome"
 
-#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:755 gajim/data/gui/join_groupchat_window.ui:163
 msgid "Server"
 msgstr "Servidor"
 
-#: gajim/dialogs.py:2670
+#: gajim/dialogs.py:791
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: gajim/dialogs.py:2671
+#: gajim/dialogs.py:792
 #, 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."
 
-#: gajim/dialogs.py:2700
+#: gajim/dialogs.py:821
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:2772
-#, fuzzy
-msgid "Start new Conversation"
-msgstr "Conexión"
-
-#: gajim/dialogs.py:3028
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Novo grupo de charla"
-
-#: gajim/dialogs.py:3030
-#, fuzzy
-msgid "New Contact"
-msgstr "Engadir un contacto novo"
-
-#: gajim/dialogs.py:3076
-msgid "Without a connection, you can not change your password."
-msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
-
-#: gajim/dialogs.py:3096
-msgid "Invalid password"
-msgstr "O contrasinal non é válido"
-
-#: gajim/dialogs.py:3096
-msgid "You must enter a password."
-msgstr "Debe introducir un contrasinal."
-
-#: gajim/dialogs.py:3100
-msgid "Passwords do not match"
-msgstr "Os contrasinais non coinciden"
-
-#: gajim/dialogs.py:3101
-msgid "The passwords typed in both fields must be identical."
-msgstr "Os contrasinais escritos nos dous campos deben ser idénticos."
-
-#: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2745
-msgid "Contact Signed In"
-msgstr "Contacto conectado"
-
-#: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2751
-msgid "Contact Signed Out"
-msgstr "Contacto desconectado"
-
-#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2565
-msgid "New Message"
-msgstr "Mensaxe nova"
-
-#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2547
-msgid "New Single Message"
-msgstr "Mensaxe nova"
-
-#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2553
-msgid "New Private Message"
-msgstr "Mensaxe privada nova"
-
-#: gajim/dialogs.py:3144
-msgid "New E-mail"
-msgstr "Correo electrónico novo"
-
-#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
-msgid "File Transfer Request"
-msgstr "Solicitude de transferencia de ficheiro"
-
-#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
-#: gajim/notify.py:94
-msgid "File Transfer Error"
-msgstr "Produciuse un erro na transferencia do ficheiro"
-
-#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
-#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
-msgid "File Transfer Completed"
-msgstr "Rematou a transferencia do ficheiro"
-
-#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
-#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
-msgid "File Transfer Stopped"
-msgstr "Detívose a transferencia do ficheiro"
-
-#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
-#: gajim/gui_interface.py:663 gajim/notify.py:95
-msgid "Groupchat Invitation"
-msgstr "Convite a grupo de charla"
-
-#: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2739
-msgid "Contact Changed Status"
-msgstr "Un contacto cambiou o seu estado"
-
-#: gajim/dialogs.py:3374
-#, python-format
-msgid "Single Message using account %s"
-msgstr "Mensaxe nova coa conta %s"
-
-#: gajim/dialogs.py:3376
-#, python-format
-msgid "Single Message in account %s"
-msgstr "Entrou unha mensaxe nova na conta %s"
-
-#: gajim/dialogs.py:3378
-msgid "Single Message"
-msgstr "Mensaxe:"
-
-#: gajim/dialogs.py:3381
-#, python-format
-msgid "Send %s"
-msgstr "Enviar %s"
-
-#: gajim/dialogs.py:3404
-#, python-format
-msgid "Received %s"
-msgstr "Recibida %s"
-
-#: gajim/dialogs.py:3427
-#, fuzzy, python-format
-msgid "Form %s"
-msgstr "Estou %s"
-
-#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
-msgid "Connection not available"
-msgstr "Conexión non dispoñíbel"
-
-#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
-#, python-format
-msgid "Please make sure you are connected with \"%s\"."
-msgstr "Por favor, asegúrese de estar conectado con \"%s\"."
-
-#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
-#, 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"
-
-#: gajim/dialogs.py:3510
-#, python-format
-msgid "RE: %s"
-msgstr "RE: %s"
-
-#: gajim/dialogs.py:3511
-#, python-format
-msgid "%s wrote:\n"
-msgstr "%s escribiu:\n"
-
-#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Serán"
-
-#: gajim/dialogs.py:3563
-#, fuzzy
-msgid "Filter"
-msgstr "Filtro:"
-
-#: gajim/dialogs.py:3568
-#, fuzzy
-msgid "XML Input"
-msgstr "<b>Entrada de XML</b>"
-
-#: gajim/dialogs.py:3572
-#, fuzzy
-msgid "Send"
-msgstr "_Enviar"
-
-#: gajim/dialogs.py:3755
-#, fuzzy
-msgid "add"
-msgstr "Atascado"
-
-#: gajim/dialogs.py:3755
-#, fuzzy
-msgid "modify"
-msgstr "_Modificar"
-
-#: gajim/dialogs.py:3756
-#, fuzzy
-msgid "remove"
-msgstr "_Eliminar"
-
-#: gajim/dialogs.py:3785
-#, fuzzy, python-format
-msgid ""
-"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
-"roster."
-msgstr "Gustaríame engadilo á miña listaxe de contactos."
-
-#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
-#, fuzzy
-msgid "Add"
-msgstr "Enderezo"
-
-#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
-#, fuzzy
-msgid "Modify"
-msgstr "_Modificar"
-
-#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
-msgid "Delete"
-msgstr "Eliminar"
-
-#: gajim/dialogs.py:3815
-#, fuzzy
-msgid "Groups"
-msgstr "Grupo"
-
-#: gajim/dialogs.py:3923
-#, fuzzy, python-format
-msgid "%s suggested me to add you in my roster."
-msgstr "Gustaríame engadilo á miña listaxe de contactos"
-
-#: gajim/dialogs.py:3937
-#, fuzzy, python-format
-msgid "Added %d contact"
-msgid_plural "Added %d contacts"
-msgstr[0] "Engadir un _contacto"
-msgstr[1] "Engadir un _contacto"
-
-#: gajim/dialogs.py:3975
-#, fuzzy, python-format
-msgid "Removed %d contact"
-msgid_plural "Removed %d contacts"
-msgstr[0] "Elimina o contacto da listaxe"
-msgstr[1] "Elimina o contacto da listaxe"
-
-#: gajim/dialogs.py:4001
-#, python-format
-msgid "Archiving Preferences for %s"
-msgstr ""
-
-#: gajim/dialogs.py:4039
-msgid "Success!"
-msgstr ""
-
-#: gajim/dialogs.py:4039
-#, fuzzy
-msgid "Your Archiving Preferences have been saved!"
-msgstr "_Preferencias"
-
-#: gajim/dialogs.py:4055
-msgid "We got no response from the Server"
-msgstr ""
-
-#: gajim/dialogs.py:4057
-#, fuzzy
-msgid "We received an error: {}"
-msgstr "Recibiu unha entrada nova:"
-
-#: gajim/dialogs.py:4061
-#, fuzzy
-msgid "Error!"
-msgstr "Erro de Avahi"
-
-#: gajim/dialogs.py:4120
-#, fuzzy
-msgid "Add JID"
-msgstr "ID de Jabber:"
-
-#: gajim/dialogs.py:4193
-#, python-format
-msgid "Privacy List <b><i>%s</i></b>"
-msgstr "Listaxe de privacidade <b><i>%s</i></b>"
-
-#: gajim/dialogs.py:4197
-#, python-format
-msgid "Privacy List for %s"
-msgstr "Listaxe de privacidade para %s"
-
-#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
-msgid "Privacy List"
-msgstr "Listaxe de privacidade"
-
-#: gajim/dialogs.py:4270
-#, 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"
-
-#: gajim/dialogs.py:4275
-#, fuzzy, python-format
-msgid "Order: %(order)s, action: %(action)s"
-msgstr "Orde: %s, acción: %s"
-
-#: gajim/dialogs.py:4329
-msgid "<b>Edit a rule</b>"
-msgstr "<b>Editar unha regra</b>"
-
-#: gajim/dialogs.py:4441
-msgid "<b>Add a rule</b>"
-msgstr "<b>Engadir unha regra</b>"
-
-#: gajim/dialogs.py:4542
-#, python-format
-msgid "Privacy Lists for %s"
-msgstr "Listaxes de privacidade para %s"
-
-#: gajim/dialogs.py:4638
-msgid "Invalid List Name"
-msgstr "O nome de listaxe non é válido"
-
-#: gajim/dialogs.py:4639
-msgid "You must enter a name to create a privacy list."
-msgstr "Debe introducir un nome para crear unha listaxe de privacidade."
-
-#: gajim/dialogs.py:4675
-#, fuzzy
-msgid "You are invited to a groupchat"
-msgstr "Está expulsado deste grupo de charla."
-
-#: gajim/dialogs.py:4678
-#, fuzzy
-msgid "$Contact has invited you to join a discussion"
-msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
-
-#: gajim/dialogs.py:4680
-#, 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."
-
-#: gajim/dialogs.py:4689
-#, python-format
-msgid "Comment: %s"
-msgstr "Comentario: %s"
-
-#: gajim/dialogs.py:4691
-msgid "Do you want to accept the invitation?"
-msgstr ""
-
-#: gajim/dialogs.py:4707
-msgid "Reason (if you decline):"
-msgstr ""
-
-#: gajim/dialogs.py:4756
-msgid "Choose Client Cert #PCKS12"
-msgstr ""
-
-#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
-msgid "PKCS12 Files"
-msgstr ""
-
-#: gajim/dialogs.py:4798
-msgid "Choose Sound"
-msgstr "Elixir un son"
-
-#: gajim/dialogs.py:4814
-msgid "Wav Sounds"
-msgstr "Sons Wav"
-
-#: gajim/dialogs.py:4844
-msgid "Choose Image"
-msgstr "Elixir unha imaxe"
-
-#: gajim/dialogs.py:4862
-msgid "Images"
-msgstr "Imaxes"
-
-#: gajim/dialogs.py:4933
-#, fuzzy
-msgid "Choose Archive"
-msgstr "Elixir unha imaxe"
-
-#: gajim/dialogs.py:4952
-#, fuzzy
-msgid "Zip files"
-msgstr "Todos os ficheiros"
-
-#: gajim/dialogs.py:4978
-#, python-format
-msgid "When %s becomes:"
-msgstr "Cando %s estea:"
-
-#: gajim/dialogs.py:4980
-#, python-format
-msgid "Adding Special Notification for %s"
-msgstr "Engadir unha notificación especial para %s"
-
-#: gajim/dialogs.py:5220
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5222
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5224
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
+#: gajim/groupchat_control.py:505
 #, fuzzy, python-format
-msgid "Certificate for account %s"
-msgstr "para a conta %s"
-
-#: gajim/dialogs.py:5333
-#, 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"
-"SHA-1 Fingerprint: %(sha1)s\n"
-"\n"
-"SHA256 Fingerprint: %(sha256)s\n"
-msgstr ""
-
-#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
-#, fuzzy, python-format
-msgid "SSL Certificate Verification for %s"
-msgstr "Engadir unha notificación especial para %s"
-
-#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
-msgid "View cert…"
-msgstr ""
+msgid "Send File (max. %s MiB)…"
+msgstr "Gardar o ficheiro como..."
 
-#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
 #, fuzzy
-msgid "File Transfer"
+msgid "No File Transfer available"
 msgstr "Transferencias"
 
-#: gajim/dialogs.py:5438
-msgid "Requesting HTTP Upload Slot..."
-msgstr ""
-
-#: gajim/dialogs.py:5442
-msgid "Uploading file via HTTP File Upload..."
-msgstr ""
-
-#: gajim/dialogs.py:5446
-#, fuzzy
-msgid "Encrypting file..."
-msgstr "Cifrado desactivado"
-
-#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s coñéceselle como %s"
-
-#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s está agora %(status)s"
-
-#: gajim/groupchat_control.py:247
-msgid "Sending private message failed"
-msgstr "O envío da mensaxe privada fallou"
-
-#: gajim/groupchat_control.py:249
-#, 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."
-
-#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
-#: gajim/chat_control.py:327
-msgid "HTTP File Upload"
-msgstr ""
-
-#: gajim/groupchat_control.py:638
-#, fuzzy
-msgid "HTTP File Upload not supported by your server"
-msgstr "O teu servidor non admite o almacenamento de metacontactos"
-
-#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
+#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
 msgid "Changing Subject"
 msgstr "Cambiando o asunto"
 
-#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
+#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
 msgid "Please specify the new subject:"
 msgstr "Especifique o asunto novo:"
 
-#: gajim/groupchat_control.py:659
+#: gajim/groupchat_control.py:638
 msgid "Changing Nickname"
 msgstr "Cambiando o alcume"
 
-#: gajim/groupchat_control.py:660
+#: gajim/groupchat_control.py:639
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifique o novo alcume que quere usar:"
 
-#: gajim/groupchat_control.py:677
+#: gajim/groupchat_control.py:657
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "A ID de Jabber non é válida para o grupo de charla"
 
-#: gajim/groupchat_control.py:678
+#: gajim/groupchat_control.py:658
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: gajim/groupchat_control.py:684
-#, fuzzy, python-format
-msgid "Destroying %s"
-msgstr "Descrición: %s"
-
-#: gajim/groupchat_control.py:685
-msgid ""
-"You are going to remove this room permanently.\n"
-"You may specify a reason below:"
-msgstr ""
-
-#: gajim/groupchat_control.py:687
-msgid "You may also enter an alternate venue:"
-msgstr ""
+#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+msgid "Could not load image"
+msgstr "Non foi posíbel cargar a imaxe"
 
-#: gajim/groupchat_control.py:864
+#: gajim/groupchat_control.py:888
 msgid "Insert Nickname"
 msgstr "Introducir alcume"
 
-#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar a autenticación"
 
-#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar a autenticación"
 
-#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
+#: gajim/groupchat_control.py:1064
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1066
+#: gajim/groupchat_control.py:1111
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historial de conversas"
 
-#: gajim/groupchat_control.py:1068
+#: gajim/groupchat_control.py:1113
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Conexión"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1411
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: gajim/groupchat_control.py:1452
+#: gajim/groupchat_control.py:1433
 msgid "Room now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1454
+#: gajim/groupchat_control.py:1436
 msgid "Room now does not show unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1456
+#: gajim/groupchat_control.py:1439
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1446
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1462
+#: gajim/groupchat_control.py:1449
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1464
+#: gajim/groupchat_control.py:1452
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1467
+#: gajim/groupchat_control.py:1456
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1470
+#: gajim/groupchat_control.py:1460
 msgid "Room is now fully anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
+#: gajim/groupchat_control.py:1500
+#, python-format
+msgid "Ping? (%s)"
+msgstr ""
+
+#: gajim/groupchat_control.py:1503
 #, python-format
-msgid "Pong! (%s s.)"
+msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
-#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
+#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#, fuzzy
+msgid "Error."
+msgstr "Erro de Avahi"
+
+#: gajim/groupchat_control.py:1711
 #, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
+msgid "You (%s) joined the room"
+msgstr "%s entrou no grupo de charla"
 
-#: gajim/groupchat_control.py:1739
+#: gajim/groupchat_control.py:1717
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: gajim/groupchat_control.py:1721
 msgid "Room logging is enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1741
+#: gajim/groupchat_control.py:1725
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
+#: gajim/groupchat_control.py:1732
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A súa conta nova creouse con éxito"
 
-#: gajim/groupchat_control.py:1744
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#, python-format
+msgid "You are now known as %s"
+msgstr "Coñéceselle como %s"
+
+#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#, fuzzy, python-brace-format
+msgid "{nick} is now known as {new_nick}"
+msgstr "%s coñéceselle como %s"
+
+#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#, fuzzy, python-brace-format
+msgid "You are now {show}{status}"
+msgstr "Coñéceselle como %s"
+
+#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#, fuzzy, python-brace-format
+msgid "{nick} is now {show}{status}"
+msgstr "%(nick)s está agora %(status)s"
+
+#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#, python-brace-format
+msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1750
-#, python-format
-msgid "%(nick)s has been kicked: %(reason)s"
-msgstr "%(nick)s foi expulsado por %(reason)s"
+#: gajim/groupchat_control.py:1793
+#, python-brace-format
+msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
+msgstr ""
 
-#: gajim/groupchat_control.py:1753
-#, python-format
-msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
+#: gajim/groupchat_control.py:1799
+#, python-brace-format
+msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
+msgstr ""
+
+#: gajim/groupchat_control.py:1822
+#, fuzzy, python-brace-format
+msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1762
-#, python-format
-msgid "%(nick)s has been banned: %(reason)s"
-msgstr "%(nick)s foi expulsado: %(reason)s"
+#: gajim/groupchat_control.py:1827
+#, fuzzy, python-brace-format
+msgid "** Role of {nick} has been set to {role}{actor}{reason}"
+msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1765
-#, python-format
-msgid "%(nick)s has been banned by %(who)s: %(reason)s"
+#: gajim/groupchat_control.py:1852
+#, fuzzy, python-brace-format
+msgid "You have been removed from the room{actor}{reason}"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
-#, python-format
-msgid "You are now known as %s"
-msgstr "Coñéceselle como %s"
+#: gajim/groupchat_control.py:1857
+#, python-brace-format
+msgid "You have left due to an error{reason}"
+msgstr ""
 
-#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1825
-#, fuzzy, python-format
-msgid "%(nick)s has been removed from the room (%(reason)s)"
-msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
+#: gajim/groupchat_control.py:1863
+#, python-brace-format
+msgid "You have been kicked{actor}{reason}"
+msgstr ""
 
-#: gajim/groupchat_control.py:1816
+#: gajim/groupchat_control.py:1870
+#, python-brace-format
+msgid "You have been banned{actor}{reason}"
+msgstr ""
+
+#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
 #, fuzzy
-msgid "affiliation changed"
+msgid ": Affiliation changed"
 msgstr "Afiliación:"
 
-#: gajim/groupchat_control.py:1821
-msgid "room configuration changed to members-only"
+#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+msgid ": Room configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1827
-msgid "system shutdown"
+#: gajim/groupchat_control.py:1912
+#, fuzzy, python-brace-format
+msgid "{nick} has been removed from the room{by}{reason}"
+msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
+
+#: gajim/groupchat_control.py:1922
+#, python-brace-format
+msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1881
-#, python-format
-msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+#: gajim/groupchat_control.py:1928
+#, fuzzy, python-brace-format
+msgid "{nick} has been kicked{actor}{reason}"
+msgstr "%(nick)s foi expulsado por %(reason)s"
+
+#: gajim/groupchat_control.py:1936
+#, fuzzy, python-brace-format
+msgid "{nick} has been banned{actor}{reason}"
+msgstr "%(nick)s foi expulsado: %(reason)s"
+
+#: gajim/groupchat_control.py:1953
+#, python-brace-format
+msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1885
+#: gajim/groupchat_control.py:1970
 #, python-format
-msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
-msgstr ""
+msgid "%s has joined the group chat"
+msgstr "%s entrou no grupo de charla"
+
+#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
+#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
+#: gajim/groupchat_control.py:2011
+msgid "Unable to join group chat"
+msgstr "Non se puido entrar no grupo de charla"
 
-#: gajim/groupchat_control.py:1900
+#: gajim/groupchat_control.py:1986
 #, 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"
+msgid "You are banned from group chat <b>%s</b>."
+msgstr "Está expulsado deste grupo de charla."
 
-#: gajim/groupchat_control.py:1904
+#: gajim/groupchat_control.py:1991
 #, fuzzy, python-format
-msgid "** Role of %(nick)s has been set to %(role)s"
-msgstr "%(nick)s foi expulsado por %(reason)s"
+msgid "Remote server <b>%s</b> does not exist."
+msgstr "Non existe o grupo de charla."
 
-#: gajim/groupchat_control.py:1934
-#, python-format
-msgid "%s has left"
-msgstr "%s saíu"
+#: gajim/groupchat_control.py:1996
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
+msgstr "Non existe o grupo de charla."
 
-#: gajim/groupchat_control.py:1939
-#, python-format
-msgid "%s has joined the group chat"
-msgstr "%s entrou no grupo de charla"
+#: gajim/groupchat_control.py:2001
+#, fuzzy
+msgid "Group chat creation is not permitted."
+msgstr "A creación de grupos de charla está restrinxida."
+
+#: gajim/groupchat_control.py:2005
+#, fuzzy
+msgid "Unable to join groupchat"
+msgstr "Non se puido entrar no grupo de charla"
 
-#: gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:2006
+#, fuzzy, python-format
+msgid "You must use your registered nickname in <b>%s</b>."
+msgstr "É necesario usar o alcume rexistrado."
+
+#: gajim/groupchat_control.py:2012
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Non está na listaxe de membros"
+
+#: gajim/groupchat_control.py:2068
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Eliminouse a autorización"
+
+#: gajim/groupchat_control.py:2073
 #, python-format
-msgid "Are you sure you want to leave group chat \"%s\"?"
+msgid "You can join this room instead: xmpp:%s?join"
+msgstr ""
+
+#: gajim/groupchat_control.py:2306
+#, fuzzy
+msgid "Leave Group Chat"
+msgstr "Novo grupo de charla"
+
+#: gajim/groupchat_control.py:2307
+#, fuzzy
+msgid "Are you sure you want to leave this group chat?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: gajim/groupchat_control.py:2280
-msgid ""
-"If you close this window, you will be disconnected from this group chat."
+#: gajim/groupchat_control.py:2308
+#, fuzzy, python-format
+msgid "If you close this window, you will be disconnected from '%s'."
 msgstr "Se pecha esta fiestra, desconectaráselle deste grupo de charla."
 
-#: gajim/groupchat_control.py:2498
+#: gajim/groupchat_control.py:2314
+msgid "_Leave"
+msgstr ""
+
+#: gajim/groupchat_control.py:2377
+#, fuzzy, python-format
+msgid "%(jid)s has been invited to this group chat"
+msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
+
+#: gajim/groupchat_control.py:2527
 #, python-format
 msgid "Kicking %s"
 msgstr "A expulsar %s"
 
-#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
+#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
 msgid "You may specify a reason below:"
 msgstr "Debe especificar un motivo debaixo:"
 
-#: gajim/groupchat_control.py:2794
+#: gajim/groupchat_control.py:2828
 #, python-format
 msgid "Banning %s"
 msgstr "A expulsar %s"
 
-#: gajim/chat_control.py:325 gajim/chat_control.py:329
-#, fuzzy
-msgid "Jingle File Transfer"
-msgstr "Transferencias"
-
-#: gajim/chat_control.py:331
-#, fuzzy
-msgid "No File Transfer available"
-msgstr "Transferencias"
-
-#: gajim/chat_control.py:392
+#: gajim/chat_control.py:408
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
-#: gajim/chat_control.py:396
-msgid "Formatting is not available so long as GPG is active"
-msgstr ""
-
-#: gajim/chat_control.py:399
+#: gajim/chat_control.py:412
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
-#: gajim/chat_control.py:511
+#: gajim/chat_control.py:562
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:652
+#: gajim/chat_control.py:686
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da sala %(room_name)s"
 
-#: gajim/chat_control.py:886
-msgid "Session negotiation cancelled"
-msgstr ""
-
-#: gajim/chat_control.py:896
-msgid "This session WILL be archived on server"
-msgstr ""
-
-#: gajim/chat_control.py:898
-msgid "This session WILL NOT be archived on server"
+#: gajim/chat_control.py:832
+#, python-format
+msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 
-#: gajim/chat_control.py:907
+#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
 #, fuzzy
-msgid "This session is encrypted"
-msgstr "[Esta mensaxe está cifrada]"
-
-#: gajim/chat_control.py:910
-msgid " and WILL be logged"
-msgstr ""
+msgid "Close"
+msgstr "_Enviar e pechar"
 
-#: gajim/chat_control.py:912
-msgid " and WILL NOT be logged"
-msgstr ""
+#: gajim/chat_control.py:1161
+#, fuzzy, python-format
+msgid "You just received a new message from %s"
+msgstr "Acaba de recibir unha mensaxe nova de \"%s\""
 
-#: gajim/chat_control.py:917
+#: gajim/chat_control.py:1163
+#, fuzzy
 msgid ""
-"Remote contact's identity not verified. Click the shield button for more "
-"details."
+"If you close this tab while having chat history disabled, this message will "
+"be lost."
 msgstr ""
+"Se pecha este separador e ten o historial desactivado, esta mensaxe "
+"perderase."
 
-#: gajim/chat_control.py:919
-#, fuzzy
-msgid "E2E encryption disabled"
-msgstr "Cifrado desactivado"
+#: gajim/chat_control.py:1208
+msgid "Ping?"
+msgstr ""
 
-#: gajim/chat_control.py:1218
+#: gajim/chat_control.py:1211
 #, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Acaba de recibir unha mensaxe nova de \"%s\""
-
-#: gajim/chat_control.py:1220
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
+msgid "Pong! (%s seconds)"
 msgstr ""
-"Se pecha este separador e ten o historial desactivado, esta mensaxe "
-"perderase."
 
-#: gajim/chat_control.py:1363
+#: gajim/chat_control.py:1308
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2189,331 +1229,453 @@ msgstr ""
 "Asunto: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: gajim/chat_control.py:1515
+#: gajim/chat_control.py:1416
 #, fuzzy, python-format
-msgid "%(name)s is now %(status)s"
+msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
-msgid "File transfer"
+msgid "File Transfer"
 msgstr "Transferencias"
 
-#: gajim/chat_control.py:1577
+#: gajim/chat_control.py:1480
 #, fuzzy
 msgid "Size"
 msgstr "Tamaño: %s"
 
-#: gajim/chat_control.py:1579
+#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/data/gui/groupchat_invitation_received.ui:77
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy
 msgid "_Accept"
 msgstr "Aceptar"
 
-#: gajim/chat_control.py:1633 gajim/disco.py:1752
-#: gajim/data/gui/join_groupchat_window.ui:325
-msgid "_Join"
-msgstr "_Entrar"
+#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/data/gui/groupchat_invitation_received.ui:62
+#, fuzzy
+msgid "_Decline"
+msgstr "D_esconectado"
 
-#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
-#: gajim/gui_interface.py:1013
+#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
+#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
+msgid "File Transfer Completed"
+msgstr "Rematou a transferencia do ficheiro"
+
+#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#, fuzzy
+msgid "Open _Folder"
+msgstr "_Abrir un cartafol de contido"
+
+#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#, fuzzy
+msgid "_Close"
+msgstr "_Enviar e pechar"
+
+#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
+#: gajim/gtk/notification.py:281
+msgid "Groupchat Invitation"
+msgstr "Convite a grupo de charla"
+
+#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Elimina o contacto da listaxe"
 
-#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
-#: gajim/gui_interface.py:1016
+#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
 #, fuzzy
 msgid "Error opening file"
 msgstr "Erro ao ler o ficheiro:"
 
-#: gajim/roster_window.py:273 gajim/roster_window.py:1074
+#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Detívose a transferencia do ficheiro"
+
+#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
+#: gajim/gtk/filetransfer.py:284
+#, fuzzy
+msgid "File transfer cancelled"
+msgstr "Cancelouse a transferencia do ficheiro"
+
+#: gajim/chat_control.py:1576
+msgid "Connection with peer cannot be established."
+msgstr "Non se puido estabelecer a conexión co cliente."
+
+#: gajim/application.py:72
+#, fuzzy
+msgid "Show the application's version"
+msgstr "Usar a icona na á_rea de notificación"
+
+#: gajim/application.py:79
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Amosar só na _listaxe de contactos"
+
+#: gajim/application.py:86
+msgid "Separate profile files completely (even history database and plugins)"
+msgstr ""
+
+#: gajim/application.py:94
+msgid "Print XML stanzas and other debug information"
+msgstr ""
+
+#: gajim/application.py:101
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Editor avanzado de configuración"
+
+#: gajim/application.py:109
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Configuración da sala"
+
+#: gajim/application.py:117
+msgid "Configure logging system"
+msgstr ""
+
+#: gajim/application.py:125
+#, fuzzy
+msgid "Show all warnings"
+msgstr "Amosar todos os _eventos pendentes"
+
+#: gajim/application.py:132
+msgid "Open IPython shell"
+msgstr ""
+
+#: gajim/application.py:139
+#, fuzzy
+msgid "Pops up a window with the next pending event"
+msgstr "Amosa unha fiestra emerxente co seguinte acontecemento pendente"
+
+#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: data/org.gajim.Gajim.desktop.in:21
+#, fuzzy
+msgid "Start a new chat"
+msgstr "Iniciar a charla"
+
+#: gajim/application.py:152
+msgid "Simulate loss of connectivity"
+msgstr ""
+
+#: gajim/application.py:159
+msgid "Simulate regaining connectivity"
+msgstr ""
+
+#: gajim/application.py:201 gajim/gui_interface.py:133
+msgid "Database Error"
+msgstr ""
+
+#: gajim/roster_window.py:294 gajim/roster_window.py:1030
 msgid "Merged accounts"
 msgstr "Contas combinadas"
 
-#: gajim/roster_window.py:857 gajim/roster_window.py:1757
-#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
-#: gajim/roster_window.py:5128 gajim/message_window.py:525
-#: gajim/common/contacts.py:133 gajim/common/commands.py:230
-#: gajim/common/helpers.py:95
+#: gajim/roster_window.py:853 gajim/roster_window.py:1631
+#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
+#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
+#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
+#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+msgid "Transports"
+msgstr "Transportes"
+
+#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
+#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
+#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
+#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
 #, fuzzy
 msgid "Groupchats"
 msgstr "Grupos de charla"
 
-#: gajim/roster_window.py:896 gajim/roster_window.py:1665
-#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
-#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
-#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
-#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
-msgid "Transports"
-msgstr "Transportes"
-
-#: gajim/roster_window.py:2045
+#: gajim/roster_window.py:2012
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Enviouse a autorización"
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2013
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Agora \"%s\" poderá saber o seu estado."
 
-#: gajim/roster_window.py:2069
+#: gajim/roster_window.py:2031
 msgid "Subscription request has been sent"
 msgstr "Enviouse a solicitude de subscrición"
 
-#: gajim/roster_window.py:2070
+#: gajim/roster_window.py:2032
 #, 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."
 
-#: gajim/roster_window.py:2084
+#: gajim/roster_window.py:2046
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Eliminouse a autorización"
 
-#: gajim/roster_window.py:2085
+#: gajim/roster_window.py:2047
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" sempre o/a verá desconectado."
 
-#: gajim/roster_window.py:2109
-#, fuzzy
-msgid "OpenPGP is not usable"
-msgstr "OpenPGP non se pode usar neste ordenador"
-
-#: gajim/roster_window.py:2110
-#, python-format
-msgid ""
-"Gajim needs python-gnupg >= 0.3.8\n"
-"Beware there is an incompatible python package called gnupg.\n"
-"You will be connected to %s without OpenPGP."
+#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
+#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar nun ou máis grupos de charlas"
 
-#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
+#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#, fuzzy
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
-"group chats. Are you sure you want to go invisible?"
+"group chats.\n"
+"Are you sure you want to go invisible?"
 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?"
 
-#: gajim/roster_window.py:2346
-msgid "desync'ed"
-msgstr ""
+#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
+#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Contacto desconectado"
 
-#: gajim/roster_window.py:2416
-msgid "Really quit Gajim?"
-msgstr ""
+#: gajim/roster_window.py:2285
+#, fuzzy
+msgid "desynced"
+msgstr "Avanzado"
+
+#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#, fuzzy
+msgid "Quit Gajim"
+msgstr "Gajim"
+
+#: gajim/roster_window.py:2354
+#, fuzzy
+msgid "You are about to quit Gajim"
+msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: gajim/roster_window.py:2417
+#: gajim/roster_window.py:2355
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: gajim/roster_window.py:2418
-msgid "Always close Gajim"
+#: gajim/roster_window.py:2356
+msgid "_Always quit when closing Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2505
+#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
+#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
 #, fuzzy
-msgid "You have running file transfers"
+msgid "_Quit"
+msgstr "_Saír"
+
+#: gajim/roster_window.py:2448
+#, fuzzy
+msgid "Stop File Transfers"
+msgstr "Transferencias"
+
+#: gajim/roster_window.py:2449
+#, fuzzy
+msgid "You still have running file transfers"
 msgstr "Cancelar a transferencia"
 
-#: gajim/roster_window.py:2506
+#: gajim/roster_window.py:2450
 msgid ""
-"If you quit now, the file(s) being transferred will be stopped. Do you still "
-"want to quit?"
+"If you quit now, the file(s) being transferred will be lost.\n"
+"Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
-msgid "You have unread messages"
+#: gajim/roster_window.py:2488
+#, fuzzy
+msgid "Unread Messages"
+msgstr "Acontecementos sen ler"
+
+#: gajim/roster_window.py:2489
+#, fuzzy
+msgid "You still have unread messages"
 msgstr "Ten mensaxes sen ler"
 
-#: gajim/roster_window.py:2538
+#: gajim/roster_window.py:2490
 #, fuzzy
 msgid ""
-"Messages will only be available for reading them later if you have history "
-"enabled and contact is in your roster."
+"Messages will only be available for reading them later if storing chat "
+"history is enabled and if the contact is in your contact list."
 msgstr ""
 "As mensaxes só estarán dispoñíbeis para a súa lectura posterior se ten o "
 "historial activado"
 
-#: gajim/roster_window.py:2829
+#: gajim/roster_window.py:2760
+msgid "You have unread messages"
+msgstr "Ten mensaxes sen ler"
+
+#: gajim/roster_window.py:2761
 msgid "You must read them before removing this transport."
 msgstr "Debe lelas antes de eliminar este transporte."
 
-#: gajim/roster_window.py:2832
-#, python-format
-msgid "Transport \"%s\" will be removed"
+#: gajim/roster_window.py:2764
+#, fuzzy, python-format
+msgid "Transport '%s' will be removed"
 msgstr "Eliminarase o transporte \"%s\""
 
-#: gajim/roster_window.py:2833
+#: gajim/roster_window.py:2765
 #, fuzzy
 msgid ""
-"You will no longer be able to send and receive messages from contacts using "
-"this transport."
+"You will no longer be able to send and receive messages from and to contacts "
+"using this transport."
 msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde este transporte"
 
-#: gajim/roster_window.py:2836
+#: gajim/roster_window.py:2768
 msgid "Transports will be removed"
 msgstr "Eliminaranse os transportes"
 
-#: gajim/roster_window.py:2841
+#: gajim/roster_window.py:2773
 #, fuzzy, python-format
 msgid ""
-"You will no longer be able to send and receive messages to contacts from "
-"these transports: %s"
-msgstr ""
-"Xa non poderá enviar e recibir mensaxes a contactos desde estes transportes: "
+"You will no longer be able to send and receive messages from and to contacts "
+"using these transports:\n"
 "%s"
+msgstr ""
+"Xa non poderá enviar e recibir mensaxes a contactos desde este transporte"
 
-#: gajim/roster_window.py:2892
+#: gajim/roster_window.py:2777
 #, 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?"
+msgid "Remove Transport"
+msgstr "Amosar os trans_portes"
 
-#: gajim/roster_window.py:2894
+#: gajim/roster_window.py:2844
+#, fuzzy
+msgid "Block Contact"
+msgstr "Contactos"
+
+#: gajim/roster_window.py:2845
+#, fuzzy
+msgid "Really block this contact?"
+msgstr "Está o OpenPGP activado para este contacto?"
+
+#: gajim/roster_window.py:2846
 msgid ""
-"This contact will see you offline and you will not receive messages it sends "
-"you."
+"This contact will see you offline and you will not receive any messages sent "
+"to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2934
+#: gajim/roster_window.py:2851
+#, fuzzy
+msgid "_Block Contact"
+msgstr "Contactos"
+
+#: gajim/roster_window.py:2896
 msgid "Rename Contact"
 msgstr "Renomear o contacto"
 
-#: gajim/roster_window.py:2935
+#: gajim/roster_window.py:2897
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza un alcume novo para o contacto %s"
 
-#: gajim/roster_window.py:2942
+#: gajim/roster_window.py:2904
 msgid "Rename Group"
 msgstr "Renomear o grupo"
 
-#: gajim/roster_window.py:2943
+#: gajim/roster_window.py:2905
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: gajim/roster_window.py:2988
+#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
 msgid "Remove Group"
 msgstr "Eliminar o grupo"
 
-#: gajim/roster_window.py:2989
-#, python-format
-msgid "Do you want to remove group %s from the roster?"
+#: gajim/roster_window.py:2955
+#, fuzzy, python-format
+msgid "Do you want to remove %s from the contact list?"
 msgstr "Quere eliminar o grupo %s da listaxe?"
 
-#: gajim/roster_window.py:2990
+#: gajim/roster_window.py:2956
 #, fuzzy
-msgid "Also remove all contacts in this group from your roster"
+msgid "_Also remove all contacts of this group from contact list"
 msgstr "Eliminar da listaxe tamén todos os contactos dentro do grupo"
 
-#: gajim/roster_window.py:3029
-msgid "Assign OpenPGP Key"
-msgstr "Asignar chave de OpenPGP"
+#: gajim/roster_window.py:3044
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: gajim/roster_window.py:3030
-msgid "Select a key to apply to the contact"
-msgstr "Seleccione unha chave para lle aplicar ao contacto"
+#: gajim/roster_window.py:3353
+#, fuzzy
+msgid "Remove Contact"
+msgstr "Renomear o contacto"
 
-#: gajim/roster_window.py:3436
-#, python-format
-msgid "Contact \"%s\" will be removed from your roster"
-msgstr "Eliminarase o contacto \"%s\" da súa listaxe"
+#: gajim/roster_window.py:3354
+#, fuzzy
+msgid "Remove contact from contact list"
+msgstr "Elimina o contacto da listaxe"
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3355
 #, python-format
-msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgid "You are about to remove '%(name)s' (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3443
+#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
 #, fuzzy
 msgid ""
-"By removing this contact you also remove authorization resulting in them "
-"always seeing you as offline."
+"By removing this contact you also remove authorization. This means the "
+"contact will see you as offline."
 msgstr ""
 "Ao eliminar estes contactos: %s\n"
 "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
 "desconectado."
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3375
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Que quere facer?"
 
-#: gajim/roster_window.py:3453
+#: gajim/roster_window.py:3386
 #, fuzzy
-msgid ""
-"By removing this contact you also by default remove authorization resulting "
-"in them always seeing you as offline."
-msgstr ""
-"Ao eliminar este contacto tamén se eliminará a autorización. Este contacto "
-"sempre o/a verá desconectado."
-
-#: gajim/roster_window.py:3456
-msgid "I want this contact to know my status after removal"
+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"
 
-#: gajim/roster_window.py:3460
-msgid "Contacts will be removed from your roster"
-msgstr "Os contactos eliminaranse da súa listaxe"
+#: gajim/roster_window.py:3393
+#, fuzzy
+msgid "Remove contacts from contact list"
+msgstr "Elimina o contacto da listaxe"
 
-#: gajim/roster_window.py:3465
-#, python-format
+#: gajim/roster_window.py:3399
+#, fuzzy, python-format
 msgid ""
-"By removing these contacts:%s\n"
-"you also remove authorization resulting in them always seeing you as offline."
+"By removing the following contacts, you will also remove authorization. This "
+"means they will see you as offline:\n"
+"\n"
+"%s"
 msgstr ""
 "Ao eliminar estes contactos: %s\n"
 "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
 "desconectado."
 
-#: gajim/roster_window.py:3523
+#: gajim/roster_window.py:3403
 #, fuzzy
-msgid ""
-"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?"
-
-#: gajim/roster_window.py:3525
-#, python-format
-msgid ""
-"This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then they will see your global status."
-msgstr ""
+msgid "Remove Contacts"
+msgstr "Renomear o contacto"
 
-#: gajim/roster_window.py:3544
+#: gajim/roster_window.py:3423
 msgid "No account available"
 msgstr "A conta non está dispoñíbel"
 
-#: gajim/roster_window.py:3545
+#: gajim/roster_window.py:3424
 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."
 
-#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
-#: gajim/dialog_messages.py:64
-msgid "You cannot join a group chat while you are invisible"
-msgstr "Non pode entrar nun grupo de charlas se está invisíbel"
-
-#: gajim/roster_window.py:4178
+#: gajim/roster_window.py:4060
 msgid "Metacontacts storage not supported by your server"
 msgstr "O teu servidor non admite o almacenamento de metacontactos"
 
-#: gajim/roster_window.py:4180
+#: gajim/roster_window.py:4062
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2522,1055 +1684,185 @@ 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."
 
-#: gajim/roster_window.py:4276
-msgid ""
-"You are about to create a metacontact. Are you sure you want to continue?"
+#: gajim/roster_window.py:4159
+#, fuzzy
+msgid "You are about to create a metacontact"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: gajim/roster_window.py:4278
+#: gajim/roster_window.py:4160
 #, fuzzy
 msgid ""
-"Metacontacts are a way to regroup several contacts in one line. Generally it "
-"is used when the same person has several XMPP accounts or transport accounts."
+"Metacontacts are a way to regroup several contacts in one single contact. "
+"Generally it is used when the same person has several XMPP- or Transport-"
+"Accounts."
 msgstr ""
 "Os metacontactos son unha forma de reagrupar varios contactos nunha liña. "
 "Xeralmente se usan cando a mesma persoa ten varias contas de Jabber ou "
 "contas de transportes."
 
-#: gajim/roster_window.py:4400
+#: gajim/roster_window.py:4164
+#, fuzzy
+msgid "Create Metacontact"
+msgstr "Renomear o contacto"
+
+#: gajim/roster_window.py:4170
+#, fuzzy
+msgid "_Create"
+msgstr "Inactivo"
+
+#: gajim/roster_window.py:4287
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "O ficheiro non é válido"
 
-#: gajim/roster_window.py:4412
+#: gajim/roster_window.py:4298
+#, fuzzy
+msgid "Send file?"
+msgstr "Enviar ficheiro"
+
+#: gajim/roster_window.py:4299
 #, 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:"
 
-#: gajim/roster_window.py:4552
+#: gajim/roster_window.py:4451
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Enviar %s"
 
-#: gajim/roster_window.py:4565
+#: gajim/roster_window.py:4464
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Facer %s e %s metacontactos"
 
-#: gajim/roster_window.py:4570
+#: gajim/roster_window.py:4469
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Facer %s e %s metacontactos"
 
-#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
+#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
 msgid "_Change Status Message"
 msgstr "_Cambiar a mensaxe de estado"
 
-#: gajim/roster_window.py:4974
+#: gajim/roster_window.py:4845
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: gajim/roster_window.py:4985
+#: gajim/roster_window.py:4856
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publicar"
 
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4868
 #, fuzzy
 msgid "Configure Services…"
 msgstr "_Descubrir os servizos..."
 
-#: gajim/roster_window.py:5130
+#: gajim/roster_window.py:4997
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
+#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
 msgid "Send Group M_essage"
 msgstr "Enviar mensaxe ao grupo"
 
-#: gajim/roster_window.py:5144
+#: gajim/roster_window.py:5011
 msgid "To all users"
 msgstr "A todos os usuarios"
 
-#: gajim/roster_window.py:5148
+#: gajim/roster_window.py:5015
 msgid "To all online users"
 msgstr "A todos os usuarios en liña"
 
-#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
+#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Con_vidar"
 
-#: gajim/roster_window.py:5315
+#: gajim/roster_window.py:5162
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomear o contacto"
 
-#: gajim/roster_window.py:5321
+#: gajim/roster_window.py:5168
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Editar os grupos"
 
-#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
-#: gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: gajim/roster_window.py:5380
+#: gajim/roster_window.py:5226
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5387
+#: gajim/roster_window.py:5233
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contacto desconectado"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
-#, fuzzy
-msgid "_Disconnect"
-msgstr "Contacto desconectado"
-
-#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
-#: gajim/data/gui/contact_context_menu.ui:228
+#: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Historial"
 
-#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Historial"
 
-#: gajim/roster_window.py:5492
+#: gajim/roster_window.py:5343
 msgid "_Join New Group Chat"
 msgstr "_Entrar nun outro grupo de charla"
 
-#: gajim/gajim.py:75
-#, fuzzy
-msgid "Show the application's version"
-msgstr "Usar a icona na á_rea de notificación"
-
-#: gajim/gajim.py:78
-#, fuzzy
-msgid "Show only critical errors"
-msgstr "Amosar só na _listaxe de contactos"
-
-#: gajim/gajim.py:81
-msgid "Separate profile files completely (even history db and plugins)"
-msgstr ""
-
-#: gajim/gajim.py:85
-msgid "Print XML stanzas and other debug information"
-msgstr ""
-
-#: gajim/gajim.py:89
-#, fuzzy
-msgid "Use defined profile in configuration directory"
-msgstr "Editor avanzado de configuración"
-
-#: gajim/gajim.py:93
-#, fuzzy
-msgid "Set configuration directory"
-msgstr "Configuración da sala"
-
-#: gajim/gajim.py:96
-msgid "Configure logging system"
-msgstr ""
-
-#: gajim/gajim.py:99
-#, fuzzy
-msgid "Show all warnings"
-msgstr "Amosar todos os _eventos pendentes"
-
-#: gajim/gajim.py:102
-msgid "Open IPython shell"
-msgstr ""
-
-#: gajim/gajim.py:105
-#, fuzzy
-msgid "Pops up a window with the next pending event"
-msgstr "Amosa unha fiestra emerxente co seguinte acontecemento pendente"
-
-#: gajim/gajim.py:165 gajim/gui_interface.py:127
-msgid "Database Error"
-msgstr ""
-
-#: gajim/history_sync.py:217
-#, fuzzy
-msgid "How far back do you want to go?"
-msgstr "Que quere facer?"
-
-#: gajim/history_sync.py:222
-msgid "One Month"
-msgstr ""
-
-#: gajim/history_sync.py:223
-msgid "Three Months"
-msgstr ""
-
-#: gajim/history_sync.py:224
-msgid "One Year"
-msgstr ""
-
-#: gajim/history_sync.py:225
-msgid "Everything"
-msgstr ""
-
-#: gajim/history_sync.py:254
-#, fuzzy
-msgid "Connecting..."
-msgstr "Conectando"
-
-#: gajim/history_sync.py:266
-#, fuzzy, python-format
-msgid "%(received)s of %(max)s"
-msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
-
-#: gajim/history_sync.py:270
-#, fuzzy, python-format
-msgid "Downloaded %s Messages"
-msgstr "%d mensaxe sen ler"
-
-#: gajim/history_sync.py:290
-#, python-brace-format
-msgid ""
-"\n"
-"        Finshed synchronising your History.\n"
-"        {received} Messages downloaded.\n"
-"        "
-msgstr ""
-
-#: gajim/history_sync.py:297
-msgid ""
-"\n"
-"        Gajim is fully synchronised\n"
-"        with the Archive.\n"
-"        "
-msgstr ""
-
-#: gajim/history_sync.py:304
-msgid ""
-"\n"
-"        There is already a synchronisation in\n"
-"        progress. Please try later.\n"
-"        "
-msgstr ""
-
-#: gajim/config.py:156 gajim/config.py:626
-#: gajim/data/gui/preferences_window.ui:68
-#: gajim/data/gui/preferences_window.ui:85
-msgid "Disabled"
-msgstr "Desactivado"
-
-#: gajim/config.py:421 gajim/config.py:425 gajim/config.py:1947
-msgid "Default"
-msgstr "Por defecto"
-
-#: gajim/config.py:1138
-msgid "status message title"
-msgstr "título da mensaxe de estado"
-
-#: gajim/config.py:1139
-msgid "status message text"
-msgstr "texto da mensaxe de estado"
-
-#: gajim/config.py:1527
-#, python-format
-msgid "Edit %s"
-msgstr "Editar %s"
-
-#: gajim/config.py:1529
-#, python-format
-msgid "Register to %s"
-msgstr "Rexistrar %s"
-
-#: gajim/config.py:1565
-msgid "Ban List"
-msgstr "Listaxe de expulsión"
-
-#: gajim/config.py:1566
-msgid "Member List"
-msgstr "Listaxe de membros"
-
-#: gajim/config.py:1566
-msgid "Owner List"
-msgstr "Listaxe de propietarios"
-
-#: gajim/config.py:1567
-msgid "Administrator List"
-msgstr "Listaxe de administradores"
-
-#: gajim/config.py:1641
-msgid "Reason"
-msgstr "Motivo"
-
-#: gajim/config.py:1648
-msgid "Nick"
-msgstr "Alcume"
-
-#: gajim/config.py:1654
-msgid "Role"
-msgstr "Posto"
-
-#: gajim/config.py:1680
-#, fuzzy
-msgid "Banning…"
-msgstr "A expulsar..."
-
-#: gajim/config.py:1682
-msgid ""
-"<b>Whom do you want to ban?</b>\n"
-"\n"
-msgstr ""
-"<b>A quen quere expulsar?</b>\n"
-"\n"
-
-#: gajim/config.py:1684
-#, fuzzy
-msgid "Adding Member…"
-msgstr "A engadir o membro..."
-
-#: gajim/config.py:1685
-msgid ""
-"<b>Whom do you want to make a member?</b>\n"
-"\n"
-msgstr ""
-"<b>A quen quere facer membro?</b>\n"
-"\n"
-
-#: gajim/config.py:1687
-#, fuzzy
-msgid "Adding Owner…"
-msgstr "A engadir un propietario..."
-
-#: gajim/config.py:1688
-#, fuzzy
-msgid ""
-"<b>Whom do you want to make an owner?</b>\n"
-"\n"
-msgstr ""
-"<b>A quen quere facer como propietario?</b>\n"
-"\n"
-
-#: gajim/config.py:1690
-#, fuzzy
-msgid "Adding Administrator…"
-msgstr "A engadir administrador..."
-
-#: gajim/config.py:1691
-msgid ""
-"<b>Whom do you want to make an administrator?</b>\n"
-"\n"
-msgstr ""
-"<b>A quen quere facer como administrador?</b>\n"
-"\n"
-
-#: gajim/config.py:1692
-#, fuzzy
-msgid ""
-"Can be one of the following:\n"
-"1. user@domain/resource (only that resource matches).\n"
-"2. user@domain (any resource matches).\n"
-"3. domain/resource (only that resource matches).\n"
-"4. domain (the domain itself matches, as does any user@domain,\n"
-"domain/resource, or address containing a subdomain)."
-msgstr ""
-"Pode ser un dos seguintes:\n"
-"1. usuario@dominio/recurso (só ese recurso coincide)2. usuario@dominio "
-"(calquera recurso coincide)3. dominio/recurso (só ese recurso coincide)4. "
-"dominio (o dominio coincide, incluíndo calquera\n"
-"usuario@dominio, dominio/recurso ou enderezo que contén\n"
-"un subdominio."
-
-#: gajim/config.py:1792
-#, python-format
-msgid "Removing %s account"
-msgstr "A eliminar a conta %s"
-
-#: gajim/config.py:1807
-#, fuzzy
-msgid "Account is disabled"
-msgstr "Cifrado desactivado"
-
-#: gajim/config.py:1808
-msgid "To unregister from a server, account must be enabled."
-msgstr ""
-
-#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
-msgid "Password Required"
-msgstr "É necesario o contrasinal"
-
-#: gajim/config.py:1822 gajim/gui_interface.py:733
-#, python-format
-msgid "Enter your password for account %s"
-msgstr "Introduza un contrasinal para a conta %s"
-
-#: gajim/config.py:1823 gajim/gui_interface.py:748
-msgid "Save password"
-msgstr "Gardar o contrasinal"
-
-#: gajim/config.py:1833
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "A conta \"%s\" está conectada ao servidor"
-
-#: gajim/config.py:1834
-msgid "If you remove it, the connection will be lost."
-msgstr "Se a elimina, perderase a conexión co servidor"
-
-#: gajim/config.py:1848
-#, fuzzy, python-format
-msgid "Connection to server %s failed"
-msgstr "Fallou a conexión"
-
-#: gajim/config.py:1849
-#, fuzzy
-msgid "What would you like to do?"
-msgstr "Que quere facer?"
-
-#: gajim/config.py:1850
-#, fuzzy
-msgid "Remove only from Gajim"
-msgstr "Eliminar a _conta unicamente do Gajim"
-
-#: gajim/config.py:1851
-msgid "Don't remove anything. I'll try again later"
-msgstr ""
-
-#: gajim/config.py:1947
-msgid "?print_status:All"
-msgstr "Todos"
-
-#: gajim/config.py:1948
-msgid "Enter and leave only"
-msgstr "Entrar e saír soamente"
-
-#: gajim/config.py:1949
-#, fuzzy
-msgid "?print_status:None"
-msgstr "Todos"
-
-#: gajim/config.py:2015
-msgid "New Group Chat"
-msgstr "Novo grupo de charla"
-
-#: gajim/config.py:2051
-msgid "This bookmark has invalid data"
-msgstr "Este marcador ten información que non é válida"
-
-#: gajim/config.py:2052
-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."
-
-#: gajim/config.py:2175 gajim/config.py:2191 gajim/config.py:2202
-#: gajim/config.py:2230
-#, fuzzy
-msgid "Character not allowed"
-msgstr "Alcume non permitido: %s"
-
-#: gajim/config.py:2190 gajim/config.py:2201 gajim/config.py:2479
-#, fuzzy
-msgid "Invalid server"
-msgstr "O nome de usuario non é válido"
-
-#: gajim/config.py:2229
-#, fuzzy
-msgid "Invalid room"
-msgstr "A entrada non é válida"
-
-#: gajim/config.py:2393
-msgid "Account has been added successfully"
-msgstr "A conta engadiuse con éxito"
-
-#: gajim/config.py:2394 gajim/config.py:2400
-#, fuzzy
-msgid ""
-"You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menu item under the Edit menu from the main "
-"window."
-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."
-
-#: gajim/config.py:2399
-msgid "Your new account has been created successfully"
-msgstr "A súa conta nova creouse con éxito"
-
-#: gajim/config.py:2437
-msgid "Invalid username"
-msgstr "O nome de usuario non é válido"
-
-#: gajim/config.py:2439
-msgid "You must provide a username to configure this account."
-msgstr "Debe pórlle un nome para configurar esta conta."
-
-#: gajim/config.py:2480
-#, fuzzy
-msgid "Please provide a server on which you want to register."
-msgstr "Especifique o novo alcume que quere usar:"
-
-#: gajim/config.py:2503
-msgid "Invalid entry"
-msgstr "A entrada non é válida"
-
-#: gajim/config.py:2504
-msgid "Custom port must be a port number."
-msgstr "O porto personalizado debe ser un número de porto"
-
-#: gajim/config.py:2536 gajim/gui_interface.py:1357
-#, fuzzy
-msgid "Certificate Already in File"
-msgstr "O contacto xa está na listaxe"
-
-#: gajim/config.py:2537 gajim/gui_interface.py:1358
-#, python-format
-msgid "This certificate is already in file %s, so it's not added again."
-msgstr ""
-
-#: gajim/config.py:2630
-#, python-format
-msgid ""
-"<b>Security Warning</b>\n"
-"\n"
-"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
-"SSL Error: %(error)s\n"
-"Do you still want to connect to this server?"
-msgstr ""
-
-#: gajim/config.py:2636
-#, python-format
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA-1 fingerprint of the certificate:\n"
-"%(sha1)s\n"
-"SHA-256 fingerprint of the certificate:\n"
-"%(sha256)s"
-msgstr ""
-
-#: gajim/config.py:2670 gajim/config.py:2704
-#, fuzzy
-msgid "An error occurred during account creation"
-msgstr "Produciuse un erro durante a creación da conta"
-
-#: gajim/config.py:2767
-msgid "Account name is in use"
-msgstr "O nome da conta está en uso"
-
-#: gajim/config.py:2768
-msgid "You already have an account using this name."
-msgstr "Xa ten unha conta en que emprega este nome"
-
-#: gajim/config.py:2900
-msgid "PEP node was not removed"
-msgstr ""
-
-#: gajim/config.py:2901
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#: gajim/config.py:2929
-#, fuzzy, python-format
-msgid "Configure %s"
-msgstr "_Continuar"
-
-#: gajim/config.py:2946 gajim/plugins/gui.py:95
-msgid "Active"
-msgstr "Activo"
-
-#: gajim/config.py:2954
-msgid "Event"
-msgstr "Acontecemento"
-
-#: gajim/config.py:2988
-#, fuzzy
-msgid "Attention Message Received"
-msgstr "Recibiuse a primeira mensaxe"
-
-#: gajim/config.py:2989
-msgid "First Message Received"
-msgstr "Recibiuse a primeira mensaxe"
-
-#: gajim/config.py:2990
-#, fuzzy
-msgid "Next Message Received Focused"
-msgstr "Recibiuse unha mensaxe nova"
-
-#: gajim/config.py:2992
-#, fuzzy
-msgid "Next Message Received Unfocused"
-msgstr "Recibiuse unha mensaxe nova"
-
-#: gajim/config.py:2993
-msgid "Contact Connected"
-msgstr "Nome de contacto"
-
-#: gajim/config.py:2994
-msgid "Contact Disconnected"
-msgstr "Contacto desconectado"
-
-#: gajim/config.py:2995
-msgid "Message Sent"
-msgstr "Enviouse a mensaxe"
-
-#: gajim/config.py:2996
-msgid "Group Chat Message Highlight"
-msgstr "Remarcado da mensaxe de grupo de charla"
-
-#: gajim/config.py:2997
-msgid "Group Chat Message Received"
-msgstr "Recibiuse unha mensaxe de grupo de charla"
-
-#: gajim/tooltips.py:237
-#, python-format
-msgid "%(owner_or_admin_or_member)s of this group chat"
-msgstr "%(owner_or_admin_or_member)s deste grupo de charla"
-
-#: gajim/tooltips.py:263 gajim/common/helpers.py:473
-msgid "?Group Chat Contact Affiliation:None"
-msgstr "Ningún"
-
-#: gajim/tooltips.py:265 gajim/common/helpers.py:479
-msgid "Member"
-msgstr "Membro"
-
-#: gajim/tooltips.py:267 gajim/common/helpers.py:477
-msgid "Administrator"
-msgstr "Administrador"
-
-#: gajim/tooltips.py:269 gajim/common/helpers.py:475
-msgid "Owner"
-msgstr "Propietario"
-
-#: gajim/tooltips.py:423
-msgid " [blocked]"
-msgstr ""
-
-#: gajim/tooltips.py:427
-msgid " [minimized]"
-msgstr ""
-
-#: gajim/tooltips.py:596
-#, fuzzy
-msgid "Connected"
-msgstr "Conexión"
-
-#: gajim/tooltips.py:598
-#, fuzzy
-msgid "Disconnected"
-msgstr "Contacto desconectado"
-
-#: gajim/tooltips.py:647
-#, fuzzy
-msgid "?Noun:Download"
-msgstr "Descarga"
-
-#: gajim/tooltips.py:653
-#, fuzzy
-msgid "?Noun:Upload"
-msgstr "Subida"
-
-#: gajim/tooltips.py:660
-msgid "Type: "
-msgstr "Tipo: "
-
-#: gajim/tooltips.py:666
-msgid "Transferred: "
-msgstr "Transferido: "
-
-#: gajim/tooltips.py:669 gajim/tooltips.py:686
-msgid "Not started"
-msgstr "Non iniciado"
-
-#: gajim/tooltips.py:671
-msgid "Stopped"
-msgstr "Detido"
-
-#: gajim/tooltips.py:673 gajim/tooltips.py:676
-msgid "Completed"
-msgstr "Completado"
-
-#: gajim/tooltips.py:679
-msgid "?transfer status:Paused"
-msgstr "Pausada"
-
-#: gajim/tooltips.py:682
-msgid "Stalled"
-msgstr "Atascado"
-
-#: gajim/tooltips.py:684
-msgid "Transferring"
-msgstr "A transferir"
-
-#: gajim/tooltips.py:687
-msgid "Status: "
-msgstr "Estado: "
-
-#: gajim/tooltips.py:719 gajim/common/helpers.py:389
-#, fuzzy
-msgid "?user status:Available"
-msgstr "Pausada"
-
-#: gajim/tooltips.py:721 gajim/common/helpers.py:384
-msgid "Free for Chat"
-msgstr "Libre para falar"
-
-#: gajim/tooltips.py:723 gajim/common/commands.py:117
-#: gajim/common/helpers.py:396
-#: gajim/command_system/implementation/standard.py:138
-msgid "Away"
-msgstr "Ausente"
-
-#: gajim/tooltips.py:725 gajim/common/helpers.py:374
-msgid "Busy"
-msgstr "Ocupado"
-
-#: gajim/tooltips.py:727 gajim/common/helpers.py:379
-msgid "Not Available"
-msgstr "Non dispoñíbel"
-
-#: gajim/tooltips.py:729 gajim/common/helpers.py:401
-msgid "Offline"
-msgstr "Desconectado"
-
-#: gajim/advanced_configuration_window.py:88
-#, fuzzy
-msgid "Activated"
-msgstr "Activo"
-
-#: gajim/advanced_configuration_window.py:88
-#, fuzzy
-msgid "Deactivated"
-msgstr "Inactivo"
-
-#: gajim/advanced_configuration_window.py:90
-msgid "Boolean"
-msgstr ""
-
-#: gajim/advanced_configuration_window.py:91
-#, fuzzy
-msgid "Integer"
-msgstr "No grupo"
-
-#: gajim/advanced_configuration_window.py:92
-msgid "Text"
-msgstr ""
-
-#: gajim/advanced_configuration_window.py:93
-#: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:334
-msgid "Color"
-msgstr ""
-
-#: gajim/advanced_configuration_window.py:104
-msgid "Preference Name"
-msgstr "Nome da opción"
-
-#: gajim/advanced_configuration_window.py:111
-msgid "Value"
-msgstr "Valor"
-
-#: gajim/advanced_configuration_window.py:120
-msgid "Type"
-msgstr "Tipo"
-
-#: gajim/advanced_configuration_window.py:176
-msgid "(None)"
-msgstr "(Ningún)"
-
-#: gajim/advanced_configuration_window.py:307
-msgid "Hidden"
-msgstr "Oculta"
-
-#: gajim/logind_listener.py:58
-msgid "Machine going to sleep"
-msgstr ""
-
-#: gajim/logind_listener.py:90
-msgid "Disconnect from the network"
-msgstr ""
-
-#: gajim/history_window.py:339
-#, python-format
-msgid "Conversation History with %s"
-msgstr "Historial de conversas con %s"
-
-#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
-msgid "Conversation History"
-msgstr "Historial de conversas"
-
-#: gajim/history_window.py:390 gajim/history_window.py:443
-msgid "Disk Error"
-msgstr ""
-
-#: gajim/history_window.py:546
-#, python-format
-msgid "%(nick)s is now %(status)s: %(status_msg)s"
-msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
-
-#: gajim/history_window.py:557
-#, fuzzy, python-format
-msgid "Error: %s"
-msgstr "Mensaxe de erro: %s"
-
-#: gajim/history_window.py:559
-msgid "Error"
-msgstr ""
-
-#: gajim/history_window.py:561
-#, python-format
-msgid "Status is now: %(status)s: %(status_msg)s"
-msgstr "O estado é agora: %(status)s: %(status_msg)s "
-
-#: gajim/history_window.py:564
-#, python-format
-msgid "Status is now: %(status)s"
-msgstr "O estado é agora: %(status)s"
-
-#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
-#, python-format
-msgid "Subject: %s\n"
-msgstr "Asunto: %s\n"
-
-#: gajim/statusicon.py:215
-#, fuzzy
-msgid "_Change Status Message…"
-msgstr "_Cambiar a mensaxe de estado"
-
-#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
-#, python-format
-msgid "using account %s"
-msgstr "a usar a conta %s"
-
-#: gajim/statusicon.py:319
-#, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Xestionar os marcadores"
-
-#: gajim/statusicon.py:332
-#, fuzzy
-msgid "Hide _Roster"
-msgstr "Non está na listaxe"
-
-#: gajim/statusicon.py:336
-msgid "Show _Roster"
-msgstr "Amosar _listaxe"
-
-#: gajim/statusicon.py:344
-msgid "Hide this menu"
-msgstr "Ocultar este menú"
-
-#: gajim/dataforms_widget.py:587
+#: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: gajim/dataforms_widget.py:589
+#: gajim/dataforms_widget.py:587
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Extensión non admitida"
 
-#: gajim/dataforms_widget.py:604
+#: gajim/dataforms_widget.py:602
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:658
+#: gajim/dataforms_widget.py:656
 msgid "new@jabber.id"
 msgstr ""
 
-#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
+#: gajim/dataforms_widget.py:659 gajim/dataforms_widget.py:661
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: gajim/server_info.py:130
-#, python-format
-msgid "%(days)s days, %(hours)s hours"
-msgstr ""
-
-#: gajim/server_info.py:187 gajim/accounts_window.py:536
-#: gajim/accounts_window.py:637
-#, fuzzy
-msgid "Hostname"
-msgstr "Nome do host:"
-
-#: gajim/server_info.py:188
-#, fuzzy
-msgid "Server Software"
-msgstr "Características dos servidores"
-
-#: gajim/server_info.py:189
+#: gajim/conversation_textview.py:65
 #, fuzzy
-msgid "Server Uptime"
-msgstr "Gardouse en: %s"
+msgid "Untrusted"
+msgstr "Elixa a súa chave de OpenPGP"
 
-#: gajim/server_info.py:227
-msgid ""
-"\n"
-"Disabled in config"
+#: gajim/conversation_textview.py:68
+msgid "Trust Not Decided"
 msgstr ""
 
-#: gajim/disco.py:69
-msgid "This service has not yet responded with detailed information"
-msgstr "Este servizo non respondeu aínda con información detallada"
-
-#: gajim/disco.py:70
-msgid ""
-"This service could not respond with detailed information.\n"
-"It is most likely legacy or broken"
+#: gajim/conversation_textview.py:71
+msgid "Unverified"
 msgstr ""
-"Este servizo podería non responder con información detallada.\n"
-"Posibelmente é antigo ou está roto"
 
-#: gajim/disco.py:129
-msgid "Others"
-msgstr "Outros"
-
-#: gajim/disco.py:133
-msgid "Conference"
-msgstr "Conferencia"
-
-#: gajim/disco.py:537
-msgid "Without a connection, you can not browse available services"
-msgstr "Sen unha conexión non pode navegar polos servizos dispoñíbeis"
-
-#: gajim/disco.py:626
-#, python-format
-msgid "Service Discovery using account %s"
-msgstr "Xestión de servizos coa conta %s"
-
-#: gajim/disco.py:628
-msgid "Service Discovery"
-msgstr "Xestión de servizos"
-
-#: gajim/disco.py:732
-msgid "The service could not be found"
-msgstr "O servizo non se achou"
-
-#: gajim/disco.py:733
-msgid ""
-"There is no service at the address you entered, or it is not responding. "
-"Check the address and try again."
-msgstr ""
-"Non hai servizo neste enderezo ou non está a responder. Comprobe o enderezo "
-"e ténteo máis tarde."
-
-#: gajim/disco.py:739 gajim/disco.py:1091
-msgid "The service is not browsable"
-msgstr "O servizo non é navegábel"
-
-#: gajim/disco.py:740
-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."
-
-#: gajim/disco.py:781 gajim/disco.py:791
-#, fuzzy
-msgid "Invalid Server Name"
-msgstr "O nome de usuario non é válido"
-
-#: gajim/disco.py:849
-#, fuzzy, python-format
-msgid "Browsing %(address)s using account %(account)s"
-msgstr "Navegar %s coa conta %s"
-
-#: gajim/disco.py:896
-#, fuzzy
-msgid "Browse"
-msgstr "_Navegar"
-
-#: gajim/disco.py:1092
-msgid "This service does not contain any items to browse."
-msgstr "Este servizo non contén elementos para navegar."
-
-#: gajim/disco.py:1304
-#, fuzzy
-msgid "Execute Command"
-msgstr "Executar o _comando..."
-
-#: gajim/disco.py:1308 gajim/disco.py:1465
-msgid "Re_gister"
-msgstr "_Subscribir"
-
-#: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#, fuzzy
-msgid "Join"
-msgstr "_Entrar"
-
-#: gajim/disco.py:1326 gajim/data/gui/search_window.ui:23
-msgid "Search"
-msgstr "Buscar"
-
-#: gajim/disco.py:1463
-msgid "_Edit"
-msgstr "_Editar"
-
-#: gajim/disco.py:1506
-#, fuzzy, python-format
-msgid "Scanning %(current)d / %(total)d.."
-msgstr "Escaneando %d / %d.."
-
-#: gajim/disco.py:1702
-msgid "Users"
-msgstr "Usuarios"
-
-#: gajim/disco.py:1710
-msgid "Description"
-msgstr "Descrición"
-
-#: gajim/disco.py:1718
-msgid "Id"
-msgstr "Id"
-
-#: gajim/disco.py:1748 gajim/data/gui/gc_control_popup_menu.ui:99
-#, fuzzy
-msgid "_Bookmark"
-msgstr "Engadir esta sala aos marcadores"
-
-#: gajim/disco.py:1782
-msgid "Bookmark already set"
-msgstr "O marcador xa se definiu"
-
-#: gajim/disco.py:1783
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "A sala \"%s\" xa está nos seus marcadores."
-
-#: gajim/disco.py:1793
-msgid "Bookmark has been added successfully"
-msgstr "O marcador engadiuse con éxito"
-
-#: gajim/disco.py:1794
-msgid "You can manage your bookmarks via Actions menu in your roster."
+#: gajim/conversation_textview.py:74
+msgid "Verified"
 msgstr ""
-"Pode xestionar os seus marcadores mediante o menú Accións da súa listaxe"
-
-#: gajim/disco.py:1986
-msgid "Subscribed"
-msgstr "Engadiuse"
 
-#: gajim/disco.py:1995
-#, fuzzy
-msgid "Node"
-msgstr "Ningún"
-
-#: gajim/disco.py:2062
-msgid "New post"
-msgstr "Publicación nova"
-
-#: gajim/disco.py:2068
-msgid "_Subscribe"
-msgstr "_Engadir"
-
-#: gajim/disco.py:2074
-msgid "_Unsubscribe"
-msgstr "_Eliminar"
-
-#: gajim/conversation_textview.py:329
+#: gajim/conversation_textview.py:325
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -3579,383 +1871,350 @@ 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"
 
-#: gajim/conversation_textview.py:561
+#: gajim/conversation_textview.py:540
 #, fuzzy
 msgid "_Quote"
 msgstr "_Saír"
 
-#: gajim/conversation_textview.py:569
+#: gajim/conversation_textview.py:548
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Accións para \"%s\""
 
-#: gajim/conversation_textview.py:583
+#: gajim/conversation_textview.py:562
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: gajim/conversation_textview.py:588
+#: gajim/conversation_textview.py:567
 msgid "Look it up in _Dictionary"
 msgstr "Buscalo no _Dicionario"
 
-#: gajim/conversation_textview.py:605
+#: gajim/conversation_textview.py:584
 #, 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"
 
-#: gajim/conversation_textview.py:619
+#: gajim/conversation_textview.py:598
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" no URL da busca web"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:601
 msgid "Web _Search for it"
 msgstr "_Buscalo na rede"
 
-#: gajim/conversation_textview.py:628
+#: gajim/conversation_textview.py:607
 msgid "Open as _Link"
 msgstr "_Abrir como ligazón"
 
-#: gajim/conversation_textview.py:847
-msgid "URL:"
-msgstr ""
-
-#: gajim/conversation_textview.py:1021
+#: gajim/conversation_textview.py:883
 #, fuzzy
 msgid "Invalid URL"
 msgstr "A ID de Jabber non é válida"
 
-#: gajim/conversation_textview.py:1106
+#: gajim/conversation_textview.py:968
 msgid ""
 "<b>Message corrected. Original message:</b>\n"
 "{}"
 msgstr ""
 
-#: gajim/conversation_textview.py:1250
+#: gajim/conversation_textview.py:1116
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Onte"
 msgstr[1] "Onte"
 
-#: gajim/message_textview.py:43
+#: gajim/conversation_textview.py:1146
+#, fuzzy
+msgid "Not encrypted"
+msgstr "Non iniciado"
+
+#: gajim/conversation_textview.py:1149
+#, python-format
+msgid "Encrypted (%s)"
+msgstr ""
+
+#: gajim/conversation_textview.py:1259 gajim/gtk/history.py:615
+#, python-format
+msgid "Subject: %s\n"
+msgstr "Asunto: %s\n"
+
+#: gajim/message_textview.py:45
 #, fuzzy
-msgid "Write a message.."
+msgid "Write a message…"
 msgstr "Mensaxe privada nova"
 
-#: gajim/message_window.py:245
+#: gajim/message_window.py:250
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Non está conectado ao servidor"
 
-#: gajim/message_window.py:246
+#: gajim/message_window.py:251
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 
-#: gajim/message_window.py:523
+#: gajim/message_window.py:539
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Grupos de charla"
 
-#: gajim/message_window.py:527
+#: gajim/message_window.py:543
+#, fuzzy
+msgid "Group Chats"
+msgstr "_Grupos de charla"
+
+#: gajim/message_window.py:547
 msgid "Private Chats"
 msgstr "Charlas privadas"
 
-#: gajim/message_window.py:533
+#: gajim/message_window.py:553
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
-#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
-#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
-#: gajim/gui_interface.py:360
-msgid "Unable to join group chat"
-msgstr "Non se puido entrar no grupo de charla"
-
-#: gajim/gui_interface.py:158
-#, fuzzy, python-format
-msgid ""
-"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:"
-
-#: gajim/gui_interface.py:162
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: gajim/gui_interface.py:180
+#: gajim/gui_interface.py:173
 msgid "Do you accept this request?"
 msgstr "Acepta esta solicitude?"
 
-#: gajim/gui_interface.py:182
+#: gajim/gui_interface.py:175
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Acepta esta solicitude?"
 
-#: gajim/gui_interface.py:185
+#: gajim/gui_interface.py:178
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Autorización HTTP (%s) para %s (id: %s)"
 
-#: gajim/gui_interface.py:229 gajim/notify.py:96
+#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Fallou a conexión"
 
-#: gajim/gui_interface.py:315
+#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
+msgid "Password Required"
+msgstr "É necesario o contrasinal"
+
+#: gajim/gui_interface.py:280
 #, 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."
 
-#: gajim/gui_interface.py:330
-#, fuzzy, python-format
-msgid "<b>%s</b> is full"
-msgstr "<b>Sons</b>"
-
-#: gajim/gui_interface.py:339
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Está expulsado deste grupo de charla."
-
-#: gajim/gui_interface.py:346
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Non existe o grupo de charla."
-
-#: gajim/gui_interface.py:350
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Non existe o grupo de charla."
-
-#: gajim/gui_interface.py:353
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "A creación de grupos de charla está restrinxida."
-
-#: gajim/gui_interface.py:355
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Non se puido entrar no grupo de charla"
-
-#: gajim/gui_interface.py:356
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "É necesario usar o alcume rexistrado."
-
-#: gajim/gui_interface.py:361
-#, fuzzy, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Non está na listaxe de membros"
-
-#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
+#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1376
+#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/common/modules/message.py:122
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "produciuse un erro mentres se enviaba %s ( %s )"
 
-#: gajim/gui_interface.py:513 gajim/notify.py:96
+#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
 #, fuzzy
 msgid "Subscription request"
 msgstr "Solicitude de subscrición"
 
-#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
-#: gajim/common/helpers.py:95
+#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
+#: gajim/common/helpers.py:83
 msgid "Observers"
 msgstr "Observadores"
 
-#: gajim/gui_interface.py:538
+#: gajim/gui_interface.py:422
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: gajim/gui_interface.py:539
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
+#: gajim/gui_interface.py:423
+#, fuzzy, python-format
+msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "O contacto \"%s\" autorizouno para ver o seu estado."
 
-#: gajim/gui_interface.py:547
+#: gajim/gui_interface.py:431
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "O contacto \"%s\" eliminou a súa subscrición"
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:432
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:570 gajim/notify.py:96
+#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Eliminar"
 
-#: gajim/gui_interface.py:582
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Non foi posíbel estabelecer o contacto con \"%s\""
-
-#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
-#: gajim/common/connection.py:1468
-msgid "Check your connection or try again later."
-msgstr "Comprobe a súa conexión ou probe máis tarde."
-
-#: gajim/gui_interface.py:641
+#: gajim/gui_interface.py:465
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:645
+#: gajim/gui_interface.py:469
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:675
-msgid ""
-"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
-"running or it returned a wrong passphrase.\n"
-msgstr ""
-
-#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Está actualmente conectado sen a súa chave de GPG"
-
-#: gajim/gui_interface.py:680
-#, fuzzy
-msgid "Wrong passphrase"
-msgstr "O contrasinal é incorrecto"
-
-#: gajim/gui_interface.py:685
-#, fuzzy
-msgid "Wrong OpenPGP passphrase"
-msgstr "O contrasinal é incorrecto"
+#: gajim/gui_interface.py:485
+#, fuzzy, python-brace-format
+msgid "You are invited to {room} by {user}"
+msgstr "Está expulsado deste grupo de charla."
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:506
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "É necesario o contrasinal"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:507
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Introduza o contrasinal GPG para a conta %s"
 
-#: gajim/gui_interface.py:723
-#, fuzzy
-msgid "Untrusted OpenPGP key"
-msgstr "Elixa a súa chave de OpenPGP"
-
-#: gajim/gui_interface.py:723
-msgid ""
-"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
-"to encrypt this message?"
-msgstr ""
+#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#, python-format
+msgid "Enter your password for account %s"
+msgstr "Introduza un contrasinal para a conta %s"
 
-#: gajim/gui_interface.py:769
-msgid ""
-"Please copy / paste the refresh token from the website that has just been "
-"opened."
-msgstr ""
+#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+msgid "Save password"
+msgstr "Gardar o contrasinal"
 
-#: gajim/gui_interface.py:772
-msgid "Oauth2 Credentials"
-msgstr ""
+#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
+msgid "File Transfer Error"
+msgstr "Produciuse un erro na transferencia do ficheiro"
 
-#: gajim/gui_interface.py:924
+#: gajim/gui_interface.py:666
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
-msgid "SSL certificate error"
-msgstr ""
+#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
+msgid "File Transfer Request"
+msgstr "Solicitude de transferencia de ficheiro"
+
+#: gajim/gui_interface.py:767
+#, fuzzy
+msgid "Remote Contact Stopped Transfer"
+msgstr "Elimina o contacto da listaxe"
 
-#: gajim/gui_interface.py:1038
+#: gajim/gui_interface.py:772
+#, fuzzy
+msgid "Error Opening File"
+msgstr "Erro ao ler o ficheiro:"
+
+#: gajim/gui_interface.py:782
+#, fuzzy
+msgid "SSL Certificate Error"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
+#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gtk/notification.py:279
+msgid "File Transfer Stopped"
+msgstr "Detívose a transferencia do ficheiro"
+
+#: gajim/gui_interface.py:799
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Transferencias"
 
-#: gajim/gui_interface.py:1060
+#: gajim/gui_interface.py:822
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
 
-#: gajim/gui_interface.py:1064
+#: gajim/gui_interface.py:827
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
 
-#: gajim/gui_interface.py:1068
+#: gajim/gui_interface.py:833
 #, 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."
 
-#: gajim/gui_interface.py:1081
+#: gajim/gui_interface.py:848
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Envioulle con éxito o ficheiro %(filename)s a %(name)s."
 
-#: gajim/gui_interface.py:1085
+#: gajim/gui_interface.py:854
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Detívose a transferencia de %(filename)s a %(name)s."
 
-#: gajim/gui_interface.py:1089
+#: gajim/gui_interface.py:860
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Detívose a transferencia de %(filename)s a %(name)s."
 
-#: gajim/gui_interface.py:1153
-#, fuzzy
-msgid "Choose file to send"
-msgstr "Elixa un ficheiro para enviar..."
-
-#: gajim/gui_interface.py:1196
-#, fuzzy
-msgid "Unable to decrypt message"
-msgstr "En cada _mensaxe"
-
-#: gajim/gui_interface.py:1208
+#: gajim/gui_interface.py:971
 msgid "Username Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: gajim/gui_interface.py:1209
+#: gajim/gui_interface.py:972
 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"
 
-#: gajim/gui_interface.py:1232
+#: gajim/gui_interface.py:995
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: gajim/gui_interface.py:1233
+#: gajim/gui_interface.py:996
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1290
+#: gajim/gui_interface.py:1053
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: gajim/gui_interface.py:1293
+#: gajim/gui_interface.py:1055
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: gajim/gui_interface.py:1383
+#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#, fuzzy
+msgid "Certificate Already in File"
+msgstr "O contacto xa está na listaxe"
+
+#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#, python-format
+msgid "This certificate is already in file %s, so it's not added again."
+msgstr ""
+
+#: gajim/gui_interface.py:1145
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid"
+msgstr ""
+
+#: gajim/gui_interface.py:1148
+#, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr ""
+
+#: gajim/gui_interface.py:1150
+#, python-format
+msgid ""
+"\n"
+"SSL Error: <b>%s</b>"
+msgstr ""
+
+#: gajim/gui_interface.py:1155
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1384
+#: gajim/gui_interface.py:1156
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3963,79 +2222,39 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1388
+#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA-1 fingerprint of the certificate:\n"
 "%(sha1)s\n"
-"SHA256 fingerprint of the certificate:\n"
+"SHA-256 fingerprint of the certificate:\n"
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1394
+#: gajim/gui_interface.py:1166
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1407
-msgid "Non Anonymous Server"
-msgstr ""
-
-#: gajim/gui_interface.py:1431
-#, python-format
-msgid ""
-"It seems the SSL certificate of account %(account)s has changed and is not "
-"valid or your connection is being compromised.\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 ""
-
-#: gajim/gui_interface.py:1509
-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 ""
+#: gajim/gui_interface.py:1174
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Engadir unha notificación especial para %s"
 
-#: gajim/gui_interface.py:1551
-#, fuzzy
-msgid ""
-"You are about to send your password unencrypted on an insecure connection. "
-"Are you sure you want to do that?"
-msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
+#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
+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."
 
-#: gajim/gui_interface.py:1848
+#: gajim/gui_interface.py:1448
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Isto non é un grupo de charla"
 
-#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
-#, fuzzy
-msgid "Emoticons disabled"
-msgstr "Cifrado desactivado"
-
-#: gajim/gui_interface.py:2006
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-
-#: gajim/gui_interface.py:2014
-msgid ""
-"Your configured emoticons theme could not be loaded. See the log for more "
-"details."
-msgstr ""
-
-#: gajim/gui_interface.py:2032
+#: gajim/gui_interface.py:1579
 msgid "This is not a group chat"
 msgstr "Isto non é un grupo de charla"
 
-#: gajim/gui_interface.py:2033
+#: gajim/gui_interface.py:1580
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -4043,273 +2262,175 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2411
+#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Non pode entrar nun grupo de charlas se está invisíbel"
+
+#: gajim/gui_interface.py:2037
 msgid "Could not save your settings and preferences"
 msgstr "Non se poden gardar as preferencias"
 
-#: gajim/gui_interface.py:2797 gajim/common/config.py:117
-#: gajim/common/config.py:531 gajim/common/optparser.py:335
-#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
-#, fuzzy
-msgid "default"
-msgstr "Por defecto"
-
-#: gajim/gui_interface.py:2982
-msgid "Passphrase Required"
-msgstr "É necesario o contrasinal"
-
-#: gajim/gui_interface.py:2983
-#, fuzzy, python-format
-msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Introduza o contrasinal GPG para a conta %s"
-
-#: gajim/gui_interface.py:2997
-#, fuzzy
-msgid "OpenPGP key expired"
-msgstr "Selección da chave de OpenPGP"
-
-#: gajim/gui_interface.py:2998
-#, fuzzy, python-format
-msgid ""
-"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
-msgstr "Conectarase a %s sen o OpenPGP"
-
-#: gajim/gui_interface.py:3007
-msgid "Wrong Passphrase"
-msgstr "O contrasinal é incorrecto"
-
-#: gajim/gui_interface.py:3008
-#, fuzzy
-msgid "Please retype your OpenPGP passphrase or press Cancel."
-msgstr "Por favor, volva escribir o seu contrasinal de GPG ou prema Cancelar."
-
-#: gajim/search_window.py:108
-msgid "Waiting for results"
-msgstr ""
-
-#: gajim/search_window.py:146 gajim/search_window.py:224
-msgid "Error in received dataform"
-msgstr ""
-
-#: gajim/search_window.py:181 gajim/search_window.py:216
-msgid "No result"
+#: gajim/gui_interface.py:2098
+msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/htmltextview.py:559
-#, fuzzy
-msgid "Loading"
-msgstr "A compor"
-
-#: gajim/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:"
-
-#: gajim/atom_window.py:128 gajim/data/gui/atom_entry_window.ui:20
-msgid "You have received new entry:"
-msgstr "Recibiu unha entrada nova:"
-
-#: gajim/adhoc_commands.py:111 gajim/data/gui/adhoc_commands_window.ui:9
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Comandos ad-hoc - Gajim"
-
-#: gajim/adhoc_commands.py:320
+#: gajim/dialog_messages.py:32
 #, fuzzy
-msgid "Cancel confirmation"
-msgstr "Información"
-
-#: gajim/adhoc_commands.py:321
-msgid ""
-"You are in process of executing command. Do you really want to cancel it?"
-msgstr ""
-
-#: gajim/adhoc_commands.py:387 gajim/adhoc_commands.py:411
-msgid "Service sent malformed data"
-msgstr ""
+msgid "You can not start a new conversation unless you are connected."
+msgstr "Non pode entrar nunha sala de charla até que non se conecte."
 
-#: gajim/adhoc_commands.py:396
-msgid "Service changed the session identifier."
-msgstr ""
+#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
+#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
+#: gajim/gtk/account_wizard.py:229
+msgid "Invalid JID"
+msgstr "A ID de Jabber non é válida"
 
-#: gajim/adhoc_commands.py:416
+#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
 #, fuzzy, python-format
-msgid "%s - Ad-hoc Commands - Gajim"
-msgstr "Comandos ad-hoc - Gajim"
-
-#: gajim/adhoc_commands.py:510
-msgid "Service returned an error."
-msgstr ""
-
-#: gajim/negotiation.py:34
-msgid "- messages will be logged"
-msgstr ""
-
-#: gajim/negotiation.py:36
-msgid "- messages will not be logged"
-msgstr ""
-
-#: gajim/notify.py:103
-#, fuzzy
-msgid "Open"
-msgstr "OpenPGP: "
-
-#: gajim/dialog_messages.py:33
-#, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Non pode entrar nunha sala de charla até que non se conecte."
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Non se pode enviar ficheiros baleiros"
 
-#: gajim/dialog_messages.py:48
+#: gajim/dialog_messages.py:47
 msgid "Unread events"
 msgstr "Acontecementos sen ler"
 
-#: gajim/dialog_messages.py:49
+#: gajim/dialog_messages.py:48
 msgid "Read all pending events before removing this account."
 msgstr "Lea todos os eventos pendentes antes de eliminar esta conta."
 
-#: gajim/dialog_messages.py:53
-msgid "You are currently connected to the server"
-msgstr "Está actualmente conectado ao servidor"
-
-#: gajim/dialog_messages.py:54
-#, fuzzy
-msgid "To disable the account, you must be disconnected."
-msgstr "Para cambiar o nome da conta, debe estar desconectado"
-
-#: gajim/dialog_messages.py:58
+#: gajim/dialog_messages.py:52
 #, fuzzy
 msgid "Invalid Form"
 msgstr "A entrada non é válida"
 
-#: gajim/dialog_messages.py:59
+#: gajim/dialog_messages.py:53
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
+#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
 msgid "Invisible"
 msgstr "Invisíbel"
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:62
 msgid "A connection is not available"
 msgstr "Non está dispoñíbel ningunha conexión"
 
-#: gajim/dialog_messages.py:69
+#: gajim/dialog_messages.py:63
 msgid "Your message can not be sent until you are connected."
 msgstr "A súa mensaxe non se enviará mentres non estiver conectado."
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:67
 #, fuzzy
 msgid "JID already in list"
 msgstr "Cliente de MI de Jabber"
 
-#: gajim/dialog_messages.py:74
+#: gajim/dialog_messages.py:68
 msgid "The JID you entered is already in the list. Choose another one."
 msgstr ""
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:72
 msgid "Invalid answer"
 msgstr "A resposta non é válida"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:73
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
 
-#: gajim/dialog_messages.py:84
+#: gajim/dialog_messages.py:78
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Usa un nome de host e un porto personalizados"
 
-#: gajim/dialog_messages.py:85
+#: gajim/dialog_messages.py:79
 #, fuzzy, python-format
 msgid "Wrong custom hostname \"%s\". Ignoring it."
 msgstr "Usa un nome de host e un porto personalizados"
 
-#: gajim/dialog_messages.py:89
+#: gajim/dialog_messages.py:83
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: gajim/dialog_messages.py:90
+#: gajim/dialog_messages.py:84
 #, 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 ""
 
-#: gajim/dialog_messages.py:96
+#: gajim/dialog_messages.py:90
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Extensión non admitida"
 
-#: gajim/dialog_messages.py:97
+#: gajim/dialog_messages.py:91
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: gajim/dialog_messages.py:101
+#: gajim/dialog_messages.py:95
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Fallou a conexión"
 
-#: gajim/dialog_messages.py:102
+#: gajim/dialog_messages.py:96
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:100
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Rexistrar %s"
 
-#: gajim/dialog_messages.py:107
+#: gajim/dialog_messages.py:101
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
 #, fuzzy
 msgid "Registration failed"
 msgstr "Fallou a conexión"
 
-#: gajim/dialog_messages.py:112
+#: gajim/dialog_messages.py:106
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:111
 #, fuzzy
-msgid "Unable to join Groupchat"
+msgid "Unable to Join Group Chat"
 msgstr "Non se puido entrar no grupo de charla"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:116
 msgid "GStreamer error"
 msgstr ""
 
-#: gajim/dialog_messages.py:123
+#: gajim/dialog_messages.py:117
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Mensaxe de erro: %s"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:121
 msgid "Wrong host"
 msgstr "Host errado"
 
-#: gajim/dialog_messages.py:128
+#: gajim/dialog_messages.py:122
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:132
+#: gajim/dialog_messages.py:126
 msgid "Avahi error"
 msgstr "Erro de Avahi"
 
-#: gajim/dialog_messages.py:133
+#: gajim/dialog_messages.py:127
 #, python-format
 msgid ""
 "%s\n"
@@ -4318,364 +2439,122 @@ msgstr ""
 "%s\n"
 "A mensaxaría de ligazón local podería non funcionar correctamente."
 
-#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
 #, fuzzy
 msgid "Could not request upload slot"
 msgstr "Non foi posíbel iniciar o servizo local"
 
-#: gajim/dialog_messages.py:143
+#: gajim/dialog_messages.py:137
 msgid "Got unexpected response from server (see log)"
 msgstr ""
 
-#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
 #, fuzzy
 msgid "Could not open file"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: gajim/dialog_messages.py:148
+#: gajim/dialog_messages.py:142
 msgid "Exception raised while opening file (see log)"
 msgstr ""
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:151
 msgid "Unsecure"
 msgstr ""
 
-#: gajim/dialog_messages.py:158
-msgid "Server returned unsecure transport (http)"
+#: gajim/dialog_messages.py:152
+msgid "Server returned unsecure transport (HTTP)"
 msgstr ""
 
-#: gajim/dialog_messages.py:162
+#: gajim/dialog_messages.py:156
 #, fuzzy
 msgid "Could not upload file"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: gajim/dialog_messages.py:163
+#: gajim/dialog_messages.py:157
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:167
+#: gajim/dialog_messages.py:161
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:172
+#: gajim/dialog_messages.py:166
 #, fuzzy
 msgid "Encryption Error"
 msgstr "Cifrado activado"
 
-#: gajim/dialog_messages.py:173
+#: gajim/dialog_messages.py:167
 #, fuzzy
-msgid "For the choosen encryption is no encryption method available"
+msgid "For the chosen encryption there is no encryption method available"
 msgstr "Non está dispoñíbel ningunha conexión"
 
-#: gajim/gajim_themes_window.py:61
-msgid "Theme"
-msgstr "Tema"
-
-#: gajim/gajim_themes_window.py:98
+#: gajim/dialog_messages.py:171
 #, fuzzy
-msgid "You cannot make changes to the default theme"
-msgstr "Non pode eliminar o tema actual"
-
-#: gajim/gajim_themes_window.py:99
-#, fuzzy
-msgid "Please create a new clean theme."
-msgstr "Crear unha publicación nova"
-
-#: gajim/gajim_themes_window.py:170
-msgid "theme name"
-msgstr "nome do tema"
-
-#: gajim/gajim_themes_window.py:187
-msgid "You cannot delete your current theme"
-msgstr "Non pode eliminar o tema actual"
-
-#: gajim/gajim_themes_window.py:188
-msgid "Pick another theme to use first."
-msgstr ""
-
-#: gajim/accounts_window.py:40
-#, fuzzy
-msgid "Merge Accounts"
-msgstr "Contas combinadas"
-
-#: gajim/accounts_window.py:41
-msgid "Use PGP Agent"
-msgstr ""
-
-#: gajim/accounts_window.py:153 gajim/common/config.py:510
-msgid "Be right back."
-msgstr "Volvo axiña"
-
-#: gajim/accounts_window.py:157
-msgid "Relogin now?"
-msgstr "Quere reconectarse agora?"
-
-#: gajim/accounts_window.py:158
-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."
-
-#: gajim/accounts_window.py:211
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Comezou unha charla coa conta %s"
-
-#: gajim/accounts_window.py:212
-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?"
-
-#: gajim/accounts_window.py:344
-#, fuzzy
-msgid "Remove"
-msgstr "_Eliminar"
-
-#: gajim/accounts_window.py:387
-#, fuzzy
-msgid "Rename account label"
-msgstr "Xestionar as contas"
-
-#: gajim/accounts_window.py:456
-msgid "Login"
-msgstr ""
-
-#: gajim/accounts_window.py:465
-msgid "Connection"
-msgstr "Conexión"
-
-#: gajim/accounts_window.py:468
-#, fuzzy
-msgid "Import Contacts"
-msgstr "Contactos"
-
-#: gajim/accounts_window.py:471 gajim/accounts_window.py:654
-#, fuzzy
-msgid "Client Certificate"
-msgstr "O nome de usuario non é válido"
-
-#: gajim/accounts_window.py:474 gajim/accounts_window.py:569
-#, fuzzy
-msgid "OpenPGP Key"
-msgstr "Asignar chave de OpenPGP"
-
-#: gajim/accounts_window.py:485 gajim/accounts_window.py:557
-#, fuzzy
-msgid "Connect on startup"
-msgstr "C_onectar ao inicio de Gajim"
-
-#: gajim/accounts_window.py:488
-#, fuzzy
-msgid "Reconnect when connection is lost"
-msgstr "Conectar automaticamente se se perde a conexión"
-
-#: gajim/accounts_window.py:491 gajim/accounts_window.py:561
-#, fuzzy
-msgid "Save conversations for all contacts"
-msgstr "Gravar as conversas para todos os contactos"
-
-#: gajim/accounts_window.py:493 gajim/accounts_window.py:563
-msgid "Store conversations on the harddrive"
-msgstr ""
-
-#: gajim/accounts_window.py:495
-#, fuzzy
-msgid "Server Message Archive"
-msgstr "_Enviar a mensaxe do servidor"
-
-#: gajim/accounts_window.py:497
-msgid ""
-"Messages get stored on the server.\n"
-"The archive is used to sync messages\n"
-"between multiple devices.\n"
-"XEP-0313"
-msgstr ""
-
-#: gajim/accounts_window.py:502 gajim/accounts_window.py:565
-#, fuzzy
-msgid "Global Status"
-msgstr "Todos os estados"
-
-#: gajim/accounts_window.py:504
-#, fuzzy
-msgid "Synchronise the status of all accounts"
-msgstr "Cambia o estado dunha ou de varias contas"
-
-#: gajim/accounts_window.py:506
-#, fuzzy
-msgid "Message Carbons"
-msgstr "Mensaxes"
-
-#: gajim/accounts_window.py:508
-msgid ""
-"All your other online devices get copies\n"
-"of sent and received messages.\n"
-"XEP-0280"
-msgstr ""
-
-#: gajim/accounts_window.py:512
-msgid "Use file transfer proxies"
-msgstr "Usar proxies para as transferencias de ficheiros"
-
-#: gajim/accounts_window.py:524 gajim/accounts_window.py:559
-#, fuzzy
-msgid "Use environment variable"
-msgstr "Conexión non dispoñíbel"
-
-#: gajim/accounts_window.py:526
-#, fuzzy
-msgid "Proxy"
-msgstr "Proxy"
-
-#: gajim/accounts_window.py:529
-#, fuzzy
-msgid "Warn on insecure connection"
-msgstr "Conexión"
+msgid "Avatar upload failed"
+msgstr "Fallou a publicación da vCard"
 
-#: gajim/accounts_window.py:533
-msgid "Send keep-alive packets"
-msgstr "Enviar paquetes de mantemento de actividade"
+#: gajim/privatechat_control.py:204
+msgid "Sending private message failed"
+msgstr "O envío da mensaxe privada fallou"
 
-#: gajim/accounts_window.py:537
-msgid "Manually set the hostname for the server"
+#: gajim/privatechat_control.py:206
+#, 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."
 
-#: gajim/accounts_window.py:540
-#, fuzzy
-msgid "Resource"
-msgstr "Recurso:"
-
-#: gajim/accounts_window.py:543 gajim/accounts_window.py:611
-#: gajim/accounts_window.py:616
-#, fuzzy
-msgid "Priority"
-msgstr "Pr_ioridade:"
-
-#: gajim/accounts_window.py:567
-#, fuzzy
-msgid "Synchronize the status of all accounts"
-msgstr "Cambia o estado dunha ou de varias contas"
-
-#: gajim/accounts_window.py:580
-#, fuzzy
-msgid "First Name"
-msgstr "Nome:"
-
-#: gajim/accounts_window.py:583
-#, fuzzy
-msgid "Last Name"
-msgstr "Apelido(s):"
-
-#: gajim/accounts_window.py:586
-#: gajim/data/gui/archiving_313_preferences_window.ui:71
-#, fuzzy
-msgid "Jabber ID"
-msgstr "ID de Jabber:"
-
-#: gajim/accounts_window.py:589
-#, fuzzy
-msgid "Email"
-msgstr "Correo electrónico novo"
-
-#: gajim/accounts_window.py:607
-#, fuzzy
-msgid "Adjust to status"
-msgstr "_Adaptar ao estado"
-
-#: gajim/accounts_window.py:634
-msgid "Enable"
-msgstr "Activar"
-
-#: gajim/accounts_window.py:641
-#, fuzzy
-msgid "Port"
-msgstr "_Porto:"
-
-#: gajim/accounts_window.py:646
-#, fuzzy
-msgid "Connection Options"
-msgstr "Conexión"
-
-#: gajim/accounts_window.py:658
-#, fuzzy
-msgid "Encrypted Certificate"
-msgstr "O nome de usuario non é válido"
-
-#: gajim/accounts_window.py:662
-#, fuzzy
-msgid "Certificate Options"
-msgstr "O nome de usuario non é válido"
-
-#: gajim/accounts_window.py:670 gajim/data/gui/join_groupchat_window.ui:143
-#, fuzzy
-msgid "Password"
-msgstr "Contrasinal: "
-
-#: gajim/accounts_window.py:674
-#, fuzzy
-msgid "Save Password"
-msgstr "Gardar o contrasinal"
-
-#: gajim/accounts_window.py:677 gajim/data/gui/change_password_dialog.ui:8
-msgid "Change Password"
-msgstr "Cambiar o contrasinal"
-
-#: gajim/accounts_window.py:682
-#, fuzzy
-msgid "Login Options"
-msgstr "Emoticonas:"
-
-#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:55 gajim/common/exceptions.py:70
 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"
 
-#: gajim/gajim_remote.py:81
+#: gajim/gajim_remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Amosa axuda sobre un comando específico"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:80
 msgid "command"
 msgstr "comando"
 
-#: gajim/gajim_remote.py:85
+#: gajim/gajim_remote.py:81
 msgid "show help on command"
 msgstr "amosar axuda sobre un comando"
 
-#: gajim/gajim_remote.py:89
+#: gajim/gajim_remote.py:85
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Amosa unha listaxe de todos os contactos na listaxe. Cada contacto aparece "
 "nunha liña distinta"
 
-#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
-#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
-#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
-#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
-#: gajim/gajim_remote.py:220
+#: gajim/gajim_remote.py:87 gajim/gajim_remote.py:102 gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:122 gajim/gajim_remote.py:133
+#: gajim/gajim_remote.py:142 gajim/gajim_remote.py:163
+#: gajim/gajim_remote.py:193 gajim/gajim_remote.py:202
+#: gajim/gajim_remote.py:209
 #, fuzzy
 msgid "?CLI:account"
 msgstr "conta"
 
-#: gajim/gajim_remote.py:91
+#: gajim/gajim_remote.py:87
 msgid "show only contacts of the given account"
 msgstr "amosar só contactos da conta especificada"
 
-#: gajim/gajim_remote.py:97
+#: gajim/gajim_remote.py:93
 msgid "Prints a list of registered accounts"
 msgstr "Amosa unha listaxe de contas que están rexistradas"
 
-#: gajim/gajim_remote.py:101
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Cambia o estado dunha ou de varias contas"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:100
 #, fuzzy
 msgid "?CLI:status"
 msgstr "estado"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:100
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4684,17 +2563,17 @@ msgstr ""
 "un de: desconectado, en liña, libre para falar, ausente, non dispoñíbel, "
 "ocupado, invisíbel"
 
-#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
-#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:101 gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:132 gajim/gajim_remote.py:141
 #, fuzzy
 msgid "?CLI:message"
 msgstr "mensaxe"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:101
 msgid "status message"
 msgstr "mensaxe de estado"
 
-#: gajim/gajim_remote.py:106
+#: gajim/gajim_remote.py:102
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4703,22 +2582,22 @@ msgstr ""
 "o estado de todas as contas que teñen a opción \"sync with global status\" "
 "activada"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:108
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Cambia o estado dunha ou de varias contas"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:110
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "Pr_ioridade:"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:110
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Quero _rexistrar unha conta nova de Jabber"
 
-#: gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4728,167 +2607,148 @@ msgstr ""
 "o estado de todas as contas que teñen a opción \"sync with global status\" "
 "activada"
 
-#: gajim/gajim_remote.py:122
-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 "
-"key', just set 'OpenPGP key' to ''."
-msgstr ""
-"Envía unha mensaxe nova de charla a un contacto na listaxe. Tanto a chave de "
-"OpenPGP como a conta son opcionais. Se quere definir só 'conta' sen 'chave "
-"pgp', só defina 'chave pgp' a ''."
+#: gajim/gajim_remote.py:118
+#, fuzzy
+msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgstr "Uso: /%s, oculta os botóns de charla."
 
-#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
+#: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
-#: gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
+#: gajim/gajim_remote.py:141
 msgid "message contents"
 msgstr "contido da mensaxe"
 
-#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
-msgid "PGP key"
-msgstr ""
-
-#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
-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"
-
-#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
-#: gajim/gajim_remote.py:153
+#: gajim/gajim_remote.py:122 gajim/gajim_remote.py:133
+#: gajim/gajim_remote.py:142
 msgid "if specified, the message will be sent using this account"
 msgstr "se se especifica, a mensaxe enviarase a través desta conta"
 
-#: gajim/gajim_remote.py:135
-#, fuzzy
-msgid ""
-"Sends a chat message to someone on your roster. Optionally with OpenPGP key "
-"and account. If you want to only set the latter, set OpenPGP key to \"\"."
+#: gajim/gajim_remote.py:127
+msgid "Sends a chat message to someone on your roster. Account is optional."
 msgstr ""
-"Envía unha mensaxe nova de charla a un contacto na listaxe. Tanto a chave de "
-"OpenPGP como a conta son opcionais. Se quere definir só 'conta' sen 'chave "
-"pgp', só defina 'chave pgp' a ''."
 
-#: gajim/gajim_remote.py:140
+#: gajim/gajim_remote.py:131
 msgid "subject"
 msgstr "tema"
 
-#: gajim/gajim_remote.py:140
+#: gajim/gajim_remote.py:131
 msgid "message subject"
 msgstr "tema da mensaxe"
 
-#: gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:138
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:151
+#: gajim/gajim_remote.py:140
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:147
 msgid "Gets detailed info on a contact"
 msgstr "Obter información detallada dun contacto"
 
-#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
+#: gajim/gajim_remote.py:192
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: gajim/gajim_remote.py:164
+#: gajim/gajim_remote.py:153
 msgid "Gets detailed info on a account"
 msgstr "Obter información detallada dunha conta"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:155
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: gajim/gajim_remote.py:170
+#: gajim/gajim_remote.py:159
 msgid "Sends file to a contact"
 msgstr "Enviarlle un ficheiro a un contacto"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:161
 msgid "file"
 msgstr "ficheiro"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:161
 msgid "File path"
 msgstr "Camiño do ficheiro"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:163
 msgid "if specified, file will be sent using this account"
 msgstr "se se especifica, o ficheiro enviarase mediante esta conta"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:168
 msgid "Lists all preferences and their values"
 msgstr "Nomea todas as preferencias e os seus valores"
 
-#: gajim/gajim_remote.py:183
+#: gajim/gajim_remote.py:172
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'entrada' a 'valor'."
 
-#: gajim/gajim_remote.py:185
+#: gajim/gajim_remote.py:174
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: gajim/gajim_remote.py:185
+#: gajim/gajim_remote.py:174
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "a 'entrada' é o nome da preferencia, o 'valor' é o do valor para definir"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:179
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:181
 msgid "key"
 msgstr "entrada"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:181
 msgid "name of the preference to be deleted"
 msgstr "nome da preferencia para eliminar"
 
-#: gajim/gajim_remote.py:196
+#: gajim/gajim_remote.py:185
 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"
 
-#: gajim/gajim_remote.py:201
+#: gajim/gajim_remote.py:190
 msgid "Removes contact from roster"
 msgstr "Elimina o contacto da listaxe"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:193
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "se se especifica, o contacto obtense da listaxe desta conta"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Devolve o estado actual (o global se non se especificar unha conta)"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:207
 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)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:214
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Devolve o número de mensaxes sen ler"
 
-#: gajim/gajim_remote.py:230
+#: gajim/gajim_remote.py:219
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:221
 msgid "XML to send"
 msgstr "XML para enviar"
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:222
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4897,35 +2757,16 @@ msgstr ""
 "Conta a que se lle enviará; se non se especificar nada, o xml enviaráselles "
 "a todas as contas"
 
-#: gajim/gajim_remote.py:239
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Un contacto cambiou o seu estado"
-
-#: gajim/gajim_remote.py:241
-#, fuzzy
-msgid "Picture to use"
-msgstr "Non se achou o alcume: %s"
-
-#: gajim/gajim_remote.py:242
-#, 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"
-
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:229
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Por favor, comprobe se o avahi-daemon está en execución."
 
-#: gajim/gajim_remote.py:275
+#: gajim/gajim_remote.py:255
 msgid "Missing argument \"contact_jid\""
 msgstr "Non se atopa o argumento \"contact_jid\""
 
-#: gajim/gajim_remote.py:295
+#: gajim/gajim_remote.py:275
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4934,31 +2775,31 @@ msgstr ""
 "'%s' non está na súa listaxe de contactos.\n"
 "Por favor, especifique unha conta para enviar a mensaxe."
 
-#: gajim/gajim_remote.py:298
+#: gajim/gajim_remote.py:278
 msgid "You have no active account"
 msgstr "Non ten contas activas"
 
-#: gajim/gajim_remote.py:346
+#: gajim/gajim_remote.py:326
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:373
+#: gajim/gajim_remote.py:353
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:377
+#: gajim/gajim_remote.py:357
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: gajim/gajim_remote.py:381
+#: gajim/gajim_remote.py:361
 #, python-format
 msgid "%s not found"
 msgstr "Non se encontrou %s"
 
-#: gajim/gajim_remote.py:387
+#: gajim/gajim_remote.py:367
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4969,7 +2810,7 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando é un de:\n"
 
-#: gajim/gajim_remote.py:457
+#: gajim/gajim_remote.py:437
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4978,7 +2819,7 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: gajim/gajim_remote.py:462
+#: gajim/gajim_remote.py:442
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4987,397 +2828,363 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: gajim/common/app.py:263
-msgid "Unable to load idle module"
-msgstr "Non se pode cargar o módulo inactivo"
-
-#: gajim/common/fuzzyclock.py:37
+#: gajim/common/fuzzyclock.py:36
 msgid "twelve"
 msgstr "doce"
 
-#: gajim/common/fuzzyclock.py:37
+#: gajim/common/fuzzyclock.py:36
 msgid "one"
 msgstr "unha"
 
-#: gajim/common/fuzzyclock.py:37
+#: gajim/common/fuzzyclock.py:36
 msgid "two"
 msgstr "dúas"
 
-#: gajim/common/fuzzyclock.py:37
+#: gajim/common/fuzzyclock.py:36
 msgid "three"
 msgstr "tres"
 
-#: gajim/common/fuzzyclock.py:37
+#: gajim/common/fuzzyclock.py:36
 msgid "four"
 msgstr "catro"
 
-#: gajim/common/fuzzyclock.py:38
+#: gajim/common/fuzzyclock.py:37
 msgid "five"
 msgstr "cinco"
 
-#: gajim/common/fuzzyclock.py:38
+#: gajim/common/fuzzyclock.py:37
 msgid "six"
 msgstr "seis"
 
-#: gajim/common/fuzzyclock.py:38
+#: gajim/common/fuzzyclock.py:37
 msgid "seven"
 msgstr "sete"
 
-#: gajim/common/fuzzyclock.py:38
+#: gajim/common/fuzzyclock.py:37
 msgid "eight"
 msgstr "oito"
 
-#: gajim/common/fuzzyclock.py:38
+#: gajim/common/fuzzyclock.py:37
 msgid "nine"
 msgstr "nove"
 
-#: gajim/common/fuzzyclock.py:38
+#: gajim/common/fuzzyclock.py:37
 msgid "ten"
 msgstr "dez"
 
-#: gajim/common/fuzzyclock.py:39
+#: gajim/common/fuzzyclock.py:38
 msgid "eleven"
 msgstr "once"
 
-#: gajim/common/fuzzyclock.py:43
+#: gajim/common/fuzzyclock.py:45
 #, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s en punto"
 
-#: gajim/common/fuzzyclock.py:43
+#: gajim/common/fuzzyclock.py:46
 #, python-format
 msgid "five past %(0)s"
 msgstr "%(0)s e cinco"
 
-#: gajim/common/fuzzyclock.py:43
+#: gajim/common/fuzzyclock.py:47
 #, python-format
 msgid "ten past %(0)s"
 msgstr "%(0)s e dez"
 
-#: gajim/common/fuzzyclock.py:44
+#: gajim/common/fuzzyclock.py:48
 #, python-format
 msgid "quarter past %(0)s"
 msgstr "%(0)s e cuarto"
 
-#: gajim/common/fuzzyclock.py:44
+#: gajim/common/fuzzyclock.py:49
 #, python-format
 msgid "twenty past %(0)s"
 msgstr "%(0)s e vinte"
 
-#: gajim/common/fuzzyclock.py:44
+#: gajim/common/fuzzyclock.py:50
 #, python-format
 msgid "twenty five past %(0)s"
 msgstr "%(0)s e vinte e cinco"
 
-#: gajim/common/fuzzyclock.py:45
+#: gajim/common/fuzzyclock.py:51
 #, python-format
 msgid "half past %(0)s"
 msgstr "%(0)s e media"
 
-#: gajim/common/fuzzyclock.py:45
+#: gajim/common/fuzzyclock.py:52
 #, python-format
 msgid "twenty five to %(1)s"
 msgstr "%(1)s menos vinte e cinco"
 
-#: gajim/common/fuzzyclock.py:45
+#: gajim/common/fuzzyclock.py:53
 #, python-format
 msgid "twenty to %(1)s"
 msgstr "%(1)s menos vinte"
 
-#: gajim/common/fuzzyclock.py:46
+#: gajim/common/fuzzyclock.py:54
 #, python-format
 msgid "quarter to %(1)s"
 msgstr "%(1)s menos cuarto"
 
-#: gajim/common/fuzzyclock.py:46
+#: gajim/common/fuzzyclock.py:55
 #, python-format
 msgid "ten to %(1)s"
 msgstr "%(1)s menos dez"
 
-#: gajim/common/fuzzyclock.py:46
+#: gajim/common/fuzzyclock.py:56
 #, python-format
 msgid "five to %(1)s"
 msgstr "%(1)s menos cinco"
 
-#: gajim/common/fuzzyclock.py:46
+#: gajim/common/fuzzyclock.py:57
 #, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s en punto"
 
-#: gajim/common/fuzzyclock.py:48 gajim/common/fuzzyclock.py:50
+#: gajim/common/fuzzyclock.py:61 gajim/common/fuzzyclock.py:69
 msgid "Night"
 msgstr "Noite"
 
-#: gajim/common/fuzzyclock.py:48
+#: gajim/common/fuzzyclock.py:62
 msgid "Early morning"
 msgstr "Madrugada"
 
-#: gajim/common/fuzzyclock.py:48
+#: gajim/common/fuzzyclock.py:63
 msgid "Morning"
 msgstr "Mañá"
 
-#: gajim/common/fuzzyclock.py:49
+#: gajim/common/fuzzyclock.py:64
 msgid "Almost noon"
 msgstr "Media mañá"
 
-#: gajim/common/fuzzyclock.py:49
+#: gajim/common/fuzzyclock.py:65
 msgid "Noon"
 msgstr "Mediodía"
 
-#: gajim/common/fuzzyclock.py:49
+#: gajim/common/fuzzyclock.py:66
 msgid "Afternoon"
 msgstr "Tarde"
 
-#: gajim/common/fuzzyclock.py:49
+#: gajim/common/fuzzyclock.py:67
 msgid "Evening"
 msgstr "Serán"
 
-#: gajim/common/fuzzyclock.py:50
+#: gajim/common/fuzzyclock.py:68
 msgid "Late evening"
 msgstr "Noite"
 
-#: gajim/common/fuzzyclock.py:52
+#: gajim/common/fuzzyclock.py:73
 msgid "Start of week"
 msgstr "Comezo da semana"
 
-#: gajim/common/fuzzyclock.py:52 gajim/common/fuzzyclock.py:53
+#: gajim/common/fuzzyclock.py:74 gajim/common/fuzzyclock.py:75
+#: gajim/common/fuzzyclock.py:76
 msgid "Middle of week"
 msgstr "Metade de semana"
 
-#: gajim/common/fuzzyclock.py:53
+#: gajim/common/fuzzyclock.py:77
 msgid "End of week"
 msgstr "Final de semana"
 
-#: gajim/common/fuzzyclock.py:53
+#: gajim/common/fuzzyclock.py:78 gajim/common/fuzzyclock.py:79
 msgid "Weekend!"
 msgstr "Fin de semana!"
 
-#: gajim/common/connection_handlers_events.py:350
-#, 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"
-
-#: gajim/common/connection_handlers_events.py:833
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "solicitude de eliminación de subscrición de %s"
-
-#: gajim/common/connection_handlers_events.py:933
-#, fuzzy
-msgid "Room has been destroyed"
-msgstr "Eliminouse a autorización"
+#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#, fuzzy, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s é un directorio mais podería ser un ficheiro"
 
-#: gajim/common/connection_handlers_events.py:941
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr ""
+#: gajim/common/logger.py:217
+#, fuzzy, python-format
+msgid "Creating %s"
+msgstr "Descrición: %s"
 
-#: gajim/common/connection_handlers_events.py:1903
+#: gajim/common/connection_handlers_events.py:141
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2549
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Mensaxe nova de %(nickname)s"
+#: gajim/common/connection_handlers_events.py:393 gajim/gtk/notification.py:170
+#: gajim/gtk/notification.py:200 gajim/gtk/notification.py:271
+msgid "New Single Message"
+msgstr "Mensaxe nova"
 
-#: gajim/common/connection_handlers_events.py:2555
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nova mensaxe privada desde o grupo de charlas %s"
+#: gajim/common/connection_handlers_events.py:396 gajim/gtk/notification.py:170
+#: gajim/gtk/notification.py:201 gajim/gtk/notification.py:272
+msgid "New Private Message"
+msgstr "Mensaxe privada nova"
 
-#: gajim/common/connection_handlers_events.py:2558
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#: gajim/common/connection_handlers_events.py:399 gajim/gtk/notification.py:170
+#: gajim/gtk/notification.py:199 gajim/gtk/notification.py:271
+msgid "New Message"
+msgstr "Mensaxe nova"
 
-#: gajim/common/connection_handlers_events.py:2561
+#: gajim/common/connection_handlers_events.py:404
+#: gajim/common/connection_handlers_events.py:496
 #, fuzzy, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Mensaxe nova de %(nickname)s"
+msgid "New message from %(nickname)s"
+msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
+msgstr[0] "Mensaxe nova de %(nickname)s"
+msgstr[1] "Mensaxe nova de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2567
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Mensaxe nova de %(nickname)s"
+#: gajim/common/connection_handlers_events.py:485 gajim/gtk/notification.py:171
+#: gajim/gtk/notification.py:202
+#, fuzzy
+msgid "New Group Chat Message"
+msgstr "Novo grupo de charla"
 
-#: gajim/common/connection_handlers_events.py:2733
+#: gajim/common/connection_handlers_events.py:571
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s cambiou o seu estado"
 
-#: gajim/common/connection_handlers_events.py:2741
+#: gajim/common/connection_handlers_events.py:573 gajim/gtk/history.py:578
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s está agora %(status)s"
+
+#: gajim/common/connection_handlers_events.py:577 gajim/gtk/notification.py:172
+#: gajim/gtk/notification.py:193 gajim/gtk/notification.py:283
+msgid "Contact Changed Status"
+msgstr "Un contacto cambiou o seu estado"
+
+#: gajim/common/connection_handlers_events.py:579
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s conectouse"
 
-#: gajim/common/connection_handlers_events.py:2747
+#: gajim/common/connection_handlers_events.py:583 gajim/gtk/notification.py:169
+#: gajim/gtk/notification.py:191 gajim/gtk/notification.py:267
+msgid "Contact Signed In"
+msgstr "Contacto conectado"
+
+#: gajim/common/connection_handlers_events.py:585
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s desconectouse"
 
-#: gajim/common/contacts.py:386
+#: gajim/common/connection_handlers_events.py:589 gajim/gtk/notification.py:169
+#: gajim/gtk/notification.py:192 gajim/gtk/notification.py:269
+msgid "Contact Signed Out"
+msgstr "Contacto desconectado"
+
+#: gajim/common/contacts.py:455
 #, fuzzy
 msgid "Not in roster"
 msgstr "Non está na listaxe"
 
-#: gajim/common/config.py:76
+#: gajim/common/config.py:80
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
 "and does not have focus"
 msgstr ""
 
-#: gajim/common/config.py:77
+#: gajim/common/config.py:81
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: gajim/common/config.py:79
+#: gajim/common/config.py:83
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: gajim/common/config.py:82
+#: gajim/common/config.py:86
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo en minutos, despois de cambiar a ausente"
 
-#: gajim/common/config.py:83
+#: gajim/common/config.py:87
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Ausente por inactividade"
 
-#: gajim/common/config.py:83
+#: gajim/common/config.py:87
 msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
-#: gajim/common/config.py:85
+#: gajim/common/config.py:89
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo en minutos, despois de cambiar a non dispoñíbel"
 
-#: gajim/common/config.py:86
+#: gajim/common/config.py:90
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Non dispoñíbel por inactividade"
 
-#: gajim/common/config.py:86
+#: gajim/common/config.py:90
 msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
-#: gajim/common/config.py:89
+#: gajim/common/config.py:93
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: gajim/common/config.py:90
+#: gajim/common/config.py:94
 msgid "Allow to hide the roster window even if the tray icon is not shown."
 msgstr ""
 
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Incoming nickname color."
-msgstr "O nome de usuario non é válido"
-
-#: gajim/common/config.py:96
-msgid "Outgoing nickname color."
-msgstr ""
-
 #: gajim/common/config.py:97
-msgid "Incoming text color."
-msgstr ""
-
-#: gajim/common/config.py:98
-msgid "Outgoing text color."
-msgstr ""
-
-#: gajim/common/config.py:99
-#, fuzzy
-msgid "Status message text color."
-msgstr "texto da mensaxe de estado"
-
-#: gajim/common/config.py:102
 #, fuzzy
 msgid "Contact signed in notification color."
 msgstr "_Mostrar o evento na listaxe de contactos"
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:98
 #, fuzzy
 msgid "Contact signout notification color"
 msgstr "_Mostrar o evento na listaxe de contactos"
 
-#: gajim/common/config.py:104
+#: gajim/common/config.py:99
 #, fuzzy
 msgid "New message notification color."
 msgstr "_Mostrar o evento na listaxe de contactos"
 
-#: gajim/common/config.py:105
+#: gajim/common/config.py:100
 #, fuzzy
 msgid "File transfer request notification color."
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: gajim/common/config.py:106
+#: gajim/common/config.py:101
 #, fuzzy
 msgid "File transfer error notification color."
 msgstr "Cancelouse a transferencia do ficheiro"
 
-#: gajim/common/config.py:107
+#: gajim/common/config.py:102
 #, fuzzy
 msgid "File transfer complete or stopped notification color."
 msgstr ""
 "Cando unha transferencia se completar, amosa unha notificación emerxente"
 
-#: gajim/common/config.py:108
+#: gajim/common/config.py:103
 #, fuzzy
 msgid "Groupchat invitation notification color"
 msgstr "Convite a grupo de charla"
 
-#: gajim/common/config.py:109
+#: gajim/common/config.py:104
 #, fuzzy
 msgid "Background color of status changed notification"
 msgstr "Cor de fondo para os contactos que acaban de se conectar."
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:105
 msgid "Other dialogs color."
 msgstr ""
 
-#: gajim/common/config.py:111
-#, fuzzy
-msgid "Incoming nickname font."
-msgstr "O nome de usuario non é válido"
-
-#: gajim/common/config.py:112
-#, fuzzy
-msgid "Outgoing nickname font."
-msgstr "Cambiando o alcume"
-
-#: gajim/common/config.py:113
-msgid "Incoming text font."
-msgstr ""
-
-#: gajim/common/config.py:114
-msgid "Outgoing text font."
-msgstr ""
-
-#: gajim/common/config.py:115
-#, fuzzy
-msgid "Status message text font."
-msgstr "texto da mensaxe de estado"
-
 # duda sobre collapsed
-#: gajim/common/config.py:116
+#: gajim/common/config.py:106
 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."
 
-#: gajim/common/config.py:123
+#: gajim/common/config.py:107
+#, fuzzy
+msgid "default"
+msgstr "Por defecto"
+
+#: gajim/common/config.py:113
 msgid "Language used by speller"
 msgstr "Idioma que emprega o corrector"
 
-#: gajim/common/config.py:124
+#: gajim/common/config.py:114
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -5387,7 +3194,7 @@ msgstr ""
 "'ás veces' - amosar a hora cada print_ichat_every_foo_minutes minutos.\n"
 "'nunca' - nunca amosar a hora."
 
-#: gajim/common/config.py:125
+#: gajim/common/config.py:115
 #, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
@@ -5398,22 +3205,23 @@ 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'"
 
-#: gajim/common/config.py:127
-msgid "Enable ASCII emoticons"
+#: gajim/common/config.py:117
+msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:129
+#: gajim/common/config.py:119
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Tratar os pares de * / _ como posíbeis caracteres de formato."
 
-#: gajim/common/config.py:130
+#: gajim/common/config.py:120
+#, fuzzy
 msgid ""
-"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+"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 * *"
 
-#: gajim/common/config.py:133
+#: gajim/common/config.py:123
 #, fuzzy
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
@@ -5423,7 +3231,7 @@ msgstr ""
 "Usa a sintaxe de ReStructured para HTML, mais o formato ascii se está "
 "seleccionado (se quere usalo, instale o docutils)"
 
-#: gajim/common/config.py:142
+#: gajim/common/config.py:132
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -5431,7 +3239,7 @@ msgstr ""
 "Carácter para engadir despois do alcume cando se usa o completado de alcume "
 "(tab) nos grupos de charla."
 
-#: gajim/common/config.py:143
+#: gajim/common/config.py:133
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -5439,36 +3247,36 @@ msgstr ""
 "Carácter para propor para engadir logo do alcume desexado cando alguén está "
 "a empregalo no grupo de conversa."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:155
 msgid ""
-"If True, Gajim will save roster position when hiding roster, and restore it "
+"If true, Gajim will save roster position when hiding roster, and restore it "
 "when showing roster."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:161
 msgid "Place the roster on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:177
+#: gajim/common/config.py:167
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
-"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:168
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: gajim/common/config.py:179
+#: gajim/common/config.py:169
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: gajim/common/config.py:181
+#: gajim/common/config.py:170
 msgid "Add * and [n] in roster title?"
 msgstr "Engadir * e [n] no título da listaxe?"
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:171
 #, fuzzy
 msgid ""
 "How many history messages should be restored when a chat tab/window is "
@@ -5477,33 +3285,32 @@ msgstr ""
 "Cantas liñas quere lembrar da última charla cando se volve abrir un "
 "separador/fiestra de charla"
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:172
 msgid "How far back in time (minutes) history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:173
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit"
 msgstr ""
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:174
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit"
 msgstr ""
 
-#: gajim/common/config.py:186
+#: gajim/common/config.py:175
 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 ""
 
-#: gajim/common/config.py:187
-msgid ""
-"Should autorejoin be activated when we are being kicked from a conference?"
+#: gajim/common/config.py:176
+msgid "Should autorejoin be activated when kicked from a conference?"
 msgstr ""
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:177
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5511,40 +3318,25 @@ msgstr ""
 "Envíe un mensaxe con Ctrl+Intro e con Intro faise unha liña nova (como o "
 "cliente de Mirabilis ICQ)"
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:179
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Cantas liñas desexa almacenar para Ctrl+Arriba."
 
-#: gajim/common/config.py:193
+#: gajim/common/config.py:182
 #, fuzzy, python-format
 msgid ""
-"Either custom url with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use wiktionary."
+"Either custom URL with %%s in it where %%s is the word/phrase or "
+"'WIKTIONARY' which means use Wikitionary."
 msgstr ""
 "URL personalizada con %s onde %s é a palabra/frase ou 'WIKTIONARY' que "
 "significa usar o wiktionary"
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:185
 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."
 
-#: gajim/common/config.py:197
-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."
-
-#: gajim/common/config.py:198
-msgid ""
-"Displayed chat state notifications in chat windows. Can be one of all, "
-"composing_only, disabled."
-msgstr ""
-"As notificacións de estado móstranse nas fiestras de conversa. Poden ser "
-"todo, só_compor ou desactivado."
-
-#: gajim/common/config.py:200
+#: gajim/common/config.py:187
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -5552,11 +3344,15 @@ msgstr ""
 "Cando non se amosa a hora en cada mensaxe (print_time==sometimes), móstraa "
 "cada x minutos."
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:188
+msgid "Ask before pasting an image."
+msgstr ""
+
+#: gajim/common/config.py:189
 msgid "Ask before closing a group chat tab/window."
 msgstr "Preguntar antes de pechar unha fiestra/separador da sala de charla."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "Always ask for confirmation before closing groupchats with any of the JIDs "
@@ -5565,7 +3361,7 @@ 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."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Never ask for confirmation before closing groupchats with any of the JIDs on "
@@ -5574,175 +3370,143 @@ 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."
 
-#: gajim/common/config.py:204
+#: gajim/common/config.py:192
 msgid ""
 "Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
-"Comma separated list of hosts that we send, in addition of local interfaces, "
-"for File Transfer in case of address translation/port forwarding."
+"Comma separated list of sent hosts, in addition of local interfaces, for "
+"File Transfer in case of address translation/port forwarding."
 msgstr ""
 "Elimínase o host que enviamos para a transferencia dun ficheiro caso de "
 "tradución do enderezo ou o redirección de portos."
 
-#: gajim/common/config.py:209
+#: gajim/common/config.py:196
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Segundo o estándar IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:198
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notifica acontecementos na área de notificación."
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:199
 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 ""
 
-#: gajim/common/config.py:218
+#: gajim/common/config.py:205
 msgid "Show tab when only one conversation?"
 msgstr "Quere amosar o separador cando só hai unha conversa?"
 
-#: gajim/common/config.py:219
+#: gajim/common/config.py:206
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 "Quere amosar o bordo a pestanexar do caderno de notas nas fiestras charla?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:207
 msgid "Show close button in tab?"
 msgstr "Quere amosar o botón de pechar no tabulador?"
 
-#: gajim/common/config.py:221
-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 "
-"numbers are more secure, but take longer to calculate when you start a "
-"session."
-msgstr ""
-
-#: gajim/common/config.py:234
+#: gajim/common/config.py:220
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:223
 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."
 
-#: gajim/common/config.py:238
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If True, quits Gajim when X button of Window Manager is clicked. This "
+"If true, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if notification icon is used."
 msgstr ""
 "Se é verdadeiro, peche o Gajim cando se preme o botón X do xestor de "
 "fiestras. Esta preferencia só se activa se se usa a icona da área de "
 "notificación. "
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:225
 msgid ""
-"If True, Gajim hides the Roster window on pressing the X button instead of "
+"If true, Gajim hides the Roster window on pressing the X button instead of "
 "minimizing into the Dock."
 msgstr ""
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:226
+#, fuzzy
 msgid ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
+"If true, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
 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."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:227
+#, fuzzy
 msgid ""
-"If True, Gajim will display the status message, if not empty, for every "
+"If true, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
 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."
 
-#: gajim/common/config.py:247
+#: gajim/common/config.py:233
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: gajim/common/config.py:248
+#: gajim/common/config.py:234
+#, fuzzy
 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."
+"changes their status and/or their status message."
 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"
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:235
 #, fuzzy
 msgid ""
-"Can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
-"longer print status line in groupchats when a member changes his or her "
-"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 "
-"group chat."
-msgstr ""
-"pode ser \"none\", \"all\" ou \"in_and_out\". Se é \"none\", Gajim non "
-"volverá mostrar a liña de estado nos grupos de conversa cando un membro "
-"cambie a súa mensaxe de estado. Se é \"all\" o Gajim amosará todos as "
-"mensaxes de estado. Se é \"in_and_out\", o Gajim só amosará as entradas e as "
-"saídas no grupo de conversa."
+"Default Setting: Show a status message for every join or leave in a group "
+"chat"
+msgstr "Non se puido entrar no grupo de charla"
 
-#: gajim/common/config.py:251
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid ""
+"Default Setting: Show a status message for all status (away, dnd, etc.) "
+"changes of users in a group chat"
 msgstr ""
 
-#: gajim/common/config.py:252
-msgid "Background color of contacts when they just signed in."
-msgstr "Cor de fondo para os contactos que acaban de se conectar."
-
-#: gajim/common/config.py:253
-msgid "Background color of contacts when they just signed out."
-msgstr "Cor de fondo para os contactos que acaban de se desconectar."
-
-#: gajim/common/config.py:255
-msgid ""
-"If True, restored messages will use a smaller font than the default one."
+#: gajim/common/config.py:238
+msgid "Log XHTML messages instead of plain text messages."
 msgstr ""
-"Se é verdadeiro, as mensaxes restauradas usarán unha fonte máis pequena que "
-"a predefinida."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:239
 msgid "Don't show avatar for the transport itself."
 msgstr "Non amosar a circunstancia para o transporte en si mesmo"
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:240
 msgid "Don't show roster in the system taskbar."
 msgstr "Non amosar a listaxe na barra de tarefas."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:241
+#, fuzzy
 msgid ""
-"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
-"window flash (the default behaviour in most Window Managers) when holding "
-"pending events."
+"If true, make the window flash (the default behaviour in most Window "
+"Managers) when holding pending events."
 msgstr ""
 "Se é verdadeiro e as versións instaladas de GTK+ e PyGTK son, cando menos, "
 "2.8, resalta a fiestra cando hai eventos pendentes."
 
-#: gajim/common/config.py:260
-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 "
-"presences."
-msgstr ""
-"A Jabberd1.4 non lle gusta a información SHA cando se entra nun grupo de "
-"charla protexido por contrasinal. Cambie esta opción a Falso para deter o "
-"envío de información SHA no grupo de charla."
-
-#: gajim/common/config.py:263
+#: gajim/common/config.py:245
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -5763,7 +3527,7 @@ msgstr ""
 "envíase a unha fiestra específica. Nota: cambie esta opción require "
 "reiniciar o Gajim para que os cambios teñan efecto."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:246
 msgid ""
 "Show roster on startup.\n"
 "'always' - Always show roster.\n"
@@ -5771,28 +3535,29 @@ msgid ""
 "'last_state' - Restore the last state roster."
 msgstr ""
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:247
 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."
 
-#: gajim/common/config.py:266
-msgid "If True, pressing the escape key closes a tab/window."
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "If true, pressing the escape key closes a tab/window."
 msgstr ""
 "Se é verdadeiro, ao premer a tecla escape pecha unha fiestra/separador."
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Oculta o báner nunha fiestra de grupo de charla"
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Oculta o báner nunha fiestra de charla de dúas persoas."
 
-#: gajim/common/config.py:269
+#: gajim/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Oculta os ocupantes nas fiestras de grupo de charla."
 
-#: gajim/common/config.py:270
+#: gajim/common/config.py:252
 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."
@@ -5800,56 +3565,48 @@ msgstr ""
 "Nunha charla, amosa o alcume ao comezo nunha soa liña cando non é a mesma "
 "persoa a que enviou a última mensaxe."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:253
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Sangría cando se use unha combinación de alcumes consecutivos."
 
-#: gajim/common/config.py:272
-#, fuzzy
-msgid ""
-"List of colors, separated by \":\", that will be used to color nicknames in "
-"group chats."
-msgstr ""
-"Listaxe de cores que se empregarán para colorear o alcume nos grupos de "
-"charla."
-
-#: gajim/common/config.py:273
+#: gajim/common/config.py:254
 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."
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:255
+#, fuzzy
 msgid ""
-"Should we show the confirm metacontacts creation dialog or not? Empty string "
-"means we never show the dialog."
+"Show the confirm metacontacts creation dialog or not? Empty string means "
+"never show the dialog."
 msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"Should we show the confirm block contact dialog or not? Empty string means "
-"we never show the dialog."
+"Show the confirm block contact dialog or not? Empty string means never show "
+"the dialog."
 msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: gajim/common/config.py:276
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"Should we show the confirm custom status dialog or not? Empty string means "
-"we never show the dialog."
+"Show the confirm custom status dialog or not? Empty string means never show "
+"the dialog."
 msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:258
 #, fuzzy
 msgid ""
-"If True, you will be able to set a negative priority to your account in "
+"If true, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 msgstr ""
@@ -5857,127 +3614,175 @@ msgstr ""
 "fiestra de modificación de conta. TEÑA COIDADO, cando está conectado cunha "
 "prioridade negativa, NON recibirá ningunha mensaxe do seu servidor."
 
-#: gajim/common/config.py:278
+#: gajim/common/config.py:259
 msgid ""
-"If True, Gajim will show number of online and total contacts in account and "
+"If true, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:260
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: gajim/common/config.py:280
+#: gajim/common/config.py:261
 msgid ""
-"If True, Gajim will scroll and select the contact who sent you the last "
+"If true, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: gajim/common/config.py:281
+#: gajim/common/config.py:262
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:263
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:264
 msgid ""
-"If True, notification windows from notification-daemon will be attached to "
+"If true, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: gajim/common/config.py:284
+#: gajim/common/config.py:265
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:266
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: gajim/common/config.py:286
-msgid "If True, completion in groupchats will be like a shell auto-completion"
-msgstr ""
-
-#: gajim/common/config.py:287
-msgid ""
-"When is self contact row displayed. Can be \"always\", \"when_other_resource"
-"\" or \"never\""
+#: gajim/common/config.py:267
+msgid "If true, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: gajim/common/config.py:292
+#: gajim/common/config.py:272
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: gajim/common/config.py:293
+#: gajim/common/config.py:273
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: gajim/common/config.py:294
-msgid "If True, You will also see your webcam"
+#: gajim/common/config.py:274
+msgid "If true, You will also see your webcam"
 msgstr ""
 
-#: gajim/common/config.py:297
+#: gajim/common/config.py:277
 msgid ""
-"If True, Gajim will try to use a STUN server when using Jingle. The one in "
+"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 XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:278
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:279
 msgid ""
-"If True, Gajim will show affiliation of groupchat occupants by adding a "
+"If true, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:280
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured"
 msgstr ""
 
-#: gajim/common/config.py:301
-msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+#: gajim/common/config.py:281
+msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
 msgstr ""
 
-#: gajim/common/config.py:302
+#: gajim/common/config.py:282
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:303
+#: gajim/common/config.py:283
 msgid ""
 "If enabled, Gajim will show an icon to show that sent message has been "
 "received by your contact"
 msgstr ""
 
-#: gajim/common/config.py:304
+#: gajim/common/config.py:284
 msgid "Show a mini avatar in chat window tabs and in window icon"
 msgstr ""
 
-#: gajim/common/config.py:305
-msgid "If True, Gajim will use the Systems Keyring to store account passwords."
+#: gajim/common/config.py:285
+msgid "If true, Gajim will use the Systems Keyring to store account passwords."
 msgstr ""
 
-#: gajim/common/config.py:306
-msgid "Sets the encoding used by python-gnupg"
+#: gajim/common/config.py:286
+msgid "If true, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:307
-msgid "If True, Gajim will execute XEP-0146 Commands."
+#: gajim/common/config.py:287
+msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:288
+msgid "Options in days which can be chosen in the sync threshold menu"
+msgstr ""
+
+#: gajim/common/config.py:289
+msgid ""
+"Maximum history in days we request from a public room archive. 0: As much as "
+"possible"
+msgstr ""
+
+#: gajim/common/config.py:290
+msgid ""
+"Maximum history in days we request from a private room archive. 0: As much "
+"as possible"
+msgstr ""
+
+#: gajim/common/config.py:291
+msgid "If the room subject is shown in chat on join"
+msgstr ""
+
+#: gajim/common/config.py:292
+msgid ""
+"If the contact row is colored according to the current chatstate of the "
+"contact"
+msgstr ""
+
+#: gajim/common/config.py:293
+msgid "If the tab is colored according to the current chatstate of the contact"
+msgstr ""
+
+#: gajim/common/config.py:294
+msgid ""
+"Shows a text in the banner that describes the current chatstate of the "
+"contact"
+msgstr ""
+
+#: gajim/common/config.py:295 gajim/common/config.py:424
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to contacts. Possible values: all, "
+"composing_only, disabled"
+msgstr ""
+"Enviáronse as notificacións de estado. Pode ser all, composing_only o "
+"disabled."
+
+#: gajim/common/config.py:296 gajim/common/config.py:438
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"all, composing_only, disabled"
+msgstr ""
+"Enviáronse as notificacións de estado. Pode ser all, composing_only o "
+"disabled."
+
+#: gajim/common/config.py:312
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -5985,107 +3790,88 @@ msgstr ""
 "A prioridade cambiará automaticamente segundo o seu estado. As prioridades "
 "están definidas nas opcións de autoprioridade_*"
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:320
 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 ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:321
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: gajim/common/config.py:334
+#: gajim/common/config.py:322
 msgid ""
-"If True, Contacts requesting authorization will be automatically accepted."
+"If true, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: gajim/common/config.py:335
+#: gajim/common/config.py:323
 #, 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."
 
-#: gajim/common/config.py:338
-msgid ""
-"If disabled, don't sign presences with GPG key, even if GPG is configured."
-msgstr ""
-
-#: gajim/common/config.py:340
-msgid "Enable ESessions encryption for this account."
-msgstr ""
-
-#: gajim/common/config.py:341
-msgid "Should Gajim automatically start an encrypted session when possible?"
-msgstr ""
-
-#: gajim/common/config.py:342
+#: gajim/common/config.py:327
 msgid "Allow plaintext connections"
 msgstr ""
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:330
 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 ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:331
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:332
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:333
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:334
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: gajim/common/config.py:357
+#: gajim/common/config.py:340
 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 ""
 
-#: gajim/common/config.py:358
-msgid ""
-"On startup, Gajim will download logs stored on server, provided the server "
-"supports XEP-0313"
-msgstr ""
-
-#: gajim/common/config.py:359
+#: gajim/common/config.py:341
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:362
+#: gajim/common/config.py:343
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:344
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:367
+#: gajim/common/config.py:348
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before we try "
+"How many seconds to wait for the answer of ping alive packet before trying "
 "to reconnect?"
 msgstr ""
 
-#: gajim/common/config.py:371
+#: gajim/common/config.py:352
 msgid "Jabberd2 workaround"
 msgstr "Corrección Jabberd2"
 
-#: gajim/common/config.py:374
+#: gajim/common/config.py:355
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -6093,189 +3879,190 @@ 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."
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:356
 msgid ""
-"If True, Gajim will test file transfer proxies on startup to be sure it "
+"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 ""
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:369
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:370
 msgid "Sent receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:398
+#: gajim/common/config.py:379
 #, 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"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:380
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: gajim/common/config.py:400
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-
-#: gajim/common/config.py:403
+#: gajim/common/config.py:383
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Por favor, cubra a información do contacto que quere engadir"
 
-#: gajim/common/config.py:404
-msgid ""
-"If enabled and if server supports this feature, Gajim will receive messages "
-"sent and received by other resources."
-msgstr ""
-
-#: gajim/common/config.py:405
+#: gajim/common/config.py:384
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:406
-#, fuzzy
-msgid "Latest token for OAuth 2.0 authentication."
-msgstr "Usar a autenticación"
-
-#: gajim/common/config.py:407
-#, fuzzy
-msgid "client_id for OAuth 2.0 authentication."
-msgstr "Usar a autenticación"
-
-#: gajim/common/config.py:408
-#, fuzzy
-msgid "redirect_url for OAuth 2.0 authentication."
-msgstr "Usar a autenticación"
-
-#: gajim/common/config.py:409
+#: gajim/common/config.py:385
 msgid ""
-"Space separated list of JIDs for which we want to re-open a chat window on "
-"next startup."
+"Space separated list of JIDs for which chat window will be re-opened on next "
+"startup."
 msgstr ""
 
-#: gajim/common/config.py:411
+#: gajim/common/config.py:387
 msgid "HTTP Upload: Enable HTTPS Verification"
 msgstr ""
 
-#: gajim/common/config.py:412
+#: gajim/common/config.py:388
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on chat window. Can be "
 "'httpupload' (default) or 'jingle'"
 msgstr ""
 
-#: gajim/common/config.py:475 gajim/common/config.py:480
-msgid "Language for which we want to check misspelled words"
+#: gajim/common/config.py:389
+msgid "Allow cert verification with POSH"
+msgstr ""
+
+#: gajim/common/config.py:423 gajim/common/config.py:430
+#, fuzzy
+msgid "Language for which misspelled words will be checked"
 msgstr "Lingua en que se comprobarán os erros ortográficos"
 
-#: gajim/common/config.py:477
+#: gajim/common/config.py:427
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:431
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:432
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:483
-msgid "State whether we want a notification for every message in this room"
+#: gajim/common/config.py:433
+msgid "State whether a notification is created for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:486
+#: gajim/common/config.py:434
+msgid ""
+"Show a status message for all status (away, dnd, etc.) changes of users in a "
+"group chat"
+msgstr ""
+
+#: gajim/common/config.py:435
+#, fuzzy
+msgid "Show a status message for every join or leave in a group chat"
+msgstr "Non se puido entrar no grupo de charla"
+
+#: gajim/common/config.py:436
+msgid "If the group chat is minimized into the roster on autojoin"
+msgstr ""
+
+#: gajim/common/config.py:437
+msgid "If the group chat is minimized into the roster on close"
+msgstr ""
+
+#: gajim/common/config.py:441
 msgid ""
 "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 ""
 
-#: gajim/common/config.py:491 gajim/common/pep.py:157
+#: gajim/common/config.py:446 gajim/common/const.py:281
 msgid "Sleeping"
 msgstr "A durmir"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:447
 msgid "Back soon"
 msgstr "Volvo axiña"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:447
 msgid "Back in some minutes."
 msgstr "Volvo nuns minutos."
 
-#: gajim/common/config.py:493 gajim/common/pep.py:127
+#: gajim/common/config.py:448 gajim/common/const.py:247
 msgid "Eating"
 msgstr "A comer"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:448
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, déixeme unha mensaxe."
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:449
 msgid "Movie"
 msgstr "Filme"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:449
 msgid "I'm watching a movie."
 msgstr "Estou a ver un filme."
 
-#: gajim/common/config.py:495 gajim/common/pep.py:186
+#: gajim/common/config.py:450 gajim/common/const.py:314
 msgid "Working"
 msgstr "A traballar"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:450
 msgid "I'm working."
 msgstr "Estou a traballar."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:451
 msgid "Phone"
 msgstr "Teléfono"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:451
 msgid "I'm on the phone."
 msgstr "Estou a falar por teléfono."
 
-#: gajim/common/config.py:497
+#: gajim/common/config.py:452
 msgid "Out"
 msgstr "Fóra"
 
-#: gajim/common/config.py:497
+#: gajim/common/config.py:452
 msgid "I'm out enjoying life."
 msgstr "Estou fóra a gozar da vida."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:463
 msgid "I'm available."
 msgstr "Estou dispoñíbel."
 
-#: gajim/common/config.py:509
+#: gajim/common/config.py:464
 msgid "I'm free for chat."
 msgstr "Estou libre para falar."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+msgid "Be right back."
+msgstr "Volvo axiña"
+
+#: gajim/common/config.py:466
 msgid "I'm not available."
 msgstr "Non estou dispoñíbel."
 
-#: gajim/common/config.py:512
+#: gajim/common/config.py:467
 msgid "Do not disturb."
 msgstr "Non molestar."
 
-#: gajim/common/config.py:513 gajim/common/config.py:514
+#: gajim/common/config.py:468 gajim/common/config.py:469
 msgid "Bye!"
 msgstr "Adeus!"
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:480
 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."
@@ -6284,1324 +4071,1103 @@ msgstr ""
 "palabras de muc_highlight_words, ou cuando unha mensaxe dun grupo de charla "
 "contén o teu alcume."
 
-#: gajim/common/config.py:526
+#: gajim/common/config.py:481
 msgid "Sound to play when any MUC message arrives."
 msgstr "Son para reproducir cando chega calquera mensaxe MUC"
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:349
-msgid "green"
-msgstr "verde"
-
-#: gajim/common/config.py:538 gajim/common/optparser.py:335
-msgid "grocery"
-msgstr "ultramariño"
-
-#: gajim/common/config.py:542
-msgid "human"
-msgstr "humano"
-
-#: gajim/common/config.py:546
-msgid "marine"
-msgstr "mariño"
-
-#: gajim/common/config.py:553
+#: gajim/common/config.py:485
 #, fuzzy
 msgid "Tor"
 msgstr "A"
 
-#: gajim/common/commands.py:86
-#, fuzzy
-msgid "Change status information"
-msgstr "Información"
-
-#: gajim/common/commands.py:108
-#, fuzzy
-msgid "Change status"
-msgstr "Un contacto cambiou o seu estado"
+#: gajim/common/optparser.py:52
+#, python-format
+msgid "Error: cannot open %s for reading"
+msgstr "Erro: non se pode abrir %s para lectura"
 
-#: gajim/common/commands.py:109
-msgid "Set the presence type and description"
+#: gajim/common/const.py:214
+msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/commands.py:115
-#, fuzzy
-msgid "Free for chat"
-msgstr "Libre para falar"
-
-#: gajim/common/commands.py:116
-#, fuzzy
-msgid "Online"
-msgstr "nove"
-
-#: gajim/common/commands.py:118
-msgid "Extended away"
+#: gajim/common/const.py:217
+msgid ""
+"This message was encrypted with Legacy OpenPGP and could not be decrypted. "
+"You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/commands.py:119
-#, fuzzy
-msgid "Do not disturb"
-msgstr "Non molestar."
-
-#: gajim/common/commands.py:120
-msgid "Offline - disconnect"
+#: gajim/common/const.py:221
+msgid ""
+"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/commands.py:125
-#, fuzzy
-msgid "Presence description:"
-msgstr "Descrición do erro..."
-
-#: gajim/common/commands.py:160 gajim/common/commands.py:343
-msgid "The status has been changed."
+#: gajim/common/const.py:224
+#, python-format
+msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/commands.py:192 gajim/common/commands.py:225
-#, fuzzy
-msgid "Leave Groupchats"
-msgstr "Novo grupo de charla"
-
-#: gajim/common/commands.py:215
-#, fuzzy, python-format
-msgid "%(nickname)s on %(room_jid)s"
-msgstr "%(nickname)s da sala %(room_name)s"
-
-#: gajim/common/commands.py:219
+#: gajim/common/const.py:231
 #, fuzzy
-msgid "You have not joined a groupchat."
-msgstr "%s entrou no grupo de charla"
+msgid "Doing Chores"
+msgstr "Host errado"
 
-#: gajim/common/commands.py:226
-msgid "Choose the groupchats you want to leave"
+#: gajim/common/const.py:232
+msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/commands.py:271
+#: gajim/common/const.py:233
 #, fuzzy
-msgid "You left the following groupchats:"
-msgstr "Xa está na sala %s"
+msgid "Cleaning"
+msgstr "Serán"
 
-#: gajim/common/commands.py:283
+#: gajim/common/const.py:234
 #, fuzzy
-msgid "Forward unread messages"
-msgstr "%d mensaxe sen ler"
+msgid "Cooking"
+msgstr "A compor"
 
-#: gajim/common/commands.py:310
-msgid "All unread messages have been forwarded."
+#: gajim/common/const.py:235
+msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/commands.py:318
-#, fuzzy
-msgid "Forward unread message then disconnect"
-msgstr "%d mensaxe sen ler"
+#: gajim/common/const.py:236
+msgid "Doing the Dishes"
+msgstr ""
 
-#: gajim/common/httpupload.py:137
-#, fuzzy
-msgid "File is empty"
-msgstr "Camiño do ficheiro"
+#: gajim/common/const.py:237
+msgid "Doing the Laundry"
+msgstr ""
 
-#: gajim/common/httpupload.py:140
+#: gajim/common/const.py:238
 #, fuzzy
-msgid "File does not exist"
-msgstr "Non existe o grupo de charla."
+msgid "Gardening"
+msgstr "Mañá"
 
-#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
-#, python-format
-msgid "File is too large, maximum allowed file size is: %s"
+#: gajim/common/const.py:239
+msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/check_paths.py:37
-msgid "creating logs database"
-msgstr "a crear a base de datos de rexistros"
-
-#: gajim/common/check_paths.py:98
+#: gajim/common/const.py:240
 #, fuzzy
-msgid "creating cache database"
-msgstr "a crear a base de datos de rexistros"
-
-#: gajim/common/check_paths.py:261
-#, fuzzy, python-format
-msgid "moving %(src)s to %(dst)s"
-msgstr "Enviar %s"
-
-#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
-#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
-#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
-#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
-#, fuzzy, python-format
-msgid "%s is a file but it should be a directory"
-msgstr "%s é un ficheiro mais podería ser un directorio"
-
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
-msgid "Gajim will now exit"
-msgstr "Gajim pecharase agora"
-
-#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
-#, fuzzy, python-format
-msgid "%s is a directory but should be a file"
-msgstr "%s é un directorio mais podería ser un ficheiro"
-
-#: gajim/common/optparser.py:55
-#, python-format
-msgid "Error: cannot open %s for reading"
-msgstr "Erro: non se pode abrir %s para lectura"
-
-#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
-msgid "cyan"
-msgstr "ciano"
+msgid "Walking the Dog"
+msgstr "todos no grupo"
 
-#: gajim/common/optparser.py:413
+#: gajim/common/const.py:242
 #, fuzzy
-msgid "migrating logs database to indices"
-msgstr "migrando os rexistros da base de datos aos índices"
-
-#: gajim/common/logging_helpers.py:34
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr ""
+msgid "Drinking"
+msgstr "A traballar"
 
-#: gajim/common/connection.py:79
-msgid "Unable to get issuer certificate"
+#: gajim/common/const.py:243
+msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/connection.py:80
-msgid "Unable to get certificate CRL"
+#: gajim/common/const.py:244
+msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/connection.py:81
-msgid "Unable to decrypt certificate's signature"
+#: gajim/common/const.py:245
+msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/connection.py:82
-msgid "Unable to decrypt CRL's signature"
+#: gajim/common/const.py:248
+msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/connection.py:83
-#, fuzzy
-msgid "Unable to decode issuer public key"
-msgstr "Non se pode cargar o módulo inactivo"
-
-#: gajim/common/connection.py:84
-msgid "Certificate signature failure"
+#: gajim/common/const.py:249
+msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/connection.py:85
-msgid "CRL signature failure"
+#: gajim/common/const.py:250
+msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/connection.py:86
-msgid "Certificate is not yet valid"
+#: gajim/common/const.py:251
+msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/connection.py:87
-msgid "Certificate has expired"
+#: gajim/common/const.py:253
+msgid "Exercising"
 msgstr ""
 
-#: gajim/common/connection.py:88
-msgid "CRL is not yet valid"
+#: gajim/common/const.py:254 gajim/common/const.py:305
+msgid "Cycling"
 msgstr ""
 
-#: gajim/common/connection.py:89
-msgid "CRL has expired"
-msgstr ""
+#: gajim/common/const.py:255
+#, fuzzy
+msgid "Dancing"
+msgstr "Serán"
 
-#: gajim/common/connection.py:90
-msgid "Format error in certificate's notBefore field"
-msgstr ""
+#: gajim/common/const.py:256
+#, fuzzy
+msgid "Hiking"
+msgstr "A expulsar %s"
 
-#: gajim/common/connection.py:91
-msgid "Format error in certificate's notAfter field"
-msgstr ""
+#: gajim/common/const.py:257
+#, fuzzy
+msgid "Jogging"
+msgstr "_Entrar"
 
-#: gajim/common/connection.py:92
-msgid "Format error in CRL's lastUpdate field"
+#: gajim/common/const.py:258
+msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/connection.py:93
-msgid "Format error in CRL's nextUpdate field"
+#: gajim/common/const.py:259
+msgid "Running"
 msgstr ""
 
-#: gajim/common/connection.py:94
-msgid "Out of memory"
-msgstr ""
+#: gajim/common/const.py:260
+#, fuzzy
+msgid "Skiing"
+msgstr "A traballar"
 
-#: gajim/common/connection.py:95
-msgid "Self signed certificate"
+#: gajim/common/const.py:261
+msgid "Swimming"
 msgstr ""
 
-#: gajim/common/connection.py:96
-msgid "Self signed certificate in certificate chain"
-msgstr ""
+#: gajim/common/const.py:262
+#, fuzzy
+msgid "Working out"
+msgstr "A traballar"
 
-#: gajim/common/connection.py:97
-msgid "Unable to get local issuer certificate"
+#: gajim/common/const.py:264
+msgid "Grooming"
 msgstr ""
 
-#: gajim/common/connection.py:98
-msgid "Unable to verify the first certificate"
+#: gajim/common/const.py:265
+msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/connection.py:99
-msgid "Certificate chain too long"
+#: gajim/common/const.py:266
+msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/connection.py:100
-msgid "Certificate revoked"
+#: gajim/common/const.py:267
+msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/connection.py:101
+#: gajim/common/const.py:268
 #, fuzzy
-msgid "Invalid CA certificate"
-msgstr "O nome de usuario non é válido"
-
-#: gajim/common/connection.py:102
-msgid "Path length constraint exceeded"
-msgstr ""
+msgid "Shaving"
+msgstr "A comer"
 
-#: gajim/common/connection.py:103
-msgid "Unsupported certificate purpose"
+#: gajim/common/const.py:269
+msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/connection.py:104
-msgid "Certificate not trusted"
+#: gajim/common/const.py:270
+msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/connection.py:105
-msgid "Certificate rejected"
+#: gajim/common/const.py:272
+msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/connection.py:106
-msgid "Subject issuer mismatch"
-msgstr ""
+#: gajim/common/const.py:274
+msgid "Inactive"
+msgstr "Inactivo"
 
-#: gajim/common/connection.py:107
-msgid "Authority and subject key identifier mismatch"
+#: gajim/common/const.py:275
+msgid "Day Off"
 msgstr ""
 
-#: gajim/common/connection.py:108
-msgid "Authority and issuer serial number mismatch"
-msgstr ""
+#: gajim/common/const.py:276
+#, fuzzy
+msgid "Hanging out"
+msgstr "Cambiando o asunto"
 
-#: gajim/common/connection.py:109
-msgid "Key usage does not include certificate signing"
-msgstr ""
+#: gajim/common/const.py:277
+#, fuzzy
+msgid "Hiding"
+msgstr "A expulsar %s"
 
-#: gajim/common/connection.py:110
-msgid "Application verification failure"
+#: gajim/common/const.py:278
+msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/connection.py:870
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Perdeuse a conexión da conta \"%s\""
+#: gajim/common/const.py:279
+#, fuzzy
+msgid "Praying"
+msgstr "A comer"
 
-#: gajim/common/connection.py:871
-msgid "Reconnect manually."
-msgstr "Reconectar manualmente."
+#: gajim/common/const.py:280
+msgid "Scheduled Holiday"
+msgstr ""
 
-#: gajim/common/connection.py:882
-#, fuzzy, python-format
-msgid "Server %(name)s answered wrongly to register request: %(error)s"
-msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
+#: gajim/common/const.py:282
+#, fuzzy
+msgid "Thinking"
+msgstr "A traballar"
 
-#: gajim/common/connection.py:923
-#, python-format
-msgid "Server %s provided a different registration form"
+#: gajim/common/const.py:284
+msgid "Relaxing"
 msgstr ""
 
-#: gajim/common/connection.py:1277
-#, fuzzy, python-format
-msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
-msgstr "Non se pode conectar a \"%s\""
-
-#: gajim/common/connection.py:1280
-#, fuzzy, python-format
-msgid "Could not connect to \"%(host)s\""
-msgstr "Non se pode conectar a \"%s\""
+#: gajim/common/const.py:285
+#, fuzzy
+msgid "Fishing"
+msgstr "A expulsar %s"
 
-#: gajim/common/connection.py:1287
-#, fuzzy, python-format
-msgid "Server replied: %s"
-msgstr "Gardouse en: %s"
+#: gajim/common/const.py:286
+#, fuzzy
+msgid "Gaming"
+msgstr "A comer"
 
-#: gajim/common/connection.py:1302
+#: gajim/common/const.py:287
 #, fuzzy
-msgid "Connection to proxy failed"
-msgstr "Fallou a conexión"
+msgid "Going out"
+msgstr "_Desconectar"
 
-#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
-#, fuzzy, python-format
-msgid "Could not connect to account %s"
-msgstr "Non se pode conectar a \"%s\""
+#: gajim/common/const.py:288
+#, fuzzy
+msgid "Partying"
+msgstr "A comer"
 
-#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
-#, fuzzy, python-format
-msgid "Connection with account %s has been lost. Retry connecting."
-msgstr "Perdeuse a conexión da conta \"%s\""
+#: gajim/common/const.py:289
+#, fuzzy
+msgid "Reading"
+msgstr "Motivo"
 
-#: gajim/common/connection.py:1366
-#, python-format
-msgid "The authenticity of the %s certificate could be invalid"
-msgstr ""
+#: gajim/common/const.py:290
+#, fuzzy
+msgid "Rehearsing"
+msgstr "Motivo"
 
-#: gajim/common/connection.py:1369
-#, python-format
-msgid ""
-"\n"
-"SSL Error: <b>%s</b>"
-msgstr ""
+#: gajim/common/const.py:291
+#, fuzzy
+msgid "Shopping"
+msgstr "A durmir"
 
-#: gajim/common/connection.py:1371
-#, python-format
-msgid ""
-"\n"
-"Unknown SSL error: %d"
-msgstr ""
+#: gajim/common/const.py:292
+#, fuzzy
+msgid "Smoking"
+msgstr "A traballar"
 
-#: gajim/common/connection.py:1417
-#, python-format
-msgid ""
-"The authenticity of the %s certificate could be invalid.\n"
-"The certificate does not cover this domain."
+#: gajim/common/const.py:293
+msgid "Socializing"
 msgstr ""
 
-#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
-#: gajim/common/zeroconf/connection_zeroconf.py:209
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Non se pode conectar a \"%s\""
-
-#: gajim/common/connection.py:1506
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Fallou a autenticación con \"%s\""
-
-#: gajim/common/connection.py:1507
-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."
+#: gajim/common/const.py:294
+#, fuzzy
+msgid "Sunbathing"
+msgstr "A comer"
 
-#: gajim/common/connection.py:2094
-#, python-format
-msgid "Sent contact: \"%(jid)s\" (%(name)s)"
+#: gajim/common/const.py:295
+msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/connection.py:2098
+#: gajim/common/const.py:296
 #, fuzzy
-msgid "Sent contacts:"
-msgstr "Contactos"
-
-#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
-msgid "Not fetched because of invisible status"
-msgstr "Non se conseguiu debido ao estado invisíbel"
-
-#: gajim/common/dbus_support.py:44
-msgid "D-Bus python bindings are missing in this computer"
-msgstr "As ligazóns D-Bus de python non se achan neste computador"
+msgid "Watching a Movie"
+msgstr "Estou a ver un filme."
 
-#: gajim/common/dbus_support.py:45 gajim/common/dbus_support.py:56
-msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Non se poden empregar as capacidades D-Bus de Gajim"
+#: gajim/common/const.py:298
+#, fuzzy
+msgid "Talking"
+msgstr "A comer"
 
-#: gajim/common/dbus_support.py:55
-msgid "D-Bus does not run correctly on this machine"
+#: gajim/common/const.py:299
+msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/dbus_support.py:58
+#: gajim/common/const.py:300
 #, 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"
+msgid "On the Phone"
+msgstr "Estou a falar por teléfono."
 
-#: gajim/common/dbus_support.py:61
+#: gajim/common/const.py:301
+msgid "On Video Phone"
+msgstr ""
+
+#: gajim/common/const.py:303
 #, 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"
+msgid "Traveling"
+msgstr "A transferir"
 
-#: gajim/common/multimedia_helpers.py:40
+#: gajim/common/const.py:304
 #, fuzzy
-msgid "Default device"
-msgstr "Mensaxes de estado por defecto"
+msgid "Commuting"
+msgstr "A compor"
 
-#: gajim/common/multimedia_helpers.py:59
-msgid "Audio test"
+#: gajim/common/const.py:306
+msgid "Driving"
 msgstr ""
 
-#: gajim/common/multimedia_helpers.py:62 gajim/common/multimedia_helpers.py:78
-#: gajim/common/multimedia_helpers.py:92 gajim/common/multimedia_helpers.py:110
-msgid "Autodetect"
+#: gajim/common/const.py:307
+msgid "In a Car"
 msgstr ""
 
-#: gajim/common/multimedia_helpers.py:65 gajim/common/multimedia_helpers.py:80
-#, fuzzy, python-format
-msgid "ALSA: %s"
-msgstr "Tamaño: %s"
-
-#: gajim/common/multimedia_helpers.py:68 gajim/common/multimedia_helpers.py:82
-#, fuzzy, python-format
-msgid "Pulse: %s"
-msgstr "Ficheiro: %s"
-
-#: gajim/common/multimedia_helpers.py:76
-msgid "Fake audio output"
+#: gajim/common/const.py:308
+msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/multimedia_helpers.py:89
-msgid "Video test"
+#: gajim/common/const.py:309
+msgid "On a Plane"
 msgstr ""
 
-#: gajim/common/multimedia_helpers.py:94
-#, python-format
-msgid "V4L2: %s"
+#: gajim/common/const.py:310
+#, fuzzy
+msgid "On a Train"
+msgstr "_Abrir como ligazón"
+
+#: gajim/common/const.py:311
+msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/multimedia_helpers.py:97
+#: gajim/common/const.py:312
 #, fuzzy
-msgid "Screen"
-msgstr "verde"
+msgid "Walking"
+msgstr "A traballar"
 
-#: gajim/common/multimedia_helpers.py:104
-msgid "Fake video output"
-msgstr ""
+#: gajim/common/const.py:315
+#, fuzzy
+msgid "Coding"
+msgstr "A compor"
 
-#: gajim/common/multimedia_helpers.py:107
-#, python-format
-msgid "X Window System (X11/XShm/Xv): %s"
+#: gajim/common/const.py:316
+msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/multimedia_helpers.py:109
-msgid "X Window System (without Xv)"
+#: gajim/common/const.py:317
+msgid "Studying"
 msgstr ""
 
-#: gajim/common/pep.py:27
+#: gajim/common/const.py:318
+#, fuzzy
+msgid "Writing"
+msgstr "A traballar"
+
+#: gajim/common/const.py:321
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/pep.py:28
+#: gajim/common/const.py:322
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/pep.py:29
+#: gajim/common/const.py:323
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/pep.py:30
+#: gajim/common/const.py:324
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/pep.py:31
+#: gajim/common/const.py:325
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/pep.py:32
+#: gajim/common/const.py:326
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/pep.py:33
+#: gajim/common/const.py:327
 #, fuzzy
 msgid "Aroused"
 msgstr "Pausado"
 
-#: gajim/common/pep.py:34
+#: gajim/common/const.py:328
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/pep.py:35
+#: gajim/common/const.py:329
 #, fuzzy
 msgid "Bored"
 msgstr "Negra"
 
-#: gajim/common/pep.py:36
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Brave"
 msgstr "Ten "
 
-#: gajim/common/pep.py:37
+#: gajim/common/const.py:331
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/pep.py:38
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Cautious"
 msgstr "Charlas"
 
-#: gajim/common/pep.py:39
+#: gajim/common/const.py:333
 #, fuzzy
 msgid "Cold"
 msgstr "Negra"
 
-#: gajim/common/pep.py:40
+#: gajim/common/const.py:334
 #, fuzzy
 msgid "Confident"
 msgstr "_Contidos"
 
-#: gajim/common/pep.py:41
+#: gajim/common/const.py:335
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/pep.py:42
+#: gajim/common/const.py:336
 #, fuzzy
 msgid "Contemplative"
 msgstr "Completado"
 
-#: gajim/common/pep.py:43
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Contented"
 msgstr "_Contidos"
 
-#: gajim/common/pep.py:44
+#: gajim/common/const.py:338
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/pep.py:45
+#: gajim/common/const.py:339
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/pep.py:46
+#: gajim/common/const.py:340
 #, fuzzy
 msgid "Creative"
 msgstr "Inactivo"
 
-#: gajim/common/pep.py:47
+#: gajim/common/const.py:341
 msgid "Curious"
 msgstr ""
 
-#: gajim/common/pep.py:48
+#: gajim/common/const.py:342
 #, fuzzy
 msgid "Dejected"
 msgstr "Eliminar"
 
-#: gajim/common/pep.py:49
+#: gajim/common/const.py:343
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/pep.py:50
+#: gajim/common/const.py:344
 #, fuzzy
 msgid "Disappointed"
 msgstr "Desactivado"
 
-#: gajim/common/pep.py:51
+#: gajim/common/const.py:345
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/pep.py:52
+#: gajim/common/const.py:346
 #, fuzzy
 msgid "Dismayed"
 msgstr "Desactivado"
 
-#: gajim/common/pep.py:53
+#: gajim/common/const.py:347
 #, fuzzy
 msgid "Distracted"
 msgstr "Desactivado"
 
-#: gajim/common/pep.py:54
+#: gajim/common/const.py:348
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/pep.py:55
+#: gajim/common/const.py:349
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/pep.py:56
+#: gajim/common/const.py:350
 msgid "Excited"
 msgstr ""
 
-#: gajim/common/pep.py:57
+#: gajim/common/const.py:351
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/pep.py:58
+#: gajim/common/const.py:352
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/pep.py:59
+#: gajim/common/const.py:353
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/pep.py:60
+#: gajim/common/const.py:354
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/pep.py:61
+#: gajim/common/const.py:355
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
 
-#: gajim/common/pep.py:62
+#: gajim/common/const.py:356
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/pep.py:63
+#: gajim/common/const.py:357
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/pep.py:64
+#: gajim/common/const.py:358
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/pep.py:65
+#: gajim/common/const.py:359
 msgid "Hot"
 msgstr ""
 
-#: gajim/common/pep.py:66
+#: gajim/common/const.py:360
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/pep.py:67
+#: gajim/common/const.py:361
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/pep.py:68
+#: gajim/common/const.py:362
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/pep.py:69
+#: gajim/common/const.py:363
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/pep.py:70
+#: gajim/common/const.py:364
 #, fuzzy
 msgid "Impressed"
 msgstr "mensaxe"
 
-#: gajim/common/pep.py:71
+#: gajim/common/const.py:365
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/pep.py:72
+#: gajim/common/const.py:366
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/pep.py:73
+#: gajim/common/const.py:367
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/pep.py:74
+#: gajim/common/const.py:368
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/pep.py:75
+#: gajim/common/const.py:369
 msgid "Intoxicated"
 msgstr ""
 
-#: gajim/common/pep.py:76
+#: gajim/common/const.py:370
 #, fuzzy
 msgid "Invincible"
 msgstr "Invisíbel"
 
-#: gajim/common/pep.py:77
+#: gajim/common/const.py:371
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/pep.py:78
+#: gajim/common/const.py:372
 #, fuzzy
 msgid "Lonely"
 msgstr "unha"
 
-#: gajim/common/pep.py:79
+#: gajim/common/const.py:373
 msgid "Lost"
 msgstr ""
 
-#: gajim/common/pep.py:80
+#: gajim/common/const.py:374
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/pep.py:81
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Mean"
 msgstr "Alemán"
 
-#: gajim/common/pep.py:82
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Moody"
 msgstr "_Modificar"
 
-#: gajim/common/pep.py:83
+#: gajim/common/const.py:377
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/pep.py:84
+#: gajim/common/const.py:378
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/pep.py:85
+#: gajim/common/const.py:379
 #, fuzzy
 msgid "Offended"
 msgstr "Desconectado"
 
-#: gajim/common/pep.py:86
+#: gajim/common/const.py:380
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/pep.py:87
+#: gajim/common/const.py:381
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/pep.py:88
+#: gajim/common/const.py:382
 #, fuzzy
 msgid "Proud"
 msgstr "Grupo"
 
-#: gajim/common/pep.py:89
+#: gajim/common/const.py:383
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/pep.py:90
+#: gajim/common/const.py:384
 #, fuzzy
 msgid "Relieved"
 msgstr "once"
 
-#: gajim/common/pep.py:91
+#: gajim/common/const.py:385
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/pep.py:92
+#: gajim/common/const.py:386
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/pep.py:93
+#: gajim/common/const.py:387
 #, fuzzy
 msgid "Sad"
 msgstr "Atascado"
 
-#: gajim/common/pep.py:94
+#: gajim/common/const.py:388
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/pep.py:95
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Satisfied"
 msgstr "Última modificación:"
 
-#: gajim/common/pep.py:96
+#: gajim/common/const.py:390
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/pep.py:97
+#: gajim/common/const.py:391
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/pep.py:98
+#: gajim/common/const.py:392
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/pep.py:99
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Sick"
 msgstr "Alcume"
 
-#: gajim/common/pep.py:100
+#: gajim/common/const.py:394
 #, fuzzy
 msgid "Sleepy"
 msgstr "A durmir"
 
-#: gajim/common/pep.py:101
+#: gajim/common/const.py:395
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/pep.py:102
+#: gajim/common/const.py:396
 #, fuzzy
 msgid "Stressed"
 msgstr "Rúa:"
 
-#: gajim/common/pep.py:103
+#: gajim/common/const.py:397
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/pep.py:104
+#: gajim/common/const.py:398
 #, fuzzy
 msgid "Surprised"
 msgstr "Engadiuse"
 
-#: gajim/common/pep.py:105
+#: gajim/common/const.py:399
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/pep.py:106
+#: gajim/common/const.py:400
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/pep.py:107
+#: gajim/common/const.py:401
 #, fuzzy
 msgid "Tired"
 msgstr "Hora"
 
-#: gajim/common/pep.py:108
+#: gajim/common/const.py:402
 #, fuzzy
 msgid "Undefined"
 msgstr "nove"
 
-#: gajim/common/pep.py:109
+#: gajim/common/const.py:403
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/pep.py:110
+#: gajim/common/const.py:404
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/pep.py:113
+#: gajim/common/const.py:408
+msgid "accuracy"
+msgstr ""
+
+#: gajim/common/const.py:409
 #, fuzzy
-msgid "Doing Chores"
-msgstr "Host errado"
+msgid "alt"
+msgstr "Por defecto"
 
-#: gajim/common/pep.py:114
-msgid "Buying Groceries"
+#: gajim/common/const.py:410
+msgid "area"
 msgstr ""
 
-#: gajim/common/pep.py:115
+#: gajim/common/const.py:411
 #, fuzzy
-msgid "Cleaning"
-msgstr "Serán"
+msgid "bearing"
+msgstr "mariño"
 
-#: gajim/common/pep.py:116
+#: gajim/common/const.py:412
 #, fuzzy
-msgid "Cooking"
-msgstr "A compor"
-
-#: gajim/common/pep.py:117
-msgid "Doing Maintenance"
-msgstr ""
-
-#: gajim/common/pep.py:118
-msgid "Doing the Dishes"
-msgstr ""
+msgid "building"
+msgstr "A expulsar %s"
 
-#: gajim/common/pep.py:119
-msgid "Doing the Laundry"
-msgstr ""
+#: gajim/common/const.py:413
+#, fuzzy
+msgid "country"
+msgstr "País:"
 
-#: gajim/common/pep.py:120
+#: gajim/common/const.py:414
 #, fuzzy
-msgid "Gardening"
-msgstr "Mañá"
+msgid "countrycode"
+msgstr "Conta"
 
-#: gajim/common/pep.py:121
-msgid "Running an Errand"
+#: gajim/common/const.py:415
+msgid "datum"
 msgstr ""
 
-#: gajim/common/pep.py:122
+#: gajim/common/const.py:416
 #, fuzzy
-msgid "Walking the Dog"
-msgstr "todos no grupo"
+msgid "description"
+msgstr "Descrición"
 
-#: gajim/common/pep.py:123
+#: gajim/common/const.py:417
 #, fuzzy
-msgid "Drinking"
-msgstr "A traballar"
+msgid "error"
+msgstr "Erro de Avahi"
 
-#: gajim/common/pep.py:124
-msgid "Having a Beer"
+#: gajim/common/const.py:418
+msgid "floor"
 msgstr ""
 
-#: gajim/common/pep.py:125
-msgid "Having Coffee"
+#: gajim/common/const.py:419
+msgid "lat"
 msgstr ""
 
-#: gajim/common/pep.py:126
-msgid "Having Tea"
+#: gajim/common/const.py:420
+msgid "locality"
 msgstr ""
 
-#: gajim/common/pep.py:128
-msgid "Having a Snack"
-msgstr ""
+#: gajim/common/const.py:421
+#, fuzzy
+msgid "lon"
+msgstr "unha"
 
-#: gajim/common/pep.py:129
-msgid "Having Breakfast"
+#: gajim/common/const.py:422
+msgid "postalcode"
 msgstr ""
 
-#: gajim/common/pep.py:130
-msgid "Having Dinner"
+#: gajim/common/const.py:423
+msgid "region"
 msgstr ""
 
-#: gajim/common/pep.py:131
-msgid "Having Lunch"
-msgstr ""
+#: gajim/common/const.py:424
+#, fuzzy
+msgid "room"
+msgstr "De"
 
-#: gajim/common/pep.py:132
-msgid "Exercising"
+#: gajim/common/const.py:425
+msgid "speed"
 msgstr ""
 
-#: gajim/common/pep.py:133 gajim/common/pep.py:178
-msgid "Cycling"
+#: gajim/common/const.py:426
+msgid "street"
 msgstr ""
 
-#: gajim/common/pep.py:134
-#, fuzzy
-msgid "Dancing"
-msgstr "Serán"
-
-#: gajim/common/pep.py:135
-#, fuzzy
-msgid "Hiking"
-msgstr "A expulsar %s"
-
-#: gajim/common/pep.py:136
-#, fuzzy
-msgid "Jogging"
-msgstr "_Entrar"
-
-#: gajim/common/pep.py:137
-msgid "Playing Sports"
+#: gajim/common/const.py:427
+msgid "text"
 msgstr ""
 
-#: gajim/common/pep.py:138
-msgid "Running"
+#: gajim/common/const.py:428
+msgid "timestamp"
 msgstr ""
 
-#: gajim/common/pep.py:139
-#, fuzzy
-msgid "Skiing"
-msgstr "A traballar"
-
-#: gajim/common/pep.py:140
-msgid "Swimming"
+#: gajim/common/const.py:429
+msgid "URI"
 msgstr ""
 
-#: gajim/common/pep.py:141
-#, fuzzy
-msgid "Working out"
-msgstr "A traballar"
-
-#: gajim/common/pep.py:142
-msgid "Grooming"
+#: gajim/common/const.py:434
+msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/pep.py:143
-msgid "At the Spa"
+#: gajim/common/const.py:435
+msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/pep.py:144
-msgid "Brushing Teeth"
+#: gajim/common/const.py:436
+msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/pep.py:145
-msgid "Getting a Haircut"
+#: gajim/common/const.py:437
+msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/pep.py:146
+#: gajim/common/const.py:438
 #, fuzzy
-msgid "Shaving"
-msgstr "A comer"
+msgid "Unable to decode issuer public key"
+msgstr "Non se pode cargar o módulo inactivo"
 
-#: gajim/common/pep.py:147
-msgid "Taking a Bath"
+#: gajim/common/const.py:439
+msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/pep.py:148
-msgid "Taking a Shower"
+#: gajim/common/const.py:440
+msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/pep.py:149
-msgid "Having an Appointment"
+#: gajim/common/const.py:441
+msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/pep.py:150 gajim/data/gui/gajim_themes_window.ui:363
-msgid "Inactive"
-msgstr "Inactivo"
-
-#: gajim/common/pep.py:151
-msgid "Day Off"
+#: gajim/common/const.py:442
+msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/pep.py:152
-#, fuzzy
-msgid "Hanging out"
-msgstr "Cambiando o asunto"
-
-#: gajim/common/pep.py:153
-#, fuzzy
-msgid "Hiding"
-msgstr "A expulsar %s"
-
-#: gajim/common/pep.py:154
-msgid "On Vacation"
+#: gajim/common/const.py:443
+msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/pep.py:155
-#, fuzzy
-msgid "Praying"
-msgstr "A comer"
-
-#: gajim/common/pep.py:156
-msgid "Scheduled Holiday"
+#: gajim/common/const.py:444
+msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/pep.py:158
-#, fuzzy
-msgid "Thinking"
-msgstr "A traballar"
-
-#: gajim/common/pep.py:159
-msgid "Relaxing"
+#: gajim/common/const.py:445
+msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/pep.py:160
-#, fuzzy
-msgid "Fishing"
-msgstr "A expulsar %s"
-
-#: gajim/common/pep.py:161
-#, fuzzy
-msgid "Gaming"
-msgstr "A comer"
-
-#: gajim/common/pep.py:162
-#, fuzzy
-msgid "Going out"
-msgstr "_Desconectar"
-
-#: gajim/common/pep.py:163
-#, fuzzy
-msgid "Partying"
-msgstr "A comer"
-
-#: gajim/common/pep.py:164
-#, fuzzy
-msgid "Reading"
-msgstr "Motivo"
-
-#: gajim/common/pep.py:165
-#, fuzzy
-msgid "Rehearsing"
-msgstr "Motivo"
-
-#: gajim/common/pep.py:166
-#, fuzzy
-msgid "Shopping"
-msgstr "A durmir"
-
-#: gajim/common/pep.py:167
-#, fuzzy
-msgid "Smoking"
-msgstr "A traballar"
+#: gajim/common/const.py:446
+msgid "Format error in certificate's notAfter field"
+msgstr ""
 
-#: gajim/common/pep.py:168
-msgid "Socializing"
+#: gajim/common/const.py:447
+msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/pep.py:169
-#, fuzzy
-msgid "Sunbathing"
-msgstr "A comer"
+#: gajim/common/const.py:448
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
 
-#: gajim/common/pep.py:170
-msgid "Watching TV"
+#: gajim/common/const.py:449
+msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/pep.py:171
-#, fuzzy
-msgid "Watching a Movie"
-msgstr "Estou a ver un filme."
+#: gajim/common/const.py:450
+msgid "Self signed certificate"
+msgstr ""
 
-#: gajim/common/pep.py:172
-#, fuzzy
-msgid "Talking"
-msgstr "A comer"
+#: gajim/common/const.py:451
+msgid "Self signed certificate in certificate chain"
+msgstr ""
 
-#: gajim/common/pep.py:173
-msgid "In Real Life"
+#: gajim/common/const.py:452
+msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/pep.py:174
-#, fuzzy
-msgid "On the Phone"
-msgstr "Estou a falar por teléfono."
+#: gajim/common/const.py:453
+msgid "Unable to verify the first certificate"
+msgstr ""
 
-#: gajim/common/pep.py:175
-msgid "On Video Phone"
+#: gajim/common/const.py:454
+msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/pep.py:176
-#, fuzzy
-msgid "Traveling"
-msgstr "A transferir"
+#: gajim/common/const.py:455
+msgid "Certificate revoked"
+msgstr ""
 
-#: gajim/common/pep.py:177
+#: gajim/common/const.py:456
 #, fuzzy
-msgid "Commuting"
-msgstr "A compor"
+msgid "Invalid CA certificate"
+msgstr "O nome de usuario non é válido"
 
-#: gajim/common/pep.py:179
-msgid "Driving"
+#: gajim/common/const.py:457
+msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/pep.py:180
-msgid "In a Car"
+#: gajim/common/const.py:458
+msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/pep.py:181
-msgid "On a Bus"
+#: gajim/common/const.py:459
+msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/pep.py:182
-msgid "On a Plane"
+#: gajim/common/const.py:460
+msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/pep.py:183
-#, fuzzy
-msgid "On a Train"
-msgstr "_Abrir como ligazón"
-
-#: gajim/common/pep.py:184
-msgid "On a Trip"
+#: gajim/common/const.py:461
+msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/pep.py:185
-#, fuzzy
-msgid "Walking"
-msgstr "A traballar"
-
-#: gajim/common/pep.py:187
-#, fuzzy
-msgid "Coding"
-msgstr "A compor"
+#: gajim/common/const.py:462
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
 
-#: gajim/common/pep.py:188
-msgid "In a Meeting"
+#: gajim/common/const.py:463
+msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/pep.py:189
-msgid "Studying"
+#: gajim/common/const.py:464
+msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/pep.py:190
-#, fuzzy
-msgid "Writing"
-msgstr "A traballar"
+#: gajim/common/const.py:465
+msgid "Application verification failure"
+msgstr ""
 
-#: gajim/common/pep.py:195
-msgid "accuracy"
+#: gajim/common/logging_helpers.py:31
+#, python-format
+msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: gajim/common/pep.py:196
-#, fuzzy
-msgid "alt"
-msgstr "Por defecto"
+#: gajim/common/connection.py:631
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Perdeuse a conexión da conta \"%s\""
 
-#: gajim/common/pep.py:197
-msgid "area"
-msgstr ""
+#: gajim/common/connection.py:632
+msgid "Reconnect manually."
+msgstr "Reconectar manualmente."
 
-#: gajim/common/pep.py:198
-#, fuzzy
-msgid "bearing"
-msgstr "mariño"
+#: gajim/common/connection.py:672
+#, fuzzy, python-format
+msgid "Server %(name)s answered wrongly to register request: %(error)s"
+msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
 
-#: gajim/common/pep.py:199
-#, fuzzy
-msgid "building"
-msgstr "A expulsar %s"
+#: gajim/common/connection.py:713
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
 
-#: gajim/common/pep.py:200
-#, fuzzy
-msgid "country"
-msgstr "País:"
+#: gajim/common/connection.py:1025
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Non se pode conectar a \"%s\""
 
-#: gajim/common/pep.py:201
-#, fuzzy
-msgid "countrycode"
-msgstr "Conta"
+#: gajim/common/connection.py:1028
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Non se pode conectar a \"%s\""
 
-#: gajim/common/pep.py:202
-msgid "datum"
-msgstr ""
+#: gajim/common/connection.py:1030
+msgid "Check your connection or try again later."
+msgstr "Comprobe a súa conexión ou probe máis tarde."
 
-#: gajim/common/pep.py:203
-#, fuzzy
-msgid "description"
-msgstr "Descrición"
+#: gajim/common/connection.py:1035
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Gardouse en: %s"
 
-#: gajim/common/pep.py:204
+#: gajim/common/connection.py:1050
 #, fuzzy
-msgid "error"
-msgstr "Erro de Avahi"
-
-#: gajim/common/pep.py:205
-msgid "floor"
-msgstr ""
+msgid "Connection to proxy failed"
+msgstr "Fallou a conexión"
 
-#: gajim/common/pep.py:206
-msgid "lat"
-msgstr ""
+#: gajim/common/connection.py:1080 gajim/common/connection.py:1203
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Non se pode conectar a \"%s\""
 
-#: gajim/common/pep.py:207
-msgid "locality"
-msgstr ""
+#: gajim/common/connection.py:1081 gajim/common/connection.py:1204
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Perdeuse a conexión da conta \"%s\""
 
-#: gajim/common/pep.py:208
-#, fuzzy
-msgid "lon"
-msgstr "unha"
+#: gajim/common/connection.py:1279
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Fallou a autenticación con \"%s\""
 
-#: gajim/common/pep.py:209
-msgid "postalcode"
+#: gajim/common/connection.py:1280
+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."
 
-#: gajim/common/pep.py:210
-msgid "region"
-msgstr ""
+#: gajim/common/connection.py:1599
+#: gajim/common/zeroconf/connection_zeroconf.py:260
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Non se pode conectar a \"%s\""
 
-#: gajim/common/pep.py:211
+#: gajim/common/multimedia_helpers.py:48
 #, fuzzy
-msgid "room"
-msgstr "De"
+msgid "Default device"
+msgstr "Mensaxes de estado por defecto"
 
-#: gajim/common/pep.py:212
-msgid "speed"
+#: gajim/common/multimedia_helpers.py:69
+msgid "Audio test"
 msgstr ""
 
-#: gajim/common/pep.py:213
-msgid "street"
+#: gajim/common/multimedia_helpers.py:72 gajim/common/multimedia_helpers.py:88
+#: gajim/common/multimedia_helpers.py:102
+#: gajim/common/multimedia_helpers.py:120
+msgid "Autodetect"
 msgstr ""
 
-#: gajim/common/pep.py:214
-msgid "text"
-msgstr ""
+#: gajim/common/multimedia_helpers.py:75 gajim/common/multimedia_helpers.py:90
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Tamaño: %s"
 
-#: gajim/common/pep.py:215
-msgid "timestamp"
-msgstr ""
+#: gajim/common/multimedia_helpers.py:78 gajim/common/multimedia_helpers.py:92
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Ficheiro: %s"
 
-#: gajim/common/pep.py:216
-msgid "uri"
+#: gajim/common/multimedia_helpers.py:86
+msgid "Fake audio output"
 msgstr ""
 
-#: gajim/common/pep.py:343
-msgid "Unknown Artist"
+#: gajim/common/multimedia_helpers.py:99
+msgid "Video test"
 msgstr ""
 
-#: gajim/common/pep.py:346
-msgid "Unknown Title"
+#: gajim/common/multimedia_helpers.py:104
+#, python-format
+msgid "V4L2: %s"
 msgstr ""
 
-#: gajim/common/pep.py:349
-msgid "Unknown Source"
+#: gajim/common/multimedia_helpers.py:107
+#, fuzzy
+msgid "Screen"
+msgstr "verde"
+
+#: gajim/common/multimedia_helpers.py:114
+msgid "Fake video output"
 msgstr ""
 
-#: gajim/common/pep.py:352
+#: gajim/common/multimedia_helpers.py:117
 #, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
-#: gajim/common/stanza_session.py:422
-msgid ""
-"[This is part of an encrypted session. If you see this message, something "
-"went wrong.]"
+#: gajim/common/multimedia_helpers.py:119
+msgid "X Window System (without Xv)"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:123
+#: gajim/common/jingle_rtp.py:122
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configuración da sala"
 
-#: gajim/common/jingle_rtp.py:124
+#: gajim/common/jingle_rtp.py:123
 #, python-format
 msgid ""
-"Couldn’t setup %(text)s. Check your configuration.\n"
+"Couldn’t set up %(text)s. Check your configuration.\n"
 "\n"
 "Pipeline was:\n"
 "%(pipeline)s\n"
@@ -7610,300 +5176,291 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:371
+#: gajim/common/jingle_rtp.py:394
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:375
+#: gajim/common/jingle_rtp.py:398
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:433
+#: gajim/common/jingle_rtp.py:456
 msgid "video input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:463
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:296
+#: gajim/common/helpers.py:210
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:304
+#: gajim/common/helpers.py:214
 msgid "Invalid character in hostname."
 msgstr "Carácter non válido no nome do host."
 
-#: gajim/common/helpers.py:306
+#: gajim/common/helpers.py:216
 msgid "Server address required."
 msgstr "É necesario o enderezo do servidor."
 
-#: gajim/common/helpers.py:310
+#: gajim/common/helpers.py:220
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:318
+#: gajim/common/helpers.py:224
 msgid "Invalid character in username."
 msgstr "Hai un caracter non válido no nome de usuario."
 
-#: gajim/common/helpers.py:324
+#: gajim/common/helpers.py:230
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:234
 msgid "Invalid character in resource."
 msgstr "Carácter non válido no recurso."
 
-#: gajim/common/helpers.py:372
+#: gajim/common/helpers.py:275
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: gajim/common/helpers.py:377
+#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+msgid "Busy"
+msgstr "Ocupado"
+
+#: gajim/common/helpers.py:280
 msgid "_Not Available"
 msgstr "_Non dispoñíbel"
 
-#: gajim/common/helpers.py:382
+#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+msgid "Not Available"
+msgstr "Non dispoñíbel"
+
+#: gajim/common/helpers.py:285
 msgid "_Free for Chat"
 msgstr "_Libre para falar"
 
-#: gajim/common/helpers.py:387
+#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+msgid "Free for Chat"
+msgstr "Libre para falar"
+
+#: gajim/common/helpers.py:290
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Pausada"
 
-#: gajim/common/helpers.py:391
+#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#, fuzzy
+msgid "?user status:Available"
+msgstr "Pausada"
+
+#: gajim/common/helpers.py:294
 msgid "Connecting"
 msgstr "Conectando"
 
-#: gajim/common/helpers.py:394
+#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "A_usente"
 
-#: gajim/common/helpers.py:399
+#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:139
+#: gajim/gtk/tooltips.py:645
+msgid "Away"
+msgstr "Ausente"
+
+#: gajim/common/helpers.py:302
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: gajim/common/helpers.py:404
+#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+msgid "Offline"
+msgstr "Desconectado"
+
+#: gajim/common/helpers.py:307
 msgid "_Invisible"
 msgstr "_Invisíbel"
 
-#: gajim/common/helpers.py:410
+#: gajim/common/helpers.py:313
 msgid "?contact has status:Unknown"
 msgstr "Descoñecido"
 
-#: gajim/common/helpers.py:412
+#: gajim/common/helpers.py:315
 msgid "?contact has status:Has errors"
 msgstr "Ten erros"
 
-#: gajim/common/helpers.py:427
+#: gajim/common/helpers.py:330
 msgid "?Subscription we already have:None"
 msgstr "Ningunha"
 
-#: gajim/common/helpers.py:429
+#: gajim/common/helpers.py:332
 msgid "To"
 msgstr "A"
 
-#: gajim/common/helpers.py:431
+#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:433
+#: gajim/common/helpers.py:336
 msgid "Both"
 msgstr "Ambos"
 
-#: gajim/common/helpers.py:441
+#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#, fuzzy
+msgid "Unknown"
+msgstr "Descoñecido"
+
+#: gajim/common/helpers.py:344
 msgid "?Ask (for Subscription):None"
 msgstr "Ningunha"
 
-#: gajim/common/helpers.py:443
+#: gajim/common/helpers.py:346
 msgid "Subscribe"
 msgstr "_Engadir"
 
-#: gajim/common/helpers.py:452
+#: gajim/common/helpers.py:355
 msgid "?Group Chat Contact Role:None"
 msgstr "Ningún"
 
-#: gajim/common/helpers.py:455
+#: gajim/common/helpers.py:358
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: gajim/common/helpers.py:457
+#: gajim/common/helpers.py:360
 msgid "Moderator"
 msgstr "Moderador"
 
-#: gajim/common/helpers.py:460
+#: gajim/common/helpers.py:363
 msgid "Participants"
 msgstr "Participantes"
 
-#: gajim/common/helpers.py:462
+#: gajim/common/helpers.py:365
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:465
+#: gajim/common/helpers.py:368
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: gajim/common/helpers.py:467
+#: gajim/common/helpers.py:370
 msgid "Visitor"
 msgstr "Visitante"
 
-#: gajim/common/helpers.py:518
+#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Ningún"
+
+#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/gtk/tooltips.py:259
+msgid "Owner"
+msgstr "Propietario"
+
+#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+msgid "Administrator"
+msgstr "Administrador"
+
+#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
+msgid "Member"
+msgstr "Membro"
+
+#: gajim/common/helpers.py:421
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atención á conversa"
 
-#: gajim/common/helpers.py:520
+#: gajim/common/helpers.py:423
 msgid "is doing something else"
 msgstr "está a facer algo máis"
 
-#: gajim/common/helpers.py:522
+#: gajim/common/helpers.py:425
 #, fuzzy
 msgid "is composing a message…"
 msgstr "está a escribir..."
 
-#: gajim/common/helpers.py:525
+#: gajim/common/helpers.py:428
 msgid "paused composing a message"
 msgstr "Parou de escribir"
 
-#: gajim/common/helpers.py:527
+#: gajim/common/helpers.py:430
 msgid "has closed the chat window or tab"
 msgstr "pechou a fiestra de charla"
 
-#: gajim/common/helpers.py:754
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#: gajim/common/helpers.py:757
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#: gajim/common/helpers.py:761
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#: gajim/common/helpers.py:764
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#: gajim/common/helpers.py:768
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#: gajim/common/helpers.py:771
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: gajim/common/helpers.py:774
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
+#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Enviar a mensaxe"
 msgstr[1] "Enviar a mensaxe"
 
-#: gajim/common/helpers.py:1155
+#: gajim/common/helpers.py:950
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr "Estou %s"
 
-#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
+#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:1160
+#: gajim/common/helpers.py:955
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "De"
 
-#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
+#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1205
+#: gajim/common/helpers.py:1000
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Gustaríame engadilo á miña listaxe de contactos."
 
-#: gajim/common/helpers.py:1394
+#: gajim/common/helpers.py:1111
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
-#: gajim/common/helpers.py:1576
+#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
+#: gajim/common/helpers.py:1282
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
+#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1538
+#: gajim/common/helpers.py:1245
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1578
+#: gajim/common/helpers.py:1284
 #, fuzzy
 msgid "Error loading image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: gajim/common/connection_handlers.py:133
-#, 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"
-
-#: gajim/common/connection_handlers.py:979
-msgid "This message was encrypted with OTR and could not be decrypted."
-msgstr ""
-
-#: gajim/common/connection_handlers.py:982
-msgid ""
-"This message was encrypted with Legacy OpenPGP and could not be decrypted. "
-"You can install the PGP plugin to handle those messages."
-msgstr ""
-
-#: gajim/common/connection_handlers.py:986
-msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
-msgstr ""
-
-#: gajim/common/connection_handlers.py:992
-#, python-format
-msgid "This message was encrypted with %s and could not be decrypted."
-msgstr ""
-
-#: gajim/common/connection_handlers.py:1060
-msgid "message"
-msgstr "mensaxe"
+#: gajim/common/configpaths.py:85
+#, fuzzy, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s é un ficheiro mais podería ser un directorio"
 
-#: gajim/common/connection_handlers.py:1855
-msgid "I would like to add you to my roster."
-msgstr "Gustaríame engadilo á miña listaxe de contactos"
+#: gajim/common/configpaths.py:86
+msgid "Gajim will now exit"
+msgstr "Gajim pecharase agora"
 
-#: gajim/common/exceptions.py:46
+#: gajim/common/exceptions.py:45
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see https://dev."
@@ -7911,13 +5468,13 @@ msgid ""
 "will be lost)."
 msgstr ""
 
-#: gajim/common/exceptions.py:60
+#: gajim/common/exceptions.py:59
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "O servizo non está dispoñíbel: o Gajim non se está a executar, ou "
 "remote_control está en Falso"
 
-#: gajim/common/exceptions.py:82
+#: gajim/common/exceptions.py:81
 #, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
@@ -7926,7 +5483,7 @@ msgstr ""
 "O bus da sesión non está dispoñíbel.\n"
 "Probe a ler http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/exceptions.py:94
+#: gajim/common/exceptions.py:93
 #, fuzzy, python-format
 msgid ""
 "System bus is not available.\n"
@@ -7935,123 +5492,290 @@ msgstr ""
 "O bus da sesión non está dispoñíbel.\n"
 "Probe a ler http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:210
+#: gajim/common/zeroconf/connection_zeroconf.py:261
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Por favor, comprobe se o Avahi está instalado."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:224
+#: gajim/common/zeroconf/connection_zeroconf.py:271
+#: gajim/common/zeroconf/connection_zeroconf.py:275
 msgid "Could not start local service"
 msgstr "Non foi posíbel iniciar o servizo local"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:221
+#: gajim/common/zeroconf/connection_zeroconf.py:272
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Non foi posíbel ligar ao porto %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:225
-#: gajim/common/zeroconf/connection_zeroconf.py:310
-#: gajim/common/zeroconf/connection_zeroconf.py:323
-#: gajim/common/zeroconf/connection_zeroconf.py:339
-msgid "Please check if avahi-daemon is running."
+#: gajim/common/zeroconf/connection_zeroconf.py:276
+#, fuzzy
+msgid "Please check if avahi/bonjour-daemon is running."
 msgstr "Por favor, comprobe se o avahi-daemon está en execución."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:309
-#: gajim/common/zeroconf/connection_zeroconf.py:322
-#: gajim/common/zeroconf/connection_zeroconf.py:338
+#: gajim/common/zeroconf/connection_zeroconf.py:379
+#: gajim/common/zeroconf/connection_zeroconf.py:392
+#: gajim/common/zeroconf/connection_zeroconf.py:408
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Non foi posíbel cambiar o estado da conta \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:354
+#: gajim/common/zeroconf/connection_zeroconf.py:380
+#: gajim/common/zeroconf/connection_zeroconf.py:393
+#: gajim/common/zeroconf/connection_zeroconf.py:409
+msgid "Please check if avahi-daemon is running."
+msgstr "Por favor, comprobe se o avahi-daemon está en execución."
+
+#: gajim/common/zeroconf/connection_zeroconf.py:425
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "O contacto está desconectado. A súa mensaxe non se puido enviar."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:369
+#: gajim/common/zeroconf/connection_zeroconf.py:440
 msgid "Contact is offline. Your message could not be sent."
 msgstr "O contacto está desconectado. A súa mensaxe non se puido enviar."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:391
+#: gajim/common/zeroconf/connection_zeroconf.py:464
 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."
 
-#: gajim/common/zeroconf/zeroconf_bonjour.py:197
-#: gajim/common/zeroconf/zeroconf_avahi.py:220
+#: gajim/common/zeroconf/zeroconf_bonjour.py:228
+#: gajim/common/zeroconf/zeroconf_bonjour.py:253
+#: gajim/common/zeroconf/zeroconf_bonjour.py:299
+#: gajim/common/zeroconf/zeroconf_avahi.py:253
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Erro ao engadir o servizo. %s"
 
+#: gajim/common/zeroconf/connection_handlers_zeroconf.py:157
+#: gajim/common/modules/message.py:227
+msgid "message"
+msgstr "mensaxe"
+
+#: gajim/common/dbus/logind.py:72
+msgid "Machine is going to sleep"
+msgstr ""
+
+#: gajim/common/dbus/logind.py:97
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/common/modules/presence.py:255
+msgid "I would like to add you to my roster."
+msgstr "Gustaríame engadilo á miña listaxe de contactos"
+
+#: gajim/common/modules/message.py:125
+#, fuzzy, python-format
+msgid "error: %s"
+msgstr "Mensaxe de erro: %s"
+
+#: gajim/common/modules/httpupload.py:129
+#, fuzzy
+msgid "File is empty"
+msgstr "Camiño do ficheiro"
+
+#: gajim/common/modules/httpupload.py:132
+#, fuzzy
+msgid "File does not exist"
+msgstr "Non existe o grupo de charla."
+
+#: gajim/common/modules/httpupload.py:139
+#: gajim/common/modules/httpupload.py:209
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
+#: gajim/common/modules/adhoc_commands.py:86
+#, fuzzy
+msgid "Change status information"
+msgstr "Información"
+
+#: gajim/common/modules/adhoc_commands.py:110
+#, fuzzy
+msgid "Change status"
+msgstr "Un contacto cambiou o seu estado"
+
+#: gajim/common/modules/adhoc_commands.py:111
+msgid "Set the presence type and description"
+msgstr ""
+
+#: gajim/common/modules/adhoc_commands.py:118
+#, fuzzy
+msgid "Free for chat"
+msgstr "Libre para falar"
+
+#: gajim/common/modules/adhoc_commands.py:119
+#, fuzzy
+msgid "Online"
+msgstr "nove"
+
+#: gajim/common/modules/adhoc_commands.py:121
+msgid "Extended away"
+msgstr ""
+
+#: gajim/common/modules/adhoc_commands.py:122
+#, fuzzy
+msgid "Do not disturb"
+msgstr "Non molestar."
+
+#: gajim/common/modules/adhoc_commands.py:123
+msgid "Offline - disconnect"
+msgstr ""
+
+#: gajim/common/modules/adhoc_commands.py:129
+#, fuzzy
+msgid "Presence description:"
+msgstr "Descrición do erro..."
+
+#: gajim/common/modules/adhoc_commands.py:168
+msgid "The status has been changed."
+msgstr ""
+
+#: gajim/common/modules/adhoc_commands.py:202
+#: gajim/common/modules/adhoc_commands.py:239
+#, fuzzy
+msgid "Leave Groupchats"
+msgstr "Novo grupo de charla"
+
+#: gajim/common/modules/adhoc_commands.py:228
+#, fuzzy, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s da sala %(room_name)s"
+
+#: gajim/common/modules/adhoc_commands.py:232
+#, fuzzy
+msgid "You have not joined a groupchat."
+msgstr "%s entrou no grupo de charla"
+
+#: gajim/common/modules/adhoc_commands.py:240
+msgid "Choose the groupchats you want to leave"
+msgstr ""
+
+#: gajim/common/modules/adhoc_commands.py:289
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "Xa está na sala %s"
+
+#: gajim/common/modules/roster_item_exchange.py:102
+#, python-format
+msgid "Sent contact: \"%(jid)s\" (%(name)s)"
+msgstr ""
+
+#: gajim/common/modules/roster_item_exchange.py:106
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Contactos"
+
 #: gajim/data/gui/blocked_contacts_window.ui:13
 #, fuzzy
 msgid "Blocked Contacts"
 msgstr "Contactos"
 
-#: gajim/data/gui/advanced_configuration_window.ui:13
-msgid "Advanced Configuration Editor"
-msgstr "Editor avanzado de configuración"
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+msgid "Destroy this group chat permanently?"
+msgstr ""
 
-#: gajim/data/gui/advanced_configuration_window.ui:35
-msgid "Filter:"
-msgstr "Filtro:"
+#: gajim/data/gui/destroy_muc_dialog.ui:109
+#, fuzzy
+msgid "Reason..."
+msgstr "Motivo"
+
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+msgid "Where participants should go (optional)"
+msgstr ""
+
+#: gajim/data/gui/destroy_muc_dialog.ui:141
+msgid "Alternate venue..."
+msgstr ""
 
-#: gajim/data/gui/advanced_configuration_window.ui:107
-#: gajim/data/gui/features_window.ui:111
-msgid "<b>Description</b>"
-msgstr "<b>Descrición</b>"
+#: gajim/data/gui/destroy_muc_dialog.ui:155
+msgid "_Reason and alternate venue (optional)"
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration_window.ui:7
+#: gajim/data/gui/preferences_window.ui:2723
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Editor avanzado de configuración"
 
-#: gajim/data/gui/advanced_configuration_window.ui:136
+#: gajim/data/gui/advanced_configuration_window.ui:52
 #, fuzzy
-msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgid "You should restart Gajim for some changes to take effect"
 msgstr ""
 "<b>NOTA:</b> Debe reiniciar o Gajim para que algúns cambios teñan efecto"
 
-#: gajim/data/gui/advanced_configuration_window.ui:161
+#: gajim/data/gui/advanced_configuration_window.ui:84
 #, fuzzy
-msgid "_Reset to default"
-msgstr "_Restabelecer as cores predeterminadas"
+msgid "_Filter"
+msgstr "_Filtro:"
 
-#: gajim/data/gui/join_groupchat_window.ui:34
+#: gajim/data/gui/advanced_configuration_window.ui:153
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/gtk/discovery.py:1666
+msgid "Description"
+msgstr "Descrición"
+
+#: gajim/data/gui/advanced_configuration_window.ui:197
 #, fuzzy
-msgid "Bookmark this Groupchat"
-msgstr "Engadir esta sala aos marcadores"
+msgid "_Reset to default"
+msgstr "_Restabelecer as cores predeterminadas"
 
-#: gajim/data/gui/join_groupchat_window.ui:51
-msgid "Join this Groupchat everytime Gajim is started"
+#: gajim/data/gui/join_groupchat_window.ui:56
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:69
-#, fuzzy
-msgid "Bookmark"
-msgstr "Engadir esta sala aos marcadores"
+#: gajim/data/gui/join_groupchat_window.ui:97
+msgid "Join group chat every time Gajim is started"
+msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:82
+#: gajim/data/gui/join_groupchat_window.ui:113
 #, fuzzy
-msgid "Autojoin"
+msgid "Auto Join"
 msgstr "Autoconectar"
 
-#: gajim/data/gui/join_groupchat_window.ui:119
+#: gajim/data/gui/join_groupchat_window.ui:131
+#: gajim/data/gui/profile_window.ui:233
 msgid "Account"
 msgstr "Conta"
 
-#: gajim/data/gui/join_groupchat_window.ui:226
+#: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
 msgid "Room"
 msgstr "Sala:"
 
-#: gajim/data/gui/join_groupchat_window.ui:238
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
 #, fuzzy
-msgid "Recently"
-msgstr "Recentemente:"
+msgid "Password"
+msgstr "Contrasinal: "
+
+#: gajim/data/gui/join_groupchat_window.ui:253
+#, fuzzy
+msgid "Bookmark group chat"
+msgstr "Engadir esta sala aos marcadores"
 
-#: gajim/data/gui/join_groupchat_window.ui:290
-msgid "Search the rooms on this server"
+#: gajim/data/gui/join_groupchat_window.ui:270
+#, fuzzy
+msgid "Bookmark"
+msgstr "Engadir esta sala aos marcadores"
+
+#: gajim/data/gui/join_groupchat_window.ui:339
+#, fuzzy
+msgid "Recently used group chats"
+msgstr "Entrar nun grupo de charla"
+
+#: gajim/data/gui/join_groupchat_window.ui:360
+msgid "Search group chats on selected server"
 msgstr ""
 
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#, fuzzy
+msgid "Join"
+msgstr "_Entrar"
+
 #: gajim/data/gui/manage_proxies_window.ui:12
 #, fuzzy
 msgid "HTTP Connect"
@@ -8065,71 +5789,88 @@ msgstr ""
 msgid "BOSH"
 msgstr ""
 
-#: gajim/data/gui/manage_proxies_window.ui:25
+#: gajim/data/gui/manage_proxies_window.ui:27
 msgid "Manage Proxy Profiles"
 msgstr "Xestionar os perfís do proxy"
 
-#: gajim/data/gui/manage_proxies_window.ui:148
+#: gajim/data/gui/manage_proxies_window.ui:83
 #, fuzzy
-msgid "_Name:"
-msgstr "_Nome: "
+msgid "Add Proxy"
+msgstr "Proxy"
 
-#: gajim/data/gui/manage_proxies_window.ui:161
+#: gajim/data/gui/manage_proxies_window.ui:97
 #, fuzzy
-msgid "_Type:"
-msgstr "Tipo:"
+msgid "Remove Proxy"
+msgstr "Eliminar o grupo"
 
-#: gajim/data/gui/manage_proxies_window.ui:205
-msgid "<b>Properties</b>"
+#: gajim/data/gui/manage_proxies_window.ui:141
+#, fuzzy
+msgid "Properties"
 msgstr "<b>Propiedades</b>"
 
-#: gajim/data/gui/manage_proxies_window.ui:234
+#: gajim/data/gui/manage_proxies_window.ui:157
 #, fuzzy
-msgid "_BOSH URL:"
-msgstr "_URL"
+msgid "_Name"
+msgstr "_Nome: "
 
-#: gajim/data/gui/manage_proxies_window.ui:258
+#: gajim/data/gui/manage_proxies_window.ui:173
 #, fuzzy
-msgid "Proxy _Host:"
-msgstr "Proxy"
+msgid "_Type"
+msgstr "Tipo:"
 
-#: gajim/data/gui/manage_proxies_window.ui:269
+#: gajim/data/gui/manage_proxies_window.ui:236
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_URL"
+
+#: gajim/data/gui/manage_proxies_window.ui:261
 #, fuzzy
 msgid "Use HTTP prox_y"
 msgstr "_Usar proxy"
 
-#: gajim/data/gui/manage_proxies_window.ui:288
+#: gajim/data/gui/manage_proxies_window.ui:280
+#, fuzzy
+msgid "Proxy _Host"
+msgstr "Proxy"
+
+#: gajim/data/gui/manage_proxies_window.ui:307
 #, fuzzy
-msgid "Proxy _Port:"
+msgid "Proxy _Port"
 msgstr "_Porto:"
 
-#: gajim/data/gui/manage_proxies_window.ui:299
+#: gajim/data/gui/manage_proxies_window.ui:334
+#, fuzzy
+msgid "_Username"
+msgstr "_Nome de usuario:"
+
+#: gajim/data/gui/manage_proxies_window.ui:347
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Usar a autenticación"
 
-#: gajim/data/gui/manage_proxies_window.ui:318
-msgid "_Username:"
-msgstr "_Nome de usuario:"
-
-#: gajim/data/gui/manage_proxies_window.ui:331
-msgid "Pass_word:"
+#: gajim/data/gui/manage_proxies_window.ui:377
+#, fuzzy
+msgid "Pass_word"
 msgstr "_Contrasinal: "
 
-#: gajim/data/gui/manage_proxies_window.ui:391
-msgid "<b>Settings</b>"
-msgstr "<b>Configuración</b>"
+#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
+#, fuzzy
+msgid "Settings"
+msgstr "Fallou a conexión"
 
-#: gajim/data/gui/change_password_dialog.ui:89
-msgid "Enter new password:"
-msgstr "Insira o contrasinal novo:"
+#: gajim/data/gui/change_password_dialog.ui:17
+#, fuzzy
+msgid "New Password"
+msgstr "Gardar o contrasinal"
 
-#: gajim/data/gui/change_password_dialog.ui:115
-msgid "Enter it again for confirmation:"
-msgstr "Insírao mais unha vez para confirmar:"
+#: gajim/data/gui/change_password_dialog.ui:31
+#, fuzzy
+msgid "Confirm New Password"
+msgstr "Cambiar o contrasinal"
 
 #: gajim/data/gui/zeroconf_information_window.ui:8
 #: gajim/data/gui/vcard_information_window.ui:8
+#: gajim/data/gui/subscription_request_window.ui:91
 msgid "Contact Information"
 msgstr "Información"
 
@@ -8138,23 +5879,20 @@ msgid "Local jid:"
 msgstr "JID local"
 
 #: gajim/data/gui/zeroconf_information_window.ui:67
-#: gajim/data/gui/tooltip_roster_contact.ui:55
-#: gajim/data/gui/tooltip_gc_contact.ui:75
+#: gajim/data/gui/tooltip_roster_contact.ui:18
 msgid "Resource:"
 msgstr "Recurso:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:80
-#: gajim/data/gui/tooltip_roster_contact.ui:110
 msgid "Status:"
 msgstr "Estado:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "Historial de conversas"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
-#: gajim/data/gui/vcard_information_window.ui:360
+#: gajim/data/gui/vcard_information_window.ui:390
 msgid "Contact"
 msgstr "Contacto"
 
@@ -8167,9 +5905,6 @@ msgid "Last Name:"
 msgstr "Apelido(s):"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-#: gajim/data/gui/archiving_313_preferences_item.ui:84
-#: gajim/data/gui/tooltip_roster_contact.ui:30
-#: gajim/data/gui/tooltip_gc_contact.ui:50
 msgid "Jabber ID:"
 msgstr "ID de Jabber:"
 
@@ -8178,6 +5913,7 @@ msgid "E-Mail:"
 msgstr "Correo electrónico:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:354
+#: gajim/data/gui/profile_window.ui:825
 msgid "Personal"
 msgstr "Persoal"
 
@@ -8231,60 +5967,32 @@ msgstr "_Engadir á listaxe de contactos"
 msgid "_Execute command"
 msgstr "Executar o _comando..."
 
-#: gajim/data/gui/archiving_313_preferences_item.ui:12
-#: gajim/data/gui/preferences_window.ui:102
-#: gajim/data/gui/preferences_window.ui:153
-#: gajim/data/gui/archiving_313_preferences_window.ui:25
-#, fuzzy
-msgid "Always"
-msgstr "Ausente"
-
-#: gajim/data/gui/archiving_313_preferences_item.ui:15
-#: gajim/data/gui/preferences_window.ui:96
-#: gajim/data/gui/preferences_window.ui:156
-#: gajim/data/gui/archiving_313_preferences_window.ui:31
-#, fuzzy
-msgid "Never"
-msgstr "_Nunca"
-
-#: gajim/data/gui/archiving_313_preferences_item.ui:96
-#, fuzzy
-msgid "Preference:"
-msgstr "Preferencias"
-
-#: gajim/data/gui/tooltip_roster_contact.ui:125
+#: gajim/data/gui/tooltip_roster_contact.ui:60
 #, fuzzy
 msgid "Idle since:"
 msgstr " desde %s"
 
-#: gajim/data/gui/tooltip_roster_contact.ui:151
-#: gajim/data/gui/change_status_message_dialog.ui:191
+#: gajim/data/gui/tooltip_roster_contact.ui:86
 #, fuzzy
 msgid "Mood:"
 msgstr "Sala:"
 
-#: gajim/data/gui/tooltip_roster_contact.ui:164
-#: gajim/data/gui/change_status_message_dialog.ui:179
+#: gajim/data/gui/tooltip_roster_contact.ui:99
 #, fuzzy
 msgid "Activity:"
 msgstr "Activo"
 
-#: gajim/data/gui/tooltip_roster_contact.ui:178
+#: gajim/data/gui/tooltip_roster_contact.ui:113
 #, fuzzy
 msgid "Tune:"
 msgstr "Tipo:"
 
-#: gajim/data/gui/tooltip_roster_contact.ui:191
+#: gajim/data/gui/tooltip_roster_contact.ui:126
 #, fuzzy
 msgid "Location:"
 msgstr "Modificar a conta"
 
-#: gajim/data/gui/tooltip_roster_contact.ui:255
-#, fuzzy
-msgid "OpenPGP:"
-msgstr "OpenPGP: "
-
-#: gajim/data/gui/tooltip_roster_contact.ui:281
+#: gajim/data/gui/tooltip_roster_contact.ui:191
 msgid "Subscription:"
 msgstr "Subscrición:"
 
@@ -8298,10 +6006,71 @@ msgstr "E_stado"
 msgid "_Modify Account..."
 msgstr "_Modificar a conta..."
 
+#: gajim/data/gui/certificate_dialog.ui:66
+#: gajim/data/gui/certificate_dialog.ui:178
+msgid "Common Name (CN)"
+msgstr ""
+
+#: gajim/data/gui/certificate_dialog.ui:93
+#: gajim/data/gui/certificate_dialog.ui:205
+msgid "Organization (O)"
+msgstr ""
+
+#: gajim/data/gui/certificate_dialog.ui:120
+#: gajim/data/gui/certificate_dialog.ui:232
+msgid "Organizational Unit (OU)"
+msgstr ""
+
+#: gajim/data/gui/certificate_dialog.ui:147
+#, fuzzy
+msgid "Serial Number"
+msgstr "Número de GG:"
+
+#: gajim/data/gui/certificate_dialog.ui:259
+msgid "Issued on"
+msgstr ""
+
+#: gajim/data/gui/certificate_dialog.ui:286
+msgid "Expires on"
+msgstr ""
+
+#: gajim/data/gui/certificate_dialog.ui:313
+msgid "SHA-1"
+msgstr ""
+
+#: gajim/data/gui/certificate_dialog.ui:330
+msgid "SHA-256"
+msgstr ""
+
+#: gajim/data/gui/certificate_dialog.ui:380
+msgid "Issued to"
+msgstr ""
+
+#: gajim/data/gui/certificate_dialog.ui:397
+msgid "Issued by"
+msgstr ""
+
+#: gajim/data/gui/certificate_dialog.ui:414
+msgid "Validity"
+msgstr ""
+
+#: gajim/data/gui/certificate_dialog.ui:431
+msgid "Fingerprints"
+msgstr ""
+
+#: gajim/data/gui/certificate_dialog.ui:448
+#, fuzzy
+msgid "Copy Certificate Information"
+msgstr "Información"
+
 #: gajim/data/gui/atom_entry_window.ui:8
 msgid "New entry received"
 msgstr "Recibiuse unha entrada nova"
 
+#: gajim/data/gui/atom_entry_window.ui:20
+msgid "You have received new entry:"
+msgstr "Recibiu unha entrada nova:"
+
 #: gajim/data/gui/atom_entry_window.ui:92
 msgid "Feed name:"
 msgstr "Nome do feed:"
@@ -8318,6 +6087,32 @@ msgstr "Última modificación:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:54
+#, fuzzy
+msgid "_Send Files"
+msgstr "Enviar ficheiro"
+
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:58
+#: gajim/gtk/xml_console.py:90
+#, fuzzy
+msgid "Send"
+msgstr "_Enviar"
+
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:76
+#, fuzzy
+msgid "Files to send"
+msgstr "Elixa un ficheiro para enviar..."
+
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:133
+#, fuzzy
+msgid "Add Files"
+msgstr "Ficheiro: "
+
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:147
+#, fuzzy
+msgid "Remove Files"
+msgstr "_Eliminar"
+
 #: gajim/data/gui/gc_control_popup_menu.ui:11
 #, fuzzy
 msgid "Change _Nickname..."
@@ -8352,1176 +6147,1217 @@ msgstr ""
 msgid "_Request Voice"
 msgstr "_Voz"
 
-#: gajim/data/gui/profile_window.ui:7
-msgid "Personal Information"
-msgstr "Información persoal"
-
-#: gajim/data/gui/profile_window.ui:35
-#: gajim/data/gui/vcard_information_window.ui:382
+#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
 #, fuzzy
-msgid "<b>Name:</b>"
-msgstr "<b>Personalizado</b>"
+msgid "_Bookmark"
+msgstr "Engadir esta sala aos marcadores"
 
-#: gajim/data/gui/profile_window.ui:59
-#: gajim/data/gui/vcard_information_window.ui:410
+#: gajim/data/gui/profile_window.ui:67
 #, fuzzy
-msgid "<b>Nickname:</b>"
-msgstr "Alcume:"
+msgid "Clear Avatar"
+msgstr "Imaxe:"
 
-#. Family Name
-#: gajim/data/gui/profile_window.ui:94
-#: gajim/data/gui/vcard_information_window.ui:740
+#: gajim/data/gui/profile_window.ui:137
 #, fuzzy
-msgid "<b>Family:</b>"
-msgstr "Familia:"
+msgid "Set Avatar…"
+msgstr "Elixir unha imaxe"
 
-#. Given Name
-#: gajim/data/gui/profile_window.ui:118
-#: gajim/data/gui/vcard_information_window.ui:822
+#: gajim/data/gui/profile_window.ui:175
+#: gajim/data/gui/vcard_information_window.ui:412
 #, fuzzy
-msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Full Name"
+msgstr "<b>Personalizado</b>"
 
-#. Middle Name
-#: gajim/data/gui/profile_window.ui:142
-#: gajim/data/gui/vcard_information_window.ui:753
+#: gajim/data/gui/profile_window.ui:307 gajim/data/gui/profile_window.ui:1004
+#: gajim/data/gui/vcard_information_window.ui:721
+#: gajim/data/gui/vcard_information_window.ui:1397
 #, fuzzy
-msgid "<b>Middle:</b>"
-msgstr "<b>Engadir unha regra</b>"
+msgid "Phone No."
+msgstr "Teléfono"
 
-#. Prefix in Name
-#: gajim/data/gui/profile_window.ui:156
-#: gajim/data/gui/vcard_information_window.ui:766
-#, fuzzy
-msgid "<b>Prefix:</b>"
-msgstr "<b>Propiedades</b>"
+#: gajim/data/gui/profile_window.ui:344
+#: gajim/data/gui/vcard_information_window.ui:765
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: AAAA-MM-DD"
 
-#. Suffix in Name
-#: gajim/data/gui/profile_window.ui:190
-#: gajim/data/gui/vcard_information_window.ui:835
+#: gajim/data/gui/profile_window.ui:351
+#: gajim/data/gui/vcard_information_window.ui:771
 #, fuzzy
-msgid "<b>Suffix:</b>"
-msgstr "<b>Sons</b>"
+msgid "Birthday"
+msgstr "Aniversario:"
 
-#: gajim/data/gui/profile_window.ui:222
-#: gajim/data/gui/vcard_information_window.ui:878
+#: gajim/data/gui/profile_window.ui:370
+#: gajim/data/gui/vcard_information_window.ui:689
+#: gajim/data/gui/plugins_window.ui:319
 #, fuzzy
-msgid "<b>Full Name</b>"
-msgstr "<b>Personalizado</b>"
+msgid "Homepage"
+msgstr "Páxina web:"
 
-#: gajim/data/gui/profile_window.ui:250 gajim/data/gui/profile_window.ui:724
-#: gajim/data/gui/vcard_information_window.ui:454
-#: gajim/data/gui/vcard_information_window.ui:1087
+#: gajim/data/gui/profile_window.ui:387 gajim/data/gui/profile_window.ui:976
+#: gajim/data/gui/vcard_information_window.ui:705
+#: gajim/data/gui/vcard_information_window.ui:1381
 #, fuzzy
-msgid "<b>Street:</b>"
-msgstr "<b>Configuración</b>"
+msgid "E-Mail"
+msgstr "Correo electrónico:"
 
-#: gajim/data/gui/profile_window.ui:274 gajim/data/gui/profile_window.ui:748
-#: gajim/data/gui/vcard_information_window.ui:535
-#: gajim/data/gui/vcard_information_window.ui:1126
+#: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
+#: gajim/data/gui/vcard_information_window.ui:55
+#: gajim/data/gui/blocking_list.ui:115 gajim/gtk/add_contact.py:30
+#: gajim/gtk/accounts.py:801
 #, fuzzy
-msgid "<b>Extra Address:</b>"
-msgstr "Segundo enderezo:"
+msgid "Jabber ID"
+msgstr "ID de Jabber:"
 
-#: gajim/data/gui/profile_window.ui:298 gajim/data/gui/profile_window.ui:772
-#: gajim/data/gui/vcard_information_window.ui:467
-#: gajim/data/gui/vcard_information_window.ui:1100
-#, fuzzy
-msgid "<b>City:</b>"
-msgstr "<b>Personalizado</b>"
+#: gajim/data/gui/profile_window.ui:440
+msgid "Main"
+msgstr ""
 
-#: gajim/data/gui/profile_window.ui:322 gajim/data/gui/profile_window.ui:796
-#: gajim/data/gui/vcard_information_window.ui:548
-#: gajim/data/gui/vcard_information_window.ui:1140
+#. Family Name
+#: gajim/data/gui/profile_window.ui:462
+#: gajim/data/gui/vcard_information_window.ui:806
 #, fuzzy
-msgid "<b>Postal Code:</b>"
-msgstr "Código postal:"
+msgid "Family"
+msgstr "Familia:"
 
-#: gajim/data/gui/profile_window.ui:346 gajim/data/gui/profile_window.ui:820
-#: gajim/data/gui/vcard_information_window.ui:480
-#: gajim/data/gui/vcard_information_window.ui:1113
+#. Given Name
+#: gajim/data/gui/profile_window.ui:489
+#: gajim/data/gui/vcard_information_window.ui:897
 #, fuzzy
-msgid "<b>State:</b>"
-msgstr "<b>Configuración</b>"
+msgid "Given"
+msgstr "Nome:"
 
-#: gajim/data/gui/profile_window.ui:370 gajim/data/gui/profile_window.ui:844
-#: gajim/data/gui/vcard_information_window.ui:561
-#: gajim/data/gui/vcard_information_window.ui:1153
+#. Middle Name
+#: gajim/data/gui/profile_window.ui:516
+#: gajim/data/gui/vcard_information_window.ui:822
 #, fuzzy
-msgid "<b>Country:</b>"
-msgstr "<b>Sons</b>"
+msgid "Middle"
+msgstr "Medio:"
 
-#: gajim/data/gui/profile_window.ui:396 gajim/data/gui/profile_window.ui:870
-#: gajim/data/gui/vcard_information_window.ui:618
-#: gajim/data/gui/vcard_information_window.ui:1253
+#. Prefix in Name
+#: gajim/data/gui/profile_window.ui:532
+#: gajim/data/gui/vcard_information_window.ui:838
 #, fuzzy
-msgid "<b>Address</b>"
-msgstr "<b>Engadir unha regra</b>"
+msgid "Prefix"
+msgstr "Prefixo"
 
-#: gajim/data/gui/profile_window.ui:413
-#: gajim/data/gui/vcard_information_window.ui:635
+#. Suffix in Name
+#: gajim/data/gui/profile_window.ui:569
+#: gajim/data/gui/vcard_information_window.ui:913
 #, fuzzy
-msgid "<b>Homepage:</b>"
-msgstr "Páxina web:"
+msgid "Suffix"
+msgstr "Sufixo:"
 
-#: gajim/data/gui/profile_window.ui:437 gajim/data/gui/profile_window.ui:887
-#: gajim/data/gui/vcard_information_window.ui:648
-#: gajim/data/gui/vcard_information_window.ui:1270
+#: gajim/data/gui/profile_window.ui:596 gajim/data/gui/profile_window.ui:1031
+#: gajim/data/gui/vcard_information_window.ui:490
+#: gajim/data/gui/vcard_information_window.ui:1180
 #, fuzzy
-msgid "<b>E-Mail:</b>"
-msgstr "Correo electrónico:"
+msgid "Street"
+msgstr "Rúa:"
 
-#: gajim/data/gui/profile_window.ui:462 gajim/data/gui/profile_window.ui:912
-#: gajim/data/gui/vcard_information_window.ui:661
-#: gajim/data/gui/vcard_information_window.ui:1283
+#: gajim/data/gui/profile_window.ui:624 gajim/data/gui/profile_window.ui:1058
+#: gajim/data/gui/vcard_information_window.ui:580
+#: gajim/data/gui/vcard_information_window.ui:1228
 #, fuzzy
-msgid "<b>Phone No.:</b>"
-msgstr "Teléfono:"
+msgid "Extra Address"
+msgstr "Segundo enderezo:"
 
-#: gajim/data/gui/profile_window.ui:497
+#: gajim/data/gui/profile_window.ui:652 gajim/data/gui/profile_window.ui:1085
+#: gajim/data/gui/vcard_information_window.ui:506
+#: gajim/data/gui/vcard_information_window.ui:1196
 #, fuzzy
-msgid "<b>Avatar:</b>"
-msgstr "Imaxe:"
+msgid "City"
+msgstr "Cidade:"
 
-#: gajim/data/gui/profile_window.ui:540
-msgid "Click to set your avatar"
-msgstr "Prema para definir a súa circunstancia"
+#: gajim/data/gui/profile_window.ui:669 gajim/data/gui/profile_window.ui:1148
+#: gajim/data/gui/vcard_information_window.ui:522
+#: gajim/data/gui/vcard_information_window.ui:1212
+#, fuzzy
+msgid "State"
+msgstr "Estado:"
 
-#: gajim/data/gui/profile_window.ui:566
-#: gajim/data/gui/vcard_information_window.ui:702
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: AAAA-MM-DD"
+#: gajim/data/gui/profile_window.ui:716 gajim/data/gui/profile_window.ui:1112
+#: gajim/data/gui/vcard_information_window.ui:596
+#: gajim/data/gui/vcard_information_window.ui:1245
+#, fuzzy
+msgid "Postal Code"
+msgstr "Código postal:"
 
-#: gajim/data/gui/profile_window.ui:574
-#: gajim/data/gui/vcard_information_window.ui:708
+#: gajim/data/gui/profile_window.ui:743 gajim/data/gui/profile_window.ui:1175
+#: gajim/data/gui/vcard_information_window.ui:612
+#: gajim/data/gui/vcard_information_window.ui:1261
 #, fuzzy
-msgid "<b>Birthday:</b>"
-msgstr "Aniversario:"
+msgid "Country"
+msgstr "País:"
 
-#: gajim/data/gui/profile_window.ui:598
-#: gajim/data/gui/vcard_information_window.ui:937
-msgid "Personal Info"
-msgstr "Información persoal"
+#: gajim/data/gui/profile_window.ui:761 gajim/data/gui/profile_window.ui:1192
+#: gajim/data/gui/vcard_information_window.ui:672
+#: gajim/data/gui/vcard_information_window.ui:1364
+#, fuzzy
+msgid "<b>Address</b>"
+msgstr "<b>Engadir unha regra</b>"
 
-#: gajim/data/gui/profile_window.ui:617
-#: gajim/data/gui/vcard_information_window.ui:960
+#: gajim/data/gui/profile_window.ui:786
+#: gajim/data/gui/vcard_information_window.ui:959
 #, fuzzy
-msgid "<b>Company:</b>"
+msgid "<b>Name Details</b>"
 msgstr "<b>Personalizado</b>"
 
-#: gajim/data/gui/profile_window.ui:641
-#: gajim/data/gui/vcard_information_window.ui:990
+#: gajim/data/gui/profile_window.ui:853
+#: gajim/data/gui/vcard_information_window.ui:1041
 #, fuzzy
-msgid "<b>Department:</b>"
+msgid "Company"
+msgstr "Empresa:"
+
+#: gajim/data/gui/profile_window.ui:881
+#: gajim/data/gui/vcard_information_window.ui:1074
+#, fuzzy
+msgid "Department"
 msgstr "Departamento:"
 
-#: gajim/data/gui/profile_window.ui:665
-#: gajim/data/gui/vcard_information_window.ui:1018
+#: gajim/data/gui/profile_window.ui:908
+#: gajim/data/gui/vcard_information_window.ui:1105
 #, fuzzy
-msgid "<b>Position:</b>"
-msgstr "<b>Condicións</b>"
+msgid "Position"
+msgstr "Posición:"
 
-#: gajim/data/gui/profile_window.ui:689
-#: gajim/data/gui/vcard_information_window.ui:1045
+#: gajim/data/gui/profile_window.ui:945
+#: gajim/data/gui/vcard_information_window.ui:1135
+#: gajim/data/gui/groupchat_config.ui:342
+msgid "Role"
+msgstr "Posto"
+
+#: gajim/data/gui/profile_window.ui:1207
 #, fuzzy
-msgid "<b>Role:</b>"
-msgstr "<b>Sons</b>"
+msgid "<b>Contact</b>"
+msgstr "<b>Configuración</b>"
 
-#: gajim/data/gui/profile_window.ui:947
-#: gajim/data/gui/vcard_information_window.ui:1336
+#: gajim/data/gui/profile_window.ui:1261
+#: gajim/data/gui/vcard_information_window.ui:1453
 msgid "Work"
 msgstr "Traballo"
 
 #. "About" is the text of a tab of vcard window
-#: gajim/data/gui/profile_window.ui:979
-#: gajim/data/gui/vcard_information_window.ui:1368
+#: gajim/data/gui/profile_window.ui:1297
+#: gajim/data/gui/vcard_information_window.ui:1485
 #: gajim/data/gui/application_menu.ui:62
 msgid "About"
 msgstr "Acerca de"
 
-#: gajim/data/gui/filetransfers.ui:20
+#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
+msgid "Users"
+msgstr "Usuarios"
+
+#: gajim/data/gui/start_chat_dialog.ui:185
+msgid "Name:"
+msgstr "Nome:"
+
+#: gajim/data/gui/start_chat_dialog.ui:197
 #, fuzzy
-msgid "Con_tinue"
-msgstr "_Continuar"
+msgid "Description:"
+msgstr "Descrición: %s"
+
+#: gajim/data/gui/start_chat_dialog.ui:209
+#, fuzzy
+msgid "Address:"
+msgstr "_Enderezo:"
+
+#: gajim/data/gui/start_chat_dialog.ui:246
+msgid ""
+"Semi-Anonymous\n"
+"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
-msgid "_Pause"
-msgstr "_Pausa"
+#: gajim/data/gui/filetransfers.ui:21
+msgid "Pa_use/Resume"
+msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
-#: gajim/data/gui/service_registration_window.ui:53
+#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: gajim/data/gui/filetransfers.ui:50
-msgid "_Open Containing Folder"
+#: gajim/data/gui/filetransfers.ui:45
+#, fuzzy
+msgid "_Open Folder"
 msgstr "_Abrir un cartafol de contido"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:56 gajim/data/gui/filetransfers.ui:206
 msgid "File Transfers"
 msgstr "Transferencias"
 
-#: gajim/data/gui/filetransfers.ui:110
+#: gajim/data/gui/filetransfers.ui:94
+#, fuzzy
+msgid "_Show notification when file transfer is complete"
+msgstr "_Notificarme cando rematar unha transferencia"
+
+#: gajim/data/gui/filetransfers.ui:134
 msgid "file transfers list"
 msgstr "listaxe de transferencias"
 
-#: gajim/data/gui/filetransfers.ui:111
+#: gajim/data/gui/filetransfers.ui:135
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
-#: gajim/data/gui/filetransfers.ui:131
-msgid "Clean _up"
-msgstr "Limpar"
-
-#: gajim/data/gui/filetransfers.ui:137
+#: gajim/data/gui/filetransfers.ui:157
 #, fuzzy
-msgid "Removes completed, cancelled and failed file transfers from the list"
+msgid "Remove completed, cancelled and failed file transfers from the list"
 msgstr "Elimina da listaxe as transferencias rematadas, canceladas e erradas"
 
-#: gajim/data/gui/filetransfers.ui:143
-msgid "Remove file transfer from the list."
-msgstr "Eliminar transferencias da listaxe"
-
-#: gajim/data/gui/filetransfers.ui:144
-msgid ""
-"This action removes single file transfer from the list. If the transfer is "
-"active, it is first stopped and then removed"
-msgstr ""
-"Esta acción elimina transferencias da listaxe. Se a transferencia estiver "
-"activa, detense primeiro e elimínase despois"
-
-#: gajim/data/gui/filetransfers.ui:180
+#: gajim/data/gui/filetransfers.ui:170
 #, fuzzy
-msgid "Cancels the selected file transfer and removes incomplete files"
-msgstr ""
-"Cancela a transferencia seleccionada do ficheiro e elimina o ficheiro "
-"incompleto"
-
-#: gajim/data/gui/filetransfers.ui:186
-msgid "Cancel file transfer"
+msgid "Pause or resume file transfer"
 msgstr "Cancelar a transferencia"
 
-#: gajim/data/gui/filetransfers.ui:187
-msgid "Cancels the selected file transfer"
-msgstr "Cancela a transferencia seleccionada do ficheiro"
-
-#: gajim/data/gui/filetransfers.ui:199
+#: gajim/data/gui/filetransfers.ui:183
 #, fuzzy
-msgid "_Close"
-msgstr "_Enviar e pechar"
-
-#: gajim/data/gui/filetransfers.ui:205
-msgid "Hides the window"
-msgstr "Oculta a fiestra"
-
-#: gajim/data/gui/filetransfers.ui:226
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Notificarme cando rematar unha transferencia"
-
-#: gajim/data/gui/filetransfers.ui:236
-msgid "When a file transfer is complete show a popup notification"
+msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr ""
-"Cando unha transferencia se completar, amosa unha notificación emerxente"
+"Cancela a transferencia seleccionada do ficheiro e elimina o ficheiro "
+"incompleto"
 
-#: gajim/data/gui/filetransfers.ui:254
+#: gajim/data/gui/filetransfers.ui:207
 #, fuzzy
 msgid "Shows a list of file transfers between you and others"
 msgstr "Amosa unha listaxe de transferencias entre vostede e outra persoa"
 
-#: gajim/data/gui/service_registration_window.ui:18
-msgid "Register to"
-msgstr "Rexistrar en"
-
-#: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:126
-msgid "_OK"
-msgstr "_Aceptar"
-
-#: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:293
-#: gajim/data/gui/gajim_themes_window.ui:264
+#: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
 msgid "Bold"
 msgstr "Negra"
 
-#: gajim/data/gui/groupchat_control.ui:22 gajim/data/gui/chat_control.ui:302
-#: gajim/data/gui/gajim_themes_window.ui:284
+#: gajim/data/gui/groupchat_control.ui:22 gajim/data/gui/chat_control.ui:286
 msgid "Italic"
 msgstr "Itálica"
 
-#: gajim/data/gui/groupchat_control.ui:31 gajim/data/gui/chat_control.ui:311
+#: gajim/data/gui/groupchat_control.ui:31 gajim/data/gui/chat_control.ui:295
 #, fuzzy
 msgid "Underline"
 msgstr "nove"
 
-#: gajim/data/gui/groupchat_control.ui:40 gajim/data/gui/chat_control.ui:320
+#: gajim/data/gui/groupchat_control.ui:40 gajim/data/gui/chat_control.ui:304
 #, fuzzy
 msgid "Strike"
 msgstr "Alcume"
 
-#: gajim/data/gui/groupchat_control.ui:62 gajim/data/gui/chat_control.ui:342
+#: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/advanced_config.py:86
+msgid "Color"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:62 gajim/data/gui/chat_control.ui:326
 #, fuzzy
 msgid "Font"
 msgstr "_Letra:"
 
-#: gajim/data/gui/groupchat_control.ui:76 gajim/data/gui/chat_control.ui:356
+#: gajim/data/gui/groupchat_control.ui:76 gajim/data/gui/chat_control.ui:340
 #, fuzzy
 msgid "Clear formatting"
 msgstr "Información"
 
-#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
+#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
 #, fuzzy
-msgid "Choose an encryption"
+msgid "Choose encryption"
 msgstr "Elixa un ficheiro para enviar..."
 
-#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
 #, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
+msgid "Show a list of emojis (Alt+M)"
 msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
-#: gajim/data/gui/popup_notification_window.ui:55
+#: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
 msgstr "Acontecemento"
 
-#: gajim/data/gui/popup_notification_window.ui:100
+#: gajim/data/gui/popup_notification_window.ui:88
 #, fuzzy
 msgid "Event desc"
 msgstr "Eventos"
 
-#: gajim/data/gui/chat_control.ui:41
+#: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
 msgstr "<b>Sons</b>"
 
-#: gajim/data/gui/chat_control.ui:63
+#: gajim/data/gui/chat_control.ui:56
 #, fuzzy
 msgid "<b>2</b> abc"
 msgstr "<b>Sons</b>"
 
-#: gajim/data/gui/chat_control.ui:84
+#: gajim/data/gui/chat_control.ui:76
 #, fuzzy
 msgid "<b>3</b> def"
 msgstr "<b>Sons</b>"
 
-#: gajim/data/gui/chat_control.ui:105
+#: gajim/data/gui/chat_control.ui:96
 #, fuzzy
 msgid "<b>4</b> ghi"
 msgstr "<b>Sons</b>"
 
-#: gajim/data/gui/chat_control.ui:126
+#: gajim/data/gui/chat_control.ui:116
 #, fuzzy
 msgid "<b>5</b> jkl"
 msgstr "<b>Sons</b>"
 
-#: gajim/data/gui/chat_control.ui:147
+#: gajim/data/gui/chat_control.ui:136
 #, fuzzy
 msgid "<b>6</b> mno"
 msgstr "<b>Sons</b>"
 
-#: gajim/data/gui/chat_control.ui:167
+#: gajim/data/gui/chat_control.ui:156
 msgid "<b>7</b> pqrs"
 msgstr ""
 
-#: gajim/data/gui/chat_control.ui:188
+#: gajim/data/gui/chat_control.ui:176
 #, fuzzy
 msgid "<b>8</b> tuv"
 msgstr "<b>Sons</b>"
 
-#: gajim/data/gui/chat_control.ui:209
+#: gajim/data/gui/chat_control.ui:196
 msgid "<b>9</b> wxyz"
 msgstr ""
 
-#: gajim/data/gui/chat_control.ui:229
+#: gajim/data/gui/chat_control.ui:216
 #, fuzzy
 msgid "<b>*</b>"
 msgstr "<b>Sons</b>"
 
-#: gajim/data/gui/chat_control.ui:249
+#: gajim/data/gui/chat_control.ui:236
 #, fuzzy
 msgid "<b>0</b>"
 msgstr "<b>Sons</b>"
 
-#: gajim/data/gui/chat_control.ui:269
+#: gajim/data/gui/chat_control.ui:256
 #, fuzzy
 msgid "<b>#</b>"
 msgstr "<b>Sons</b>"
 
-#: gajim/data/gui/chat_control.ui:725
-msgid "#"
-msgstr "núm."
+#: gajim/data/gui/chat_control.ui:437
+msgid "The last message was written on a mobile client"
+msgstr ""
 
-#: gajim/data/gui/vcard_information_window.ui:55
+#: gajim/data/gui/mam_preferences.ui:14
+#: gajim/data/gui/preferences_window.ui:120
+#: gajim/data/gui/preferences_window.ui:169
 #, fuzzy
-msgid "<b>Jabber ID:</b>"
-msgstr "ID de Jabber:"
+msgid "Always"
+msgstr "Ausente"
 
-#: gajim/data/gui/vcard_information_window.ui:69
+#: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "<b>Resource:</b>"
-msgstr "Recurso:"
+msgid "Roster"
+msgstr "Amosar _listaxe"
 
-#: gajim/data/gui/vcard_information_window.ui:83
+#: gajim/data/gui/mam_preferences.ui:22
+#: gajim/data/gui/preferences_window.ui:123
+#: gajim/data/gui/preferences_window.ui:163
 #, fuzzy
-msgid "<b>Status:</b>"
-msgstr "<b>Configuración</b>"
+msgid "Never"
+msgstr "_Nunca"
 
-#: gajim/data/gui/vcard_information_window.ui:97
+#: gajim/data/gui/mam_preferences.ui:53
 #, fuzzy
-msgid "<b>Client:</b>"
-msgstr "<b>Personalizado</b>"
+msgid "_Default"
+msgstr "Por defecto"
+
+#: gajim/data/gui/mam_preferences.ui:136
+#, fuzzy
+msgid "Archive"
+msgstr "Camiño do ficheiro"
+
+#: gajim/data/gui/mam_preferences.ui:180 gajim/gtk/roster_item_exchange.py:71
+#: gajim/gtk/roster_item_exchange.py:130
+#, fuzzy
+msgid "Add"
+msgstr "Enderezo"
+
+#: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
+#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#, fuzzy
+msgid "Remove"
+msgstr "_Eliminar"
 
-#: gajim/data/gui/vcard_information_window.ui:111
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
 #, fuzzy
-msgid "<b>System:</b>"
+msgid "Resource"
+msgstr "Recurso:"
+
+#: gajim/data/gui/vcard_information_window.ui:89
+#: gajim/data/gui/preferences_window.ui:1358
+#: gajim/data/gui/preferences_window.ui:1514
+#: gajim/data/gui/preferences_window.ui:1718
+msgid "Status"
+msgstr "Estado"
+
+#: gajim/data/gui/vcard_information_window.ui:106
+#, fuzzy
+msgid "Client"
+msgstr "Cliente:"
+
+#: gajim/data/gui/vcard_information_window.ui:123
+#: gajim/data/gui/preferences_window.ui:1821
+#, fuzzy
+msgid "System"
 msgstr "<b>Personalizado</b>"
 
-#: gajim/data/gui/vcard_information_window.ui:125
+#: gajim/data/gui/vcard_information_window.ui:140
 #, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Configuración</b>"
+msgid "Contact time"
+msgstr "Nome de contacto"
 
-#: gajim/data/gui/vcard_information_window.ui:222
+#: gajim/data/gui/vcard_information_window.ui:240
 #, fuzzy
-msgid "<b>User avatar:</b>"
+msgid "User avatar"
 msgstr "Imaxe:"
 
-#: gajim/data/gui/vcard_information_window.ui:234
+#: gajim/data/gui/vcard_information_window.ui:255
 #, fuzzy
-msgid "<b>Configured avatar:</b>"
+msgid "Configured avatar"
 msgstr "Configurar a sala"
 
 #. Given Name
-#: gajim/data/gui/vcard_information_window.ui:263
+#: gajim/data/gui/vcard_information_window.ui:287
 #, fuzzy
-msgid "<b>Ask:</b>"
-msgstr "<b>Accións</b>"
+msgid "Ask"
+msgstr "Pregunta:"
 
 #. Family Name
-#: gajim/data/gui/vcard_information_window.ui:277
+#: gajim/data/gui/vcard_information_window.ui:304
 #, fuzzy
-msgid "<b>Subscription:</b>"
-msgstr "<b>Descrición</b>"
+msgid "Subscription"
+msgstr "Subscrición:"
 
-#: gajim/data/gui/vcard_information_window.ui:893
-#: gajim/data/gui/vcard_information_window.ui:912
-#: gajim/data/gui/vcard_information_window.ui:1310
+#: gajim/data/gui/vcard_information_window.ui:974
+#: gajim/data/gui/vcard_information_window.ui:993
+#: gajim/data/gui/vcard_information_window.ui:1427
 msgid "button"
 msgstr ""
 
-#: gajim/data/gui/vcard_information_window.ui:1398
+#: gajim/data/gui/vcard_information_window.ui:1018
+msgid "Personal Info"
+msgstr "Información persoal"
+
+#: gajim/data/gui/vcard_information_window.ui:1515
 msgid "Comments"
 msgstr "Comentarios"
 
-#: gajim/data/gui/gajim_themes_window.ui:12
-#, fuzzy
-msgid "Account row"
-msgstr "Conta"
+#: gajim/data/gui/preferences_window.ui:26
+msgid "Use default applications"
+msgstr ""
 
-#: gajim/data/gui/gajim_themes_window.ui:15
+#: gajim/data/gui/preferences_window.ui:29
 #, fuzzy
-msgid "Group row"
-msgstr "Grupo"
+msgid "Custom"
+msgstr "<b>Personalizado</b>"
 
-#: gajim/data/gui/gajim_themes_window.ui:18
+#: gajim/data/gui/preferences_window.ui:52
 #, fuzzy
-msgid "Contact row"
-msgstr "Contacto"
-
-#: gajim/data/gui/gajim_themes_window.ui:21
-msgid "Chat Banner"
-msgstr ""
-
-#: gajim/data/gui/gajim_themes_window.ui:28
-msgid "Gajim Themes Customization"
-msgstr "Personalización de temas do Gajim"
-
-#: gajim/data/gui/gajim_themes_window.ui:157
-msgid "Text _color:"
-msgstr "_Cor do texto:"
-
-#: gajim/data/gui/gajim_themes_window.ui:173
-msgid "_Background:"
-msgstr "_Fondo"
-
-#: gajim/data/gui/gajim_themes_window.ui:189
-msgid "Text _font:"
-msgstr "_Letra do texto:"
-
-#: gajim/data/gui/gajim_themes_window.ui:207
-msgid "Font style:"
-msgstr "Estilo:"
+msgid "Pop it up"
+msgstr "_Emerxer"
 
-#: gajim/data/gui/gajim_themes_window.ui:375
-msgid "Composing"
-msgstr "A compor"
+#: gajim/data/gui/preferences_window.ui:55
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notificarmo"
 
-#: gajim/data/gui/gajim_themes_window.ui:387
-msgid "Paused"
-msgstr "Pausado"
+#: gajim/data/gui/preferences_window.ui:58
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Amosar só na _listaxe de contactos"
 
-#: gajim/data/gui/gajim_themes_window.ui:399
-msgid "Gone"
-msgstr "Marchei"
+#: gajim/data/gui/preferences_window.ui:69
+msgid "Detached roster with detached chats"
+msgstr ""
 
-#: gajim/data/gui/gajim_themes_window.ui:411
-msgid ""
-"MUC\n"
-"Messages"
+#: gajim/data/gui/preferences_window.ui:72
+msgid "Detached roster with single chat"
 msgstr ""
-"MUC\n"
-"Mensaxes"
 
-#: gajim/data/gui/gajim_themes_window.ui:424
-msgid ""
-"MUC Directed\n"
-"Messages"
+#: gajim/data/gui/preferences_window.ui:75
+msgid "Single window for everything"
 msgstr ""
-"Mensaxes dirixidas\n"
-"ás salas"
 
-#: gajim/data/gui/gajim_themes_window.ui:510
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Cores do separador para os estados da charla</b>"
+#: gajim/data/gui/preferences_window.ui:78
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:48
-msgid "Use default applications"
+#: gajim/data/gui/preferences_window.ui:81
+msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:51
+#: gajim/data/gui/preferences_window.ui:92
 #, fuzzy
-msgid "Custom"
-msgstr "<b>Personalizado</b>"
+msgid "No status messages"
+msgstr "mensaxe de estado"
 
-#: gajim/data/gui/preferences_window.ui:62
-#: gajim/data/gui/preferences_window.ui:79
+#: gajim/data/gui/preferences_window.ui:95
 #, fuzzy
-msgid "All chat states"
-msgstr "Todos os estados"
+msgid "All status messages"
+msgstr "mensaxe de estado"
 
-#: gajim/data/gui/preferences_window.ui:65
-#: gajim/data/gui/preferences_window.ui:82
+#: gajim/data/gui/preferences_window.ui:98
 #, fuzzy
-msgid "Composing only"
-msgstr "A compor"
+msgid "Only enter/leave messages"
+msgstr "Ten mensaxes sen ler"
+
+#: gajim/data/gui/preferences_window.ui:126
+#, fuzzy
+msgid "Last state"
+msgstr "Último estado: %s"
 
-#: gajim/data/gui/preferences_window.ui:99
+#: gajim/data/gui/preferences_window.ui:166
 msgid "Only when pending events"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:113
+#: gajim/data/gui/preferences_window.ui:180
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Emerxer"
+msgid "Top"
+msgstr "A"
 
-#: gajim/data/gui/preferences_window.ui:116
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Notificarmo"
+#: gajim/data/gui/preferences_window.ui:183
+msgid "Bottom"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:186
+msgid "Left"
+msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:119
+#: gajim/data/gui/preferences_window.ui:189
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Amosar só na _listaxe de contactos"
+msgid "Right"
+msgstr "oito"
 
-#: gajim/data/gui/preferences_window.ui:130
-msgid "Detached roster with detached chats"
+#: gajim/data/gui/preferences_window.ui:241
+msgid "_Window behavior"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:133
-msgid "Detached roster with single chat"
+#: gajim/data/gui/preferences_window.ui:296
+#, fuzzy
+msgid "_Show roster on startup"
+msgstr "Amosar _listaxe"
+
+#: gajim/data/gui/preferences_window.ui:311
+msgid "Show _avatar in chat tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:136
-msgid "Single window for everything"
+#: gajim/data/gui/preferences_window.ui:315
+msgid "If checked, the contact's avatar will be shown in chat tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:139
-msgid "Detached roster with chat grouped by account"
+#: gajim/data/gui/preferences_window.ui:349
+msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:142
-msgid "Detached roster with chat grouped by type"
+#: gajim/data/gui/preferences_window.ui:363
+msgid "_Quit Gajim when closing roster window"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:159
-#, fuzzy
-msgid "Last state"
-msgstr "Último estado: %s"
+#: gajim/data/gui/preferences_window.ui:367
+msgid ""
+"If enabled, Gajim will quit when closing the roster window instead of "
+"minimizing to the system's notification area"
+msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:195
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:188
-msgid "Preferences"
-msgstr "Preferencias"
+#: gajim/data/gui/preferences_window.ui:391
+msgid "Behavior of Windows and Tabs"
+msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:237
-msgid "Display a_vatars of contacts in roster"
+#: gajim/data/gui/preferences_window.ui:423
+#, fuzzy
+msgid "Show a_vatars of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: gajim/data/gui/preferences_window.ui:241
+#: gajim/data/gui/preferences_window.ui:427
+#, fuzzy
 msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
+"If checked, avatars of contacts will be shown in the 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"
 
-#: gajim/data/gui/preferences_window.ui:255
-msgid "Display status _messages of contacts in roster"
+#: gajim/data/gui/preferences_window.ui:441
+#, fuzzy
+msgid "Show status _messages of contacts in roster"
 msgstr "Amosar na listaxe as _mensaxes de estado dos contactos"
 
-#: gajim/data/gui/preferences_window.ui:259
+#: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name, in roster window and in group chats"
+"If checked, status messages of contacts will be shown under the contact's "
+"name, in the 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"
 
-#: gajim/data/gui/preferences_window.ui:273
+#: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: gajim/data/gui/preferences_window.ui:277
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
+"If checked, additional info published by the contact will be shown in "
+"roster. Additional infos (published via PEP) may include e.g. mood, "
+"activity, tune, location, ..."
 msgstr ""
-"Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
-"listaxe e nos grupos de charla"
 
-#: gajim/data/gui/preferences_window.ui:298
+#: gajim/data/gui/preferences_window.ui:484
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Ordenar os contacto_s polo estado"
 
-#: gajim/data/gui/preferences_window.ui:308
+#: gajim/data/gui/preferences_window.ui:494
 #, fuzzy
 msgid "in _roster"
 msgstr "Non está na listaxe"
 
-#: gajim/data/gui/preferences_window.ui:325
+#: gajim/data/gui/preferences_window.ui:511
 #, fuzzy
 msgid "in _group chats"
 msgstr "Entrar nun grupo de charla"
 
-#: gajim/data/gui/preferences_window.ui:354
-msgid "<b>Roster Appearance</b>"
+#: gajim/data/gui/preferences_window.ui:540
+#, fuzzy
+msgid "Roster Appearance"
+msgstr "<b>Editar unha regra</b>"
+
+#: gajim/data/gui/preferences_window.ui:585
+msgid "Enable spell _checking"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:384
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"If checked, spelling errors in input fields of chat windows will be "
+"highlighted. 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. "
+"Needs gspell to be installed."
 msgstr ""
-"Se non está desactivado, o Gajim substituirá emoticonas ASCCI ':)' polo seu "
-"equivalente en iconas gráficas estáticas ou animadas"
 
-#: gajim/data/gui/preferences_window.ui:390
+#: gajim/data/gui/preferences_window.ui:602
 #, fuzzy
-msgid "_Emoticons:"
-msgstr "Emoticonas:"
+msgid "Show message recei_pts (✔)"
+msgstr "contido da mensaxe"
 
-#: gajim/data/gui/preferences_window.ui:406
-msgid "_Window behavior:"
+#: gajim/data/gui/preferences_window.ui:606
+msgid ""
+"If checked, a small checkmark will be shown after each message when it was "
+"received. Note that this is not supported by all clients and therefore could "
+"be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:420
+#: gajim/data/gui/preferences_window.ui:620
 #, fuzzy
-msgid "_Show roster on startup:"
-msgstr "Amosar _listaxe"
-
-#: gajim/data/gui/preferences_window.ui:431
-#, fuzzy
-msgid "_Ignore rich content in incoming messages"
+msgid "_Ignore formatting of incoming messages"
 msgstr "Ignorar o contido adornado en mensaxes entrantes"
 
-#: gajim/data/gui/preferences_window.ui:435
+#: gajim/data/gui/preferences_window.ui:624
+#, fuzzy
 msgid ""
-"Some messages may include rich content (formatting, colors etc). If checked, "
-"Gajim will just display the raw message text."
+"Some messages may include rich content (xhtml formatting, colors etc). If "
+"checked, Gajim will just display the plain 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."
 
-#: gajim/data/gui/preferences_window.ui:449
-msgid "_Highlight misspelled words"
-msgstr "_Marcar os erros ortográficos"
+#: gajim/data/gui/preferences_window.ui:638
+#, fuzzy
+msgid "Display status messages in _single chats"
+msgstr "Amosar na listaxe as _mensaxes de estado dos contactos"
 
-#: gajim/data/gui/preferences_window.ui:452
+#: gajim/data/gui/preferences_window.ui:642
+#, fuzzy
 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."
+"If checked, status lines will be shown in 1 on 1 chats when a contact "
+"changes their status or status message"
 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"
 
-#: gajim/data/gui/preferences_window.ui:466
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
-msgid "Notify by icon when your messages are received"
-msgstr "Son para reproducir cando chega calquera mensaxe MUC"
+msgid "Show subject after _joining a group chat"
+msgstr "Non se puido entrar no grupo de charla"
+
+#: gajim/data/gui/preferences_window.ui:660
+#, fuzzy
+msgid "If checked, the room subject will be shown when joining a group chat"
+msgstr "Non se puido entrar no grupo de charla"
+
+#: gajim/data/gui/preferences_window.ui:682
+#, fuzzy
+msgid "Group Chat Settings"
+msgstr "Fallou a conexión"
 
-#: gajim/data/gui/preferences_window.ui:531
-msgid "Show avatar in chat tabs"
+#: gajim/data/gui/preferences_window.ui:697
+msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:552
+#: gajim/data/gui/preferences_window.ui:701
+msgid ""
+"If join/leave status messages are shown in the group chat. This setting can "
+"be overridden in the groupchat menu."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:720
+msgid ""
+"The default sync threshold for new public group chats. This setting can be "
+"overridden in the groupchat menu."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:722
+msgid "Default Sync Threshold"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:764
 #, fuzzy
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Editar unha regra</b>"
+msgid "Show status changes (Default)"
+msgstr "_Rexistrar os cambios de estado dos contactos"
+
+#: gajim/data/gui/preferences_window.ui:768
+msgid ""
+"If status change messages are shown in the group chat. This setting can be "
+"overridden in the groupchat menu."
+msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:607
+#: gajim/data/gui/preferences_window.ui:825
 #, fuzzy
-msgid "When new event is received:"
-msgstr "Cando se reciba un acontecemento novo"
+msgid "Show chatstate in tabs"
+msgstr "Quere amosar o botón de pechar no tabulador?"
 
-#: gajim/data/gui/preferences_window.ui:645
+#: gajim/data/gui/preferences_window.ui:829
 #, fuzzy
-msgid "Notify me about contacts that sign _in"
-msgstr "Notificar cando un contacto: "
+msgid ""
+"If checked, the tab will be colored according to the current chatstate of "
+"the contact"
+msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
-#: gajim/data/gui/preferences_window.ui:663
+#: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Notify me about contacts that sign _out"
-msgstr "Notificar cando un contacto: "
+msgid "Show chatstate in roster"
+msgstr "Amosar na listaxe os a_vatares dos contactos"
+
+#: gajim/data/gui/preferences_window.ui:847
+msgid ""
+"If checked, the contact row will be colored according to the current "
+"chatstate of the contact"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:861
+msgid "Show chatstate in banner"
+msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:667
+#: gajim/data/gui/preferences_window.ui:865
 msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed out"
+"If checked, a desciption of the contacts current chatstate is shown in the "
+"banner"
 msgstr ""
-"O Gajim notificaralle cunha mensaxe emerxente na parte inferior dereita da "
-"pantalla cando un contacto se desconectar"
 
-#: gajim/data/gui/preferences_window.ui:681
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+#: gajim/data/gui/preferences_window.ui:885
+#, fuzzy
+msgid "Chatstate"
+msgstr "Último estado: %s"
+
+#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/history_window.ui:303
+msgid "Chat"
+msgstr "Charla"
+
+#: gajim/data/gui/preferences_window.ui:956
+#, fuzzy
+msgid "Show _notification area icon"
+msgstr "Usar a icona na á_rea de notificación"
+
+#: gajim/data/gui/preferences_window.ui:975
+#, fuzzy
+msgid "_When new event is received"
+msgstr "Cando se reciba un acontecemento novo"
+
+#: gajim/data/gui/preferences_window.ui:1016
+#, fuzzy
+msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Permitir as notificacións emerxentes cando estou _ausente, non dispoñíbel, "
 "ocupado ou invisíbel."
 
-#: gajim/data/gui/preferences_window.ui:698
+#: gajim/data/gui/preferences_window.ui:1033
 #, fuzzy
-msgid "Allow popup/notifications when a chat window is opened"
+msgid ""
+"Allow popups/notifications when I'm _away, not available, busy, or invisible"
 msgstr ""
 "Permitir as notificacións emerxentes cando estou _ausente, non dispoñíbel, "
 "ocupado ou invisíbel."
 
-#: gajim/data/gui/preferences_window.ui:722
+#: gajim/data/gui/preferences_window.ui:1050
 #, fuzzy
-msgid "Show notification area icon:"
-msgstr "Usar a icona na á_rea de notificación"
+msgid "Notify me about contacts that sign _in"
+msgstr "Notificar cando un contacto: "
+
+#: gajim/data/gui/preferences_window.ui:1055
+#, fuzzy
+msgid ""
+"A popup window about contacts that just signed in will be shown in the "
+"bottom right of the screen "
+msgstr ""
+"O Gajim notificaralle novos acontecementos a través dunha mensaxe emerxente "
+"no bordo inferior dereito da pantalla"
+
+#: gajim/data/gui/preferences_window.ui:1069
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Notificar cando un contacto: "
+
+#: gajim/data/gui/preferences_window.ui:1073
+msgid ""
+"A popup window about contacts that just signed out will be shown in the "
+"bottom right of the screen "
+msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:762
-msgid "<b>Visual Notifications</b>"
+#: gajim/data/gui/preferences_window.ui:1091
+#, fuzzy
+msgid "Visual Notifications"
 msgstr "<b>Notificacións visuais</b>"
 
-#: gajim/data/gui/preferences_window.ui:795
+#: gajim/data/gui/preferences_window.ui:1127
 msgid "Play _sounds"
 msgstr "Reproducir _sons"
 
-#: gajim/data/gui/preferences_window.ui:812
-#: gajim/data/gui/preferences_window.ui:1656
+#: gajim/data/gui/preferences_window.ui:1144
+#: gajim/data/gui/preferences_window.ui:1784
 msgid "Ma_nage..."
 msgstr "Xestio_nar..."
 
-#: gajim/data/gui/preferences_window.ui:834
-msgid "Allow sound when I'm _busy"
+#: gajim/data/gui/preferences_window.ui:1167
+msgid "Allow playing sounds when I'm _busy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:856
-msgid "<b>Sounds</b>"
-msgstr "<b>Sons</b>"
+#: gajim/data/gui/preferences_window.ui:1189
+#, fuzzy
+msgid "Sounds"
+msgstr "Sons Wav"
 
-#: gajim/data/gui/preferences_window.ui:877
+#: gajim/data/gui/preferences_window.ui:1207
 #, fuzzy
 msgid "Notifications"
 msgstr "Modificar a conta"
 
-#: gajim/data/gui/preferences_window.ui:911
-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."
-
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:1234
 #, fuzzy
-msgid "_Display chat state notifications:"
-msgstr "Notificacións de estado nas charlas:"
+msgid "No_t Available"
+msgstr "Non dispoñíbel"
 
-#: gajim/data/gui/preferences_window.ui:967
+#: gajim/data/gui/preferences_window.ui:1238
 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."
+"If checked, the status will be changed to Not Available when the computer "
+"has not been used for the specified time"
 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."
 
-#: gajim/data/gui/preferences_window.ui:972
-#, fuzzy
-msgid "_Send chat state notifications:"
-msgstr "Notificacións de estado nas charlas:"
-
-#: gajim/data/gui/preferences_window.ui:990
-#, fuzzy
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Notificacións visuais</b>"
-
-#: gajim/data/gui/preferences_window.ui:1012
-#, fuzzy
-msgid "Personal Events"
-msgstr "Información persoal"
-
-#: gajim/data/gui/preferences_window.ui:1043
-#, fuzzy
-msgid "_Away after:"
-msgstr "Pór _ausente despois de:"
-
-#: gajim/data/gui/preferences_window.ui:1047
+#: gajim/data/gui/preferences_window.ui:1255
 msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
+"If checked, the status will be changed to Away when the computer has not "
+"been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1060
-#, fuzzy
-msgid "_Not available after:"
-msgstr "Pór _non dispoñíbel despois de:"
+#: gajim/data/gui/preferences_window.ui:1301
+msgid ""
+"The automatic away status message. If empty, the current status message will "
+"not be changed.\n"
+"$S will be replaced by previous status message.\n"
+"$T will be replaced by auto-away timeout."
+msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1064
+#: gajim/data/gui/preferences_window.ui:1316
 msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
+"The automatic not available status message. If empty, the current status "
+"message will not be changed.\n"
+"$S will be replaced by previous status message.\n"
+"$T will be replaced by auto-not-available timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1079
-#: gajim/data/gui/preferences_window.ui:1091
-msgid "minutes"
+#: gajim/data/gui/preferences_window.ui:1330
+#, fuzzy
+msgid "Minutes"
 msgstr "minutos"
 
-#: gajim/data/gui/preferences_window.ui:1103
-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"
+#: gajim/data/gui/preferences_window.ui:1374 gajim/gtk/features.py:100
+#, fuzzy
+msgid "Automatic Status"
+msgstr "_Adaptar ao estado"
+
+#: gajim/data/gui/preferences_window.ui:1405
+msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1117
+#: gajim/data/gui/preferences_window.ui:1409
 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"
+"If checked, the status and status message used in the last session will be "
+"restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1165
+#: gajim/data/gui/preferences_window.ui:1431
 #, fuzzy
-msgid "<b>Auto Status</b>"
-msgstr "<b>Accións</b>"
-
-#: gajim/data/gui/preferences_window.ui:1200
-msgid "Ask status message when I:"
+msgid "Ask for status message when I"
 msgstr "Preguntar a mensaxe de estado cando estea: "
 
-#: gajim/data/gui/preferences_window.ui:1215
+#: gajim/data/gui/preferences_window.ui:1447
 msgid "Sign _in"
 msgstr "Conectar"
 
-#: gajim/data/gui/preferences_window.ui:1232
+#: gajim/data/gui/preferences_window.ui:1464
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: gajim/data/gui/preferences_window.ui:1265
+#: gajim/data/gui/preferences_window.ui:1498
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1277
-#: gajim/data/gui/preferences_window.ui:1479
-msgid "Status"
-msgstr "Estado"
-
-#: gajim/data/gui/preferences_window.ui:1288
+#: gajim/data/gui/preferences_window.ui:1526
 #, fuzzy
 msgid "Default Message"
 msgstr "Mensaxes de estado por defecto"
 
-#: gajim/data/gui/preferences_window.ui:1303
+#: gajim/data/gui/preferences_window.ui:1541
+#: gajim/data/gui/preferences_window.ui:1822
 #, fuzzy
 msgid "Enabled"
 msgstr "Activar"
 
-#: gajim/data/gui/preferences_window.ui:1329
-#, fuzzy
-msgid "<b>Status Messages</b>"
-msgstr "<b>Mensaxes de estado predefinidas</b>"
-
-#: gajim/data/gui/preferences_window.ui:1459
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Mensaxes de estado predefinidas</b>"
-
-#: gajim/data/gui/preferences_window.ui:1512
-#, fuzzy
-msgid "Chat message:"
-msgstr "Men_saxe de estado:"
-
-#: gajim/data/gui/preferences_window.ui:1537
-msgid "Use system _default"
-msgstr "Usar o pre_definido do sistema"
-
-#: gajim/data/gui/preferences_window.ui:1560
+#: gajim/data/gui/preferences_window.ui:1567
 #, fuzzy
-msgid "<b>Font</b>"
-msgstr "<b>Sons</b>"
-
-#: gajim/data/gui/preferences_window.ui:1590
-msgid "T_heme:"
-msgstr "Te_ma:"
+msgid "Status Messages"
+msgstr "Mensaxe de estado"
 
-#: gajim/data/gui/preferences_window.ui:1603
+#: gajim/data/gui/preferences_window.ui:1700
 #, fuzzy
-msgid "Status _iconset:"
-msgstr "Conxunto de _iconas de estado por defecto:"
+msgid "Preset Status Messages"
+msgstr "<b>Mensaxes de estado predefinidas</b>"
 
-#: gajim/data/gui/preferences_window.ui:1614
+#: gajim/data/gui/preferences_window.ui:1741 gajim/data/gui/themes_window.ui:65
 #, fuzzy
-msgid "Use _transports icons"
-msgstr "_Usar as iconas do transporte"
+msgid "Themes"
+msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1618
+#: gajim/data/gui/preferences_window.ui:1758
 #, 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.)"
+msgid "_Theme"
+msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1660
+#: gajim/data/gui/preferences_window.ui:1789
 msgid "Configure color and font of the interface"
 msgstr "Configurar as cores e as fontes da interface"
 
-#: gajim/data/gui/preferences_window.ui:1682
+#: gajim/data/gui/preferences_window.ui:1803
 #, fuzzy
-msgid "<b>Themes</b>"
-msgstr "<b>Propiedades</b>"
+msgid "_Dark Theme"
+msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1712
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Nome de contacto"
+#: gajim/data/gui/preferences_window.ui:1837
+msgid "Emojis"
+msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1726
+#: gajim/data/gui/preferences_window.ui:1854
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Men_saxe de estado:"
+msgid "_Emoji Theme"
+msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1738
-msgid "_Status message:"
-msgstr "Men_saxe de estado:"
+#: gajim/data/gui/preferences_window.ui:1883
+msgid "Icons"
+msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1752
+#: gajim/data/gui/preferences_window.ui:1900
 #, fuzzy
-msgid "Group chat highlight:"
-msgstr "Remarcado da mensaxe de grupo de charla"
+msgid "_Status iconset"
+msgstr "Conxunto de _iconas de estado por defecto:"
 
-#: gajim/data/gui/preferences_window.ui:1890
+#: gajim/data/gui/preferences_window.ui:1926
 #, fuzzy
-msgid "Your nickname:"
-msgstr "Ant_es do alcume:"
+msgid "Use transports _icons"
+msgstr "_Usar as iconas do transporte"
 
-#: gajim/data/gui/preferences_window.ui:1904
+#: gajim/data/gui/preferences_window.ui:1930
 #, fuzzy
-msgid "Your message:"
-msgstr "Mensaxe de erro: %s"
-
-#: gajim/data/gui/preferences_window.ui:1916
-msgid "_URL highlight:"
+msgid ""
+"If checked, protocol-specific status icons will be used (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.)"
 
-#: gajim/data/gui/preferences_window.ui:2041
-msgid "_Reset to Default Colors"
-msgstr "_Restabelecer as cores predeterminadas"
-
-#: gajim/data/gui/preferences_window.ui:2075
-#, fuzzy
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Cores do separador para os estados da charla</b>"
+#: gajim/data/gui/preferences_window.ui:1957
+msgid "_Convert ASCII Emojis"
+msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2095
+#: gajim/data/gui/preferences_window.ui:2035
 #, fuzzy
 msgid "Style"
 msgstr "Atascado"
 
-#: gajim/data/gui/preferences_window.ui:2128
-msgid "Audio input device"
+#: gajim/data/gui/preferences_window.ui:2059
+msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2140
-msgid "Audio output device"
+#: gajim/data/gui/preferences_window.ui:2100
+msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2176
-#, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Accións</b>"
+#: gajim/data/gui/preferences_window.ui:2117
+msgid "Audio"
+msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2206
-msgid "Video input device"
+#: gajim/data/gui/preferences_window.ui:2134
+msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2218
-msgid "Video output device"
+#: gajim/data/gui/preferences_window.ui:2151
+#, fuzzy
+msgid "_Video input device"
+msgstr "Mensaxes de estado por defecto"
+
+#: gajim/data/gui/preferences_window.ui:2179
+msgid "V_ideo output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2230
-msgid "Video framerate"
+#: gajim/data/gui/preferences_window.ui:2208
+msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2242
-msgid "Video size"
+#: gajim/data/gui/preferences_window.ui:2237
+msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2252
-msgid "View own video source"
+#: gajim/data/gui/preferences_window.ui:2262
+msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2316
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Engadir unha regra</b>"
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+msgid "Connection"
+msgstr "Conexión"
 
-#: gajim/data/gui/preferences_window.ui:2346
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
-msgid "STUN server:"
+msgid "STU_N server"
 msgstr "Servidor:"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2313
 msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
+"STUN server hostname. If no hostname was given, Gajim will try\n"
+"to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2386
-msgid "<i>(example: stun.iptel.org)</i>"
+#: gajim/data/gui/preferences_window.ui:2345
+msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2400
+#: gajim/data/gui/preferences_window.ui:2408
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Condicións</b>"
-
-#: gajim/data/gui/preferences_window.ui:2485
-msgid "_Mail client:"
+msgid "Mail _client"
 msgstr "_Cliente de correo:"
 
-#: gajim/data/gui/preferences_window.ui:2498
-msgid "_Browser:"
+#: gajim/data/gui/preferences_window.ui:2426
+#, fuzzy
+msgid "_Browser"
 msgstr "_Navegador:"
 
-#: gajim/data/gui/preferences_window.ui:2511
-msgid "_File manager:"
+#: gajim/data/gui/preferences_window.ui:2444
+#, fuzzy
+msgid "_File manager"
 msgstr "A_dministrador de ficheiros:"
 
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: gajim/data/gui/preferences_window.ui:2559
-msgid "<b>Custom</b>"
-msgstr "<b>Personalizado</b>"
+#: gajim/data/gui/preferences_window.ui:2497
+msgid "Custom applications"
+msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2576
-msgid "<b>Applications</b>"
+#: gajim/data/gui/preferences_window.ui:2519
+#, fuzzy
+msgid "Applications"
 msgstr "<b>Programas</b>"
 
-#: gajim/data/gui/preferences_window.ui:2604
-msgid "_Ignore events from contacts not in the roster"
+#: gajim/data/gui/preferences_window.ui:2556
+msgid "_Global proxy"
 msgstr ""
-"_Ignorar as mensaxes de contactos que non estean na listaxe de contactos"
 
-#: gajim/data/gui/preferences_window.ui:2608
+#: gajim/data/gui/preferences_window.ui:2593
 #, 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."
+msgid "_Manage..."
+msgstr "Xestionar..."
 
-#: gajim/data/gui/preferences_window.ui:2622
-#, fuzzy
-msgid "Allow client / _OS information to be sent"
-msgstr "Permitir o envío de información sobre o sistema operativo"
+#: gajim/data/gui/preferences_window.ui:2616
+msgid "_Log status changes of contacts"
+msgstr "_Rexistrar os cambios de estado dos contactos"
 
-#: gajim/data/gui/preferences_window.ui:2626
-#, 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"
+#: gajim/data/gui/preferences_window.ui:2633
+msgid "Enable _debug logging"
+msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2640
+#: gajim/data/gui/preferences_window.ui:2637
 #, fuzzy
-msgid "Allow local system time information to be sent"
-msgstr "Permitir o envío de información sobre o sistema operativo"
+msgid "If checked, Gajim will store a log file for debugging"
+msgstr "Se isto está marcado, o Gajim lembrará o contrasinal para esta conta"
 
-#: gajim/data/gui/preferences_window.ui:2644
+#: gajim/data/gui/preferences_window.ui:2655
 #, 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"
+msgid "Miscellaneous"
+msgstr "<b>Varios</b>"
 
-#: gajim/data/gui/preferences_window.ui:2658
-msgid "Log _encrypted chat session"
+#: gajim/data/gui/preferences_window.ui:2688
+msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2662
-msgid ""
-"If checked, Gajim will keep logs for encrypted messages. Please note that "
-"when using End-to-End encryption the remote party has to agree on logging, "
-"else the messages will not be logged."
-msgstr ""
+#: gajim/data/gui/preferences_window.ui:2701
+msgid "_Open..."
+msgstr "_Abrir..."
 
-#: gajim/data/gui/preferences_window.ui:2676
+#: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Permitir o envío de información sobre o sistema operativo"
+msgid ""
+"<b>Jabber-ID</b>\n"
+"&lt;user@domain/resource&gt; (only that resource matches)\n"
+"&lt;user@domain&gt; (any resource matches)\n"
+"&lt;domain/resource&gt; (only that resource matches)\n"
+"&lt;domain&gt; (the domain itself matches, as does any user@domain or domain/"
+"resource)\n"
+msgstr ""
+"Pode ser un dos seguintes:\n"
+"1. usuario@dominio/recurso (só ese recurso coincide)2. usuario@dominio "
+"(calquera recurso coincide)3. dominio/recurso (só ese recurso coincide)4. "
+"dominio (o dominio coincide, incluíndo calquera\n"
+"usuario@dominio, dominio/recurso ou enderezo que contén\n"
+"un subdominio."
 
-#: gajim/data/gui/preferences_window.ui:2695
-msgid "Global proxy:"
+#: gajim/data/gui/groupchat_config.ui:132
+#: gajim/data/gui/groupchat_config.ui:156
+msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2724
+#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
 #, fuzzy
-msgid "_Manage..."
-msgstr "Xestionar..."
+msgid "Configuration"
+msgstr "Configuración da sala"
 
-#: gajim/data/gui/preferences_window.ui:2743
+#: gajim/data/gui/groupchat_config.ui:321
 #, fuzzy
-msgid "<b>Privacy</b>"
-msgstr "<i>Listaxe de privacidade</i>"
+msgid "Reserved Name"
+msgstr "Nome da opción"
 
-#: gajim/data/gui/preferences_window.ui:2770
-msgid "_Log status changes of contacts"
-msgstr "_Rexistrar os cambios de estado dos contactos"
+#: gajim/data/gui/groupchat_config.ui:358
+#, fuzzy
+msgid "Affiliation"
+msgstr "<b>Programas</b>"
 
-#: gajim/data/gui/preferences_window.ui:2791
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Varios</b>"
+#: gajim/data/gui/groupchat_config.ui:389
+#, fuzzy
+msgid "Affiliations"
+msgstr "<b>Programas</b>"
 
-#: gajim/data/gui/preferences_window.ui:2810
-msgid "_Open..."
-msgstr "_Abrir..."
+#: gajim/data/gui/groupchat_config.ui:441
+msgid "Reason"
+msgstr "Motivo"
 
-#: gajim/data/gui/preferences_window.ui:2826
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Editor de configuración avanzada</b>"
+#: gajim/data/gui/groupchat_config.ui:470
+msgid "Ban List"
+msgstr "Listaxe de expulsión"
 
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
@@ -9542,66 +7378,60 @@ msgstr "Enviar ficheiro"
 msgid "Invite _Contacts"
 msgstr "Contactos"
 
-#: gajim/data/gui/contact_context_menu.ui:73
+#: gajim/data/gui/contact_context_menu.ui:58
 #, fuzzy
 msgid "E_xecute Command..."
 msgstr "Executar o comando..."
 
-#: gajim/data/gui/contact_context_menu.ui:82
+#: gajim/data/gui/contact_context_menu.ui:67
 #, fuzzy
 msgid "M_anage Contact"
 msgstr "Renomear o contacto"
 
-#: gajim/data/gui/contact_context_menu.ui:92
+#: gajim/data/gui/contact_context_menu.ui:77
 #, fuzzy
 msgid "_Rename..."
 msgstr "Renomear"
 
-#: gajim/data/gui/contact_context_menu.ui:99
+#: gajim/data/gui/contact_context_menu.ui:84
 #, fuzzy
 msgid "Edit _Groups..."
 msgstr "Editar os grupos"
 
-#: gajim/data/gui/contact_context_menu.ui:106
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Asignar chave de OpenPGP"
-
-#: gajim/data/gui/contact_context_menu.ui:115
+#: gajim/data/gui/contact_context_menu.ui:92
 #, fuzzy
 msgid "Add Special _Notification..."
 msgstr "Engadir unha _notificación especial"
 
-#: gajim/data/gui/contact_context_menu.ui:129
+#: gajim/data/gui/contact_context_menu.ui:106
 msgid "_Subscription"
 msgstr "_Subscrición"
 
-#: gajim/data/gui/contact_context_menu.ui:138
+#: gajim/data/gui/contact_context_menu.ui:115
 #, fuzzy
 msgid "_Allow contact to see my status"
 msgstr "Permitirlle a este contacto que vexa o meu estado"
 
-#: gajim/data/gui/contact_context_menu.ui:146
+#: gajim/data/gui/contact_context_menu.ui:123
 #, fuzzy
 msgid "A_sk to see contact status"
 msgstr "Pregunta para ver o _seu estado"
 
-#: gajim/data/gui/contact_context_menu.ui:154
+#: gajim/data/gui/contact_context_menu.ui:131
 #, fuzzy
 msgid "_Forbid contact to see my status"
 msgstr "Prohibirlle ver o meu estado"
 
-#: gajim/data/gui/contact_context_menu.ui:182
+#: gajim/data/gui/contact_context_menu.ui:159
 #, fuzzy
 msgid "_Unignore"
 msgstr "nove"
 
-#: gajim/data/gui/contact_context_menu.ui:190
+#: gajim/data/gui/contact_context_menu.ui:167
 msgid "_Ignore"
 msgstr ""
 
-#: gajim/data/gui/contact_context_menu.ui:197
-#: gajim/data/gui/chat_context_menu.ui:66
+#: gajim/data/gui/contact_context_menu.ui:174
 #, fuzzy
 msgid "_Add to Roster..."
 msgstr "_Engadir á listaxe de contactos"
@@ -9647,7 +7477,6 @@ msgid "Anon_ymous authentication"
 msgstr "Usar a autenticación"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:259
-#: gajim/data/gui/manage_bookmarks_window.ui:172
 msgid "_Password:"
 msgstr "C_ontrasinal:"
 
@@ -9664,7 +7493,6 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: gajim/data/gui/account_creation_wizard_window.ui:358
-#: gajim/data/gui/manage_bookmarks_window.ui:159
 msgid "_Server:"
 msgstr "_Servidor:"
 
@@ -9728,12 +7556,14 @@ msgstr "_Rematar"
 msgid "Privacy Lists:"
 msgstr "Listaxes de privacidade:"
 
-#: gajim/data/gui/service_discovery_window.ui:84
-msgid "_Address:"
+#: gajim/data/gui/service_discovery_window.ui:111
+#, fuzzy
+msgid "_Address"
 msgstr "_Enderezo:"
 
-#: gajim/data/gui/service_discovery_window.ui:115
-msgid "G_o"
+#: gajim/data/gui/service_discovery_window.ui:152
+#, fuzzy
+msgid "Go"
 msgstr "I_r"
 
 #: gajim/data/gui/synchronise_select_contacts_dialog.ui:8
@@ -9745,61 +7575,45 @@ msgstr ""
 msgid "Select the contacts you want to synchronise"
 msgstr "JID do contacto co que quere conversar"
 
-#: gajim/data/gui/edit_groups_dialog.ui:8
-msgid "Edit Groups"
-msgstr "Editar grupos"
-
-#: gajim/data/gui/search_window.ui:42
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #, fuzzy
-msgid "Please wait while retrieving search form..."
-msgstr "Por favor, agarde mentres se solicita a listaxe de comandos..."
+msgid "Group Chat Invitation"
+msgstr "Convite a grupo de charla"
 
-#: gajim/data/gui/search_window.ui:80
+#: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
-msgid "_Add contact"
-msgstr "Engadir un _contacto"
-
-#: gajim/data/gui/search_window.ui:116
-msgid "_Search"
-msgstr "_Buscar"
-
-#: gajim/data/gui/chat_context_menu.ui:11
-msgid "_Copy Link Location"
-msgstr "_Copiar o enderezo da ligazón"
-
-#: gajim/data/gui/chat_context_menu.ui:19
-msgid "_Open Link in Browser"
-msgstr "_Abrir a ligazón no navegador"
+msgid "Message..."
+msgstr "Mensaxe"
 
-#: gajim/data/gui/chat_context_menu.ui:27
-msgid "_Copy JID/Email Address"
-msgstr "_Copiar o enderezo"
+#: gajim/data/gui/groupchat_invitation_received.ui:120
+msgid "_Message if you decline (optional)"
+msgstr ""
 
-#: gajim/data/gui/chat_context_menu.ui:35
-msgid "_Open Email Composer"
-msgstr "_Abrir o editor de correo"
+#: gajim/data/gui/edit_groups_dialog.ui:8
+msgid "Edit Groups"
+msgstr "Editar grupos"
 
-#: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_window.ui:12
-msgid "_Start Chat"
-msgstr "_Iniciar a charla"
+#: gajim/data/gui/change_status_message_dialog.ui:116
+msgid "Save this message as a preset"
+msgstr ""
 
-#: gajim/data/gui/chat_context_menu.ui:57
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Entrar nun grupo de charla"
+#: gajim/data/gui/change_status_message_dialog.ui:152
+#, fuzzy
+msgid "Preset _messages"
+msgstr "Mensaxes predefinidas:"
 
-#: gajim/data/gui/change_status_message_dialog.ui:131
-msgid "Save as Preset..."
-msgstr "Gardar como predefinido..."
+#: gajim/data/gui/change_status_message_dialog.ui:170
+#, fuzzy
+msgid "Ac_tivity"
+msgstr "Activo"
 
-#: gajim/data/gui/change_status_message_dialog.ui:167
-msgid "Preset messages:"
-msgstr "Mensaxes predefinidas:"
+#: gajim/data/gui/change_status_message_dialog.ui:187
+msgid "M_ood"
+msgstr ""
 
-#: gajim/data/gui/change_status_message_dialog.ui:313
-msgid "<b>Type your new status message</b>"
+#: gajim/data/gui/change_status_message_dialog.ui:314
+#, fuzzy
+msgid "_Type your new status message"
 msgstr "<b>Escriba a súa mensaxe nova de estado</b>"
 
 #: gajim/data/gui/synchronise_select_account_dialog.ui:8
@@ -9811,74 +7625,57 @@ msgstr "Amosar os contactos desconectados"
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
-#: gajim/data/gui/archiving_313_preferences_window.ui:28
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
+#: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "Roster"
-msgstr "Amosar _listaxe"
+msgid "_Jabber ID"
+msgstr "ID de _Jabber: "
 
-#: gajim/data/gui/archiving_313_preferences_window.ui:85
+#: gajim/data/gui/add_new_contact_window.ui:100
+#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
-msgid "Preference"
-msgstr "Preferencias"
+msgid "_Nickname"
+msgstr "_Alcume:"
 
-#: gajim/data/gui/archiving_313_preferences_window.ui:159
+#: gajim/data/gui/add_new_contact_window.ui:117
 #, fuzzy
-msgid "Default:"
-msgstr "Por defecto"
+msgid "_Group"
+msgstr "_Grupo:"
 
-#: gajim/data/gui/voip_call_received_dialog.ui:15
-msgid "<b><big>Incoming call</big></b>"
+#: gajim/data/gui/add_new_contact_window.ui:165
+msgid "Choose or type new group name"
 msgstr ""
 
-#: gajim/data/gui/add_new_contact_window.ui:29
-msgid "Add New Contact"
-msgstr "Engadir un contacto novo"
-
-#: gajim/data/gui/add_new_contact_window.ui:62
-msgid "A_ccount:"
+#: gajim/data/gui/add_new_contact_window.ui:181
+#, fuzzy
+msgid "A_ccount"
 msgstr "_Conta:"
 
-#: gajim/data/gui/add_new_contact_window.ui:110
-msgid "_Protocol:"
+#: gajim/data/gui/add_new_contact_window.ui:197
+#, fuzzy
+msgid "_Protocol"
 msgstr "_Protocolo:"
 
-#: gajim/data/gui/add_new_contact_window.ui:169
-msgid "_User ID:"
-msgstr "ID de _usuario:"
-
-#: gajim/data/gui/add_new_contact_window.ui:182
-#: gajim/data/gui/manage_bookmarks_window.ui:133
-msgid "_Nickname:"
-msgstr "_Alcume:"
-
-#: gajim/data/gui/add_new_contact_window.ui:195
-msgid "_Group:"
-msgstr "_Grupo:"
-
-#: gajim/data/gui/add_new_contact_window.ui:210
+#: gajim/data/gui/add_new_contact_window.ui:295
+#: gajim/data/gui/single_message_window.ui:170
 #, fuzzy
-msgid "Type User ID"
-msgstr "ID de usuario:"
+msgid "Query Contact Info"
+msgstr "Información"
 
-#: gajim/data/gui/add_new_contact_window.ui:223
+#: gajim/data/gui/add_new_contact_window.ui:314
 #, fuzzy
-msgid "Type Nickname"
-msgstr "Alcume"
-
-#: gajim/data/gui/add_new_contact_window.ui:239
-msgid "Choose a group of type a new group"
-msgstr ""
-
-#: gajim/data/gui/add_new_contact_window.ui:257
-msgid "A_llow this contact to view my status"
+msgid "A_llow contact to view my status"
 msgstr "Permitirlle a este contacto que vexa o meu estado"
 
-#: gajim/data/gui/add_new_contact_window.ui:300
+#: gajim/data/gui/add_new_contact_window.ui:365
 #, fuzzy
 msgid "_Save subscription message"
 msgstr "_Subscrición"
 
-#: gajim/data/gui/add_new_contact_window.ui:325
+#: gajim/data/gui/add_new_contact_window.ui:391
 #, fuzzy
 msgid ""
 "You have to register with this transport\n"
@@ -9891,11 +7688,11 @@ msgstr ""
 "protocolo. Prema o botón Rexistrar\n"
 "para continuar."
 
-#: gajim/data/gui/add_new_contact_window.ui:340
+#: gajim/data/gui/add_new_contact_window.ui:406
 msgid "_Register"
 msgstr "_Rexistrar"
 
-#: gajim/data/gui/add_new_contact_window.ui:369
+#: gajim/data/gui/add_new_contact_window.ui:435
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -9918,58 +7715,58 @@ msgstr "<b>Sons</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Mensaxes de estado predefinidas</b>"
 
-#: gajim/data/gui/plugins_window.ui:25 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
 msgid "Plugins"
 msgstr ""
 
-#: gajim/data/gui/plugins_window.ui:78
-msgid "Install from zip"
+#: gajim/data/gui/plugins_window.ui:70
+msgid "Install Plugin from ZIP-File"
 msgstr ""
 
-#: gajim/data/gui/plugins_window.ui:109
-msgid "&lt;empty&gt;"
+#: gajim/data/gui/plugins_window.ui:71
+msgid "Install from File…"
 msgstr ""
 
-#: gajim/data/gui/plugins_window.ui:131 gajim/data/plugins/config_dialog.ui:199
-#: gajim/data/plugins/plugin_installer/config_dialog.ui:199
+#: gajim/data/gui/plugins_window.ui:85
 #, fuzzy
-msgid "Version:"
-msgstr "Versión de GTK+:"
+msgid "Uninstall Plugin"
+msgstr "Atascado"
 
-#: gajim/data/gui/plugins_window.ui:169 gajim/data/plugins/config_dialog.ui:212
-#: gajim/data/plugins/plugin_installer/config_dialog.ui:212
+#: gajim/data/gui/plugins_window.ui:131
 #, fuzzy
-msgid "Authors:"
-msgstr "Au_torizar"
+msgid "<Plugin Name>"
+msgstr "Fallou a conexión"
 
-#: gajim/data/gui/plugins_window.ui:210 gajim/data/plugins/config_dialog.ui:224
-#: gajim/data/plugins/plugin_installer/config_dialog.ui:224
+#: gajim/data/gui/plugins_window.ui:148
 #, fuzzy
-msgid "Homepage:"
-msgstr "Páxina web:"
+msgid "Plugin Settings"
+msgstr "Fallou a conexión"
 
-#: gajim/data/gui/plugins_window.ui:253 gajim/data/plugins/config_dialog.ui:236
-#: gajim/data/plugins/plugin_installer/config_dialog.ui:236
+#: gajim/data/gui/plugins_window.ui:230
 #, fuzzy
-msgid "Description:"
-msgstr "Descrición: %s"
+msgid "<Description>"
+msgstr "Descrición"
 
-#: gajim/data/gui/plugins_window.ui:301
-msgid "Uninstall"
-msgstr ""
+#: gajim/data/gui/plugins_window.ui:254
+#, fuzzy
+msgid "Version"
+msgstr "Versión de GTK+:"
 
-#: gajim/data/gui/plugins_window.ui:316
+#: gajim/data/gui/plugins_window.ui:286
 #, fuzzy
-msgid "Configure"
-msgstr "_Continuar"
+msgid "Authors"
+msgstr "Au_torizar"
+
+#: gajim/data/gui/plugins_window.ui:334
+msgid "<empty>"
+msgstr ""
 
-#: gajim/data/gui/plugins_window.ui:348 gajim/data/plugins/config_dialog.ui:121
-#: gajim/data/plugins/plugin_installer/config_dialog.ui:121
+#: gajim/data/gui/plugins_window.ui:364
 #, fuzzy
 msgid "Installed"
 msgstr "Atascado"
 
-#: gajim/data/gui/plugins_window.ui:399
+#: gajim/data/gui/plugins_window.ui:380
 msgid ""
 "Plug-in decription should be displayed here. This text will be erased during "
 "PluginsWindow initialization."
@@ -9995,6 +7792,10 @@ msgstr "De"
 msgid "to"
 msgstr "dúas"
 
+#: gajim/data/gui/privacy_list_window.ui:47 gajim/gtk/privacy_list.py:76
+msgid "Privacy List"
+msgstr "Listaxe de privacidade"
+
 #: gajim/data/gui/privacy_list_window.ui:66
 msgid "<i>Privacy List</i>"
 msgstr "<i>Listaxe de privacidade</i>"
@@ -10064,64 +7865,55 @@ msgstr "todos por subscrición"
 msgid "Order:"
 msgstr "Orde:"
 
-#: gajim/data/gui/manage_sounds_window.ui:10
+#: gajim/data/gui/manage_sounds_window.ui:23
 #, fuzzy
 msgid "Manage sounds"
 msgstr "Xestionar as contas"
 
-#: gajim/data/gui/remove_account_window.ui:56
-msgid "Remove account _only from Gajim"
-msgstr "Eliminar a _conta unicamente do Gajim"
-
-#: gajim/data/gui/remove_account_window.ui:73
-msgid "Remove account from Gajim and from _server"
-msgstr "Eliminar a conta do Gajim e do _servidor"
-
-#: gajim/data/gui/remove_account_window.ui:94
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Que quere facer?</b>"
-
-#: gajim/data/gui/adhoc_commands_window.ui:35
-msgid "Please wait while retrieving command list..."
-msgstr "Por favor, agarde mentres se solicita a listaxe de comandos..."
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+msgid "Active"
+msgstr "Activo"
 
-#: gajim/data/gui/adhoc_commands_window.ui:93
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Elixa o comando para executar:</b>"
+#: gajim/data/gui/manage_sounds_window.ui:69
+msgid "Event"
+msgstr "Acontecemento"
 
-#: gajim/data/gui/adhoc_commands_window.ui:136
-#: gajim/data/gui/adhoc_commands_window.ui:277
-msgid "Check once more"
-msgstr "Comprobar mais unha vez"
+#: gajim/data/gui/manage_sounds_window.ui:98
+msgid "Choose Sound"
+msgstr "Elixir un son"
 
-#: gajim/data/gui/adhoc_commands_window.ui:194
+#: gajim/data/gui/manage_sounds_window.ui:112
 #, fuzzy
-msgid "Please wait while the command is being sent..."
-msgstr "Por favor, agarde mentres se envía o comando..."
+msgid "Clear Sound"
+msgstr "Elixir un son"
 
-#: gajim/data/gui/adhoc_commands_window.ui:211
-msgid "Please wait..."
-msgstr "Por favor, agarde..."
+#: gajim/data/gui/manage_sounds_window.ui:133
+#, fuzzy
+msgid "Play Sound"
+msgstr "Reproducir _sons"
 
-#: gajim/data/gui/adhoc_commands_window.ui:257
-msgid "This jabber entity does not expose any commands."
-msgstr "Esta entidade de jabber non expón comandos."
+#: gajim/data/gui/remove_account_window.ui:25
+msgid "What do you want to do?"
+msgstr "Que quere facer?"
 
-#: gajim/data/gui/adhoc_commands_window.ui:336
-#, fuzzy
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>Produciuse un erro:</b>"
+#: gajim/data/gui/remove_account_window.ui:63
+msgid "Remove account _only from Gajim"
+msgstr "Eliminar a _conta unicamente do Gajim"
 
-#: gajim/data/gui/adhoc_commands_window.ui:465
-#, fuzzy
-msgid "F_inish"
-msgstr "_Rematar"
+#: gajim/data/gui/remove_account_window.ui:80
+msgid "Remove account from Gajim and from _server"
+msgstr "Eliminar a conta do Gajim e do _servidor"
 
 #: gajim/data/gui/account_context_menu.ui:20
 #, fuzzy
 msgid "_Personal Events"
 msgstr "Información persoal"
 
+#: gajim/data/gui/account_context_menu.ui:35
+#: gajim/data/gui/systray_context_menu.ui:28
+msgid "Join _Group Chat"
+msgstr "Entrar nun grupo de charla"
+
 #: gajim/data/gui/account_context_menu.ui:49
 msgid "_Add Contact..."
 msgstr "_Engadir un contacto..."
@@ -10134,15 +7926,6 @@ msgstr "_Descubrir os servizos"
 msgid "_Execute Command..."
 msgstr "Executar o _comando..."
 
-#: gajim/data/gui/esession_info_window.ui:50
-msgid "_Verify"
-msgstr ""
-
-#: gajim/data/gui/esession_info_window.ui:137
-#, fuzzy
-msgid "(<b>ESession</b> info)"
-msgstr "<b>Descrición</b>"
-
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -10187,109 +7970,139 @@ msgstr "_FAQ"
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: gajim/data/gui/application_menu.ui:58 gajim/data/gui/features_window.ui:9
+#: gajim/data/gui/application_menu.ui:58 gajim/gtk/features.py:34
+#: gajim/gtk/features.py:48
 #, fuzzy
 msgid "Features"
 msgstr "Características dos servidores"
 
-#: gajim/data/gui/application_menu.ui:76
-msgid "Start Chat"
-msgstr "Iniciar a charla"
-
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
 msgid "Bookmarks"
 msgstr "Engadir esta sala aos marcadores"
 
+#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:59
+msgid "Preferences"
+msgstr "Preferencias"
+
 #: gajim/data/gui/application_menu.ui:99
 #, fuzzy
 msgid "Quit"
 msgstr "_Saír"
 
-#: gajim/data/gui/features_window.ui:26
-msgid "<b>List of possible features in Gajim:</b>"
+#: gajim/data/gui/httpupload_progress_dialog.ui:110
+#: gajim/gtk/filetransfer.py:121
+msgid "Progress"
+msgstr "Progreso"
+
+#: gajim/data/gui/httpupload_progress_dialog.ui:125
+msgid "Speed"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:14
-msgid "Manage Bookmarks"
-msgstr "Xestionar os marcadores"
+#: gajim/data/gui/httpupload_progress_dialog.ui:140
+msgid "Time remaining"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:120
+#: gajim/data/gui/httpupload_progress_dialog.ui:172
 #, fuzzy
-msgid "_Title:"
-msgstr "Título:"
+msgid "_Cancel Upload"
+msgstr "_Cancelar"
+
+#: gajim/data/gui/manage_bookmarks_window.ui:13
+#, fuzzy
+msgid "Group Chat Bookmarks"
+msgstr "Grupos de charla"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:146
-msgid "Roo_m:"
+#: gajim/data/gui/manage_bookmarks_window.ui:68
+#, fuzzy
+msgid "Add Bookmark"
+msgstr "Engadir esta sala aos marcadores"
+
+#: gajim/data/gui/manage_bookmarks_window.ui:82
+#, fuzzy
+msgid "Remove Bookmark"
+msgstr "Engadir esta sala aos marcadores"
+
+#: gajim/data/gui/manage_bookmarks_window.ui:126
+msgid "N_ame"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:188
+#: gajim/data/gui/manage_bookmarks_window.ui:145
 #, fuzzy
-msgid "A_uto join"
-msgstr "Autoconectar"
+msgid "Bookmark Name"
+msgstr "Engadir esta sala aos marcadores"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:193
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
+#: gajim/data/gui/manage_bookmarks_window.ui:160
+#, fuzzy
+msgid "_Server"
+msgstr "_Servidor:"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:207
-msgid "Minimi_ze on Auto Join"
+#: gajim/data/gui/manage_bookmarks_window.ui:223
+msgid "Roo_m"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:235
+#: gajim/data/gui/manage_bookmarks_window.ui:253
 #, fuzzy
-msgid "Pr_int status:"
-msgstr "Amosar o estado:"
+msgid "_Password"
+msgstr "C_ontrasinal:"
 
-#: gajim/data/gui/exception_dialog.ui:45
+#: gajim/data/gui/manage_bookmarks_window.ui:299
 #, fuzzy
+msgid "Join chat when connected"
+msgstr "Contacto desconectado"
+
+#: gajim/data/gui/manage_bookmarks_window.ui:307
+msgid "_Join Automatically"
+msgstr ""
+
+#: gajim/data/gui/exception_dialog.ui:49
+msgid "Sorry, that should not have happened"
+msgstr ""
+
+#: gajim/data/gui/exception_dialog.ui:66
 msgid ""
-"A programming error has been detected. It probably is not fatal, but should "
-"be reported to the developers nonetheless."
+"Gajim encountered an error. A report is shown below.\n"
+"By reporting this bug you might help people to fix this."
 msgstr ""
-"Probabelmente non é crítico mais, porén, debe informarse aos desenvolvedores."
 
-#: gajim/data/gui/exception_dialog.ui:115
+#: gajim/data/gui/exception_dialog.ui:116
 #, fuzzy
-msgid "Report Bug"
+msgid "_Report Bug"
 msgstr "_Informar do erro"
 
-#: gajim/data/gui/subscription_request_window.ui:95
+#: gajim/data/gui/subscription_request_window.ui:148
 msgid "_Deny"
 msgstr "_Denegar"
 
-#: gajim/data/gui/subscription_request_window.ui:100
+#: gajim/data/gui/subscription_request_window.ui:153
 #, fuzzy
 msgid ""
-"Deny authorization from contact so he or she cannot know when you're "
+"Deny authorization from contact so the contact cannot know if you are "
 "connected"
 msgstr ""
 "Denegar a autorización do contacto para que non poida saber cando estou "
 "conectado"
 
-#: gajim/data/gui/subscription_request_window.ui:133
-msgid "Au_thorize"
-msgstr "Au_torizar"
-
-#: gajim/data/gui/subscription_request_window.ui:138
+#: gajim/data/gui/subscription_request_window.ui:165
 #, 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 "Ac_cept"
+msgstr "Aceptar"
 
-#: gajim/data/gui/xml_console_window.ui:121
+#: gajim/data/gui/subscription_request_window.ui:171
 #, fuzzy
-msgid "Presence"
-msgstr "_Presenza"
-
-#: gajim/data/gui/xml_console_window.ui:134
-msgid "Iq"
-msgstr ""
+msgid "Authorize contact so the contact can know if you are connected"
+msgstr "Autorizar o contacto para que poida saber cando estou conectado"
 
 #: gajim/data/gui/xml_console_window.ui:149
 #, fuzzy
 msgid "Presets"
 msgstr "_Presenza"
 
+#: gajim/data/gui/emoji_chooser.ui:98
+msgid "No Results Found"
+msgstr ""
+
 #: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr ""
@@ -10301,11 +8114,6 @@ msgid ""
 "Select the contacts you want to invite"
 msgstr "JID do contacto co que quere conversar"
 
-#: gajim/data/gui/chat_to_muc_window.ui:67
-#: gajim/data/gui/chat_to_muc_window.ui:78
-msgid "column"
-msgstr ""
-
 #: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr ""
@@ -10325,16 +8133,16 @@ msgstr "Con_vidar"
 msgid "_Export"
 msgstr "Exportar"
 
-#: gajim/data/gui/history_manager.ui:94
-msgid "Gajim History Logs Manager"
-msgstr "Xestor do Historial de Gajim"
-
-#: gajim/data/gui/history_manager.ui:147
+#: gajim/data/gui/history_manager.ui:20
 #, fuzzy
-msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgid "_Delete"
+msgstr "Eliminar"
+
+#: gajim/data/gui/history_manager.ui:29 gajim/data/gui/history_manager.ui:91
+msgid "Gajim History Logs Manager"
 msgstr "Xestor do Historial de Gajim"
 
-#: gajim/data/gui/history_manager.ui:183
+#: gajim/data/gui/history_manager.ui:108
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -10343,7 +8151,7 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: gajim/data/gui/history_manager.ui:228
+#: gajim/data/gui/history_manager.ui:124
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -10360,8 +8168,14 @@ msgstr ""
 "con que estiver\n"
 "a falar neste momento."
 
-#: gajim/data/gui/history_manager.ui:335
-msgid "_Search Database"
+#: gajim/data/gui/history_manager.ui:217
+#, fuzzy
+msgid "Search database..."
+msgstr "_Buscar na base de datos"
+
+#: gajim/data/gui/history_manager.ui:232
+#, fuzzy
+msgid "Search in database"
 msgstr "_Buscar na base de datos"
 
 #: gajim/data/gui/shortcuts_window.ui:8
@@ -10380,11 +8194,11 @@ msgstr "Enviar a mensaxe"
 
 #: gajim/data/gui/shortcuts_window.ui:24
 #, fuzzy
-msgid "Create a new line"
+msgid "Add new line"
 msgstr "Crear unha publicación nova"
 
 #: gajim/data/gui/shortcuts_window.ui:31
-msgid "Select an emoticon"
+msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
@@ -10393,7 +8207,7 @@ msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
-msgid "Previous sent message"
+msgid "Previously sent message"
 msgstr "Mensaxes predefinidas:"
 
 #: gajim/data/gui/shortcuts_window.ui:52
@@ -10416,114 +8230,113 @@ msgstr "Enviar a mensaxe"
 msgid "Clear message entry"
 msgstr "Enviouse a mensaxe"
 
-#: gajim/data/gui/shortcuts_window.ui:81 gajim/data/gui/shortcuts_window.ui:231
-#, fuzzy
-msgid "Appearance"
-msgstr "<b>Editar unha regra</b>"
-
-#: gajim/data/gui/shortcuts_window.ui:86
-msgid "Toggle full / compact view"
-msgstr ""
-
-#: gajim/data/gui/shortcuts_window.ui:94
+#: gajim/data/gui/shortcuts_window.ui:81
 #, fuzzy
 msgid "Recent history"
 msgstr "Recentemente:"
 
-#: gajim/data/gui/shortcuts_window.ui:99
+#: gajim/data/gui/shortcuts_window.ui:86
 msgid "Scroll up"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:106
+#: gajim/data/gui/shortcuts_window.ui:93
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:121
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#, fuzzy
+msgid "Clear"
+msgstr "Serán"
+
+#: gajim/data/gui/shortcuts_window.ui:108
 msgid "Tabs"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:126
+#: gajim/data/gui/shortcuts_window.ui:113
 msgid "Switch to the previous tab"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:133
+#: gajim/data/gui/shortcuts_window.ui:120
 msgid "Switch to the next tab"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:140
+#: gajim/data/gui/shortcuts_window.ui:127
 msgid "Switch to the first - ninth tab"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:147
+#: gajim/data/gui/shortcuts_window.ui:134
 msgid "Switch to the previous unread tab"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:154
+#: gajim/data/gui/shortcuts_window.ui:141
 msgid "Switch to the next unread tab"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:161
+#: gajim/data/gui/shortcuts_window.ui:148
+msgid "Move tab to the left"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:155
+msgid "Move tab to the right"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:162
 msgid "Close chat"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:172
+#: gajim/data/gui/shortcuts_window.ui:173
 msgid "Roster Shortcuts"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:195
+#: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
 msgid "File transfers"
 msgstr "Transferencias"
 
-#: gajim/data/gui/shortcuts_window.ui:202
-#, fuzzy
-msgid "Start a new chat"
-msgstr "Iniciar a charla"
-
-#: gajim/data/gui/shortcuts_window.ui:209
+#: gajim/data/gui/shortcuts_window.ui:210
 #, fuzzy
 msgid "Join a group chat"
 msgstr "Entrar nun grupo de charla"
 
-#: gajim/data/gui/shortcuts_window.ui:216
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "Set the status message"
 msgstr "mensaxe de estado"
 
-#: gajim/data/gui/shortcuts_window.ui:223
+#: gajim/data/gui/shortcuts_window.ui:232
 #, fuzzy
-msgid "Quit Gajim"
-msgstr "Gajim"
+msgid "Appearance"
+msgstr "<b>Editar unha regra</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:236
+#: gajim/data/gui/shortcuts_window.ui:237
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Amosar os contactos desconectados"
 
-#: gajim/data/gui/shortcuts_window.ui:243
+#: gajim/data/gui/shortcuts_window.ui:244
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Amosar os contactos desconectados"
 
-#: gajim/data/gui/shortcuts_window.ui:250
+#: gajim/data/gui/shortcuts_window.ui:251
 msgid "Enable roster filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:259
 msgid "Contacts"
 msgstr "Contactos"
 
-#: gajim/data/gui/shortcuts_window.ui:263
+#: gajim/data/gui/shortcuts_window.ui:264
 #, fuzzy
 msgid "Contact information"
 msgstr "Información"
 
-#: gajim/data/gui/shortcuts_window.ui:270
+#: gajim/data/gui/shortcuts_window.ui:271
 #, fuzzy
 msgid "Rename contact"
 msgstr "Renomear o contacto"
 
-#: gajim/data/gui/shortcuts_window.ui:277
+#: gajim/data/gui/shortcuts_window.ui:278
 #, fuzzy
 msgid "Delete contact"
 msgstr "Contactos"
@@ -10532,64 +8345,66 @@ msgstr "Contactos"
 msgid "Passphrase"
 msgstr "Contrasinal"
 
-#: gajim/data/gui/history_window.ui:38
+#: gajim/data/gui/history_window.ui:27
 #, fuzzy
-msgid "Enter name / JID of contact or groupchat"
-msgstr "Nome de contacto"
+msgid "Display status changes"
+msgstr "_Rexistrar os cambios de estado dos contactos"
 
-#: gajim/data/gui/history_window.ui:51
+#: gajim/data/gui/history_window.ui:233
 #, fuzzy
-msgid "Search:"
-msgstr "Buscar"
+msgid "Mode"
+msgstr "Moderador"
+
+#: gajim/data/gui/history_window.ui:246
+#, fuzzy
+msgid "Search complete history"
+msgstr "Recentemente:"
 
-#: gajim/data/gui/history_window.ui:75
-msgid "_In date search"
+#: gajim/data/gui/history_window.ui:263
+msgid "Search selected day only"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:79
-msgid "Only searching within selected day"
+#: gajim/data/gui/history_window.ui:317
+msgid "Record history for this chat"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:306
+#: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "_Show status changes"
-msgstr "_Rexistrar os cambios de estado dos contactos"
+msgid "Record History"
+msgstr "Recentemente:"
 
-#: gajim/data/gui/manage_pep_services_window.ui:13
+#: gajim/data/gui/history_window.ui:350
 #, fuzzy
-msgid "PEP Service Configuration"
-msgstr "Configuración da sala"
+msgid "Ttitle"
+msgstr "Título:"
 
-#: gajim/data/gui/manage_pep_services_window.ui:69
+#: gajim/data/gui/manage_pep_services_window.ui:46
 #, fuzzy
-msgid "_Configure"
+msgid "Configure"
 msgstr "_Continuar"
 
 #: gajim/data/gui/groups_post_window.ui:9
 msgid "Create new post"
 msgstr "Crear unha publicación nova"
 
-#: gajim/data/gui/groups_post_window.ui:29
-#: gajim/data/gui/single_message_window.ui:46
-msgid "From:"
-msgstr "De:"
-
-#: gajim/data/gui/groups_post_window.ui:41
-#: gajim/data/gui/single_message_window.ui:70
-msgid "Subject:"
-msgstr "Tema:"
-
 #: gajim/data/gui/data_form_window.ui:19
 msgid "Fill in the form."
 msgstr "Cubrir o formulario."
 
-#: gajim/data/gui/data_form_window.ui:274
+#: gajim/data/gui/data_form_window.ui:229
 msgid "Room Configuration"
 msgstr "Configuración da sala"
 
-#: gajim/data/gui/roster_item_exchange_window.ui:8
-msgid "Roster Item Exchange"
-msgstr ""
+#: gajim/data/gui/roster_item_exchange_window.ui:39
+#: gajim/gtk/roster_item_exchange.py:35
+#, fuzzy
+msgid "Contact List Exchange"
+msgstr "Contacto desconectado"
+
+#: gajim/data/gui/roster_item_exchange_window.ui:144
+#, fuzzy
+msgid "OK"
+msgstr "_Aceptar"
 
 #: gajim/data/gui/systray_context_menu.ui:12
 msgid "Sta_tus"
@@ -10613,40 +8428,59 @@ msgstr "Sen sons"
 msgid "_Preferences"
 msgstr "Preferencias"
 
-#: gajim/data/gui/systray_context_menu.ui:90
+#: gajim/data/gui/single_message_window.ui:51
 #, fuzzy
-msgid "_Quit"
-msgstr "_Saír"
+msgid "_To"
+msgstr "A"
 
-#: gajim/data/gui/single_message_window.ui:59
-msgid "To:"
-msgstr "A:"
+#: gajim/data/gui/single_message_window.ui:68
+msgid "user@example.org"
+msgstr ""
 
-#: gajim/data/gui/single_message_window.ui:118
-msgid "0"
-msgstr "0"
+#: gajim/data/gui/single_message_window.ui:80
+#, fuzzy
+msgid "Su_bject"
+msgstr "Asunto"
+
+#: gajim/data/gui/single_message_window.ui:97
+msgid "Type the subject here..."
+msgstr ""
+
+#: gajim/data/gui/single_message_window.ui:111
+msgid "_Message"
+msgstr "_Mensaxe"
+
+#: gajim/data/gui/single_message_window.ui:153
+#, fuzzy
+msgid "Characters typed: 0"
+msgstr "Alcume non permitido: %s"
+
+#: gajim/data/gui/single_message_window.ui:198
+#, fuzzy
+msgid "_From"
+msgstr "De"
 
-#: gajim/data/gui/single_message_window.ui:210
+#: gajim/data/gui/single_message_window.ui:318
 msgid "Sen_d"
 msgstr "Enviar"
 
-#: gajim/data/gui/single_message_window.ui:216
+#: gajim/data/gui/single_message_window.ui:324
 msgid "Send message"
 msgstr "Enviar a mensaxe"
 
-#: gajim/data/gui/single_message_window.ui:229
+#: gajim/data/gui/single_message_window.ui:337
 msgid "_Reply"
 msgstr "_Responder"
 
-#: gajim/data/gui/single_message_window.ui:235
+#: gajim/data/gui/single_message_window.ui:343
 msgid "Reply to this message"
 msgstr "Responder esta mensaxe:"
 
-#: gajim/data/gui/single_message_window.ui:248
+#: gajim/data/gui/single_message_window.ui:359
 msgid "_Send & Close"
 msgstr "_Enviar e pechar"
 
-#: gajim/data/gui/single_message_window.ui:254
+#: gajim/data/gui/single_message_window.ui:365
 msgid "Send message and close window"
 msgstr "Enviar a mensaxe e pechar a fiestra"
 
@@ -10663,111 +8497,22 @@ msgstr ""
 msgid "<b>Message:</b> "
 msgstr "<b>Mensaxes de estado predefinidas</b>"
 
-#: gajim/data/plugins/config_dialog.ui:17
-#: gajim/data/plugins/plugin_installer/config_dialog.ui:17
-msgid "Check update after start"
-msgstr ""
-
-#: gajim/data/plugins/config_dialog.ui:103
-#: gajim/data/plugins/plugin_installer/config_dialog.ui:103
-#: gajim/plugins/gui.py:84
-msgid "Plugin"
-msgstr ""
-
-#: gajim/data/plugins/config_dialog.ui:132
-#: gajim/data/plugins/plugin_installer.py:203
-#: gajim/data/plugins/plugin_installer.py:233
-#: gajim/data/plugins/plugin_installer/config_dialog.ui:132
-#: gajim/data/plugins/plugin_installer/plugin_installer.py:203
-#: gajim/data/plugins/plugin_installer/plugin_installer.py:233
-#: gajim/command_system/implementation/standard.py:152
-#, fuzzy
-msgid "Available"
-msgstr "En liñ_a"
-
-#: gajim/data/plugins/config_dialog.ui:143
-#: gajim/data/plugins/plugin_installer/config_dialog.ui:143
-#, fuzzy
-msgid ""
-"Install /\n"
-"Upgrade"
-msgstr "Atascado"
-
-#: gajim/data/plugins/config_dialog.ui:298
-#: gajim/data/plugins/plugin_installer/config_dialog.ui:298
-#, fuzzy
-msgid "Install/Upgrade"
-msgstr "Atascado"
-
-#: gajim/data/plugins/plugin_installer.py:114
-#: gajim/data/plugins/plugin_installer/plugin_installer.py:114
-msgid "Install and Upgrade Plugins"
-msgstr ""
-
-#: gajim/data/plugins/plugin_installer.py:138
-#: gajim/data/plugins/plugin_installer/plugin_installer.py:138
-#, fuzzy
-msgid "Plugins updates"
-msgstr "Fallou a conexión"
-
-#: gajim/data/plugins/plugin_installer.py:139
-#: gajim/data/plugins/plugin_installer/plugin_installer.py:139
-#, python-format
-msgid ""
-"Some updates are available for your installer plugins. Do you want to update "
-"those plugins:\n"
-"%s"
-msgstr ""
-
-#: gajim/data/plugins/plugin_installer.py:251
-#: gajim/data/plugins/plugin_installer/plugin_installer.py:251
-msgid "Security error during download"
-msgstr ""
-
-#: gajim/data/plugins/plugin_installer.py:252
-#: gajim/data/plugins/plugin_installer/plugin_installer.py:252
-msgid ""
-"A security error occurred when downloading. The certificate of the plugin "
-"archive could not be verified. this might be a security attack. \n"
-"\n"
-"You can continue at your risk. Do you want to do so? (not recommended)"
-msgstr ""
-
-#: gajim/data/plugins/plugin_installer.py:268
-#: gajim/data/plugins/plugin_installer/plugin_installer.py:268
-msgid "Error in download"
-msgstr ""
-
-#: gajim/data/plugins/plugin_installer.py:269
-#: gajim/data/plugins/plugin_installer/plugin_installer.py:269
-#, python-format
-msgid ""
-"An error occurred when downloading\n"
-"\n"
-"<tt>[%s]</tt>"
-msgstr ""
-
-#: gajim/data/plugins/plugin_installer.py:330
-#: gajim/data/plugins/plugin_installer/plugin_installer.py:330
-msgid "All selected plugins downloaded"
-msgstr ""
-
-#: gajim/command_system/mapping.py:164 gajim/command_system/mapping.py:174
-#: gajim/command_system/mapping.py:194
+#: gajim/command_system/mapping.py:166 gajim/command_system/mapping.py:176
+#: gajim/command_system/mapping.py:196
 #, fuzzy
 msgid "Missing arguments"
 msgstr "Non se atopa o argumento \"contact_jid\""
 
-#: gajim/command_system/mapping.py:261
+#: gajim/command_system/mapping.py:263
 #, fuzzy
 msgid "Too many arguments"
 msgstr "Non se atopa o argumento \"contact_jid\""
 
-#: gajim/command_system/implementation/execute.py:53
+#: gajim/command_system/implementation/execute.py:54
 msgid "Execute expression inside a shell, show output"
 msgstr ""
 
-#: gajim/command_system/implementation/execute.py:109
+#: gajim/command_system/implementation/execute.py:110
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
@@ -10776,29 +8521,29 @@ msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:72
+#: gajim/command_system/implementation/standard.py:73
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Uso: /%s, oculta os botóns de charla."
 
-#: gajim/command_system/implementation/standard.py:77
+#: gajim/command_system/implementation/standard.py:78
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:82
+#: gajim/command_system/implementation/standard.py:83
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:87
+#: gajim/command_system/implementation/standard.py:88
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "Non se encontrou %s"
 
-#: gajim/command_system/implementation/standard.py:93
+#: gajim/command_system/implementation/standard.py:94
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:117
+#: gajim/command_system/implementation/standard.py:118
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -10808,225 +8553,2490 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:135
+#: gajim/command_system/implementation/standard.py:136
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:149
+#: gajim/command_system/implementation/standard.py:150
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:172
-#: gajim/command_system/implementation/standard.py:249
+#: gajim/command_system/implementation/standard.py:153
+#, fuzzy
+msgid "Available"
+msgstr "En liñ_a"
+
+#: gajim/command_system/implementation/standard.py:173
+#: gajim/command_system/implementation/standard.py:250
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Uso: /%s, limpa o texto da fiestra."
 
-#: gajim/command_system/implementation/standard.py:177
-#: gajim/command_system/implementation/standard.py:389
+#: gajim/command_system/implementation/standard.py:178
+#: gajim/command_system/implementation/standard.py:397
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Enviarlle un ficheiro a un contacto"
 
-#: gajim/command_system/implementation/standard.py:180
-#: gajim/command_system/implementation/standard.py:392
+#: gajim/command_system/implementation/standard.py:181
+#: gajim/command_system/implementation/standard.py:400
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:184
+#: gajim/command_system/implementation/standard.py:185
 msgid "Send DTMF sequence through an open audio session"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:187
+#: gajim/command_system/implementation/standard.py:188
 #, fuzzy
 msgid "No open audio sessions with the contact"
 msgstr "Prema aquí para ver as charlas anteriores con este contacto"
 
-#: gajim/command_system/implementation/standard.py:190
+#: gajim/command_system/implementation/standard.py:191
 #, python-format
 msgid "%s is not a valid tone"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:197
+#: gajim/command_system/implementation/standard.py:198
 msgid "Toggle audio session"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:200
+#: gajim/command_system/implementation/standard.py:201
 #, fuzzy
 msgid "Audio sessions are not available"
 msgstr "Non está dispoñíbel ningunha conexión"
 
-#: gajim/command_system/implementation/standard.py:207
+#: gajim/command_system/implementation/standard.py:208
 msgid "Toggle video session"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:210
+#: gajim/command_system/implementation/standard.py:211
 #, fuzzy
 msgid "Video sessions are not available"
 msgstr "Conexión non dispoñíbel"
 
-#: gajim/command_system/implementation/standard.py:217
-msgid "Send a message to the contact that will attract his (her) attention"
-msgstr ""
+#: gajim/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Send a message to the contact that will attract their attention"
+msgstr "Uso: /%s, oculta os botóns de charla."
 
-#: gajim/command_system/implementation/standard.py:256
+#: gajim/command_system/implementation/standard.py:255
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Cambiar o _alcume"
 
-#: gajim/command_system/implementation/standard.py:266
+#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
+#: gajim/gtk/bookmarks.py:272
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/command_system/implementation/standard.py:267
 #, fuzzy
 msgid "Open a private chat window with a specified occupant"
 msgstr ""
 "Uso: /%s <alcume>, abre unha fiestra de charla co ocupante especificado."
 
-#: gajim/command_system/implementation/standard.py:272
-#: gajim/command_system/implementation/standard.py:281
-#: gajim/command_system/implementation/standard.py:327
-#: gajim/command_system/implementation/standard.py:339
-#: gajim/command_system/implementation/standard.py:351
+#: gajim/command_system/implementation/standard.py:273
+#: gajim/command_system/implementation/standard.py:282
+#: gajim/command_system/implementation/standard.py:332
+#: gajim/command_system/implementation/standard.py:345
+#: gajim/command_system/implementation/standard.py:357
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Non se achou o alcume: %s"
 
-#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:276
 #, 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."
 
-#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:285
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Preguntar antes de pechar unha fiestra/separador da sala de charla."
 
-#: gajim/command_system/implementation/standard.py:292
+#: gajim/command_system/implementation/standard.py:294
 msgid "Invite a user to a room for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:295
+#: gajim/command_system/implementation/standard.py:297
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "%(contact_jid)s convidouse a %(room_jid)s."
 
-#: gajim/command_system/implementation/standard.py:299
+#: gajim/command_system/implementation/standard.py:301
 #, fuzzy
-msgid "Join a group chat given by a jid"
+msgid "Join a group chat given by a JID"
 msgstr "Entrar nun grupo de charla"
 
-#: gajim/command_system/implementation/standard.py:307
+#: gajim/command_system/implementation/standard.py:309
 msgid ""
 "Leave the groupchat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:312
+#: gajim/command_system/implementation/standard.py:314
 msgid ""
 "\n"
-"    Ban user by a nick or a jid from a groupchat\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"
+"    If given nickname is not found it will be treated as a JID.\n"
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:324
+#: gajim/command_system/implementation/standard.py:329
 #, fuzzy
 msgid "Kick user by a nick from a groupchat"
 msgstr "Está expulsado deste grupo de charla."
 
-#: gajim/command_system/implementation/standard.py:332
+#: gajim/command_system/implementation/standard.py:338
 msgid ""
 "Set occupant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:337
+#: gajim/command_system/implementation/standard.py:343
 #, fuzzy
 msgid "Invalid role given"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/command_system/implementation/standard.py:344
+#: gajim/command_system/implementation/standard.py:350
 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 ""
 
-#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:355
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "Afiliación:"
 
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:365
 #, fuzzy
 msgid "Display names of all group chat occupants"
 msgstr "Uso: /%s , amosa os nomes dos ocupantes do grupo de charla."
 
-#: gajim/command_system/implementation/standard.py:379
+#: gajim/command_system/implementation/standard.py:387
 msgid "Forbid an occupant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:384
+#: gajim/command_system/implementation/standard.py:392
 msgid "Allow an occupant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/middleware.py:72
+#: gajim/command_system/implementation/middleware.py:74
 msgid "Error during command execution!"
 msgstr ""
 
-#: gajim/command_system/implementation/custom.py:106
+#: gajim/command_system/implementation/custom.py:107
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:611 gajim/plugins/pluginmanager.py:617
+#: gajim/gtk/filetransfer.py:91
+msgid "File"
+msgstr "Ficheiro"
+
+#: gajim/gtk/filetransfer.py:108
+msgid "Time"
+msgstr "Hora"
+
+#: gajim/gtk/filetransfer.py:228
+#, fuzzy, python-format
+msgid "File name: %s"
+msgstr "Nome do ficheiro: %s"
+
+#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#, python-format
+msgid "Size: %s"
+msgstr "Tamaño: %s"
+
+#: gajim/gtk/filetransfer.py:239
+#, python-format
+msgid "Sender: %s"
+msgstr "Remitente: %s"
+
+#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/tooltips.py:577
+msgid "Recipient: "
+msgstr "Destinatario: "
+
+#: gajim/gtk/filetransfer.py:251
+#, python-format
+msgid "Saved in: %s"
+msgstr "Gardouse en: %s"
+
+#: gajim/gtk/filetransfer.py:256
+msgid "File transfer completed"
+msgstr "Rematou a transferencia do ficheiro"
+
+#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#, fuzzy
+msgid "Connection with peer could not be established."
+msgstr "Non se puido estabelecer a conexión co cliente."
+
+#: gajim/gtk/filetransfer.py:293
+#, python-format
+msgid "Filename: %s"
+msgstr "Nome do ficheiro: %s"
+
+#: gajim/gtk/filetransfer.py:294
+#, python-format
+msgid "Recipient: %s"
+msgstr "Destinatario: %s"
+
+#: gajim/gtk/filetransfer.py:296
+#, python-format
+msgid "Error message: %s"
+msgstr "Mensaxe de erro: %s"
+
+#: gajim/gtk/filetransfer.py:333
+#, fuzzy
+msgid "File transfer error"
+msgstr "Produciuse un erro na transferencia do ficheiro"
+
+#: gajim/gtk/filetransfer.py:334
+#, python-format
+msgid ""
+"The file %(file)s has been received, but it seems to have been damaged along "
+"the way.\n"
+"Do you want to download it again?"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:350
+#, fuzzy
+msgid "Gajim can not read this file"
+msgstr "O Gajim non pode acceder a este ficheiro"
+
+#: gajim/gtk/filetransfer.py:351
+msgid "Another process is using this file."
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:418
+#, fuzzy
+msgid "File Transfer Conflict"
+msgstr "Rematou a transferencia do ficheiro"
+
+#: gajim/gtk/filetransfer.py:419
+msgid "This file already exists"
+msgstr "Este ficheiro xa existe"
+
+#: gajim/gtk/filetransfer.py:420
+msgid "Resume download or replace file?"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:424
+#, fuzzy
+msgid "Replace _File"
+msgstr "Serán"
+
+#: gajim/gtk/filetransfer.py:427
+#, fuzzy
+msgid "Resume _Download"
+msgstr "Descarga"
+
+#: gajim/gtk/filetransfer.py:437
+#, fuzzy, python-format
+msgid "Directory '%s' is not writable"
+msgstr "Non se pode escribir no directorio \"%s\""
+
+#: gajim/gtk/filetransfer.py:438
+#, fuzzy
+msgid "You do not have permissions to create files in this directory."
+msgstr "Non ten autorización para crear ficheiros neste directorio."
+
+#: gajim/gtk/filetransfer.py:461
+#, python-format
+msgid "File: %s"
+msgstr "Ficheiro: %s"
+
+#: gajim/gtk/filetransfer.py:467
+#, python-format
+msgid "Type: %s"
+msgstr "Tipo: %s"
+
+#: gajim/gtk/filetransfer.py:469
+#, python-format
+msgid "Description: %s"
+msgstr "Descrición: %s"
+
+#: gajim/gtk/filetransfer.py:480
+#, fuzzy, python-format
+msgid "%s wants to send you a file"
+msgstr "%s quere enviarlle un ficheiro."
+
+#: gajim/gtk/filetransfer.py:509
+#, fuzzy
+msgid "Checking file…"
+msgstr "A enviar o perfil..."
+
+#: gajim/gtk/filetransfer.py:524
+#, fuzzy
+msgid "File error"
+msgstr "Produciuse un erro na transferencia do ficheiro"
+
+#: gajim/gtk/filetransfer.py:561
+#, python-format
+msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
+msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
+
+#: gajim/gtk/filetransfer.py:658
+#, python-format
+msgid "(%(filesize_unit)s/s)"
+msgstr "(%(filesize_unit)s/s)"
+
+#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+msgid "Invalid File"
+msgstr "O ficheiro non é válido"
+
+#: gajim/gtk/filetransfer.py:711
+msgid "File: "
+msgstr "Ficheiro: "
+
+#: gajim/gtk/filetransfer.py:716
+msgid "It is not possible to send empty files"
+msgstr "Non se pode enviar ficheiros baleiros"
+
+#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+msgid "Sender: "
+msgstr "Remitente: "
+
+#: gajim/gtk/filetransfer.py:1038
+#, fuzzy
+msgid "Choose a File to Send…"
+msgstr "Elixa un ficheiro para enviar..."
+
+#: gajim/gtk/start_chat.py:51
+#, fuzzy
+msgid "Start new Conversation"
+msgstr "Conexión"
+
+#: gajim/gtk/start_chat.py:424
+#, fuzzy
+msgid "New Groupchat"
+msgstr "Novo grupo de charla"
+
+#: gajim/gtk/start_chat.py:426
+#, fuzzy
+msgid "New Contact"
+msgstr "Engadir un contacto novo"
+
+#: gajim/gtk/start_chat.py:588
+#, fuzzy, python-format
+msgid "%s Group chats found"
+msgstr "Non se encontrou %s"
+
+#: gajim/gtk/discovery.py:70
+msgid "This service has not yet responded with detailed information"
+msgstr "Este servizo non respondeu aínda con información detallada"
+
+#: gajim/gtk/discovery.py:71
+#, fuzzy
+msgid ""
+"This service could not respond with detailed information.\n"
+"It is most likely a legacy service or broken."
+msgstr ""
+"Este servizo podería non responder con información detallada.\n"
+"Posibelmente é antigo ou está roto"
+
+#: gajim/gtk/discovery.py:128
+msgid "Others"
+msgstr "Outros"
+
+#: gajim/gtk/discovery.py:131
+msgid "Conference"
+msgstr "Conferencia"
+
+#: gajim/gtk/discovery.py:519
+msgid "Without a connection, you can not browse available services"
+msgstr "Sen unha conexión non pode navegar polos servizos dispoñíbeis"
+
+#: gajim/gtk/discovery.py:606
+#, python-format
+msgid "Service Discovery using account %s"
+msgstr "Xestión de servizos coa conta %s"
+
+#: gajim/gtk/discovery.py:608
+msgid "Service Discovery"
+msgstr "Xestión de servizos"
+
+#: gajim/gtk/discovery.py:691
+msgid "The service could not be found"
+msgstr "O servizo non se achou"
+
+#: gajim/gtk/discovery.py:692
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Non hai servizo neste enderezo ou non está a responder. Comprobe o enderezo "
+"e ténteo máis tarde."
+
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+msgid "The service is not browsable"
+msgstr "O servizo non é navegábel"
+
+#: gajim/gtk/discovery.py:700
+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."
+
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/gtk/discovery.py:806
+#, fuzzy, python-format
+msgid "Browsing %(address)s using account %(account)s"
+msgstr "Navegar %s coa conta %s"
+
+#: gajim/gtk/discovery.py:851
+#, fuzzy
+msgid "Browse"
+msgstr "_Navegar"
+
+#: gajim/gtk/discovery.py:1043
+msgid "This service does not contain any items to browse."
+msgstr "Este servizo non contén elementos para navegar."
+
+#: gajim/gtk/discovery.py:1255
+#, fuzzy
+msgid "_Command"
+msgstr "Comandos: %s"
+
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+msgid "Re_gister"
+msgstr "_Subscribir"
+
+#: gajim/gtk/discovery.py:1277
+msgid "_Search"
+msgstr "_Buscar"
+
+#: gajim/gtk/discovery.py:1420
+msgid "_Edit"
+msgstr "_Editar"
+
+#: gajim/gtk/discovery.py:1458
+#, fuzzy, python-format
+msgid "Scanning %(current)d / %(total)d ..."
+msgstr "Escaneando %d / %d.."
+
+#: gajim/gtk/discovery.py:1674
+msgid "Id"
+msgstr "Id"
+
+#: gajim/gtk/discovery.py:1713
+msgid "_Join"
+msgstr "_Entrar"
+
+#: gajim/gtk/discovery.py:1736
+msgid "Bookmark already set"
+msgstr "O marcador xa se definiu"
+
+#: gajim/gtk/discovery.py:1737
+#, fuzzy, python-format
+msgid "Group Chat '%s' is already in your bookmarks."
+msgstr "A sala \"%s\" xa está nos seus marcadores."
+
+#: gajim/gtk/discovery.py:1748
+msgid "Bookmark has been added successfully"
+msgstr "O marcador engadiuse con éxito"
+
+#: gajim/gtk/discovery.py:1749
+#, fuzzy
+msgid ""
+"You can manage your bookmarks by clicking the Bookmarks menu item in your "
+"contact list."
+msgstr ""
+"Pode xestionar os seus marcadores mediante o menú Accións da súa listaxe"
+
+#: gajim/gtk/discovery.py:1950
+msgid "Subscribed"
+msgstr "Engadiuse"
+
+#: gajim/gtk/discovery.py:1959
+#, fuzzy
+msgid "Node"
+msgstr "Ningún"
+
+#: gajim/gtk/discovery.py:2028
+#, fuzzy
+msgid "_New post"
+msgstr "Publicación nova"
+
+#: gajim/gtk/discovery.py:2037
+msgid "_Subscribe"
+msgstr "_Engadir"
+
+#: gajim/gtk/discovery.py:2045
+msgid "_Unsubscribe"
+msgstr "_Eliminar"
+
+#: gajim/gtk/single_message.py:51
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Enviar mensaxe"
+
+#: gajim/gtk/single_message.py:114
+#, fuzzy
+msgid "(No subject)"
+msgstr "tema"
+
+#: gajim/gtk/single_message.py:201
+#, python-format
+msgid "Single Message using account %s"
+msgstr "Mensaxe nova coa conta %s"
+
+#: gajim/gtk/single_message.py:203
+#, python-format
+msgid "Single Message in account %s"
+msgstr "Entrou unha mensaxe nova na conta %s"
+
+#: gajim/gtk/single_message.py:205
+msgid "Single Message"
+msgstr "Mensaxe:"
+
+#: gajim/gtk/single_message.py:208
+#, python-format
+msgid "Send %s"
+msgstr "Enviar %s"
+
+#: gajim/gtk/single_message.py:227
+#, python-format
+msgid "Received %s"
+msgstr "Recibida %s"
+
+#: gajim/gtk/single_message.py:246
+#, fuzzy, python-format
+msgid "Form: %s"
+msgstr "Estou %s"
+
+#: gajim/gtk/single_message.py:269
+#, fuzzy, python-format
+msgid "Characters typed: %s"
+msgstr "Alcume non permitido: %s"
+
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+msgid "Connection not available"
+msgstr "Conexión non dispoñíbel"
+
+#: gajim/gtk/single_message.py:275
+#, python-format
+msgid "Please make sure you are connected with \"%s\"."
+msgstr "Por favor, asegúrese de estar conectado con \"%s\"."
+
+#: gajim/gtk/single_message.py:330
+#, python-format
+msgid "RE: %s"
+msgstr "RE: %s"
+
+#: gajim/gtk/single_message.py:331
+#, python-format
+msgid "%s wrote:\n"
+msgstr "%s escribiu:\n"
+
+#: gajim/gtk/pep_config.py:44
+#, fuzzy, python-format
+msgid "PEP Service Configuration (%s)"
+msgstr "Configuración da sala"
+
+#: gajim/gtk/pep_config.py:77
+#, fuzzy
+msgid "Service"
+msgstr "Servidor"
+
+#: gajim/gtk/pep_config.py:114
+msgid "PEP node was not removed"
+msgstr ""
+
+#: gajim/gtk/pep_config.py:115
+#, python-format
+msgid ""
+"PEP node %(node)s was not removed:\n"
+"%(message)s"
+msgstr ""
+
+#: gajim/gtk/pep_config.py:146
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Continuar"
+
+#: gajim/gtk/service_registration.py:142 gajim/gtk/service_registration.py:156
+#: gajim/gtk/service_registration.py:163
+#, fuzzy
+msgid "Register"
+msgstr "_Rexistrar"
+
+#: gajim/gtk/service_registration.py:192 gajim/gtk/service_registration.py:204
+#, fuzzy
+msgid "Registration successful"
+msgstr "Rexistrar %s"
+
+#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#, fuzzy
+msgid "Cancel"
+msgstr "_Cancelar"
+
+#: gajim/gtk/dialogs.py:129
+#, fuzzy, python-format
+msgid "Dictionary for language \"%s\" not available"
+msgstr "Non está dispoñíbel o dicionario para o idioma %s"
+
+#: gajim/gtk/dialogs.py:130
+#, fuzzy, python-format
+msgid ""
+"You have to install the dictionary \"%s\" to use spellchecking, or choose "
+"another language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
+msgstr ""
+"Ten que instalar o dicionario %s para usar o corrector ou elixir outra "
+"lingua e logo definir a opción speller_language."
+
+#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Conexión"
+
+#: gajim/gtk/dialogs.py:411
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) insecurely. "
+"This means conversations will not be encrypted, and is strongly "
+"discouraged.\n"
+"Are you sure you want to do that?"
+msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
+
+#: gajim/gtk/dialogs.py:416
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: gajim/gtk/dialogs.py:417
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: gajim/gtk/dialogs.py:675
+#, fuzzy
+msgid "The nickname contains invalid characters."
+msgstr ""
+"A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
+
+#: gajim/gtk/dialogs.py:734
+#, fuzzy, python-format
+msgid "Destroy %s"
+msgstr "Descrición: %s"
+
+#: gajim/gtk/dialogs.py:775
+#, fuzzy
+msgid "Certificate"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/gtk/dialogs.py:786
+#, fuzzy, python-format
+msgid ""
+"Certificate for account\n"
+"%s"
+msgstr "para a conta %s"
+
+#: gajim/gtk/dialogs.py:824
+msgid "Issued to\n"
+msgstr ""
+
+#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+msgid "Common Name (CN): "
+msgstr ""
+
+#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+msgid "Organization (O): "
+msgstr ""
+
+#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+msgid "Organizational Unit (OU): "
+msgstr ""
+
+#: gajim/gtk/dialogs.py:828
+#, fuzzy
+msgid "Serial Number: "
+msgstr "Número de GG:"
+
+#: gajim/gtk/dialogs.py:829
+msgid "Issued by\n"
+msgstr ""
+
+#: gajim/gtk/dialogs.py:833
+msgid "Validity\n"
+msgstr ""
+
+#: gajim/gtk/dialogs.py:834
+msgid "Issued on: "
+msgstr ""
+
+#: gajim/gtk/dialogs.py:835
+msgid "Expires on: "
+msgstr ""
+
+#: gajim/gtk/dialogs.py:836
+msgid "SHA-1:"
+msgstr ""
+
+#: gajim/gtk/dialogs.py:838
+msgid "SHA-256:"
+msgstr ""
+
+#: gajim/gtk/dialogs.py:852
+#, fuzzy
+msgid "View certificate…"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+msgid "Change Password"
+msgstr "Cambiar o contrasinal"
+
+#: gajim/gtk/dialogs.py:878
+msgid "_OK"
+msgstr "_Aceptar"
+
+#: gajim/gtk/dialogs.py:891
+#, fuzzy
+msgid "You must enter a password"
+msgstr "Debe introducir un contrasinal."
+
+#: gajim/gtk/dialogs.py:895
+msgid "Passwords do not match"
+msgstr "Os contrasinais non coinciden"
+
+#: gajim/gtk/dialogs.py:923
+#, fuzzy
+msgid "Group Chat Invitation "
+msgstr "Convite a grupo de charla"
+
+#: gajim/gtk/dialogs.py:948
+#, fuzzy, python-format
+msgid "<b>%s</b> has invited you to join a discussion"
+msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
+
+#: gajim/gtk/dialogs.py:951
+#, fuzzy, python-format
+msgid ""
+"<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
+msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
+
+#: gajim/gtk/dialogs.py:959
+#, python-format
+msgid "Comment: %s"
+msgstr "Comentario: %s"
+
+#: gajim/gtk/add_contact.py:31
+#, fuzzy
+msgid "GG Number"
+msgstr "Número de GG:"
+
+#: gajim/gtk/add_contact.py:32
+#, fuzzy
+msgid "ICQ Number"
+msgstr "Número de ICQ:"
+
+#: gajim/gtk/add_contact.py:40
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Engadir un contacto..."
+
+#: gajim/gtk/add_contact.py:259
+#, fuzzy, python-format
+msgid "%s Missing"
+msgstr "%s MiB"
+
+#: gajim/gtk/add_contact.py:260
+#, fuzzy, python-format
+msgid "You must supply the %s of the new contact."
+msgstr "Debe introducir un contrasinal para a conta nova"
+
+#: gajim/gtk/add_contact.py:287 gajim/gtk/add_contact.py:293
+#: gajim/gtk/add_contact.py:298
+msgid "Invalid User ID"
+msgstr "A ID de usuario non é válida"
+
+#: gajim/gtk/add_contact.py:294
+msgid "The user ID must not contain a resource."
+msgstr "Esta ID de usuario non contén un recurso."
+
+#: gajim/gtk/add_contact.py:299
+#, fuzzy
+msgid "You cannot add yourself to your roster."
+msgstr "Gustaríame engadilo á miña listaxe de contactos"
+
+#: gajim/gtk/add_contact.py:304
+#, fuzzy
+msgid "Account Offline"
+msgstr "Desconectado"
+
+#: gajim/gtk/add_contact.py:305
+msgid "Your account must be online to add new contacts."
+msgstr ""
+
+#: gajim/gtk/add_contact.py:321
+msgid "Contact already in roster"
+msgstr "O contacto xa está na listaxe"
+
+#: gajim/gtk/add_contact.py:322
+msgid "This contact is already listed in your roster."
+msgstr "Xa engadiu este contacto á súa listaxe."
+
+#: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
+msgid "User ID:"
+msgstr "ID de usuario:"
+
+#: gajim/gtk/add_contact.py:484
+#, fuzzy
+msgid "Error while adding transport contact"
+msgstr "Erro ao engadir o servizo. %s"
+
+#: gajim/gtk/add_contact.py:485
+#, python-format
+msgid ""
+"This error occured while adding a contact for transport %(transport)s:\n"
+"\n"
+"%(error)s"
+msgstr ""
+
+#: gajim/gtk/themes.py:36
+#, fuzzy
+msgid "Chatstate Composing"
+msgstr "A compor"
+
+#: gajim/gtk/themes.py:40
+#, fuzzy
+msgid "Chatstate Inactive"
+msgstr "Inactivo"
+
+#: gajim/gtk/themes.py:44
+msgid "Chatstate Gone"
+msgstr ""
+
+#: gajim/gtk/themes.py:48
+#, fuzzy
+msgid "Chatstate Paused"
+msgstr "Un contacto cambiou o seu estado"
+
+#: gajim/gtk/themes.py:52
+#, fuzzy
+msgid "MUC Tab New Directed Message"
+msgstr ""
+"Mensaxes dirixidas\n"
+"ás salas"
+
+#: gajim/gtk/themes.py:56
+#, fuzzy
+msgid "MUC Tab New Message"
+msgstr "Mensaxe nova"
+
+#: gajim/gtk/themes.py:60
+msgid "Banner Foreground Color"
+msgstr ""
+
+#: gajim/gtk/themes.py:64
+msgid "Banner Background Color"
+msgstr ""
+
+#: gajim/gtk/themes.py:68
+msgid "Banner Font"
+msgstr ""
+
+#: gajim/gtk/themes.py:72
+msgid "Account Row Foreground Color"
+msgstr ""
+
+#: gajim/gtk/themes.py:76
+msgid "Account Row Background Color"
+msgstr ""
+
+#: gajim/gtk/themes.py:80
+#, fuzzy
+msgid "Account Row Font"
+msgstr "Conta"
+
+#: gajim/gtk/themes.py:84
+msgid "Group Row Foreground Color"
+msgstr ""
+
+#: gajim/gtk/themes.py:88
+msgid "Group Row Background Color"
+msgstr ""
+
+#: gajim/gtk/themes.py:92
+#, fuzzy
+msgid "Group Row Font"
+msgstr "Grupo"
+
+#: gajim/gtk/themes.py:96
+msgid "Contact Row Foreground Color"
+msgstr ""
+
+#: gajim/gtk/themes.py:100
+msgid "Contact Row Background Color"
+msgstr ""
+
+#: gajim/gtk/themes.py:104
+#, fuzzy
+msgid "Contact Row Font"
+msgstr "_Mostrar o evento na listaxe de contactos"
+
+#: gajim/gtk/themes.py:108
+#, fuzzy
+msgid "Conversation Font"
+msgstr "Historial de conversas"
+
+#: gajim/gtk/themes.py:112
+#, fuzzy
+msgid "Incoming Nickname Color"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/gtk/themes.py:116
+#, fuzzy
+msgid "Outgoing Nickname Color"
+msgstr "Cambiando o alcume"
+
+#: gajim/gtk/themes.py:120
+#, fuzzy
+msgid "Incoming Message Text Color"
+msgstr "Mens_axe entrante:"
+
+#: gajim/gtk/themes.py:124
+#, fuzzy
+msgid "Incoming Message Text Font"
+msgstr "Mens_axe entrante:"
+
+#: gajim/gtk/themes.py:128
+#, fuzzy
+msgid "Outgoing Message Text Color"
+msgstr "Mensaxe saínte:"
+
+#: gajim/gtk/themes.py:132
+#, fuzzy
+msgid "Outgoing Message Text Font"
+msgstr "Mensaxe saínte:"
+
+#: gajim/gtk/themes.py:136
+#, fuzzy
+msgid "Status Message Color"
+msgstr "Mensaxe de estado"
+
+#: gajim/gtk/themes.py:140
+#, fuzzy
+msgid "Status Message Font"
+msgstr "Mensaxe de estado"
+
+#: gajim/gtk/themes.py:144
+msgid "URL Color"
+msgstr ""
+
+#: gajim/gtk/themes.py:148
+#, fuzzy
+msgid "Highlight Message Color"
+msgstr "_Marcar os erros ortográficos"
+
+#: gajim/gtk/themes.py:152
+#, fuzzy
+msgid "Message Correcting"
+msgstr "Mensaxes"
+
+#: gajim/gtk/themes.py:156
+#, fuzzy
+msgid "Contact Disconnected Background"
+msgstr "Contacto desconectado"
+
+#: gajim/gtk/themes.py:160
+#, fuzzy
+msgid "Contact Connected Background "
+msgstr "Nome de contacto"
+
+#: gajim/gtk/themes.py:174
+#, fuzzy
+msgid "Gajim Themes"
+msgstr "Gajim - %s"
+
+#: gajim/gtk/themes.py:212 gajim/gtk/themes.py:219
+#, fuzzy
+msgid "Invalid Name"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/gtk/themes.py:213
+msgid "Name <b>default</b> is not allowed"
+msgstr ""
+
+#: gajim/gtk/themes.py:220
+#, fuzzy
+msgid "Spaces are not allowed"
+msgstr "Alcume non permitido: %s"
+
+#: gajim/gtk/themes.py:302
+#, fuzzy
+msgid "Active Theme"
+msgstr "Activo"
+
+#: gajim/gtk/themes.py:303
+msgid ""
+"You tried to delete the currently active theme. Please switch to a different "
+"theme first."
+msgstr ""
+
+#: gajim/gtk/themes.py:320
+#, fuzzy
+msgid "Delete Theme"
+msgstr "Activo"
+
+#: gajim/gtk/themes.py:321
+#, fuzzy
+msgid "Do you want to permanently delete this theme?"
+msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
+
+#: gajim/gtk/history.py:79
+msgid "Conversation History"
+msgstr "Historial de conversas"
+
+#: gajim/gtk/history.py:408 gajim/gtk/history.py:462
+msgid "Disk Error"
+msgstr ""
+
+#: gajim/gtk/history.py:573
+#, python-format
+msgid "%(nick)s is now %(status)s: %(status_msg)s"
+msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
+
+#: gajim/gtk/history.py:586
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Mensaxe de erro: %s"
+
+#: gajim/gtk/history.py:588 gajim/gtk/groupchat_config.py:133
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/search.py:342
+msgid "Error"
+msgstr ""
+
+#: gajim/gtk/history.py:590
+#, python-format
+msgid "Status is now: %(status)s: %(status_msg)s"
+msgstr "O estado é agora: %(status)s: %(status_msg)s "
+
+#: gajim/gtk/history.py:594
+#, python-format
+msgid "Status is now: %(status)s"
+msgstr "O estado é agora: %(status)s"
+
+#: gajim/gtk/notification.py:185
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
+#: gajim/gtk/notification.py:272
+msgid "New E-mail"
+msgstr "Correo electrónico novo"
+
+#: gajim/gtk/settings.py:439 gajim/gtk/filechoosers.py:88
+#: gajim/gtk/filechoosers.py:136 gajim/gtk/filechoosers.py:143
+#: gajim/gtk/sounds.py:34
+msgid "All files"
+msgstr "Todos os ficheiros"
+
+#: gajim/gtk/settings.py:448
+#, fuzzy
+msgid "Clear File"
+msgstr "Serán"
+
+#: gajim/gtk/settings.py:570
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Xestionar os perfís do proxy"
+
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
+#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#, fuzzy
+msgid "No Proxy"
+msgstr "Proxy"
+
+#: gajim/gtk/settings.py:617
+#, fuzzy
+msgid "Adjust to Status"
+msgstr "_Adaptar ao estado"
+
+#: gajim/gtk/settings.py:629
+msgid "On"
+msgstr ""
+
+#: gajim/gtk/settings.py:629
+#, fuzzy
+msgid "Off"
+msgstr "Desconectado"
+
+#: gajim/gtk/history_sync.py:209
+#, fuzzy
+msgid "How far back do you want to synchronize chat history?"
+msgstr "Que quere facer?"
+
+#: gajim/gtk/history_sync.py:214
+msgid "One Month"
+msgstr ""
+
+#: gajim/gtk/history_sync.py:215
+msgid "Three Months"
+msgstr ""
+
+#: gajim/gtk/history_sync.py:216
+msgid "One Year"
+msgstr ""
+
+#: gajim/gtk/history_sync.py:217
+msgid "Everything"
+msgstr ""
+
+#: gajim/gtk/history_sync.py:245
+#, fuzzy
+msgid "Connecting..."
+msgstr "Conectando"
+
+#: gajim/gtk/history_sync.py:257
+#, fuzzy, python-format
+msgid "%(received)s of %(max)s"
+msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
+
+#: gajim/gtk/history_sync.py:261
+#, fuzzy, python-format
+msgid "Downloaded %s Messages"
+msgstr "%d mensaxe sen ler"
+
+#: gajim/gtk/history_sync.py:281
+#, python-brace-format
+msgid ""
+"\n"
+"        Finished synchronising your History.\n"
+"        {received} Messages downloaded.\n"
+"        "
+msgstr ""
+
+#: gajim/gtk/history_sync.py:288
+msgid ""
+"\n"
+"        Gajim is fully synchronised\n"
+"        with the Archive.\n"
+"        "
+msgstr ""
+
+#: gajim/gtk/history_sync.py:295
+msgid ""
+"\n"
+"        There is already a synchronisation in\n"
+"        progress. Please try later.\n"
+"        "
+msgstr ""
+
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#, fuzzy
+msgid "A GTK+ XMPP client"
+msgstr "Un cliente de Jabber de GTK"
+
+#: gajim/gtk/about.py:48
+#, fuzzy, python-format
+msgid "GTK+ Version: %s"
+msgstr "Versión de GTK+:"
+
+#: gajim/gtk/about.py:49
+#, fuzzy, python-format
+msgid "PyGObject Version: %s"
+msgstr "Versión de PyGTK:"
+
+#: gajim/gtk/about.py:50
+#, python-format
+msgid "python-nbxmpp Version: %s"
+msgstr ""
+
+#: gajim/gtk/about.py:53
+#, fuzzy
+msgid "Current Developers"
+msgstr "Desenvolvedores actuais:"
+
+#: gajim/gtk/about.py:54
+#, fuzzy
+msgid "Past Developers"
+msgstr "Desenvolvedores anteriores:"
+
+#: gajim/gtk/about.py:55
+msgid "Artists"
+msgstr ""
+
+#: gajim/gtk/about.py:59
+msgid "Last but not least"
+msgstr ""
+
+#: gajim/gtk/about.py:60
+#, fuzzy
+msgid "we would like to thank all the package maintainers."
+msgstr ""
+"Por último mais non menos importante, queremos agradecerlles a todos os "
+"mantedores de paquetes."
+
+#: gajim/gtk/about.py:61
+msgid "Thanks"
+msgstr ""
+
+#: gajim/gtk/about.py:63
+msgid "translator-credits"
+msgstr "Fran Alburquerque <membriskhan@gmail.com>"
+
+#: gajim/gtk/filechoosers.py:87
+#, fuzzy
+msgid "Choose File to Send…"
+msgstr "Elixa un ficheiro para enviar..."
+
+#: gajim/gtk/filechoosers.py:93
+#, fuzzy
+msgid "Choose Avatar…"
+msgstr "Elixir unha imaxe"
+
+#: gajim/gtk/filechoosers.py:97
+#, fuzzy
+msgid "PNG files"
+msgstr "Todos os ficheiros"
+
+#: gajim/gtk/filechoosers.py:98
+#, fuzzy
+msgid "JPEG files"
+msgstr "Todos os ficheiros"
+
+#: gajim/gtk/filechoosers.py:99
+#, fuzzy
+msgid "SVG files"
+msgstr "Enviar ficheiro"
+
+#: gajim/gtk/filechoosers.py:101 gajim/gtk/filechoosers.py:150
+msgid "Images"
+msgstr "Imaxes"
+
+#: gajim/gtk/filechoosers.py:135
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Elixir unha imaxe"
+
+#: gajim/gtk/filechoosers.py:137
+#, fuzzy
+msgid "ZIP files"
+msgstr "Todos os ficheiros"
+
+#: gajim/gtk/filechoosers.py:142
+#, fuzzy
+msgid "Save File as…"
+msgstr "Gardar o ficheiro como..."
+
+#: gajim/gtk/filechoosers.py:179
+#, fuzzy
+msgid "_Open"
+msgstr "OpenPGP: "
+
+#: gajim/gtk/tooltips.py:225
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this group chat"
+msgstr "%(owner_or_admin_or_member)s deste grupo de charla"
+
+#: gajim/gtk/tooltips.py:357
+msgid " [blocked]"
+msgstr ""
+
+#: gajim/gtk/tooltips.py:361
+msgid " [minimized]"
+msgstr ""
+
+#: gajim/gtk/tooltips.py:512
+#, fuzzy
+msgid "Connected"
+msgstr "Conexión"
+
+#: gajim/gtk/tooltips.py:514
+#, fuzzy
+msgid "Disconnected"
+msgstr "Contacto desconectado"
+
+#: gajim/gtk/tooltips.py:567
+#, fuzzy
+msgid "File Name: "
+msgstr "Nome do ficheiro: %s"
+
+#: gajim/gtk/tooltips.py:570
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Descarga"
+
+#: gajim/gtk/tooltips.py:576
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Subida"
+
+#: gajim/gtk/tooltips.py:583
+#, fuzzy
+msgid "?transfer type:Type: "
+msgstr "Detívose a transferencia do ficheiro"
+
+#: gajim/gtk/tooltips.py:589
+#, fuzzy
+msgid "?transfer status:Transferred: "
+msgstr "Pausada"
+
+#: gajim/gtk/tooltips.py:592
+#, fuzzy
+msgid "?transfer status:Status: "
+msgstr "Pausada"
+
+#: gajim/gtk/tooltips.py:594
+#, fuzzy
+msgid "Description: "
+msgstr "Descrición: %s"
+
+#: gajim/gtk/tooltips.py:618
+#, fuzzy
+msgid "?transfer status:Aborted"
+msgstr "Pausada"
+
+#: gajim/gtk/tooltips.py:620
+#, fuzzy
+msgid "?transfer status:Completed"
+msgstr "Pausada"
+
+#: gajim/gtk/tooltips.py:622
+msgid "?transfer status:Paused"
+msgstr "Pausada"
+
+#: gajim/gtk/tooltips.py:625
+#, fuzzy
+msgid "?transfer status:Stalled"
+msgstr "Pausada"
+
+#: gajim/gtk/tooltips.py:629
+#, fuzzy
+msgid "?transfer status:Transferring"
+msgstr "Pausada"
+
+#: gajim/gtk/tooltips.py:630 gajim/gtk/tooltips.py:631
+#, fuzzy
+msgid "?transfer status:Not started"
+msgstr "Pausada"
+
+#: gajim/gtk/sounds.py:39
+msgid "Wav Sounds"
+msgstr "Sons Wav"
+
+#: gajim/gtk/sounds.py:71
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Recibiuse a primeira mensaxe"
+
+#: gajim/gtk/sounds.py:72
+msgid "First Message Received"
+msgstr "Recibiuse a primeira mensaxe"
+
+#: gajim/gtk/sounds.py:73
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Recibiuse unha mensaxe nova"
+
+#: gajim/gtk/sounds.py:74
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Recibiuse unha mensaxe nova"
+
+#: gajim/gtk/sounds.py:75
+msgid "Contact Connected"
+msgstr "Nome de contacto"
+
+#: gajim/gtk/sounds.py:76
+msgid "Contact Disconnected"
+msgstr "Contacto desconectado"
+
+#: gajim/gtk/sounds.py:77
+msgid "Message Sent"
+msgstr "Enviouse a mensaxe"
+
+#: gajim/gtk/sounds.py:78
+msgid "Group Chat Message Highlight"
+msgstr "Remarcado da mensaxe de grupo de charla"
+
+#: gajim/gtk/sounds.py:79
+msgid "Group Chat Message Received"
+msgstr "Recibiuse unha mensaxe de grupo de charla"
+
+#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#, fuzzy
+msgid "Required"
+msgstr "É necesario o contrasinal"
+
+#: gajim/gtk/dataform.py:286
+msgid "Yes"
+msgstr ""
+
+#: gajim/gtk/dataform.py:286
+#, fuzzy
+msgid "No"
+msgstr "Ningún"
+
+#: gajim/gtk/dataform.py:661
+msgid "Submit"
+msgstr ""
+
+#: gajim/gtk/statusicon.py:213
+#, fuzzy
+msgid "_Change Status Message…"
+msgstr "_Cambiar a mensaxe de estado"
+
+#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
+#: gajim/gtk/statusicon.py:299
+#, python-format
+msgid "using account %s"
+msgstr "a usar a conta %s"
+
+#: gajim/gtk/statusicon.py:309
+#, fuzzy
+msgid "_Manage Bookmarks…"
+msgstr "Xestionar os marcadores"
+
+#: gajim/gtk/statusicon.py:325
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "Non está na listaxe"
+
+#: gajim/gtk/statusicon.py:329
+msgid "Show _Roster"
+msgstr "Amosar _listaxe"
+
+#: gajim/gtk/statusicon.py:337
+msgid "Hide this menu"
+msgstr "Ocultar este menú"
+
+#: gajim/gtk/profile.py:74
+#, fuzzy
+msgid "Retrieving profile…"
+msgstr "A recuperar o perfil..."
+
+#: gajim/gtk/profile.py:178
+#, fuzzy
+msgid "Wrong date format"
+msgstr "Información"
+
+#: gajim/gtk/profile.py:181
+#, fuzzy
+msgid "Format of the date must be YYYY-MM-DD"
+msgstr "Formato: AAAA-MM-DD"
+
+#: gajim/gtk/profile.py:248
+msgid "Information received"
+msgstr "Información recibida"
+
+#: gajim/gtk/profile.py:324
+#, 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."
+
+#: gajim/gtk/profile.py:337
+#, fuzzy
+msgid "Sending profile…"
+msgstr "A enviar o perfil..."
+
+#: gajim/gtk/profile.py:354
+msgid "Information NOT published"
+msgstr "Información NON publicada"
+
+#: gajim/gtk/profile.py:362
+msgid "vCard publication failed"
+msgstr "Fallou a publicación da vCard"
+
+#: gajim/gtk/profile.py:363
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Produciuse un erro mentres se publicaba a súa información persoal, probe de "
+"novo máis tarde."
+
+#: gajim/gtk/join_groupchat.py:202
+#, fuzzy
+msgid "Invalid Room"
+msgstr "A entrada non é válida"
+
+#: gajim/gtk/join_groupchat.py:203
+msgid "Please choose a room"
+msgstr ""
+
+#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
+#, fuzzy
+msgid "Invalid Nickname"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/gtk/join_groupchat.py:223
+#, fuzzy
+msgid "Please choose a nickname"
+msgstr "Crear unha publicación nova"
+
+#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
+#: gajim/gtk/join_groupchat.py:293
+#, fuzzy
+msgid "Wrong server"
+msgstr "Host errado"
+
+#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
+#: gajim/gtk/join_groupchat.py:294
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Isto non é un grupo de charla"
+
+#: gajim/gtk/mam_preferences.py:38
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: gajim/gtk/mam_preferences.py:89
+#, fuzzy
+msgid "Archiving Preferences Saved"
+msgstr "_Preferencias"
+
+#: gajim/gtk/mam_preferences.py:90
+#, fuzzy
+msgid "Your archiving preferences have successfully been saved."
+msgstr "_Preferencias"
+
+#: gajim/gtk/mam_preferences.py:101
+#, fuzzy
+msgid "No response from the Server"
+msgstr "Non está conectado ao servidor"
+
+#: gajim/gtk/mam_preferences.py:103
+#, fuzzy
+msgid "Error received: {}"
+msgstr "Recibiu unha entrada nova:"
+
+#: gajim/gtk/mam_preferences.py:105
+#, fuzzy
+msgid "Archiving Preferences Error"
+msgstr "_Preferencias"
+
+#: gajim/gtk/advanced_config.py:81
+#, fuzzy
+msgid "Activated"
+msgstr "Activo"
+
+#: gajim/gtk/advanced_config.py:81
+#, fuzzy
+msgid "Deactivated"
+msgstr "Inactivo"
+
+#: gajim/gtk/advanced_config.py:83
+msgid "Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Integer"
+msgstr "No grupo"
+
+#: gajim/gtk/advanced_config.py:85
+msgid "Text"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:97
+msgid "Preference Name"
+msgstr "Nome da opción"
+
+#: gajim/gtk/advanced_config.py:104
+msgid "Value"
+msgstr "Valor"
+
+#: gajim/gtk/advanced_config.py:113
+msgid "Type"
+msgstr "Tipo"
+
+#: gajim/gtk/advanced_config.py:168
+msgid "(None)"
+msgstr "(Ningún)"
+
+#: gajim/gtk/advanced_config.py:299
+msgid "Hidden"
+msgstr "Oculta"
+
+#: gajim/gtk/server_info.py:66
+#, fuzzy
+msgid "Copy info to clipboard"
+msgstr "_Copiar o enderezo da ligazón"
+
+#: gajim/gtk/server_info.py:144
+#, python-format
+msgid "%(days)s days, %(hours)s hours"
+msgstr ""
+
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
+#: gajim/gtk/accounts.py:853
+#, fuzzy
+msgid "Hostname"
+msgstr "Nome do host:"
+
+#: gajim/gtk/server_info.py:219
+#, fuzzy
+msgid "Server Software"
+msgstr "Características dos servidores"
+
+#: gajim/gtk/server_info.py:220
+#, fuzzy
+msgid "Server Uptime"
+msgstr "Gardouse en: %s"
+
+#: gajim/gtk/server_info.py:277
+msgid ""
+"\n"
+"Disabled in config"
+msgstr ""
+
+#: gajim/gtk/features.py:93
+msgid "Audio / Video"
+msgstr ""
+
+#: gajim/gtk/features.py:95
+msgid "Enables Gajim to provide Audio and Video chats"
+msgstr ""
+
+#: gajim/gtk/features.py:96
+msgid ""
+"Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
+"gstreamer1.0-plugins-ugly"
+msgstr ""
+
+#: gajim/gtk/features.py:98 gajim/gtk/features.py:145
+#, fuzzy
+msgid "Feature not available under Windows"
+msgstr "A mensaxe de estado de non autodispoñíbel"
+
+#: gajim/gtk/features.py:102
+msgid ""
+"Enables Gajim to measure your computer's idle time in order to set your "
+"Status automatically"
+msgstr ""
+
+#: gajim/gtk/features.py:104
+msgid "Requires: libxss"
+msgstr ""
+
+#: gajim/gtk/features.py:105
+msgid "No additional requirements"
+msgstr ""
+
+#: gajim/gtk/features.py:107
+msgid "Bonjour / Zeroconf (Serverless Chat)"
+msgstr ""
+
+#: gajim/gtk/features.py:109
+msgid ""
+"Enables Gajim to automatically detected clients in a local network for "
+"serverless chats"
+msgstr ""
+
+#: gajim/gtk/features.py:111
+msgid "Requires: gir1.2-avahi-0.6"
+msgstr ""
+
+#: gajim/gtk/features.py:112
+#, python-format
+msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
+msgstr ""
+
+#: gajim/gtk/features.py:115
+#, fuzzy
+msgid "RST XHTML Generator"
+msgstr "Xeral"
+
+#: gajim/gtk/features.py:117
+#, python-format
+msgid "Enables Gajim to generate XHTML output from RST code (%(url)s)"
+msgstr ""
+
+#: gajim/gtk/features.py:121 gajim/gtk/features.py:122
+msgid "Requires: python-docutils"
+msgstr ""
+
+#: gajim/gtk/features.py:124
+#, fuzzy
+msgid "Secure Password Storage"
+msgstr "Gardar o contrasinal"
+
+#: gajim/gtk/features.py:126
+msgid ""
+"Enables Gajim to store Passwords securely instead of storing them in "
+"plaintext"
+msgstr ""
+
+#: gajim/gtk/features.py:128
+msgid ""
+"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
+msgstr ""
+
+#: gajim/gtk/features.py:130
+msgid "Windows Credential Vault is used for secure password storage"
+msgstr ""
+
+#: gajim/gtk/features.py:133
+msgid "Spell Checker"
+msgstr ""
+
+#: gajim/gtk/features.py:135
+msgid "Enables Gajim to spell check your messages while composing"
+msgstr ""
+
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
+msgid "Requires: Gspell"
+msgstr ""
+
+#: gajim/gtk/features.py:140
+msgid "UPnP-IGD Port Forwarding"
+msgstr ""
+
+#: gajim/gtk/features.py:142
+msgid ""
+"Enables Gajim to request your router to forward ports for file transfers"
+msgstr ""
+
+#: gajim/gtk/features.py:144
+msgid "Requires: gir1.2-gupnpigd-1.0"
+msgstr ""
+
+#: gajim/gtk/features.py:210
+#, fuzzy
+msgid "Disabled in Preferences"
+msgstr "_Preferencias"
+
+#: gajim/gtk/privacy_list.py:70
+#, python-format
+msgid "Privacy List <b><i>%s</i></b>"
+msgstr "Listaxe de privacidade <b><i>%s</i></b>"
+
+#: gajim/gtk/privacy_list.py:74
+#, python-format
+msgid "Privacy List for %s"
+msgstr "Listaxe de privacidade para %s"
+
+#: gajim/gtk/privacy_list.py:147
+#, 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"
+
+#: gajim/gtk/privacy_list.py:152
+#, fuzzy, python-format
+msgid "Order: %(order)s, action: %(action)s"
+msgstr "Orde: %s, acción: %s"
+
+#: gajim/gtk/privacy_list.py:208
+msgid "<b>Edit a rule</b>"
+msgstr "<b>Editar unha regra</b>"
+
+#: gajim/gtk/privacy_list.py:321
+msgid "<b>Add a rule</b>"
+msgstr "<b>Engadir unha regra</b>"
+
+#: gajim/gtk/privacy_list.py:425
+#, python-format
+msgid "Privacy Lists for %s"
+msgstr "Listaxes de privacidade para %s"
+
+#: gajim/gtk/privacy_list.py:526
+msgid "Invalid List Name"
+msgstr "O nome de listaxe non é válido"
+
+#: gajim/gtk/privacy_list.py:527
+msgid "You must enter a name to create a privacy list."
+msgstr "Debe introducir un nome para crear unha listaxe de privacidade."
+
+#: gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Convite a grupo de charla"
+
+#: gajim/gtk/groupchat_config.py:134
+#, fuzzy
+msgid "A Group Chat needs at least one Owner"
+msgstr "Ningún"
+
+#: gajim/gtk/groupchat_config.py:242
+msgid "You are not allowed to modify the affiliation of Admins and Owners"
+msgstr ""
+
+#: gajim/gtk/groupchat_config.py:399
+msgid "An entry with this Jabber-ID already exists"
+msgstr ""
+
+#: gajim/gtk/adhoc.py:91
+#, fuzzy
+msgid "Finish"
+msgstr "_Rematar"
+
+#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#, fuzzy
+msgid "Commands"
+msgstr "Comandos: %s"
+
+#: gajim/gtk/adhoc.py:103
+msgid "Next"
+msgstr ""
+
+#: gajim/gtk/adhoc.py:109
+msgid "Previous"
+msgstr ""
+
+#: gajim/gtk/adhoc.py:115
+#, fuzzy
+msgid "Execute"
+msgstr "Executar o _comando..."
+
+#: gajim/gtk/adhoc.py:195
+#, fuzzy
+msgid "No commands available"
+msgstr "A conta non está dispoñíbel"
+
+#: gajim/gtk/adhoc.py:244
+#, fuzzy
+msgid "Request Command List"
+msgstr "Executar o _comando..."
+
+#: gajim/gtk/adhoc.py:259
+#, fuzzy
+msgid "Executing…"
+msgstr "Executar o _comando..."
+
+#: gajim/gtk/adhoc.py:266
+#, fuzzy
+msgid "Command List"
+msgstr "Comandos: %s"
+
+#: gajim/gtk/adhoc.py:384
+#, fuzzy
+msgid "Finished"
+msgstr "_Rematar"
+
+#: gajim/gtk/adhoc.py:453
+#, fuzzy
+msgid "Execution failed"
+msgstr "Fallou a conexión"
+
+#: gajim/gtk/blocking.py:37
+#, fuzzy, python-format
+msgid "Blocking List for %s"
+msgstr "Listaxe de privacidade para %s"
+
+#: gajim/gtk/blocking.py:71
+#, fuzzy
+msgid "Error!"
+msgstr "Erro de Avahi"
+
+#: gajim/gtk/subscription_request.py:34
+msgid "Subscription Request"
+msgstr "Solicitude de subscrición"
+
+#: gajim/gtk/subscription_request.py:44
+#, fuzzy, python-format
+msgid "Subscription request for account %(account)s from %(jid)s"
+msgstr "Solicitude de subscrición para a conta %s de %s"
+
+#: gajim/gtk/subscription_request.py:47
+#, python-format
+msgid "Subscription request from %s"
+msgstr "Solicitude de subscrición de %s"
+
+#: gajim/gtk/htmltextview.py:543
+#, fuzzy
+msgid "Loading"
+msgstr "A compor"
+
+#: gajim/gtk/account_wizard.py:165
+msgid "Account has been added successfully"
+msgstr "A conta engadiuse con éxito"
+
+#: gajim/gtk/account_wizard.py:166 gajim/gtk/account_wizard.py:172
+#, fuzzy
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menu item under the Edit menu from the main "
+"window."
+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."
+
+#: gajim/gtk/account_wizard.py:171
+msgid "Your new account has been created successfully"
+msgstr "A súa conta nova creouse con éxito"
+
+#: gajim/gtk/account_wizard.py:209
+msgid "Invalid username"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/gtk/account_wizard.py:211
+msgid "You must provide a username to configure this account."
+msgstr "Debe pórlle un nome para configurar esta conta."
+
+#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
+#: gajim/gtk/bookmarks.py:303
+#, fuzzy
+msgid "Invalid server"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/gtk/account_wizard.py:253
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Especifique o novo alcume que quere usar:"
+
+#: gajim/gtk/account_wizard.py:277
+msgid "Invalid entry"
+msgstr "A entrada non é válida"
+
+#: gajim/gtk/account_wizard.py:278
+msgid "Custom port must be a port number."
+msgstr "O porto personalizado debe ser un número de porto"
+
+#: gajim/gtk/account_wizard.py:405
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
+"SSL Error: %(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#, fuzzy
+msgid "An error occurred during account creation"
+msgstr "Produciuse un erro durante a creación da conta"
+
+#: gajim/gtk/account_wizard.py:545
+msgid "Account name is in use"
+msgstr "O nome da conta está en uso"
+
+#: gajim/gtk/account_wizard.py:546
+msgid "You already have an account using this name."
+msgstr "Xa ten unha conta en que emprega este nome"
+
+#: gajim/gtk/http_upload_progress.py:66
+msgid "Requesting HTTP File Upload Slot…"
+msgstr ""
+
+#: gajim/gtk/http_upload_progress.py:70
+msgid "Uploading via HTTP File Upload…"
+msgstr ""
+
+#: gajim/gtk/http_upload_progress.py:74
+#, fuzzy
+msgid "Encrypting file…"
+msgstr "Cifrado desactivado"
+
+#: gajim/gtk/http_upload_progress.py:111
+#, fuzzy, python-format
+msgid "%(progress)s of %(total)s"
+msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
+
+#: gajim/gtk/http_upload_progress.py:127
+#, python-format
+msgid "%(minutes)s min %(seconds)s sec"
+msgstr ""
+
+#: gajim/gtk/xml_console.py:77
+#, fuzzy
+msgid "Filter"
+msgstr "Filtro:"
+
+#: gajim/gtk/xml_console.py:82
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>Entrada de XML</b>"
+
+#: gajim/gtk/xml_console.py:86
+msgid "Paste Last Input"
+msgstr ""
+
+#: gajim/gtk/xml_console.py:170
+#, fuzzy, python-format
+msgid "Please make sure you are connected with '%s'."
+msgstr "Por favor, asegúrese de estar conectado con \"%s\"."
+
+#: gajim/gtk/xml_console.py:182
+#, fuzzy
+msgid "Invalid Node"
+msgstr "O ficheiro non é válido"
+
+#: gajim/gtk/search.py:95 gajim/gtk/search.py:197
+msgid "Search"
+msgstr "Buscar"
+
+#: gajim/gtk/search.py:101
+#, fuzzy
+msgid "New Search"
+msgstr "Buscar"
+
+#: gajim/gtk/search.py:182
+msgid "Request Search Form"
+msgstr ""
+
+#: gajim/gtk/search.py:242
+#, fuzzy
+msgid "Search…"
+msgstr "Buscar"
+
+#: gajim/gtk/search.py:249
+#, fuzzy
+msgid "Search Result"
+msgstr "Buscar"
+
+#: gajim/gtk/search.py:256
+#, fuzzy
+msgid "No results found"
+msgstr "Non se encontrou %s"
+
+#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+msgid "Default"
+msgstr "Por defecto"
+
+#: gajim/gtk/preferences.py:801
+msgid "status message title"
+msgstr "título da mensaxe de estado"
+
+#: gajim/gtk/preferences.py:802
+msgid "status message text"
+msgstr "texto da mensaxe de estado"
+
+#: gajim/gtk/accounts.py:138
+msgid "Relogin now?"
+msgstr "Quere reconectarse agora?"
+
+#: gajim/gtk/accounts.py:139
+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."
+
+#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
+#, fuzzy
+msgid "Remove Account"
+msgstr "A eliminar a conta %s"
+
+#: gajim/gtk/accounts.py:192
+#, fuzzy, python-format
+msgid "You still have open chats in your account %s"
+msgstr "Comezou unha charla coa conta %s"
+
+#: gajim/gtk/accounts.py:193
+#, fuzzy
+msgid ""
+"All chat and group chat windows will be closed.\n"
+"Do you want to continue?"
+msgstr "Todas as charlas e os grupos de charlas pecharanse. Desexa continuar?"
+
+#: gajim/gtk/accounts.py:424
+#, fuzzy
+msgid "Back"
+msgstr "Volvo axiña"
+
+#: gajim/gtk/accounts.py:530
+#, fuzzy
+msgid "Please check if Bonjour is installed."
+msgstr "Por favor, comprobe se o Avahi está instalado."
+
+#: gajim/gtk/accounts.py:532
+#, fuzzy
+msgid "Please check if Avahi is installed."
+msgstr "Por favor, comprobe se o Avahi está instalado."
+
+#: gajim/gtk/accounts.py:569
+#, fuzzy
+msgid "Disable Account"
+msgstr "O nome da conta non é válido"
+
+#: gajim/gtk/accounts.py:570
+#, fuzzy, python-format
+msgid "Account %s is still connected"
+msgstr "A conta \"%s\" está conectada ao servidor"
+
+#: gajim/gtk/accounts.py:571
+#, fuzzy
+msgid ""
+"All chat and group chat windows will be closed. Do you want to continue?"
+msgstr "Todas as charlas e os grupos de charlas pecharanse. Desexa continuar?"
+
+#: gajim/gtk/accounts.py:576
+#, fuzzy
+msgid "_Disable Account"
+msgstr "O nome da conta non é válido"
+
+#: gajim/gtk/accounts.py:595
+#, fuzzy
+msgid "Add Account"
+msgstr "_Engadir un contacto..."
+
+#: gajim/gtk/accounts.py:663
+msgid "Label"
+msgstr ""
+
+#: gajim/gtk/accounts.py:667
+msgid "Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:670
+#, fuzzy
+msgid "Import Contacts"
+msgstr "Contactos"
+
+#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#, fuzzy
+msgid "Client Certificate"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#, fuzzy
+msgid "Connect on startup"
+msgstr "C_onectar ao inicio de Gajim"
+
+#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#, fuzzy
+msgid "Save conversations for all contacts"
+msgstr "Gravar as conversas para todos os contactos"
+
+#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+msgid "Store conversations on the harddrive"
+msgstr ""
+
+#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#, fuzzy
+msgid "Global Status"
+msgstr "Todos os estados"
+
+#: gajim/gtk/accounts.py:687
+#, fuzzy
+msgid "Synchronise the status of all accounts"
+msgstr "Cambia o estado dunha ou de varias contas"
+
+#: gajim/gtk/accounts.py:689
+msgid "Use file transfer proxies"
+msgstr "Usar proxies para as transferencias de ficheiros"
+
+#: gajim/gtk/accounts.py:705
+#, fuzzy
+msgid "Idle Time"
+msgstr " desde %s"
+
+#: gajim/gtk/accounts.py:707
+msgid "Disclose the time of your last activity"
+msgstr ""
+
+#: gajim/gtk/accounts.py:709
+msgid "Local System Time"
+msgstr ""
+
+#: gajim/gtk/accounts.py:711
+msgid "Disclose the local system time of the device Gajim runs on"
+msgstr ""
+
+#: gajim/gtk/accounts.py:714
+#, fuzzy
+msgid "Client / Operating System"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/gtk/accounts.py:716
+#, fuzzy
+msgid ""
+"Disclose informations about the client and operating system you currently use"
+msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
+
+#: gajim/gtk/accounts.py:719
+#, fuzzy
+msgid "Ignore Unknown Contacts"
+msgstr "Contactos"
+
+#: gajim/gtk/accounts.py:721
+#, fuzzy
+msgid "Ignore everything from contacts not in your Roster"
+msgstr ""
+"_Ignorar as mensaxes de contactos que non estean na listaxe de contactos"
+
+#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#, fuzzy
+msgid "Use environment variable"
+msgstr "Conexión non dispoñíbel"
+
+#: gajim/gtk/accounts.py:739
+#, fuzzy
+msgid "Proxy"
+msgstr "Proxy"
+
+#: gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Warn on insecure connection"
+msgstr "Conexión"
+
+#: gajim/gtk/accounts.py:746
+msgid "Send keep-alive packets"
+msgstr "Enviar paquetes de mantemento de actividade"
+
+#: gajim/gtk/accounts.py:750
+msgid "Manually set the hostname for the server"
+msgstr ""
+
+#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
+#: gajim/gtk/accounts.py:831
+#, fuzzy
+msgid "Priority"
+msgstr "Pr_ioridade:"
+
+#: gajim/gtk/accounts.py:785
+#, fuzzy
+msgid "Synchronize the status of all accounts"
+msgstr "Cambia o estado dunha ou de varias contas"
+
+#: gajim/gtk/accounts.py:795
+#, fuzzy
+msgid "First Name"
+msgstr "Nome:"
+
+#: gajim/gtk/accounts.py:798
+#, fuzzy
+msgid "Last Name"
+msgstr "Apelido(s):"
+
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "Email"
+msgstr "Correo electrónico novo"
+
+#: gajim/gtk/accounts.py:822
+#, fuzzy
+msgid "Adjust to status"
+msgstr "_Adaptar ao estado"
+
+#: gajim/gtk/accounts.py:849
+msgid "Enable"
+msgstr "Activar"
+
+#: gajim/gtk/accounts.py:857
+#, fuzzy
+msgid "Port"
+msgstr "_Porto:"
+
+#: gajim/gtk/accounts.py:862
+#, fuzzy
+msgid "Connection Settings"
+msgstr "Conexión"
+
+#: gajim/gtk/accounts.py:872
+msgid "PKCS12 Files"
+msgstr ""
+
+#: gajim/gtk/accounts.py:874
+#, fuzzy
+msgid "Encrypted Certificate"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/gtk/accounts.py:878
+#, fuzzy
+msgid "Certificate Settings"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/gtk/accounts.py:890
+#, fuzzy
+msgid "Save Password"
+msgstr "Gardar o contrasinal"
+
+#: gajim/gtk/accounts.py:898
+#, fuzzy
+msgid "Login Settings"
+msgstr "Fallou a conexión"
+
+#: gajim/gtk/accounts.py:931
+#, fuzzy, python-format
+msgid "Removing account %s"
+msgstr "A eliminar a conta %s"
+
+#: gajim/gtk/accounts.py:946
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Cifrado desactivado"
+
+#: gajim/gtk/accounts.py:947
+#, fuzzy
+msgid "To unregister from a server, the account must be enabled."
+msgstr "Para cambiar o nome da conta, debe estar desconectado"
+
+#: gajim/gtk/accounts.py:962
+#, fuzzy
+msgid "Password required"
+msgstr "É necesario o contrasinal"
+
+#: gajim/gtk/accounts.py:976
+#, fuzzy, python-format
+msgid "Account '%s' is still connected to the server"
+msgstr "A conta \"%s\" está conectada ao servidor"
+
+#: gajim/gtk/accounts.py:978
+msgid "If you remove it, the connection will be lost."
+msgstr "Se a elimina, perderase a conexión co servidor"
+
+#: gajim/gtk/accounts.py:995
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Fallou a conexión"
+
+#: gajim/gtk/accounts.py:996
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Que quere facer?"
+
+#: gajim/gtk/accounts.py:997
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Eliminar a _conta unicamente do Gajim"
+
+#: gajim/gtk/accounts.py:998
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: gajim/gtk/roster_item_exchange.py:49
+#, fuzzy, python-format
+msgid "<b>%s</b> would like to add some contacts to your contact list."
+msgstr "Gustaríame engadilo á miña listaxe de contactos."
+
+#: gajim/gtk/roster_item_exchange.py:52
+#, fuzzy, python-format
+msgid "<b>%s</b> would like to modify some contacts in your contact list."
+msgstr "Gustaríame engadilo á miña listaxe de contactos."
+
+#: gajim/gtk/roster_item_exchange.py:55
+#, fuzzy, python-format
+msgid "<b>%s</b> would like to delete some contacts from your contact list."
+msgstr "Gustaríame engadilo á miña listaxe de contactos."
+
+#: gajim/gtk/roster_item_exchange.py:73 gajim/gtk/roster_item_exchange.py:161
+#, fuzzy
+msgid "Modify"
+msgstr "_Modificar"
+
+#: gajim/gtk/roster_item_exchange.py:86
+#, fuzzy
+msgid "Groups"
+msgstr "Grupo"
+
+#: gajim/gtk/roster_item_exchange.py:196
+#, fuzzy, python-format
+msgid "%s suggested me to add you to my contact list."
+msgstr "Gustaríame engadilo á miña listaxe de contactos"
+
+#: gajim/gtk/roster_item_exchange.py:211
+#, fuzzy, python-format
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Engadir un _contacto"
+msgstr[1] "Engadir un _contacto"
+
+#: gajim/gtk/roster_item_exchange.py:252
+#, fuzzy, python-format
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Elimina o contacto da listaxe"
+msgstr[1] "Elimina o contacto da listaxe"
+
+#: gajim/gtk/util.py:581
+msgid "Unknown Artist"
+msgstr ""
+
+#: gajim/gtk/util.py:582
+msgid "Unknown Title"
+msgstr ""
+
+#: gajim/gtk/util.py:583
+msgid "Unknown Source"
+msgstr ""
+
+#: gajim/gtk/util.py:585
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
+#: gajim/gtk/bookmarks.py:121
+msgid "New Group Chat"
+msgstr "Novo grupo de charla"
+
+#: gajim/gtk/bookmarks.py:161
+msgid "This bookmark has invalid data"
+msgstr "Este marcador ten información que non é válida"
+
+#: gajim/gtk/bookmarks.py:162
+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."
+
+#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
+#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Alcume non permitido: %s"
+
+#: gajim/gtk/bookmarks.py:334
+#, fuzzy
+msgid "Invalid room"
+msgstr "A entrada non é válida"
+
+#: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:613
+#: gajim/plugins/pluginmanager.py:738
 #, fuzzy
 msgid "Archive empty"
 msgstr "Camiño do ficheiro"
 
-#: gajim/plugins/pluginmanager.py:625 gajim/plugins/pluginmanager.py:633
-#: gajim/plugins/gui.py:264
+#: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
+#: gajim/plugins/gui.py:257
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:641 gajim/plugins/gui.py:288
-#: gajim/plugins/gui.py:296
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
+#: gajim/plugins/gui.py:289
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Este ficheiro xa existe"
 
-#: gajim/plugins/gui.py:156
+#: gajim/plugins/gui.py:82
+msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
+msgstr ""
+
+#: gajim/plugins/gui.py:89
+msgid "Plugin"
+msgstr ""
+
+#: gajim/plugins/gui.py:151
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "A expulsar %s"
 
-#: gajim/plugins/gui.py:213
+#: gajim/plugins/gui.py:206
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Fallou a conexión"
 
-#: gajim/plugins/gui.py:256
+#: gajim/plugins/gui.py:245
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:281
 msgid "Overwrite?"
 msgstr ""
 
-#: gajim/plugins/gui.py:320
-#, fuzzy
-msgid "Configuration"
-msgstr "Configuración da sala"
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Cliente de MI de Jabber"
 
-#: data/org.gajim.Gajim.desktop.in:6 data/org.gajim.Gajim.appdata.xml.in:10
+#: data/org.gajim.Gajim.desktop.in:6
 msgid "A GTK+ Jabber client"
 msgstr "Un cliente de Jabber de GTK"
 
@@ -11034,117 +11044,1491 @@ msgstr "Un cliente de Jabber de GTK"
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
 
-#: data/org.gajim.Gajim.desktop.in:12
+#: data/org.gajim.Gajim.desktop.in:11 data/org.gajim.Gajim.desktop.in:22
+#: data/org.gajim.Gajim.desktop.in:27
 msgid "org.gajim.Gajim"
 msgstr ""
 
+#: data/org.gajim.Gajim.desktop.in:26
+#, fuzzy
+msgid "Show next pending event"
+msgstr "Amosar todos os _eventos pendentes"
+
 #: data/org.gajim.Gajim.appdata.xml.in:12
 msgid ""
-"Gajim is a chat client to be used with Jabber.org, Live Journal Talk, "
-"Nimbuzz, Ovi, Talkonaut, and thousands of other services run by companies "
-"and ISPs, and volunteers around the world."
+"Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
+"you can chat through various XMPP services of your choice (e.g. Jabber.org) "
+"as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:16
 msgid ""
-"If you have a few accounts on different servers, if you want to be in "
-"contact with your friends and family all the time, then Gajim is for you."
+"Just chat with your friends or family, easily share pictures and thoughts or "
+"discuss the news with your groups."
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:19
-#, fuzzy
-msgid "Features:"
-msgstr "Características dos servidores"
-
-#: data/org.gajim.Gajim.appdata.xml.in:21
-msgid "Tabbed chat window and single window modes"
-msgstr ""
-
-#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid ""
-"Group chat support (with Multi-User Chat protocol), invitation, chat to "
-"group chat transformation"
+"Gajim integrates well with your other devices: just chat and see what's been "
+"said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
-msgid "Emoticons, avatars, PEP (user activity, mood and tune)"
-msgstr ""
+#: data/org.gajim.Gajim.appdata.xml.in:22
+#, fuzzy
+msgid "Features:"
+msgstr "Características dos servidores"
 
 #: data/org.gajim.Gajim.appdata.xml.in:24
-msgid "Audio / video conferences"
+msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:25
-#, fuzzy
-msgid "File transfer, room bookmarks"
-msgstr "Produciuse un erro na transferencia do ficheiro"
+msgid "Invite friends to group chats or join one"
+msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:26
-msgid "Metacontacts support"
+msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Trayicon, speller, extended chat history functionalities"
+msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
-msgid "TLS, GPG and End-To-End encryption support"
+msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:29
-msgid "Transport registration support"
+msgid "Keep and manage all your chat history"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:30
-#, fuzzy
-msgid "Service discovery including nodes, user search"
-msgstr "Xestión de servizos coa conta %s"
+msgid "Organize your chats with tabs"
+msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:31
-msgid "Wikipedia, dictionary and search engine lookup"
+msgid "Automatic spell-checking for your messages"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:32
-msgid "Multiple accounts support"
+msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:33
-#, fuzzy
-msgid "XML console interface"
-msgstr "Consola XML"
+msgid ""
+"Lookup things on Wikipedia, dictionaries or other search engines directly "
+"from the chat window"
+msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:34
-msgid "Link local (bonjour / zeroconf), BOSH"
+msgid ""
+"Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:35
-msgid "Other features via plugins"
+msgid "Support for multiple accounts"
+msgstr ""
+
+#: data/org.gajim.Gajim.appdata.xml.in:36
+msgid "Group multiple contacts from one friend to a single Meta-Contact"
+msgstr ""
+
+#: data/org.gajim.Gajim.appdata.xml.in:37
+msgid "XML console to see what's happening on the protocol layer"
+msgstr ""
+
+#: data/org.gajim.Gajim.appdata.xml.in:38
+msgid "Serverless messaging (Bonjour/Zeroconf), BOSH"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:47
+#: data/org.gajim.Gajim.appdata.xml.in:39
+#, fuzzy
+msgid "Support for service discovery including nodes and search for users"
+msgstr "Xestión de servizos coa conta %s"
+
+#: data/org.gajim.Gajim.appdata.xml.in:40
+msgid "Even more features via plugins"
+msgstr ""
+
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Roster, list of contacts"
 msgstr "_Rexistrar os cambios de estado dos contactos"
 
-#: data/org.gajim.Gajim.appdata.xml.in:51
+#: data/org.gajim.Gajim.appdata.xml.in:56
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:55
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Group chat support"
 msgstr "Grupos de charla"
 
-#: data/org.gajim.Gajim.appdata.xml.in:59
+#: data/org.gajim.Gajim.appdata.xml.in:64
 #, fuzzy
 msgid "Chat history"
 msgstr "Recentemente:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:63
+#: data/org.gajim.Gajim.appdata.xml.in:68
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Fallou a conexión"
 
+#~ msgid "%s GiB"
+#~ msgstr "%s GiB"
+
+#~ msgid "%s GB"
+#~ msgstr "%s GB"
+
+#~ msgid "%s MiB"
+#~ msgstr "%s MiB"
+
+#~ msgid "%s MB"
+#~ msgstr "%s MB"
+
+#~ msgid "%s KiB"
+#~ msgstr "%s KiB"
+
+#~ msgid "%s KB"
+#~ msgstr "%s KB"
+
+#~ msgid "%s B"
+#~ msgstr "%s B"
+
+#, fuzzy
+#~ msgid "%s MiB/s"
+#~ msgstr "%s MiB"
+
+#, fuzzy
+#~ msgid "File transfer"
+#~ msgstr "Transferencias"
+
+#, fuzzy
+#~ msgid "Accept"
+#~ msgstr "Aceptar"
+
+#, fuzzy
+#~ msgid "Open _Containing Folder"
+#~ msgstr "_Abrir un cartafol de contido"
+
+#, fuzzy
+#~ msgid "Default:"
+#~ msgstr "Por defecto"
+
+#, fuzzy
+#~ msgid ""
+#~ "You will no longer be able to send and receive messages to contacts from "
+#~ "these transports: %s"
+#~ msgstr ""
+#~ "Xa non poderá enviar e recibir mensaxes a contactos desde estes "
+#~ "transportes: %s"
+
+#~ msgid "Contact \"%s\" will be removed from your roster"
+#~ msgstr "Eliminarase o contacto \"%s\" da súa listaxe"
+
+#, fuzzy
+#~ msgid ""
+#~ "By removing this contact you also by default remove authorization "
+#~ "resulting in them always seeing you as offline."
+#~ msgstr ""
+#~ "Ao eliminar este contacto tamén se eliminará a autorización. Este "
+#~ "contacto sempre o/a verá desconectado."
+
+#~ msgid "Contacts will be removed from your roster"
+#~ msgstr "Os contactos eliminaranse da súa listaxe"
+
+#~ msgid ""
+#~ "By removing these contacts:%s\n"
+#~ "you also remove authorization resulting in them always seeing you as "
+#~ "offline."
+#~ msgstr ""
+#~ "Ao eliminar estes contactos: %s\n"
+#~ "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
+#~ "desconectado."
+
+#, fuzzy
+#~ msgid "Con_tinue"
+#~ msgstr "_Continuar"
+
+#~ msgid "_Pause"
+#~ msgstr "_Pausa"
+
+#~ msgid "Clean _up"
+#~ msgstr "Limpar"
+
+#~ msgid "Remove file transfer from the list."
+#~ msgstr "Eliminar transferencias da listaxe"
+
+#~ msgid ""
+#~ "This action removes single file transfer from the list. If the transfer "
+#~ "is active, it is first stopped and then removed"
+#~ msgstr ""
+#~ "Esta acción elimina transferencias da listaxe. Se a transferencia estiver "
+#~ "activa, detense primeiro e elimínase despois"
+
+#~ msgid "Cancels the selected file transfer"
+#~ msgstr "Cancela a transferencia seleccionada do ficheiro"
+
+#, fuzzy
+#~ msgid "Hide the window"
+#~ msgstr "Oculta a fiestra"
+
+#~ msgid "When a file transfer is complete show a popup notification"
+#~ msgstr ""
+#~ "Cando unha transferencia se completar, amosa unha notificación emerxente"
+
+#~ msgid "From:"
+#~ msgstr "De:"
+
+#~ msgid "Subject:"
+#~ msgstr "Tema:"
+
+#~ msgid "%s wants to send you a file:"
+#~ msgstr "%s quere enviarlle un ficheiro:"
+
+#~ msgid "Name: "
+#~ msgstr "Nome: "
+
+#~ msgid "Pause"
+#~ msgstr "Pausa"
+
+#~ msgid "_Continue"
+#~ msgstr "_Continuar"
+
+#, fuzzy
+#~ msgid "Execute Command"
+#~ msgstr "Executar o _comando..."
+
+#~ msgid "Type: "
+#~ msgstr "Tipo: "
+
+#~ msgid "Transferred: "
+#~ msgstr "Transferido: "
+
+#~ msgid "Status: "
+#~ msgstr "Estado: "
+
+#~ msgid "Completed"
+#~ msgstr "Completado"
+
+#~ msgid "Stalled"
+#~ msgstr "Atascado"
+
+#~ msgid "Transferring"
+#~ msgstr "A transferir"
+
+#~ msgid "Not started"
+#~ msgstr "Non iniciado"
+
+#, fuzzy
+#~ msgid "%s day"
+#~ msgid_plural "%s days"
+#~ msgstr[0] "hai %i días"
+#~ msgstr[1] "hai %i días"
+
+#~ 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?"
+
+#, fuzzy
+#~ msgid ""
+#~ "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:"
+
+#, fuzzy
+#~ msgid "_Configure"
+#~ msgstr "_Continuar"
+
+#, fuzzy
+#~ msgid "Change the avatar"
+#~ msgstr "Un contacto cambiou o seu estado"
+
+#, fuzzy
+#~ msgid "Picture to use"
+#~ msgstr "Non se achou o alcume: %s"
+
+#, 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"
+
+#, fuzzy
+#~ msgid "add"
+#~ msgstr "Atascado"
+
+#, fuzzy
+#~ msgid "modify"
+#~ msgstr "_Modificar"
+
+#, fuzzy
+#~ msgid "remove"
+#~ msgstr "_Eliminar"
+
+#, fuzzy
+#~ 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."
+
+#, fuzzy
+#~ msgid "Restored Message Color"
+#~ msgstr "_Restabelecer as cores predeterminadas"
+
+#, fuzzy
+#~ msgid "Send Cus_tom Status"
+#~ msgstr "Envía XML personalizado"
+
+#, fuzzy
+#~ msgid ""
+#~ "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?"
+
+#, fuzzy
+#~ msgid "<from Subject>"
+#~ msgstr "Asunto"
+
+#~ msgid "#"
+#~ msgstr "núm."
+
+#, 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?"
+
+#~ msgid "To:"
+#~ msgstr "A:"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#, fuzzy
+#~ msgid "Merge Accounts"
+#~ msgstr "Contas combinadas"
+
+#, fuzzy
+#~ msgid "Reconnect when connection is lost"
+#~ msgstr "Conectar automaticamente se se perde a conexión"
+
+#, fuzzy
+#~ msgid "Server Message Archive"
+#~ msgstr "_Enviar a mensaxe do servidor"
+
+#, fuzzy
+#~ msgid "Message Carbons"
+#~ msgstr "Mensaxes"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "Allow my idle _time to be sent"
+#~ msgstr "Permitir o envío de información sobre o sistema operativo"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, others will be allowed to detect the idle time of your system"
+#~ msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
+
+#, fuzzy
+#~ msgid "_Allow local system time information to be sent"
+#~ msgstr "Permitir o envío de información sobre o sistema operativo"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, others will be allowed to detect the local time on your system"
+#~ msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
+
+#, fuzzy
+#~ msgid "Allow client / _OS information to be sent"
+#~ msgstr "Permitir o envío de información sobre o sistema operativo"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, others will be allowed to detect the operating system you are "
+#~ "using"
+#~ msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, incoming events from unauthorized contacts will be ignored. "
+#~ "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."
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "S_end chat state notifications"
+#~ msgstr "Notificacións de estado nas charlas:"
+
+#, fuzzy
+#~ msgid "Login Options"
+#~ msgstr "Emoticonas:"
+
+#, fuzzy
+#~ msgid "Please wait while retrieving search form..."
+#~ msgstr "Por favor, agarde mentres se solicita a listaxe de comandos..."
+
+#, fuzzy
+#~ msgid "_Add contact"
+#~ msgstr "Engadir un _contacto"
+
+#~ msgid "Ad-hoc Commands - Gajim"
+#~ msgstr "Comandos ad-hoc - Gajim"
+
+#~ msgid "Please wait while retrieving command list..."
+#~ msgstr "Por favor, agarde mentres se solicita a listaxe de comandos..."
+
+#~ msgid "<b>Choose command to execute:</b>"
+#~ msgstr "<b>Elixa o comando para executar:</b>"
+
+#~ msgid "Check once more"
+#~ msgstr "Comprobar mais unha vez"
+
+#, fuzzy
+#~ msgid "Please wait while the command is being sent..."
+#~ msgstr "Por favor, agarde mentres se envía o comando..."
+
+#~ msgid "This jabber entity does not expose any commands."
+#~ msgstr "Esta entidade de jabber non expón comandos."
+
+#, fuzzy
+#~ msgid "<b>An error has occurred:</b>"
+#~ msgstr "<b>Produciuse un erro:</b>"
+
+#, fuzzy
+#~ msgid "F_inish"
+#~ msgstr "_Rematar"
+
+#~ msgid "Failed to get secret keys"
+#~ msgstr "Produciuse un erro ao obter as chaves secretas"
+
+#, fuzzy
+#~ msgid "There is no OpenPGP secret key available."
+#~ msgstr "Houbo un problema ao recuperar as súas chaves secretas de OpenPGP"
+
+#~ msgid "OpenPGP Key Selection"
+#~ msgstr "Selección da chave de OpenPGP"
+
+#~ msgid "Choose your OpenPGP key"
+#~ msgstr "Elixa a súa chave de OpenPGP"
+
+#~ msgid "KeyID"
+#~ msgstr "Chave ID"
+
+#~ msgid "Contact name"
+#~ msgstr "Nome de contacto"
+
+#, fuzzy
+#~ msgid "OpenPGP is not usable"
+#~ msgstr "OpenPGP non se pode usar neste ordenador"
+
+#~ msgid "Assign OpenPGP Key"
+#~ msgstr "Asignar chave de OpenPGP"
+
+#~ msgid "Select a key to apply to the contact"
+#~ msgstr "Seleccione unha chave para lle aplicar ao contacto"
+
+#~ msgid "You are currently connected without your OpenPGP key."
+#~ msgstr "Está actualmente conectado sen a súa chave de GPG"
+
+#, fuzzy
+#~ msgid "Wrong passphrase"
+#~ msgstr "O contrasinal é incorrecto"
+
+#, fuzzy
+#~ msgid "Wrong OpenPGP passphrase"
+#~ msgstr "O contrasinal é incorrecto"
+
+#~ msgid "Passphrase Required"
+#~ msgstr "É necesario o contrasinal"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
+#~ msgstr "Introduza o contrasinal GPG para a conta %s"
+
+#, fuzzy
+#~ msgid "OpenPGP key expired"
+#~ msgstr "Selección da chave de OpenPGP"
+
+#, fuzzy
+#~ msgid ""
+#~ "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
+#~ msgstr "Conectarase a %s sen o OpenPGP"
+
+#~ msgid "Wrong Passphrase"
+#~ msgstr "O contrasinal é incorrecto"
+
+#, fuzzy
+#~ msgid "Please retype your OpenPGP passphrase or press Cancel."
+#~ msgstr ""
+#~ "Por favor, volva escribir o seu contrasinal de GPG ou prema Cancelar."
+
+#~ 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 "
+#~ "key', just set 'OpenPGP key' to ''."
+#~ msgstr ""
+#~ "Envía unha mensaxe nova de charla a un contacto na listaxe. Tanto a chave "
+#~ "de OpenPGP como a conta son opcionais. Se quere definir só 'conta' sen "
+#~ "'chave pgp', só defina 'chave pgp' a ''."
+
+#~ 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "Sends a chat message to someone on your roster. Optionally with OpenPGP "
+#~ "key and account. If you want to only set the latter, set OpenPGP key to "
+#~ "\"\"."
+#~ msgstr ""
+#~ "Envía unha mensaxe nova de charla a un contacto na listaxe. Tanto a chave "
+#~ "de OpenPGP como a conta son opcionais. Se quere definir só 'conta' sen "
+#~ "'chave pgp', só defina 'chave pgp' a ''."
+
+#, fuzzy
+#~ msgid "OpenPGP:"
+#~ msgstr "OpenPGP: "
+
+#, fuzzy
+#~ msgid "Assign Open_PGP Key..."
+#~ msgstr "Asignar chave de OpenPGP"
+
+#, fuzzy
+#~ msgid "OpenPGP Message Encryption"
+#~ msgstr "Cifrado OpenPGP"
+
+#, fuzzy
+#~ msgid "Enables Gajim to encrypt chat messages with OpenPGP"
+#~ msgstr "Mens_axe entrante:"
+
+#, fuzzy
+#~ msgid "Requires: gpg.exe in your PATH environment variable"
+#~ msgstr "Conexión non dispoñíbel"
+
+#, fuzzy
+#~ msgid "OpenPGP Key"
+#~ msgstr "Asignar chave de OpenPGP"
+
+#, fuzzy
+#~ msgid "Cancel confirmation"
+#~ msgstr "Información"
+
+#, fuzzy
+#~ msgid "%s - Ad-hoc Commands - Gajim"
+#~ msgstr "Comandos ad-hoc - Gajim"
+
+#, fuzzy
+#~ msgid "You are invited to a groupchat"
+#~ msgstr "Está expulsado deste grupo de charla."
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Iniciar a charla"
+
+#~ msgid "Au_thorize"
+#~ msgstr "Au_torizar"
+
+#~ msgid "You are currently connected to the server"
+#~ msgstr "Está actualmente conectado ao servidor"
+
+#, fuzzy
+#~ msgid "To disable the account, you must be disconnected."
+#~ msgstr "Para cambiar o nome da conta, debe estar desconectado"
+
+#, fuzzy
+#~ msgid "Do you wish to delete all correspondence with %(jid)s?"
+#~ msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
+
+#, fuzzy
+#~ msgid "Do you wish to delete all correspondence with the selected contacts?"
+#~ msgstr ""
+#~ "Está seguro de que quere eliminar o historial do contacto que seleccionou?"
+
+#, fuzzy
+#~ msgid "This can not be undone."
+#~ msgstr "O servizo non se achou"
+
+#~ msgid "<b>What do you want to do?</b>"
+#~ msgstr "<b>Que quere facer?</b>"
+
+#, fuzzy
+#~ msgid ""
+#~ "List of colors, separated by \":\", that will be used to color nicknames "
+#~ "in group chats."
+#~ msgstr ""
+#~ "Listaxe de cores que se empregarán para colorear o alcume nos grupos de "
+#~ "charla."
+
+#, fuzzy
+#~ 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:"
+
+#~ msgid "Stopped"
+#~ msgstr "Detido"
+
+#, fuzzy
+#~ msgid "Status messages displayed in chat window"
+#~ msgstr "Enviar a mensaxe e pechar a fiestra"
+
+#~ msgid "?print_status:All"
+#~ msgstr "Todos"
+
+#~ msgid "Enter and leave only"
+#~ msgstr "Entrar e saír soamente"
+
+#, fuzzy
+#~ msgid "?print_status:None"
+#~ msgstr "Todos"
+
+#~ msgid "D-Bus python bindings are missing in this computer"
+#~ msgstr "As ligazóns D-Bus de python non se achan neste computador"
+
+#~ msgid "D-Bus capabilities of Gajim cannot be used"
+#~ msgstr "Non se poden empregar as capacidades D-Bus de Gajim"
+
+#, 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"
+
+#, 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"
+
+#, fuzzy
+#~ msgid "Command line Control"
+#~ msgstr "Comandos: %s"
+
+#~ msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
+#~ msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
+
+#~ msgid "%(nick)s has been banned by %(who)s: %(reason)s"
+#~ msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
+
+#, fuzzy
+#~ msgid "** Role of %(nick)s has been set to %(role)s"
+#~ msgstr "%(nick)s foi expulsado por %(reason)s"
+
+#~ msgid "%s has left"
+#~ msgstr "%s saíu"
+
+#, fuzzy
+#~ msgid "<b>%s</b> is full"
+#~ msgstr "<b>Sons</b>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+#~ "longer print status line in groupchats when a member changes their status "
+#~ "and/or their status message. If \"all\" Gajim will print all status "
+#~ "messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+#~ "group chat."
+#~ msgstr ""
+#~ "pode ser \"none\", \"all\" ou \"in_and_out\". Se é \"none\", Gajim non "
+#~ "volverá mostrar a liña de estado nos grupos de conversa cando un membro "
+#~ "cambie a súa mensaxe de estado. Se é \"all\" o Gajim amosará todos as "
+#~ "mensaxes de estado. Se é \"in_and_out\", o Gajim só amosará as entradas e "
+#~ "as saídas no grupo de conversa."
+
+#, fuzzy
+#~ msgid "Displa_y status messages in group chats"
+#~ msgstr "Amosar na listaxe as _mensaxes de estado dos contactos"
+
+#, fuzzy
+#~ msgid ""
+#~ "You are about to send your password unencrypted on an insecure "
+#~ "connection. Are you sure you want to do that?"
+#~ msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
+
+#, fuzzy
+#~ msgid "Latest token for OAuth 2.0 authentication."
+#~ msgstr "Usar a autenticación"
+
+#, fuzzy
+#~ msgid "client_id for OAuth 2.0 authentication."
+#~ msgstr "Usar a autenticación"
+
+#, fuzzy
+#~ msgid "redirect_url for OAuth 2.0 authentication."
+#~ msgstr "Usar a autenticación"
+
+#~ msgid ""
+#~ "Displayed chat state notifications in chat windows. Can be one of all, "
+#~ "composing_only, disabled."
+#~ msgstr ""
+#~ "As notificacións de estado móstranse nas fiestras de conversa. Poden ser "
+#~ "todo, só_compor ou desactivado."
+
+#~ 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 "_Display chat state notifications"
+#~ msgstr "Notificacións de estado nas charlas:"
+
+#~ msgid "This is an irreversible operation."
+#~ msgstr "Esta é unha operación irreversíbel"
+
+#~ msgid "<b>Settings</b>"
+#~ msgstr "<b>Configuración</b>"
+
+#, fuzzy
+#~ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+#~ msgstr "Xestor do Historial de Gajim"
+
+#~ msgid "Member List"
+#~ msgstr "Listaxe de membros"
+
+#~ msgid "Owner List"
+#~ msgstr "Listaxe de propietarios"
+
+#~ msgid "Administrator List"
+#~ msgstr "Listaxe de administradores"
+
+#~ msgid "Nick"
+#~ msgstr "Alcume"
+
+#, fuzzy
+#~ msgid "Banning…"
+#~ msgstr "A expulsar..."
+
+#~ msgid ""
+#~ "<b>Whom do you want to ban?</b>\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<b>A quen quere expulsar?</b>\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "Adding Member…"
+#~ msgstr "A engadir o membro..."
+
+#~ msgid ""
+#~ "<b>Whom do you want to make a member?</b>\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<b>A quen quere facer membro?</b>\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "Adding Owner…"
+#~ msgstr "A engadir un propietario..."
+
+#, fuzzy
+#~ msgid ""
+#~ "<b>Whom do you want to make an owner?</b>\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<b>A quen quere facer como propietario?</b>\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "Adding Administrator…"
+#~ msgstr "A engadir administrador..."
+
+#~ msgid ""
+#~ "<b>Whom do you want to make an administrator?</b>\n"
+#~ "\n"
+#~ msgstr ""
+#~ "<b>A quen quere facer como administrador?</b>\n"
+#~ "\n"
+
+#~ msgid "Error reading file:"
+#~ msgstr "Erro ao ler o ficheiro:"
+
+#~ msgid "Error parsing file:"
+#~ msgstr "Erro ao analizar o ficheiro:"
+
+#~ msgid "<b>Description</b>"
+#~ msgstr "<b>Descrición</b>"
+
+#, fuzzy
+#~ msgid "Password encryption"
+#~ msgstr "Os contrasinais non coinciden"
+
+#, fuzzy
+#~ msgid "Automatic status"
+#~ msgstr "_Adaptar ao estado"
+
+#, fuzzy
+#~ msgid "?features:Available"
+#~ msgstr "En líña"
+
+#, fuzzy
+#~ msgid "Feature"
+#~ msgstr "Características dos servidores"
+
+#~ msgid "Filter:"
+#~ msgstr "Filtro:"
+
+#, 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"
+
+#, fuzzy
+#~ msgid "<b>Chat Appearance</b>"
+#~ msgstr "<b>Editar unha regra</b>"
+
+#~ 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 "<b>Sounds</b>"
+#~ msgstr "<b>Sons</b>"
+
+#, fuzzy
+#~ msgid "<b>Chat state notifications</b>"
+#~ msgstr "<b>Notificacións visuais</b>"
+
+#, fuzzy
+#~ msgid "Personal Events"
+#~ msgstr "Información persoal"
+
+#, fuzzy
+#~ msgid "_Away after"
+#~ msgstr "Pór _ausente despois de:"
+
+#, fuzzy
+#~ msgid "_Not available after"
+#~ msgstr "Pór _non dispoñíbel despois de:"
+
+#, fuzzy
+#~ msgid "<b>Auto Status</b>"
+#~ msgstr "<b>Accións</b>"
+
+#, fuzzy
+#~ msgid "<b>Status Messages</b>"
+#~ msgstr "<b>Mensaxes de estado predefinidas</b>"
+
+#, fuzzy
+#~ msgid "<b>Audio</b>"
+#~ msgstr "<b>Accións</b>"
+
+#, fuzzy
+#~ msgid "<b>Video</b>"
+#~ msgstr "<b>Engadir unha regra</b>"
+
+#, fuzzy
+#~ msgid "<b>Connection</b>"
+#~ msgstr "<b>Condicións</b>"
+
+#~ msgid "<b>Custom</b>"
+#~ msgstr "<b>Personalizado</b>"
+
+#, fuzzy
+#~ msgid "<b>Privacy</b>"
+#~ msgstr "<i>Listaxe de privacidade</i>"
+
+#~ msgid "<b>Advanced Configuration Editor</b>"
+#~ msgstr "<b>Editor de configuración avanzada</b>"
+
+#, fuzzy
+#~ msgid "File transfer, room bookmarks"
+#~ msgstr "Produciuse un erro na transferencia do ficheiro"
+
+#, fuzzy
+#~ msgid "XML console interface"
+#~ msgstr "Consola XML"
+
+#, fuzzy
+#~ msgid ""
+#~ "A programming error has been detected. 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."
+
+#, fuzzy
+#~ msgid "(<b>ESession</b> info)"
+#~ msgstr "<b>Descrición</b>"
+
+#~ msgid "Save as Preset..."
+#~ msgstr "Gardar como predefinido..."
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "_Emoticons"
+#~ msgstr "Emoticonas:"
+
+#~ msgid "_Highlight misspelled words"
+#~ msgstr "_Marcar os erros ortográficos"
+
+#, fuzzy
+#~ msgid "Notify by icon when your messages are received"
+#~ msgstr "Son para reproducir cando chega calquera mensaxe MUC"
+
+#, fuzzy
+#~ msgid "T_heme"
+#~ msgstr "Te_ma:"
+
+#, fuzzy
+#~ msgid "<b>Themes</b>"
+#~ msgstr "<b>Propiedades</b>"
+
+#~ 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 presences."
+#~ msgstr ""
+#~ "A Jabberd1.4 non lle gusta a información SHA cando se entra nun grupo de "
+#~ "charla protexido por contrasinal. Cambie esta opción a Falso para deter o "
+#~ "envío de información SHA no grupo de charla."
+
+#, fuzzy
+#~ msgid "Presence"
+#~ msgstr "_Presenza"
+
+#, fuzzy
+#~ msgid "Emoticons disabled"
+#~ msgstr "Cifrado desactivado"
+
+#, fuzzy
+#~ msgid "You cannot make changes to the default theme"
+#~ msgstr "Non pode eliminar o tema actual"
+
+#, fuzzy
+#~ msgid "Please create a new clean theme."
+#~ msgstr "Crear unha publicación nova"
+
+#~ msgid "theme name"
+#~ msgstr "nome do tema"
+
+#~ msgid "You cannot delete your current theme"
+#~ msgstr "Non pode eliminar o tema actual"
+
+#~ msgid "New Single Message from %(nickname)s"
+#~ msgstr "Mensaxe nova de %(nickname)s"
+
+#~ msgid "New Private Message from group chat %s"
+#~ msgstr "Nova mensaxe privada desde o grupo de charlas %s"
+
+#~ msgid "%(nickname)s: %(message)s"
+#~ msgstr "%(nickname)s: %(message)s"
+
+#, fuzzy
+#~ msgid "Messaged by %(nickname)s"
+#~ msgstr "Mensaxe nova de %(nickname)s"
+
+#, fuzzy
+#~ msgid "Status message text color."
+#~ msgstr "texto da mensaxe de estado"
+
+#, fuzzy
+#~ msgid "Incoming nickname font."
+#~ msgstr "O nome de usuario non é válido"
+
+#, fuzzy
+#~ msgid "Status message text font."
+#~ msgstr "texto da mensaxe de estado"
+
+#~ msgid "Background color of contacts when they just signed in."
+#~ msgstr "Cor de fondo para os contactos que acaban de se conectar."
+
+#~ msgid "Background color of contacts when they just signed out."
+#~ msgstr "Cor de fondo para os contactos que acaban de se desconectar."
+
+#~ msgid "green"
+#~ msgstr "verde"
+
+#~ msgid "grocery"
+#~ msgstr "ultramariño"
+
+#~ msgid "human"
+#~ msgstr "humano"
+
+#~ msgid "marine"
+#~ msgstr "mariño"
+
+#, fuzzy
+#~ msgid "Contact row"
+#~ msgstr "Contacto"
+
+#~ msgid "Gajim Themes Customization"
+#~ msgstr "Personalización de temas do Gajim"
+
+#~ msgid "Text _color:"
+#~ msgstr "_Cor do texto:"
+
+#~ msgid "_Background:"
+#~ msgstr "_Fondo"
+
+#~ msgid "Text _font:"
+#~ msgstr "_Letra do texto:"
+
+#~ msgid "Font style:"
+#~ msgstr "Estilo:"
+
+#~ msgid "Paused"
+#~ msgstr "Pausado"
+
+#~ msgid "Gone"
+#~ msgstr "Marchei"
+
+#~ msgid ""
+#~ "MUC\n"
+#~ "Messages"
+#~ msgstr ""
+#~ "MUC\n"
+#~ "Mensaxes"
+
+#~ msgid "<b>Chatstate Tab Colors</b>"
+#~ msgstr "<b>Cores do separador para os estados da charla</b>"
+
+#, fuzzy
+#~ msgid "Chat message"
+#~ msgstr "Men_saxe de estado:"
+
+#~ msgid "Use system _default"
+#~ msgstr "Usar o pre_definido do sistema"
+
+#, fuzzy
+#~ msgid "<b>Font</b>"
+#~ msgstr "<b>Sons</b>"
+
+#, fuzzy
+#~ msgid "Contact's nickname"
+#~ msgstr "Nome de contacto"
+
+#, fuzzy
+#~ msgid "Contact's message"
+#~ msgstr "Men_saxe de estado:"
+
+#, fuzzy
+#~ msgid "_Status message"
+#~ msgstr "Men_saxe de estado:"
+
+#, fuzzy
+#~ msgid "Group chat highlight"
+#~ msgstr "Remarcado da mensaxe de grupo de charla"
+
+#, fuzzy
+#~ msgid "Your nickname"
+#~ msgstr "Ant_es do alcume:"
+
+#, fuzzy
+#~ msgid "Your message"
+#~ msgstr "Mensaxe de erro: %s"
+
+#, fuzzy
+#~ msgid "<b>Chat Line Colors</b>"
+#~ msgstr "<b>Cores do separador para os estados da charla</b>"
+
+#, fuzzy
+#~ msgid "<b>Jabber ID:</b>"
+#~ msgstr "ID de Jabber:"
+
+#, fuzzy
+#~ msgid "<b>Resource:</b>"
+#~ msgstr "Recurso:"
+
+#, fuzzy
+#~ msgid "<b>Status:</b>"
+#~ msgstr "<b>Configuración</b>"
+
+#, fuzzy
+#~ msgid "<b>Client:</b>"
+#~ msgstr "<b>Personalizado</b>"
+
+#, fuzzy
+#~ msgid "<b>Contact time:</b>"
+#~ msgstr "<b>Configuración</b>"
+
+#, fuzzy
+#~ msgid "<b>Ask:</b>"
+#~ msgstr "<b>Accións</b>"
+
+#, fuzzy
+#~ msgid "<b>Subscription:</b>"
+#~ msgstr "<b>Descrición</b>"
+
+#, fuzzy
+#~ msgid "<b>Name:</b>"
+#~ msgstr "<b>Personalizado</b>"
+
+#, fuzzy
+#~ msgid "<b>Nickname:</b>"
+#~ msgstr "Alcume:"
+
+#, fuzzy
+#~ msgid "<b>Street:</b>"
+#~ msgstr "<b>Configuración</b>"
+
+#, fuzzy
+#~ msgid "<b>City:</b>"
+#~ msgstr "<b>Personalizado</b>"
+
+#, fuzzy
+#~ msgid "<b>State:</b>"
+#~ msgstr "<b>Configuración</b>"
+
+#, fuzzy
+#~ msgid "<b>Extra Address:</b>"
+#~ msgstr "Segundo enderezo:"
+
+#, fuzzy
+#~ msgid "<b>Postal Code:</b>"
+#~ msgstr "Código postal:"
+
+#, fuzzy
+#~ msgid "<b>Country:</b>"
+#~ msgstr "<b>Sons</b>"
+
+#, fuzzy
+#~ msgid "<b>Homepage:</b>"
+#~ msgstr "Páxina web:"
+
+#, fuzzy
+#~ msgid "<b>E-Mail:</b>"
+#~ msgstr "Correo electrónico:"
+
+#, fuzzy
+#~ msgid "<b>Phone No.:</b>"
+#~ msgstr "Teléfono:"
+
+#, fuzzy
+#~ msgid "<b>Birthday:</b>"
+#~ msgstr "Aniversario:"
+
+#, fuzzy
+#~ msgid "<b>Family:</b>"
+#~ msgstr "Familia:"
+
+#, fuzzy
+#~ msgid "<b>Middle:</b>"
+#~ msgstr "<b>Engadir unha regra</b>"
+
+#, fuzzy
+#~ msgid "<b>Prefix:</b>"
+#~ msgstr "<b>Propiedades</b>"
+
+#, fuzzy
+#~ msgid "<b>Given:</b>"
+#~ msgstr "<b>OpenPGP</b>"
+
+#, fuzzy
+#~ msgid "<b>Suffix:</b>"
+#~ msgstr "<b>Sons</b>"
+
+#, fuzzy
+#~ msgid "<b>Full Name</b>"
+#~ msgstr "<b>Personalizado</b>"
+
+#, fuzzy
+#~ msgid "<b>Company:</b>"
+#~ msgstr "<b>Personalizado</b>"
+
+#, fuzzy
+#~ msgid "<b>Department:</b>"
+#~ msgstr "Departamento:"
+
+#, fuzzy
+#~ msgid "<b>Position:</b>"
+#~ msgstr "<b>Condicións</b>"
+
+#, fuzzy
+#~ msgid "<b>Role:</b>"
+#~ msgstr "<b>Sons</b>"
+
+#~ msgid "Edit %s"
+#~ msgstr "Editar %s"
+
+#~ msgid "Register to %s"
+#~ msgstr "Rexistrar %s"
+
+#~ msgid "Conversation History with %s"
+#~ msgstr "Historial de conversas con %s"
+
+#~ msgid "Contact with \"%s\" cannot be established"
+#~ msgstr "Non foi posíbel estabelecer o contacto con \"%s\""
+
+#~ 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"
+
+#~ msgid "Register to"
+#~ msgstr "Rexistrar en"
+
+#, fuzzy
+#~ msgid "Enter name / JID of contact or groupchat"
+#~ msgstr "Nome de contacto"
+
+#, fuzzy
+#~ msgid "Search:"
+#~ msgstr "Buscar"
+
+#~ msgid "Without a connection, you can not change your password."
+#~ msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
+
+#~ msgid "Invalid password"
+#~ msgstr "O contrasinal non é válido"
+
+#~ msgid "The passwords typed in both fields must be identical."
+#~ msgstr "Os contrasinais escritos nos dous campos deben ser idénticos."
+
+#~ msgid "Enter new password:"
+#~ msgstr "Insira o contrasinal novo:"
+
+#~ msgid "Enter it again for confirmation:"
+#~ msgstr "Insírao mais unha vez para confirmar:"
+
+#~ 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 "unsubscribe request from %s"
+#~ msgstr "solicitude de eliminación de subscrición de %s"
+
+#, fuzzy
+#~ msgid "Autojoin"
+#~ msgstr "Autoconectar"
+
+#, fuzzy
+#~ msgid "Homepage:"
+#~ msgstr "Páxina web:"
+
+#~ msgid "Manage Bookmarks"
+#~ msgstr "Xestionar os marcadores"
+
+#~ msgid "_Nickname:"
+#~ msgstr "_Alcume:"
+
+#~ msgid "If checked, Gajim will join this group chat on startup"
+#~ msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
+
+#, fuzzy
+#~ msgid "Pr_int status:"
+#~ msgstr "Amosar o estado:"
+
+#, fuzzy
+#~ msgid "Add JID"
+#~ msgstr "ID de Jabber:"
+
+#, fuzzy
+#~ msgid "Preference:"
+#~ msgstr "Preferencias"
+
+#, fuzzy
+#~ msgid "Preference"
+#~ msgstr "Preferencias"
+
+#, fuzzy
+#~ msgid "JID:"
+#~ msgstr "O seu identificador JID"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please fill in the data of the contact you want to add to your account <b>"
+#~ "%s</b>"
+#~ msgstr ""
+#~ "Por favor, introduza a información do contacto que quere engadir á conta "
+#~ "%s"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Recently"
+#~ msgstr "Recentemente:"
+
+#~ msgid "Add New Contact"
+#~ msgstr "Engadir un contacto novo"
+
+#~ msgid "_User ID:"
+#~ msgstr "ID de _usuario:"
+
+#, fuzzy
+#~ msgid "Type User ID"
+#~ msgstr "ID de usuario:"
+
+#, fuzzy
+#~ msgid "Type Nickname"
+#~ msgstr "Alcume"
+
+#~ msgid "Personal Information"
+#~ msgstr "Información persoal"
+
+#, fuzzy
+#~ msgid "<b>Avatar:</b>"
+#~ msgstr "Imaxe:"
+
+#~ msgid "Click to set your avatar"
+#~ msgstr "Prema para definir a súa circunstancia"
+
+#, fuzzy
+#~ msgid "Remove Avatar"
+#~ msgstr "Eliminar o grupo"
+
+#~ msgid "Not fetched because of invisible status"
+#~ msgstr "Non se conseguiu debido ao estado invisíbel"
+
+#~ msgid "Please wait..."
+#~ msgstr "Por favor, agarde..."
+
+#~ msgid "Yahoo! Address:"
+#~ msgstr "Enderezo de Yahoo!:"
+
+#, fuzzy
+#~ msgid "Forward unread messages"
+#~ msgstr "%d mensaxe sen ler"
+
+#, fuzzy
+#~ msgid "Forward unread message then disconnect"
+#~ msgstr "%d mensaxe sen ler"
+
+#~ msgid "AIM Address:"
+#~ msgstr "Enderezo de AIM:"
+
+#~ msgid "MSN Address:"
+#~ msgstr "Enderezo de MSN:"
+
+#, fuzzy
+#~ msgid "End to End message encryption"
+#~ msgstr "Cifrado OpenPGP"
+
+#, fuzzy
+#~ msgid "Encrypting chat messages."
+#~ msgstr "Mens_axe entrante:"
+
+#, fuzzy
+#~ msgid "This session is encrypted"
+#~ msgstr "[Esta mensaxe está cifrada]"
+
+#, fuzzy
+#~ msgid "end-to-end encryption disabled"
+#~ msgstr "Cifrado desactivado"
+
+#, fuzzy
+#~ msgid "Unable to decrypt message"
+#~ msgstr "En cada _mensaxe"
+
+#~ msgid "_Send"
+#~ msgstr "_Enviar"
+
+#, fuzzy
+#~ msgid "Save Image as…"
+#~ msgstr "Gardar a imaxe como..."
+
+#, fuzzy
+#~ msgid "Exporting History Logs…"
+#~ msgstr "A exportar o historial..."
+
+#~ msgid "When %s becomes:"
+#~ msgstr "Cando %s estea:"
+
+#~ msgid "Adding Special Notification for %s"
+#~ msgstr "Engadir unha notificación especial para %s"
+
+#~ msgid "Unable to load idle module"
+#~ msgstr "Non se pode cargar o módulo inactivo"
+
+#, fuzzy
+#~ msgid "%s or %s is a directory but should be a file"
+#~ msgstr "%s é un directorio mais podería ser un ficheiro"
+
+#~ msgid "creating logs database"
+#~ msgstr "a crear a base de datos de rexistros"
+
+#, fuzzy
+#~ msgid "creating cache database"
+#~ msgstr "a crear a base de datos de rexistros"
+
+#, fuzzy
+#~ msgid "moving %(src)s to %(dst)s"
+#~ msgstr "Enviar %s"
+
+#, fuzzy
+#~ msgid "Rename account label"
+#~ msgstr "Xestionar as contas"
+
+#, fuzzy
+#~ msgid "Send Single Message..."
+#~ msgstr "Enviar unha _mensaxe..."
+
+#, fuzzy
+#~ msgid "E2E encryption disabled"
+#~ msgstr "Cifrado desactivado"
+
+#, fuzzy
+#~ msgid ""
+#~ "Install /\n"
+#~ "Upgrade"
+#~ msgstr "Atascado"
+
+#, fuzzy
+#~ msgid "Install/Upgrade"
+#~ msgstr "Atascado"
+
+#, fuzzy
+#~ msgid "Plugins updates"
+#~ msgstr "Fallou a conexión"
+
+#~ msgid "cyan"
+#~ msgstr "ciano"
+
+#, fuzzy
+#~ msgid "migrating logs database to indices"
+#~ msgstr "migrando os rexistros da base de datos aos índices"
+
+#, fuzzy
+#~ msgid "Send File..."
+#~ msgstr "Enviar ficheiro"
+
+#, fuzzy
+#~ msgid "HTTP File Upload not supported by your server"
+#~ msgstr "O teu servidor non admite o almacenamento de metacontactos"
+
+#, fuzzy
+#~ msgid "Jingle File Transfer"
+#~ msgstr "Transferencias"
+
 #~ msgid "Shows or hides the roster window"
 #~ msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
 
@@ -11180,10 +12564,6 @@ msgstr "Fallou a conexión"
 #~ msgstr "Entrar nun grupo de charla coa conta %s"
 
 #, fuzzy
-#~ msgid "Invalid Account"
-#~ msgstr "O nome da conta non é válido"
-
-#, fuzzy
 #~ msgid ""
 #~ "You have to choose an account from which you want to join the groupchat."
 #~ msgstr ""
@@ -11245,10 +12625,6 @@ msgstr "Fallou a conexión"
 #~ msgstr "contido da mensaxe"
 
 #, fuzzy
-#~ msgid "Room JID"
-#~ msgstr "Sala:"
-
-#, fuzzy
 #~ msgid "Nickname to use"
 #~ msgstr "Non se achou o alcume: %s"
 
@@ -11286,14 +12662,6 @@ msgstr "Fallou a conexión"
 #~ msgstr "Historial"
 
 #, fuzzy
-#~ msgid "Feature not available, see Help->Features"
-#~ msgstr "A mensaxe de estado de non autodispoñíbel"
-
-#, fuzzy
-#~ msgid "Send files"
-#~ msgstr "Enviar ficheiro"
-
-#, fuzzy
 #~ msgid "This contact does not support file transfer."
 #~ msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
@@ -11686,9 +13054,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Info/Query"
 #~ msgstr "Info/Consulta"
 
-#~ msgid "_Message"
-#~ msgstr "_Mensaxe"
-
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>Entrada de XML</b>"
 
@@ -11709,10 +13074,6 @@ msgstr "Fallou a conexión"
 #~ msgstr "desde %s"
 
 #, fuzzy
-#~ msgid "No"
-#~ msgstr "Ningún"
-
-#, fuzzy
 #~ msgid "Prefer"
 #~ msgstr "Preferencias"
 
@@ -11750,10 +13111,6 @@ msgstr "Fallou a conexión"
 #~ msgstr "Cifrado activado"
 
 #, fuzzy
-#~ msgid "OpenPGP encryption disabled"
-#~ msgstr "Cifrado desactivado"
-
-#, fuzzy
 #~ msgid "The following message was encrypted"
 #~ msgstr "[Esta mensaxe está cifrada]"
 
@@ -11927,10 +13284,6 @@ msgstr "Fallou a conexión"
 #~ 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."
 
@@ -12010,19 +13363,12 @@ msgstr "Fallou a conexión"
 #~ msgid "_Modify Account"
 #~ msgstr "Modificar conta"
 
-#~ msgid "_Group Chat"
-#~ msgstr "_Grupos de charla"
-
 #, 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 "Send Single Message"
-#~ msgstr "_Enviar mensaxe"
-
 #~ msgid "Execute Command..."
 #~ msgstr "Executar o comando..."
 
@@ -12048,10 +13394,6 @@ msgstr "Fallou a conexión"
 #~ 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 "
 
@@ -12177,10 +13519,6 @@ msgstr "Fallou a conexión"
 #~ "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 #~ "listaxe e nos grupos de charla"
 
-#, fuzzy
-#~ msgid "User avatar:"
-#~ msgstr "Imaxe:"
-
 #~ msgid "Gajim Instant Messenger"
 #~ msgstr "Mensaxaría Instantánea Gajim"
 
@@ -12512,12 +13850,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Gajim needs PySQLite2 to run"
 #~ msgstr "O Gajim precisa un PySQLite2 para funcionar"
 
-#~ msgid "_Incoming message:"
-#~ msgstr "Mens_axe entrante:"
-
-#~ msgid "_Outgoing message:"
-#~ msgstr "Mensaxe saínte:"
-
 #, fuzzy
 #~ msgid "gtk-ok"
 #~ msgstr "gtk+"
@@ -12548,18 +13880,12 @@ msgstr "Fallou a conexión"
 #~ "Non está conectado ou está invisíbel aos máis. A súa mensaxe non se puido "
 #~ "enviar "
 
-#~ msgid "%i days ago"
-#~ msgstr "hai %i días"
-
 #~ msgid "Add Special _Notification"
 #~ msgstr "Engadir unha _notificación especial"
 
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Asignar chave de OpenPGP"
 
-#~ msgid "Commands: %s"
-#~ msgstr "Comandos: %s"
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -12651,9 +13977,6 @@ msgstr "Fallou a conexión"
 #~ "Prema para ver as características (como transportes de MSN e ICQ) dos "
 #~ "servidores de Jabber"
 
-#~ msgid "Name:"
-#~ msgstr "Nome:"
-
 #, fuzzy
 #~ msgid "_Host:"
 #~ msgstr "_Porto:"
@@ -12685,10 +14008,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Generic"
 #~ msgstr "Xeral"
 
-#, fuzzy
-#~ msgid "Activity"
-#~ msgstr "Activo"
-
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr "%s non difundiu a súa chave de OpenPGP nin vostede lle asignou unha"
 
@@ -12775,9 +14094,6 @@ msgstr "Fallou a conexión"
 #~ "lle preguntará máis por unha mensaxe de estado cando mude o seu estado a "
 #~ "ausente; simplemente aplicará a mensaxe predefinida para ausente"
 
-#~ msgid "Chat"
-#~ msgstr "Charla"
-
 #~ msgid "E_very 5 minutes"
 #~ msgstr "Cada 5 _minutos"
 
@@ -12788,13 +14104,6 @@ msgstr "Fallou a conexión"
 #~ "fiestra relativa"
 
 #~ msgid ""
-#~ "Gajim will notify you for new events via a popup in the bottom right of "
-#~ "the screen"
-#~ msgstr ""
-#~ "O Gajim notificaralle novos acontecementos a través dunha mensaxe "
-#~ "emerxente no bordo inferior dereito da pantalla"
-
-#~ msgid ""
 #~ "Gajim will notify you via a popup window in the bottom right of the "
 #~ "screen about contacts that just signed in"
 #~ msgstr ""
@@ -12875,33 +14184,9 @@ msgstr "Fallou a conexión"
 #~ msgid "_Player:"
 #~ msgstr "_Reprodutor:"
 
-#~ msgid "City:"
-#~ msgstr "Cidade:"
-
-#~ msgid "Company:"
-#~ msgstr "Empresa:"
-
-#~ msgid "Given:"
-#~ msgstr "Nome:"
-
-#~ msgid "Middle:"
-#~ msgstr "Medio:"
-
-#~ msgid "Position:"
-#~ msgstr "Posición:"
-
-#~ msgid "Prefix:"
-#~ msgstr "Prefixo"
-
 #~ msgid "Role:"
 #~ msgstr "Papel:"
 
-#~ msgid "State:"
-#~ msgstr "Estado:"
-
-#~ msgid "Suffix:"
-#~ msgstr "Sufixo:"
-
 #~ msgid "_Retrieve"
 #~ msgstr "_Recuperar"
 
@@ -12911,15 +14196,6 @@ msgstr "Fallou a conexión"
 #~ msgid "A_ccounts"
 #~ msgstr "_Contas"
 
-#~ msgid "_Filter:"
-#~ msgstr "_Filtro:"
-
-#~ msgid "Ask:"
-#~ msgstr "Pregunta:"
-
-#~ msgid "Client:"
-#~ msgstr "Cliente:"
-
 #~ msgid "OS:"
 #~ msgstr "SO:"
 
@@ -12941,9 +14217,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Every %s _minutes"
 #~ msgstr "Cada %s _minutos"
 
-#~ msgid "You must enter a password for the new account."
-#~ msgstr "Debe introducir un contrasinal para a conta nova"
-
 #~ msgid "You will always see him or her as offline."
 #~ msgstr "Sempre o verá desconectado."
 
@@ -12968,9 +14241,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Private Chat"
 #~ msgstr "Charla privada"
 
-#~ msgid "Group Chat"
-#~ msgstr "Grupos de charla"
-
 #~ msgid "%s is now %s"
 #~ msgstr "%s está agora %s"