diff po/gl.po @ 13552:ba0147a93c56

[gaim-migrate @ 15930] some updates committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 23 Mar 2006 16:38:36 +0000
parents cfc2f7fcb3dd
children 760528340ee3
line wrap: on
line diff
--- a/po/gl.po	Thu Mar 23 14:20:56 2006 +0000
+++ b/po/gl.po	Thu Mar 23 16:38:36 2006 +0000
@@ -7,14 +7,15 @@
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-05 18:23+0100\n"
-"PO-Revision-Date: 2006-03-05 18:22+0100\n"
+"POT-Creation-Date: 2006-03-22 13:23+0100\n"
+"PO-Revision-Date: 2006-03-22 13:51+0100\n"
 "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
-"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
+"Language-Team: Galego <trasno@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: KBabel 1.11.2\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #: ../gaim.desktop.in.h:1
 msgid "Gaim Internet Messenger"
@@ -101,10 +102,8 @@
 #. *< version
 #. *< summary
 #: ../plugins/contact_priority.c:185
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Permite controlar os valores asociados aos diferentes estados dos amigos."
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "Permite controlar os valores asociados aos diferentes estados dos amigos."
 
 #. *< description
 #: ../plugins/contact_priority.c:187
@@ -160,7 +159,7 @@
 
 #. add enabled / disabled
 #: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
-#: ../src/gtkplugin.c:577
+#: ../src/gtkplugin.c:574
 msgid "Enabled"
 msgstr "Activado"
 
@@ -190,7 +189,7 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "Premer co botón dereito para máis mensaxes sen ler...\n"
 
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3274
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3238
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -205,31 +204,31 @@
 #: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/msn/state.c:29
 #: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
 #: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2845
-#: ../src/protocols/yahoo/yahoo.c:2734 ../src/status.c:155
+#: ../src/protocols/yahoo/yahoo.c:2735 ../src/status.c:155
 msgid "Available"
 msgstr "Dispoñible"
 
 #. Away stuff
 #: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
 #: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
+#: ../src/protocols/irc/msgs.c:223 ../src/protocols/jabber/buddy.c:1105
 #: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:793
-#: ../src/protocols/oscar/oscar.c:6830 ../src/protocols/oscar/oscar.c:7871
-#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3188
+#: ../src/protocols/oscar/oscar.c:6836 ../src/protocols/oscar/oscar.c:7879
+#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3189
 #: ../src/status.c:158
 msgid "Away"
 msgstr "Ausente"
 
 #: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2728
+#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2729
 #: ../src/status.c:157
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:3004
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2968
 #: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
 #: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859
-#: ../src/protocols/oscar/oscar.c:7843 ../src/protocols/yahoo/yahoo.c:2732
+#: ../src/protocols/oscar/oscar.c:7851 ../src/protocols/yahoo/yahoo.c:2733
 #: ../src/status.c:154
 msgid "Offline"
 msgstr "Desconectado"
@@ -246,7 +245,7 @@
 msgid "Show Buddy List"
 msgstr "Amosar lista de amigos"
 
-#: ../plugins/docklet/docklet.c:489
+#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5640
 msgid "Unread Messages"
 msgstr "Mensaxes sen ler"
 
@@ -258,7 +257,7 @@
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:541
+#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538
 msgid "Plugins"
 msgstr "Complementos"
 
@@ -395,7 +394,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/filectl.c:245
+#: ../plugins/filectl.c:248
 msgid "Gaim File Control"
 msgstr "Control de ficheiros de Gaim"
 
@@ -403,7 +402,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/filectl.c:248 ../plugins/filectl.c:250
+#: ../plugins/filectl.c:251 ../plugins/filectl.c:253
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Permite controlar Gaim introducindo comandos nun ficheiro."
 
@@ -597,10 +596,14 @@
 "Arriba e despois á dereita para cambiar á seguinte conversación."
 
 #. Extract their Name and put it in
+#. Contact Info
+#. Personal
+#. Business
 #: ../plugins/gevolution/add_buddy_dialog.c:131
-#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:590
+#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
 #: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1525
+#: ../src/protocols/msn/msn.c:1532 ../src/protocols/msn/msn.c:1585
+#: ../src/protocols/msn/msn.c:1606
 msgid "Name"
 msgstr "Nome"
 
@@ -618,14 +621,14 @@
 #. "Search"
 #: ../plugins/gevolution/add_buddy_dialog.c:467
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8391
+#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8399
 #: ../src/protocols/sametime/sametime.c:5532
 msgid "Search"
 msgstr "Buscar"
 
 #: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4570
-#: ../src/gtkblist.c:4934
+#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4612
+#: ../src/gtkblist.c:4976
 msgid "Group:"
 msgstr "Grupo:"
 
@@ -660,13 +663,13 @@
 msgstr "_Asociar amigo"
 
 #: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1121
+#: ../src/protocols/jabber/jabber.c:1122
 msgid "None"
 msgstr "Ningún"
 
 #: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1270 ../src/blist.c:1495
-#: ../src/gtkblist.c:4379 ../src/protocols/jabber/roster.c:65
+#: ../src/blist.c:516 ../src/blist.c:1278 ../src/blist.c:1505
+#: ../src/gtkblist.c:4421 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Amigos"
 
@@ -699,11 +702,10 @@
 #. Label
 #: ../plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
-"Seleccione todas as contas aos que os amigos engadiranse de forma automática"
+msgstr "Seleccione todas as contas aos que os amigos engadiranse de forma automática"
 
 #: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
-#: ../plugins/idle.c:183 ../src/gtknotify.c:371 ../src/gtkpounce.c:1262
+#: ../plugins/idle.c:183 ../src/gtknotify.c:397 ../src/gtkpounce.c:1262
 msgid "Account"
 msgstr "Conta"
 
@@ -732,14 +734,14 @@
 
 #: ../plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
-msgstr ""
-"Introduza o nome de usuario do seu amigo e o tipo de conta máis abaixo."
+msgstr "Introduza o nome de usuario do seu amigo e o tipo de conta máis abaixo."
 
 #: ../plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Tipo de conta:"
 
 #: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
+#: ../src/gtkblist.c:4574
 msgid "Screen name:"
 msgstr "Nome de usuario:"
 
@@ -813,8 +815,7 @@
 
 #: ../plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
-msgstr ""
-"Mostra as conversacións rexistradas previamente nas novas conversacións."
+msgstr "Mostra as conversacións rexistradas previamente nas novas conversacións."
 
 #: ../plugins/history.c:191
 msgid ""
@@ -840,8 +841,7 @@
 #. *  description
 #: ../plugins/iconaway.c:85 ../plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr ""
-"Iconiza a lista de amigos e de conversacións cando vostede está ausente."
+msgstr "Iconiza a lista de amigos e de conversacións cando vostede está ausente."
 
 #: ../plugins/idle.c:152 ../plugins/idle.c:210
 msgid "Minutes"
@@ -938,31 +938,31 @@
 "Complemento de soporte IPC de proba, como un servidor. Este rexistra os "
 "comandos IPC."
 
-#: ../plugins/log_reader.c:1407
+#: ../plugins/log_reader.c:1405
 msgid "User is offline."
 msgstr "O usuario está desconectado."
 
-#: ../plugins/log_reader.c:1413
+#: ../plugins/log_reader.c:1411
 msgid "Auto-response sent:"
 msgstr "Enviar resposta automática:"
 
-#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
-#: ../plugins/statenotify.c:79
+#: ../plugins/log_reader.c:1421 ../plugins/log_reader.c:1424
+#: ../plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s desconectouse."
 
-#: ../plugins/log_reader.c:1440
+#: ../plugins/log_reader.c:1438
 msgid "One or more messages may have been undeliverable."
 msgstr "Unha ou máis mensaxes pode que non chegaran ao destino."
 
 #. MSG_SERVER_DISCONNECTING
 #. we have been kicked off =^(
-#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
+#: ../plugins/log_reader.c:1448 ../src/protocols/napster/napster.c:363
 msgid "You were disconnected from the server."
 msgstr "Foi desconectado do servidor."
 
-#: ../plugins/log_reader.c:1458
+#: ../plugins/log_reader.c:1456
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -970,49 +970,49 @@
 "Está actualmente desconectado. As mensaxes non se recibirán a non ser que se "
 "conecte."
 
-#: ../plugins/log_reader.c:1473
+#: ../plugins/log_reader.c:1471
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Non se puido enviar a mensaxe porque excedeu a lonxitude máxima."
 
-#: ../plugins/log_reader.c:1478
+#: ../plugins/log_reader.c:1476
 msgid "Message could not be sent."
 msgstr "A mensaxe non puido ser enviada."
 
-#: ../plugins/log_reader.c:1837 ../plugins/log_reader.c:1930
+#: ../plugins/log_reader.c:1835 ../plugins/log_reader.c:1928
 msgid "Adium"
 msgstr "Adium"
 
-#: ../plugins/log_reader.c:1846 ../plugins/log_reader.c:1934
+#: ../plugins/log_reader.c:1844 ../plugins/log_reader.c:1932
 msgid "Fire"
 msgstr "Fogo"
 
-#: ../plugins/log_reader.c:1855 ../plugins/log_reader.c:1938
+#: ../plugins/log_reader.c:1853 ../plugins/log_reader.c:1936
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
-#: ../plugins/log_reader.c:1864 ../plugins/log_reader.c:1942
+#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1940
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../plugins/log_reader.c:1873 ../plugins/log_reader.c:1946
+#: ../plugins/log_reader.c:1871 ../plugins/log_reader.c:1944
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../plugins/log_reader.c:1912
+#: ../plugins/log_reader.c:1910
 msgid "General Log Reading Configuration"
 msgstr "Configuración de lectura de rexistro xeral"
 
-#: ../plugins/log_reader.c:1916
+#: ../plugins/log_reader.c:1914
 msgid "Fast size calculations"
 msgstr "Cálculos de tamaño rápido"
 
-#: ../plugins/log_reader.c:1920
+#: ../plugins/log_reader.c:1918
 msgid "Use name heuristics"
 msgstr "Usar nomes heurísticos"
 
 #. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1926
+#: ../plugins/log_reader.c:1924
 msgid "Log Directory"
 msgstr "Directorio de rexistro"
 
@@ -1022,19 +1022,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/log_reader.c:1969
+#: ../plugins/log_reader.c:1967
 msgid "Log Reader"
 msgstr "Lector de rexistro"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../plugins/log_reader.c:1973
+#: ../plugins/log_reader.c:1971
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Incluír outros rexistros de clientes de MI no visor de rexistro."
 
 #. * description
-#: ../plugins/log_reader.c:1977
+#: ../plugins/log_reader.c:1975
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
@@ -1054,8 +1054,7 @@
 
 #: ../plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"Engade unha pequena caixa á lista de amigos que mostra se ten novo correo."
+msgstr "Engade unha pequena caixa á lista de amigos que mostra se ten novo correo."
 
 #: ../plugins/mono/loader/mono.c:213
 msgid "Mono Plugin Loader"
@@ -1376,73 +1375,72 @@
 msgid "Tests to see that most things are working."
 msgstr "Fai probas para determinar se a maior parte das cousas funcionan."
 
-#: ../plugins/spellchk.c:1917
+#: ../plugins/spellchk.c:1918
 msgid "Duplicate Correction"
 msgstr "Corrección duplicada"
 
-#: ../plugins/spellchk.c:1918
+#: ../plugins/spellchk.c:1919
 msgid "The specified word already exists in the correction list."
 msgstr "A palabra especificada xa existe na lista de corrección."
 
-#: ../plugins/spellchk.c:2127
+#: ../plugins/spellchk.c:2128
 msgid "Text Replacements"
 msgstr "Remprazos de texto"
 
-#: ../plugins/spellchk.c:2150
+#: ../plugins/spellchk.c:2151
 msgid "You type"
 msgstr "Vostede escribe"
 
-#: ../plugins/spellchk.c:2164
+#: ../plugins/spellchk.c:2165
 msgid "You send"
 msgstr "Vostede envía"
 
-#: ../plugins/spellchk.c:2178
+#: ../plugins/spellchk.c:2179
 msgid "Whole words only"
 msgstr "Soamente palabras enteiras"
 
-#: ../plugins/spellchk.c:2190
+#: ../plugins/spellchk.c:2191
 msgid "Case sensitive"
 msgstr "Sensible ás maiúsculas"
 
-#: ../plugins/spellchk.c:2216
+#: ../plugins/spellchk.c:2217
 msgid "Add a new text replacement"
 msgstr "Engadir unha nova regra de remprazo de texto"
 
-#: ../plugins/spellchk.c:2232
+#: ../plugins/spellchk.c:2233
 msgid "You _type:"
 msgstr "Vostede _escribe:"
 
-#: ../plugins/spellchk.c:2249
+#: ../plugins/spellchk.c:2250
 msgid "You _send:"
 msgstr "Vostede _envía:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2261
+#: ../plugins/spellchk.c:2262
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 "Axustar ao formato _exacto (desmarcar para xestionar maiúsculas e minúsculas "
 "automaticamente)"
 
-#: ../plugins/spellchk.c:2263
+#: ../plugins/spellchk.c:2264
 msgid "Only replace _whole words"
 msgstr "Reemprazar soamente palabras _enteiras"
 
-#: ../plugins/spellchk.c:2288
-msgid "General Text Replacement Options"
-msgstr "Opcións de reemprazos de texto xeral"
-
 #: ../plugins/spellchk.c:2289
+msgid "General Text Replacement Options"
+msgstr "Opcións de reemprazos de texto xeral"
+
+#: ../plugins/spellchk.c:2290
 msgid "Enable replacement of last word on send"
 msgstr "Activar a sustitución da última palabra ao enviar"
 
-#: ../plugins/spellchk.c:2314
+#: ../plugins/spellchk.c:2315
 msgid "Text replacement"
 msgstr "Remprazo de texto"
 
-#: ../plugins/spellchk.c:2316 ../plugins/spellchk.c:2317
+#: ../plugins/spellchk.c:2317 ../plugins/spellchk.c:2318
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-"Rempraza o texto das mensaxes saíntes según as regras definidas polo usuario."
+msgstr "Rempraza o texto das mensaxes saíntes según as regras definidas polo usuario."
 
 #. *< type
 #. *< ui_requirement
@@ -1496,47 +1494,46 @@
 #. *  description
 #: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
-msgstr ""
-"Proporciona un recubrimento a través das bibliotecas de soporte de SSL."
-
-#: ../plugins/statenotify.c:49
+msgstr "Proporciona un recubrimento a través das bibliotecas de soporte de SSL."
+
+#: ../plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s xa non está ausente."
 
-#: ../plugins/statenotify.c:51
+#: ../plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s marchouse."
 
-#: ../plugins/statenotify.c:61
+#: ../plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s está agora inactivo."
 
-#: ../plugins/statenotify.c:63
+#: ../plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s xa non está inactivo."
 
-#: ../plugins/statenotify.c:72
+#: ../plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s conectouse."
 
-#: ../plugins/statenotify.c:90
+#: ../plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Notificar cando"
 
-#: ../plugins/statenotify.c:93
+#: ../plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "O amigo _auséntase"
 
-#: ../plugins/statenotify.c:96
+#: ../plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "O amigo está _inactivo"
 
-#: ../plugins/statenotify.c:99
+#: ../plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "_Conéctase/Desconectouse un amigo"
 
@@ -1546,7 +1543,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/statenotify.c:141
+#: ../plugins/statenotify.c:142
 msgid "Buddy State Notification"
 msgstr "Notificación de estado de amigos"
 
@@ -1554,7 +1551,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/statenotify.c:144 ../plugins/statenotify.c:147
+#: ../plugins/statenotify.c:145 ../plugins/statenotify.c:148
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1606,7 +1603,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/timestamp.c:262
+#: ../plugins/timestamp.c:254
 msgid "Timestamp"
 msgstr "Marca temporal"
 
@@ -1614,10 +1611,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/timestamp.c:265 ../plugins/timestamp.c:267
+#: ../plugins/timestamp.c:257 ../plugins/timestamp.c:259
 msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr ""
-"Engade unha marca de tempo ao estilo iChat nas conversacións cada N minutos."
+msgstr "Engade unha marca de tempo ao estilo iChat nas conversacións cada N minutos."
 
 #: ../plugins/timestamp_format.c:22
 msgid "Timestamp Format Options"
@@ -1720,19 +1716,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:657
+#: ../plugins/win32/transparency/win2ktrans.c:658
 msgid "Transparency"
 msgstr "Transparencia"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../plugins/win32/transparency/win2ktrans.c:660
+#: ../plugins/win32/transparency/win2ktrans.c:661
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparencia variable para a lista de amigos e as conversacións."
 
 #. *  description
-#: ../plugins/win32/transparency/win2ktrans.c:662
+#: ../plugins/win32/transparency/win2ktrans.c:663
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1758,7 +1754,7 @@
 msgstr "_Iniciar Gaim ao iniciar Windows"
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3623
+#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3665
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
@@ -1823,48 +1819,48 @@
 msgid "Save password"
 msgstr "Gardar contrasinal"
 
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3507
-#: ../src/gtkdialogs.c:584 ../src/gtkdialogs.c:721 ../src/gtkdialogs.c:789
-#: ../src/gtkrequest.c:275 ../src/protocols/gg/gg.c:454
-#: ../src/protocols/gg/gg.c:595 ../src/protocols/gg/gg.c:731
-#: ../src/protocols/jabber/jabber.c:1318 ../src/protocols/jabber/xdata.c:337
+#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3549
+#: ../src/gtkdialogs.c:588 ../src/gtkdialogs.c:725 ../src/gtkdialogs.c:789
+#: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
+#: ../src/protocols/gg/gg.c:638 ../src/protocols/gg/gg.c:774
+#: ../src/protocols/jabber/jabber.c:1319 ../src/protocols/jabber/xdata.c:337
 #: ../src/protocols/msn/msn.c:250 ../src/protocols/msn/msn.c:265
 #: ../src/protocols/msn/msn.c:280 ../src/protocols/msn/msn.c:295
 #: ../src/protocols/oscar/oscar.c:3064 ../src/protocols/oscar/oscar.c:4607
-#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8122
-#: ../src/protocols/oscar/oscar.c:8245 ../src/protocols/oscar/oscar.c:8270
-#: ../src/protocols/oscar/oscar.c:8322 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8130
+#: ../src/protocols/oscar/oscar.c:8253 ../src/protocols/oscar/oscar.c:8278
+#: ../src/protocols/oscar/oscar.c:8330 ../src/protocols/silc/buddy.c:466
 #: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:423
 #: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
 #: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:749 ../src/protocols/yahoo/yahoo.c:3062
-#: ../src/protocols/yahoo/yahoo.c:3071
+#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3063
+#: ../src/protocols/yahoo/yahoo.c:3072
 msgid "OK"
 msgstr "Aceptar"
 
 #: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4975
-#: ../src/gtkdialogs.c:585 ../src/gtkdialogs.c:722 ../src/gtkdialogs.c:790
+#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:5017
+#: ../src/gtkdialogs.c:589 ../src/gtkdialogs.c:726 ../src/gtkdialogs.c:790
 #: ../src/gtkdialogs.c:809 ../src/gtkdialogs.c:831 ../src/gtkdialogs.c:851
 #: ../src/gtkdialogs.c:895 ../src/gtkdialogs.c:950 ../src/gtkdialogs.c:987
 #: ../src/gtkdialogs.c:1012 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:297 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
+#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
 #: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
-#: ../src/gtkrequest.c:276 ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
-#: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
+#: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
+#: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:639
+#: ../src/protocols/gg/gg.c:775 ../src/protocols/gg/gg.c:854
 #: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1419
 #: ../src/protocols/jabber/buddy.c:1453 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1319
+#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1320
 #: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
 #: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
 #: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
 #: ../src/protocols/oscar/oscar.c:1705 ../src/protocols/oscar/oscar.c:3065
 #: ../src/protocols/oscar/oscar.c:4565 ../src/protocols/oscar/oscar.c:4608
 #: ../src/protocols/oscar/oscar.c:4645 ../src/protocols/oscar/oscar.c:4689
-#: ../src/protocols/oscar/oscar.c:8123 ../src/protocols/oscar/oscar.c:8246
-#: ../src/protocols/oscar/oscar.c:8271 ../src/protocols/oscar/oscar.c:8323
-#: ../src/protocols/oscar/oscar.c:8392
+#: ../src/protocols/oscar/oscar.c:8131 ../src/protocols/oscar/oscar.c:8254
+#: ../src/protocols/oscar/oscar.c:8279 ../src/protocols/oscar/oscar.c:8331
+#: ../src/protocols/oscar/oscar.c:8400
 #: ../src/protocols/sametime/sametime.c:3376
 #: ../src/protocols/sametime/sametime.c:3461
 #: ../src/protocols/sametime/sametime.c:3631
@@ -1873,9 +1869,9 @@
 #: ../src/protocols/sametime/sametime.c:5533 ../src/protocols/silc/buddy.c:467
 #: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
 #: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
-#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:750
-#: ../src/protocols/silc/silc.c:955 ../src/protocols/yahoo/yahoo.c:3063
-#: ../src/protocols/yahoo/yahoo.c:3072
+#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
+#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3064
+#: ../src/protocols/yahoo/yahoo.c:3073
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1884,13 +1880,13 @@
 msgid "Missing protocol plugin for %s"
 msgstr "Falta o complemento de protocolo para %s"
 
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3499
-#: ../src/gtkblist.c:3505
+#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3541
+#: ../src/gtkblist.c:3547
 msgid "Connection Error"
 msgstr "Erro de conexión"
 
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
-#: ../src/protocols/jabber/jabber.c:1271
+#: ../src/account.c:1076 ../src/protocols/gg/gg.c:679
+#: ../src/protocols/jabber/jabber.c:1272
 msgid "New passwords do not match."
 msgstr "Os novos contrasinais non coinciden."
 
@@ -1924,7 +1920,7 @@
 msgid "Change user information for %s"
 msgstr "Cambiar a información do usuario %s"
 
-#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:282
+#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
 #: ../src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Gardar"
@@ -1939,11 +1935,11 @@
 msgid "buddy list"
 msgstr "lista de amigos"
 
-#: ../src/blist.c:1173
+#: ../src/blist.c:1179
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/blist.c:1886
+#: ../src/blist.c:1901
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because it belongs to an account "
@@ -1959,7 +1955,7 @@
 "%d amigos do grupo %s non se eliminou porque a súa conta non estaba "
 "conectada. Este amigo e os seus grupos non foron eliminados.\n"
 
-#: ../src/blist.c:1896
+#: ../src/blist.c:1911
 msgid "Group not removed"
 msgstr "Grupo non eliminado"
 
@@ -1972,7 +1968,7 @@
 msgid "+++ %s signed on"
 msgstr "+++ %s conectouse"
 
-#: ../src/connection.c:322
+#: ../src/connection.c:313
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s desconectouse"
@@ -2024,7 +2020,7 @@
 msgid "%s left the room (%s)."
 msgstr "%s saíu da sala (%s)."
 
-#: ../src/desktopitem.c:286 ../src/desktopitem.c:875
+#: ../src/desktopitem.c:286 ../src/desktopitem.c:877
 msgid "No name"
 msgstr "Sen nome"
 
@@ -2176,7 +2172,7 @@
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4553 ../src/gtkblist.c:4919
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4595 ../src/gtkblist.c:4961
 msgid "Alias:"
 msgstr "Alcume:"
 
@@ -2263,7 +2259,7 @@
 msgid "Add Account"
 msgstr "Engadir conta"
 
-#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3508
+#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3550
 msgid "Modify Account"
 msgstr "Modificar conta"
 
@@ -2285,7 +2281,7 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "Está seguro de que quere borrar %s?"
 
-#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:279
+#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:273
 #: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Borrar"
@@ -2308,229 +2304,228 @@
 msgid "Add buddy to your list?"
 msgstr "Engadir o amigo a súa lista?"
 
-#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4974 ../src/gtkconv.c:1594
-#: ../src/gtkrequest.c:280 ../src/protocols/gg/gg.c:811
+#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:5016 ../src/gtkconv.c:1625
+#: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:853
 #: ../src/protocols/oscar/oscar.c:4877
 #: ../src/protocols/sametime/sametime.c:5408 ../src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "Engadir"
 
-#: ../src/gtkblist.c:673
+#: ../src/gtkblist.c:672
 msgid "Join a Chat"
 msgstr "Unirse a un Chat"
 
-#: ../src/gtkblist.c:694
+#: ../src/gtkblist.c:693
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduza a información apropiada do chat ao que desexaría unirse.\n"
 
-#: ../src/gtkblist.c:705 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+#: ../src/gtkblist.c:704 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "Con_ta:"
 
-#: ../src/gtkblist.c:949
+#: ../src/gtkblist.c:948
 msgid "Get _Info"
 msgstr "Obter _información:"
 
-#: ../src/gtkblist.c:952 ../src/gtkstock.c:141
+#: ../src/gtkblist.c:951 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "_MI"
 
-#: ../src/gtkblist.c:958
+#: ../src/gtkblist.c:957
 msgid "_Send File"
 msgstr "E_nviar ficheiro"
 
-#: ../src/gtkblist.c:965
+#: ../src/gtkblist.c:964
 msgid "Add Buddy _Pounce"
 msgstr "Engadir _aviso de amigo"
 
-#: ../src/gtkblist.c:969 ../src/gtkblist.c:973 ../src/gtkblist.c:1072
-#: ../src/gtkblist.c:1095
+#: ../src/gtkblist.c:968 ../src/gtkblist.c:972 ../src/gtkblist.c:1071
+#: ../src/gtkblist.c:1094
 msgid "View _Log"
 msgstr "Ver _rexistro"
 
-#: ../src/gtkblist.c:984
+#: ../src/gtkblist.c:983
 msgid "Alias..."
 msgstr "Alcume..."
 
-#: ../src/gtkblist.c:987 ../src/gtkconv.c:1591 ../src/gtkrequest.c:281
+#: ../src/gtkblist.c:986 ../src/gtkconv.c:1622 ../src/gtkrequest.c:275
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
+#: ../src/gtkblist.c:992 ../src/gtkblist.c:1079 ../src/gtkblist.c:1100
 msgid "_Alias..."
 msgstr "_Alcume..."
 
-#: ../src/gtkblist.c:995 ../src/gtkblist.c:1082 ../src/gtkblist.c:1103
+#: ../src/gtkblist.c:994 ../src/gtkblist.c:1081 ../src/gtkblist.c:1102
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: ../src/gtkblist.c:1043
+#: ../src/gtkblist.c:1042
 msgid "Add a _Buddy"
 msgstr "Engadir un a_migo"
 
-#: ../src/gtkblist.c:1045
+#: ../src/gtkblist.c:1044
 msgid "Add a C_hat"
 msgstr "Engadir un C_hat"
 
-#: ../src/gtkblist.c:1048
+#: ../src/gtkblist.c:1047
 msgid "_Delete Group"
 msgstr "_Borrar grupo"
 
-#: ../src/gtkblist.c:1050
+#: ../src/gtkblist.c:1049
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: ../src/gtkblist.c:1068 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkblist.c:1067 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../src/gtkblist.c:1070
+#: ../src/gtkblist.c:1069
 msgid "Auto-Join"
 msgstr "Conectarse automaticamente"
 
-#: ../src/gtkblist.c:1108 ../src/gtkblist.c:1131
+#: ../src/gtkblist.c:1107 ../src/gtkblist.c:1130
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../src/gtkblist.c:1136
+#: ../src/gtkblist.c:1135
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../src/gtkblist.c:1414 ../src/gtkblist.c:1426 ../src/gtkblist.c:3768
-#: ../src/gtkblist.c:3778
+#: ../src/gtkblist.c:1381 ../src/gtkblist.c:1393 ../src/gtkblist.c:3810
+#: ../src/gtkblist.c:3820
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Silenciar sons"
 
-#: ../src/gtkblist.c:1889 ../src/gtkconv.c:4193 ../src/gtkpounce.c:426
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
+#: ../src/gtkblist.c:1853 ../src/gtkconv.c:4209 ../src/gtkpounce.c:426
+msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "Non está conectado con ningunha conta que poida engadir a ese amigo."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2463
+#: ../src/gtkblist.c:2427
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: ../src/gtkblist.c:2464
+#: ../src/gtkblist.c:2428
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/_Mensaxe instantánea nova..."
 
-#: ../src/gtkblist.c:2465
+#: ../src/gtkblist.c:2429
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _Chat..."
 
-#: ../src/gtkblist.c:2466
+#: ../src/gtkblist.c:2430
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obter _información do usuario..."
 
-#: ../src/gtkblist.c:2467
+#: ../src/gtkblist.c:2431
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _rexistro do usuario..."
 
-#: ../src/gtkblist.c:2469
+#: ../src/gtkblist.c:2433
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Amosar amigos _desconectados"
 
-#: ../src/gtkblist.c:2470
+#: ../src/gtkblist.c:2434
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Amosar grupos _baleiros"
 
-#: ../src/gtkblist.c:2471
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Amigos/Amosar _detalles de amigos"
 
-#: ../src/gtkblist.c:2472
+#: ../src/gtkblist.c:2436
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Amigos/Amosar _tempo de ausencia"
 
-#: ../src/gtkblist.c:2473
+#: ../src/gtkblist.c:2437
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/A_rranxar amigos"
 
-#: ../src/gtkblist.c:2475
+#: ../src/gtkblist.c:2439
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Engadir un amigo..."
 
-#: ../src/gtkblist.c:2476
+#: ../src/gtkblist.c:2440
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Engadir un _Chat..."
 
-#: ../src/gtkblist.c:2477
+#: ../src/gtkblist.c:2441
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Engadir un _grupo..."
 
-#: ../src/gtkblist.c:2479
+#: ../src/gtkblist.c:2443
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Saír"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2482
+#: ../src/gtkblist.c:2446
 msgid "/_Accounts"
 msgstr "/_Contas"
 
-#: ../src/gtkblist.c:2483 ../src/gtkblist.c:5553
+#: ../src/gtkblist.c:2447 ../src/gtkblist.c:5595
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Contas/Engadir\\/Editar"
 
 #. Tools
-#: ../src/gtkblist.c:2486
+#: ../src/gtkblist.c:2450
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../src/gtkblist.c:2487
+#: ../src/gtkblist.c:2451
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Ferramentas/_Avisos de amigo"
 
-#: ../src/gtkblist.c:2488
+#: ../src/gtkblist.c:2452
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/C_omplementos"
 
-#: ../src/gtkblist.c:2489
+#: ../src/gtkblist.c:2453
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_eferencias"
 
-#: ../src/gtkblist.c:2490
+#: ../src/gtkblist.c:2454
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: ../src/gtkblist.c:2492
+#: ../src/gtkblist.c:2456
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferencias de _ficheiros"
 
-#: ../src/gtkblist.c:2493
+#: ../src/gtkblist.c:2457
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/Lista de _salas"
 
-#: ../src/gtkblist.c:2494
+#: ../src/gtkblist.c:2458
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/_Rexistro do sistema"
 
-#: ../src/gtkblist.c:2496
+#: ../src/gtkblist.c:2460
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Silenciar _sons"
 
 #. Help
-#: ../src/gtkblist.c:2499
+#: ../src/gtkblist.c:2463
 msgid "/_Help"
 msgstr "/A_xuda"
 
-#: ../src/gtkblist.c:2500
+#: ../src/gtkblist.c:2464
 msgid "/Help/Online _Help"
 msgstr "/Axuda/A_xuda en liña"
 
-#: ../src/gtkblist.c:2501
+#: ../src/gtkblist.c:2465
 msgid "/Help/_Debug Window"
 msgstr "/Axuda/Fiestra de _depuración"
 
-#: ../src/gtkblist.c:2502
+#: ../src/gtkblist.c:2466
 msgid "/Help/_About"
 msgstr "/Axuda/_Acerca de"
 
-#: ../src/gtkblist.c:2534 ../src/gtkblist.c:2603
+#: ../src/gtkblist.c:2498 ../src/gtkblist.c:2567
 #, c-format
 msgid ""
 "\n"
@@ -2539,7 +2534,7 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: ../src/gtkblist.c:2615
+#: ../src/gtkblist.c:2579
 #, c-format
 msgid ""
 "\n"
@@ -2548,7 +2543,7 @@
 "\n"
 "<b>Alcume de amigo:</b> %s"
 
-#: ../src/gtkblist.c:2627
+#: ../src/gtkblist.c:2591
 #, c-format
 msgid ""
 "\n"
@@ -2557,7 +2552,7 @@
 "\n"
 "<b>Alcume:</b> %s"
 
-#: ../src/gtkblist.c:2636
+#: ../src/gtkblist.c:2600
 #, c-format
 msgid ""
 "\n"
@@ -2566,7 +2561,7 @@
 "\n"
 "<b>Conectado:</b> %s"
 
-#: ../src/gtkblist.c:2647
+#: ../src/gtkblist.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -2575,7 +2570,7 @@
 "\n"
 "<b>Inactivo:</b> %s"
 
-#: ../src/gtkblist.c:2682
+#: ../src/gtkblist.c:2646
 #, c-format
 msgid ""
 "\n"
@@ -2584,7 +2579,7 @@
 "\n"
 "<b>Visto por última vez</b> fai %s"
 
-#: ../src/gtkblist.c:2691
+#: ../src/gtkblist.c:2655
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2592,7 +2587,7 @@
 "\n"
 "<b>Estado:</b> Desconectado"
 
-#: ../src/gtkblist.c:2702
+#: ../src/gtkblist.c:2666
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2600,7 +2595,7 @@
 "\n"
 "<b>Descrición:</b> Terrorífica"
 
-#: ../src/gtkblist.c:2704
+#: ../src/gtkblist.c:2668
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2608,7 +2603,7 @@
 "\n"
 "<b>Estado</b>: Xenial"
 
-#: ../src/gtkblist.c:2706
+#: ../src/gtkblist.c:2670
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2616,125 +2611,125 @@
 "\n"
 "<b>Estado</b>: Rock & roll"
 
-#: ../src/gtkblist.c:2995
+#: ../src/gtkblist.c:2959
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"
 
-#: ../src/gtkblist.c:2997
+#: ../src/gtkblist.c:2961
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:3000 ../src/gtkprefs.c:1745
+#: ../src/gtkblist.c:2964 ../src/gtkprefs.c:1745
 #: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
 #: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2730
+#: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2731
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Inactivo"
 
-#: ../src/gtkblist.c:3132
+#: ../src/gtkblist.c:3096
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Mensaxe instantánea _nova..."
 
-#: ../src/gtkblist.c:3133 ../src/gtkblist.c:3166
+#: ../src/gtkblist.c:3097 ../src/gtkblist.c:3130
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un Chat..."
 
-#: ../src/gtkblist.c:3134
+#: ../src/gtkblist.c:3098
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Obter información do usuario..."
 
-#: ../src/gtkblist.c:3135
+#: ../src/gtkblist.c:3099
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Engadir un amigo..."
 
-#: ../src/gtkblist.c:3136 ../src/gtkblist.c:3169
+#: ../src/gtkblist.c:3100 ../src/gtkblist.c:3133
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Engadir un Chat..."
 
-#: ../src/gtkblist.c:3137
+#: ../src/gtkblist.c:3101
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Engadir un grupo..."
 
-#: ../src/gtkblist.c:3172
+#: ../src/gtkblist.c:3136
 msgid "/Tools/Buddy Pounces"
 msgstr "/Ferramentas/Avisos de amigo"
 
-#: ../src/gtkblist.c:3175
+#: ../src/gtkblist.c:3139
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../src/gtkblist.c:3178
+#: ../src/gtkblist.c:3142
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: ../src/gtkblist.c:3372
+#: ../src/gtkblist.c:3336
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../src/gtkblist.c:3374
+#: ../src/gtkblist.c:3338
 msgid "Alphabetically"
 msgstr "Alfabeticamente"
 
-#: ../src/gtkblist.c:3375
+#: ../src/gtkblist.c:3339
 msgid "By status"
 msgstr "Por estado"
 
-#: ../src/gtkblist.c:3376
+#: ../src/gtkblist.c:3340
 msgid "By log size"
 msgstr "Por tamaño de rexistro"
 
-#: ../src/gtkblist.c:3493 ../src/gtkconn.c:196
+#: ../src/gtkblist.c:3535 ../src/gtkconn.c:196
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../src/gtkblist.c:3509 ../src/protocols/sametime/sametime.c:3630
+#: ../src/gtkblist.c:3551 ../src/protocols/sametime/sametime.c:3630
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../src/gtkblist.c:3509 ../src/gtkblist.c:5652
-msgid "Enable Account"
-msgstr "Activar conta"
-
-#: ../src/gtkblist.c:3530
+#: ../src/gtkblist.c:3551
+msgid "Re-enable Account"
+msgstr "Re-activar conta"
+
+#: ../src/gtkblist.c:3572
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s desconectado: %s</span>"
 
-#: ../src/gtkblist.c:3657
+#: ../src/gtkblist.c:3699
 msgid "/Accounts"
 msgstr "/Contas"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3762
+#: ../src/gtkblist.c:3804
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Amosar amigos desconectados"
 
-#: ../src/gtkblist.c:3765
+#: ../src/gtkblist.c:3807
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Amosar grupos baleiros"
 
-#: ../src/gtkblist.c:3771
+#: ../src/gtkblist.c:3813
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Amigos/Amosar detalles de amigos"
 
-#: ../src/gtkblist.c:3774
+#: ../src/gtkblist.c:3816
 msgid "/Buddies/Show Idle Times"
 msgstr "/Amigos/Amosar tempos de ausencia"
 
-#: ../src/gtkblist.c:4486 ../src/protocols/silc/buddy.c:736
+#: ../src/gtkblist.c:4528 ../src/protocols/silc/buddy.c:736
 #: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
-#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2977
+#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2978
 msgid "Add Buddy"
 msgstr "Engadir amigo"
 
-#: ../src/gtkblist.c:4510
+#: ../src/gtkblist.c:4552
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2744,31 +2739,26 @@
 "Pode, opcionalmente, introducir un alias ou alcume. O alcume mostrarase en "
 "lugar do nome de usuario sempre que sexa posible.\n"
 
-#: ../src/gtkblist.c:4532
-msgid "Screen Name:"
-msgstr "Nome de usuario:"
-
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4580 ../src/gtkblist.c:4899
+#: ../src/gtkblist.c:4622 ../src/gtkblist.c:4941
 msgid "Account:"
 msgstr "Conta:"
 
-#: ../src/gtkblist.c:4832
+#: ../src/gtkblist.c:4874
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo non está soportado nas salas de chats."
 
-#: ../src/gtkblist.c:4848
+#: ../src/gtkblist.c:4890
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr ""
-"Non está conectado con ningunha conta que teña capacidade de acceder a chats."
-
-#: ../src/gtkblist.c:4865
+msgstr "Non está conectado con ningunha conta que teña capacidade de acceder a chats."
+
+#: ../src/gtkblist.c:4907
 msgid "Add Chat"
 msgstr "Engadir Chat"
 
-#: ../src/gtkblist.c:4889
+#: ../src/gtkblist.c:4931
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2776,32 +2766,36 @@
 "Introduza un alcume, e a información que crea apropiada do chat que "
 "desexaría engadir na lista de amigos.\n"
 
-#: ../src/gtkblist.c:4971 ../src/protocols/sametime/sametime.c:5319
+#: ../src/gtkblist.c:5013 ../src/protocols/sametime/sametime.c:5319
 #: ../src/protocols/sametime/sametime.c:5406
 msgid "Add Group"
 msgstr "Engadir grupo"
 
-#: ../src/gtkblist.c:4972
+#: ../src/gtkblist.c:5014
 msgid "Please enter the name of the group to be added."
 msgstr "Introduza o nome do grupo a engadir."
 
-#: ../src/gtkblist.c:5593
+#: ../src/gtkblist.c:5635
 msgid "_Edit Account"
 msgstr "_Editar conta"
 
-#: ../src/gtkblist.c:5626 ../src/gtkblist.c:5632
+#: ../src/gtkblist.c:5668 ../src/gtkblist.c:5674
 msgid "No actions available"
 msgstr "Non hai accións dispoñibles"
 
-#: ../src/gtkblist.c:5640
+#: ../src/gtkblist.c:5682
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../src/gtkblist.c:5705
+#: ../src/gtkblist.c:5694
+msgid "Enable Account"
+msgstr "Activar conta"
+
+#: ../src/gtkblist.c:5747
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../src/gtkblist.c:5800
+#: ../src/gtkblist.c:5833
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
@@ -2861,10 +2855,8 @@
 msgstr "Ese amigo non utiliza o mesmo protocolo que este chat."
 
 #: ../src/gtkconv.c:764
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-"Non está conectado con ningunha conta coa que poida invitar a ese amigo."
+msgid "You are not currently signed on with an account that can invite that buddy."
+msgstr "Non está conectado con ningunha conta coa que poida invitar a ese amigo."
 
 #: ../src/gtkconv.c:817
 msgid "Invite Buddy Into Chat Room"
@@ -2888,7 +2880,7 @@
 msgid "_Message:"
 msgstr "_Mensaxe:"
 
-#: ../src/gtkconv.c:945 ../src/gtkconv.c:2377 ../src/gtkdebug.c:217
+#: ../src/gtkconv.c:945 ../src/gtkconv.c:2392 ../src/gtkdebug.c:217
 #: ../src/gtkft.c:488
 msgid "Unable to open file."
 msgstr "Non se puido abrir o ficheiro."
@@ -2902,279 +2894,295 @@
 msgid "Save Conversation"
 msgstr "Gardar conversación"
 
-#: ../src/gtkconv.c:1093 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../src/gtkconv.c:1096 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Buscar"
 
-#: ../src/gtkconv.c:1119 ../src/gtkdebug.c:193
+#: ../src/gtkconv.c:1122 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "Termo a _buscar:"
 
-#: ../src/gtkconv.c:1290
+#: ../src/gtkconv.c:1293
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Iniciuose o rexistro. A partir de agora rexistraranse todas as mensaxes "
 "desta conversación."
 
-#: ../src/gtkconv.c:1298
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
+#: ../src/gtkconv.c:1301
+msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Deteuse o rexistro. Non se rexistrarán mensaxes desta conversación de agora "
 "endiante."
 
-#: ../src/gtkconv.c:1556
+#: ../src/gtkconv.c:1562
 msgid "IM"
 msgstr "MI"
 
-#: ../src/gtkconv.c:1562 ../src/protocols/oscar/oscar.c:714
+#: ../src/gtkconv.c:1573 ../src/protocols/oscar/oscar.c:714
 msgid "Send File"
 msgstr "Enviar ficheiro"
 
-#: ../src/gtkconv.c:1569
+#: ../src/gtkconv.c:1588
 msgid "Un-Ignore"
 msgstr "Non ignorar"
 
-#: ../src/gtkconv.c:1572
+#: ../src/gtkconv.c:1591
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/gtkconv.c:1578
+#: ../src/gtkconv.c:1601
 msgid "Info"
 msgstr "Info"
 
-#: ../src/gtkconv.c:1584
+#: ../src/gtkconv.c:1611
 msgid "Get Away Message"
 msgstr "Mensaxe de ausencia"
 
-#: ../src/gtkconv.c:1599
+#: ../src/gtkconv.c:1634
 msgid "Last said"
 msgstr "Dito a última vez"
 
-#: ../src/gtkconv.c:2385
+#: ../src/gtkconv.c:2400
 msgid "Unable to save icon file to disk."
 msgstr "Non se puido gardar o ficheiro de iconas ao disco."
 
-#: ../src/gtkconv.c:2408
+#: ../src/gtkconv.c:2424
 msgid "Save Icon"
 msgstr "Gardar icona"
 
-#: ../src/gtkconv.c:2457
+#: ../src/gtkconv.c:2473
 msgid "Animate"
 msgstr "Animar"
 
-#: ../src/gtkconv.c:2462
+#: ../src/gtkconv.c:2478
 msgid "Hide Icon"
 msgstr "Agochar icona"
 
-#: ../src/gtkconv.c:2468
+#: ../src/gtkconv.c:2484
 msgid "Save Icon As..."
 msgstr "Gardar icona como..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2609
+#: ../src/gtkconv.c:2625
 msgid "/_Conversation"
 msgstr "/_Conversación"
 
-#: ../src/gtkconv.c:2611
+#: ../src/gtkconv.c:2627
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversación/_Mensaxe instantánea nova..."
 
-#: ../src/gtkconv.c:2616
+#: ../src/gtkconv.c:2632
 msgid "/Conversation/_Find..."
 msgstr "/Conversación/_Buscar..."
 
-#: ../src/gtkconv.c:2618
+#: ../src/gtkconv.c:2634
 msgid "/Conversation/View _Log"
 msgstr "/Conversación/Ver _rexistro"
 
-#: ../src/gtkconv.c:2619
+#: ../src/gtkconv.c:2635
 msgid "/Conversation/_Save As..."
 msgstr "/Conversación/_Gardar como..."
 
-#: ../src/gtkconv.c:2621
+#: ../src/gtkconv.c:2637
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversación/_Limpar deslizante"
 
-#: ../src/gtkconv.c:2625
+#: ../src/gtkconv.c:2641
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversación/E_nviar ficheiro..."
 
-#: ../src/gtkconv.c:2626
+#: ../src/gtkconv.c:2642
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversación/Engadir _aviso de amigo..."
 
-#: ../src/gtkconv.c:2628
+#: ../src/gtkconv.c:2644
 msgid "/Conversation/_Get Info"
 msgstr "/Conversación/_Obter información"
 
-#: ../src/gtkconv.c:2630
+#: ../src/gtkconv.c:2646
 msgid "/Conversation/In_vite..."
 msgstr "/Conversación/In_vitar..."
 
-#: ../src/gtkconv.c:2635
+#: ../src/gtkconv.c:2651
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversación/Alc_ume..."
 
-#: ../src/gtkconv.c:2637
+#: ../src/gtkconv.c:2653
 msgid "/Conversation/_Block..."
 msgstr "/Conversación/_Bloquear..."
 
-#: ../src/gtkconv.c:2639
+#: ../src/gtkconv.c:2655
 msgid "/Conversation/_Add..."
 msgstr "/Conversación/_Engadir..."
 
-#: ../src/gtkconv.c:2641
+#: ../src/gtkconv.c:2657
 msgid "/Conversation/_Remove..."
 msgstr "/Conversación/El_iminar..."
 
-#: ../src/gtkconv.c:2646
+#: ../src/gtkconv.c:2662
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversación/Inserir li_gazón..."
 
-#: ../src/gtkconv.c:2648
+#: ../src/gtkconv.c:2664
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversación/Inserir ima_xe..."
 
-#: ../src/gtkconv.c:2653
+#: ../src/gtkconv.c:2669
 msgid "/Conversation/_Close"
 msgstr "/Conversación/_Pechar"
 
 #. Options
-#: ../src/gtkconv.c:2657
+#: ../src/gtkconv.c:2673
 msgid "/_Options"
 msgstr "/_Opcións"
 
-#: ../src/gtkconv.c:2658
+#: ../src/gtkconv.c:2674
 msgid "/Options/Enable _Logging"
 msgstr "/Opcións/Activar _rexistro"
 
-#: ../src/gtkconv.c:2659
+#: ../src/gtkconv.c:2675
 msgid "/Options/Enable _Sounds"
 msgstr "/Opcións/Activar _sons"
 
-#: ../src/gtkconv.c:2660
+#: ../src/gtkconv.c:2676
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Opcións/Amosar _iconas dos amigos"
 
-#: ../src/gtkconv.c:2662
+#: ../src/gtkconv.c:2678
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opcións/Amosar _barra de formato"
 
-#: ../src/gtkconv.c:2663
+#: ../src/gtkconv.c:2679
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opcións/Amosar _marcas de tempo"
 
-#: ../src/gtkconv.c:2755
+#: ../src/gtkconv.c:2771
 msgid "/Conversation/View Log"
 msgstr "/Conversación/Ver rexistro"
 
-#: ../src/gtkconv.c:2761
+#: ../src/gtkconv.c:2777
 msgid "/Conversation/Send File..."
 msgstr "/Conversación/Enviar ficheiro..."
 
-#: ../src/gtkconv.c:2765
+#: ../src/gtkconv.c:2781
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversación/Engadir aviso de amigo..."
 
-#: ../src/gtkconv.c:2771
+#: ../src/gtkconv.c:2787
 msgid "/Conversation/Get Info"
 msgstr "/Conversación/Obter información"
 
-#: ../src/gtkconv.c:2775
+#: ../src/gtkconv.c:2791
 msgid "/Conversation/Invite..."
 msgstr "/Conversación/Invitar..."
 
-#: ../src/gtkconv.c:2781
+#: ../src/gtkconv.c:2797
 msgid "/Conversation/Alias..."
 msgstr "/Conversación/Alcume..."
 
-#: ../src/gtkconv.c:2785
+#: ../src/gtkconv.c:2801
 msgid "/Conversation/Block..."
 msgstr "/Conversación/Bloquear..."
 
-#: ../src/gtkconv.c:2789
+#: ../src/gtkconv.c:2805
 msgid "/Conversation/Add..."
 msgstr "/Conversación/Engadir..."
 
-#: ../src/gtkconv.c:2793
+#: ../src/gtkconv.c:2809
 msgid "/Conversation/Remove..."
 msgstr "/Conversación/Eliminar..."
 
-#: ../src/gtkconv.c:2799
+#: ../src/gtkconv.c:2815
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversación/Inserir ligazón..."
 
-#: ../src/gtkconv.c:2803
+#: ../src/gtkconv.c:2819
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversación/Inserir imaxe..."
 
-#: ../src/gtkconv.c:2809
+#: ../src/gtkconv.c:2825
 msgid "/Options/Enable Logging"
 msgstr "/Opcións/Activar rexistro"
 
-#: ../src/gtkconv.c:2812
+#: ../src/gtkconv.c:2828
 msgid "/Options/Enable Sounds"
 msgstr "/Opcións/Activar sons"
 
-#: ../src/gtkconv.c:2825
+#: ../src/gtkconv.c:2841
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opcións/Amosar barra de formato"
 
-#: ../src/gtkconv.c:2828
+#: ../src/gtkconv.c:2844
 msgid "/Options/Show Timestamps"
 msgstr "/Opcións/Amosar marcas de tempo"
 
-#: ../src/gtkconv.c:2831
+#: ../src/gtkconv.c:2847
 msgid "/Options/Show Buddy Icon"
 msgstr "/Opcións/Amosar iconas dos amigos"
 
-#: ../src/gtkconv.c:2911
+#: ../src/gtkconv.c:2927
 msgid "User is typing..."
 msgstr "O usuario está escribindo..."
 
-#: ../src/gtkconv.c:2914
+#: ../src/gtkconv.c:2930
 msgid "User has typed something and stopped"
 msgstr "O usuario escribiu algo e parou"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3097
+#: ../src/gtkconv.c:3113
 msgid "_Send To"
 msgstr "_Enviar a"
 
-#: ../src/gtkconv.c:3749
+#: ../src/gtkconv.c:3765
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/gtkconv.c:3804 ../src/protocols/sametime/sametime.c:3572
+#: ../src/gtkconv.c:3820 ../src/protocols/sametime/sametime.c:3572
 msgid "Topic:"
 msgstr "Tópico:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3856
+#: ../src/gtkconv.c:3872
 msgid "0 people in room"
 msgstr "0 persoas na conversación"
 
-#: ../src/gtkconv.c:3935
+#: ../src/gtkconv.c:3951
 msgid "IM the user"
 msgstr "Enviar un MI ao usuario"
 
-#: ../src/gtkconv.c:3948
+#: ../src/gtkconv.c:3964
 msgid "Ignore the user"
 msgstr "Ignorar ao usuario"
 
-#: ../src/gtkconv.c:3960
+#: ../src/gtkconv.c:3976
 msgid "Get the user's information"
 msgstr "Obter a información do usuario"
 
-#: ../src/gtkconv.c:4933 ../src/gtkconv.c:5042
+#: ../src/gtkconv.c:4958 ../src/gtkconv.c:5067
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoa na conversación"
 msgstr[1] "%d persoas na conversación"
 
-#: ../src/gtkconv.c:6515
+#: ../src/gtkconv.c:5624 ../src/gtkstatusbox.c:366
+msgid "Typing"
+msgstr "Escribindo"
+
+#: ../src/gtkconv.c:5630
+msgid "Stopped Typing"
+msgstr "Deixa de escribir"
+
+#: ../src/gtkconv.c:5635
+#, fuzzy
+msgid "Nick Said"
+msgstr "Alcume"
+
+#: ../src/gtkconv.c:5645
+msgid "New Event"
+msgstr "Evento novo"
+
+#: ../src/gtkconv.c:6547
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -3182,12 +3190,11 @@
 "say &lt;mensaxe&gt;:  Enviar unha mensaxe como se non se estivera utilizando "
 "un comando."
 
-#: ../src/gtkconv.c:6518
+#: ../src/gtkconv.c:6550
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
-"me &lt;acción&gt;:  Enviar unha acción estilo IRC a un amigo ou a un chat."
-
-#: ../src/gtkconv.c:6521
+msgstr "me &lt;acción&gt;:  Enviar unha acción estilo IRC a un amigo ou a un chat."
+
+#: ../src/gtkconv.c:6553
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3195,59 +3202,59 @@
 "debug &lt;opción&gt;:  Enviar información de depuración sobre a conversación "
 "actual."
 
-#: ../src/gtkconv.c:6524
+#: ../src/gtkconv.c:6556
 msgid "clear: Clears the conversation scrollback."
 msgstr "limpar: Limpa a conversación desprazada."
 
-#: ../src/gtkconv.c:6527
+#: ../src/gtkconv.c:6559
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Recibir axuda dun comando específico."
 
-#: ../src/gtkconv.c:6686
-msgid "Confirm close"
-msgstr "Confirmar peche"
-
 #: ../src/gtkconv.c:6718
+msgid "Confirm close"
+msgstr "Confirmar peche"
+
+#: ../src/gtkconv.c:6750
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Ten mensaxes sen ler. Está seguro que quere pechar a fiestra?"
 
-#: ../src/gtkconv.c:7240
+#: ../src/gtkconv.c:7272
 msgid "Close other tabs"
 msgstr "Pechar outras solapas"
 
-#: ../src/gtkconv.c:7246
+#: ../src/gtkconv.c:7278
 msgid "Close all tabs"
 msgstr "Pechar todas as solapas"
 
-#: ../src/gtkconv.c:7254
+#: ../src/gtkconv.c:7286
 msgid "Detach this tab"
 msgstr "Desacoplar esta solapa"
 
-#: ../src/gtkconv.c:7260
+#: ../src/gtkconv.c:7292
 msgid "Close this tab"
 msgstr "Pechar esta solapa"
 
-#: ../src/gtkconv.c:7522
+#: ../src/gtkconv.c:7554
 msgid "Close conversation"
 msgstr "Pechar conversación"
 
-#: ../src/gtkconv.c:7986
+#: ../src/gtkconv.c:8018
 msgid "Last created window"
 msgstr "Última fiestra creada"
 
-#: ../src/gtkconv.c:7988
+#: ../src/gtkconv.c:8020
 msgid "Separate IM and Chat windows"
 msgstr "Separar fiestras de MIs e Chats"
 
-#: ../src/gtkconv.c:7990 ../src/gtkprefs.c:1243
+#: ../src/gtkconv.c:8022 ../src/gtkprefs.c:1243
 msgid "New window"
 msgstr "Nova fiestra"
 
-#: ../src/gtkconv.c:7992
+#: ../src/gtkconv.c:8024
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../src/gtkconv.c:7994
+#: ../src/gtkconv.c:8026
 msgid "By account"
 msgstr "Por conta"
 
@@ -3287,14 +3294,15 @@
 msgid "Right click for more options."
 msgstr "Premer co botón dereito para máis opcións."
 
-#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:100
+#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:103
 msgid "lead developer"
 msgstr "desenrolador principal"
 
 #: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
-#: ../src/gtkdialogs.c:67 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
-#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:73
-#: ../src/gtkdialogs.c:74
+#: ../src/gtkdialogs.c:66 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
+#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:72
+#: ../src/gtkdialogs.c:73 ../src/gtkdialogs.c:75 ../src/gtkdialogs.c:76
+#: ../src/gtkdialogs.c:77
 msgid "developer"
 msgstr "desenrolador"
 
@@ -3302,218 +3310,222 @@
 msgid "win32 port"
 msgstr "adaptación a win32"
 
-#: ../src/gtkdialogs.c:66
+#: ../src/gtkdialogs.c:67
 msgid "developer & webmaster"
 msgstr "desenrolador e webmaster"
 
-#: ../src/gtkdialogs.c:72
+#: ../src/gtkdialogs.c:74
 msgid "support"
 msgstr "soporte"
 
-#: ../src/gtkdialogs.c:94 ../src/gtkdialogs.c:95
+#: ../src/gtkdialogs.c:97 ../src/gtkdialogs.c:98
 msgid "maintainer"
 msgstr "mantedor"
 
-#: ../src/gtkdialogs.c:96
-msgid "libfaim maintainer"
-msgstr "mantedor de libfaim"
-
-#: ../src/gtkdialogs.c:97
-msgid "hacker and designated driver [lazy bum]"
-msgstr "hacker e deseñador de controladores [lazy bum]"
-
-#: ../src/gtkdialogs.c:98
-msgid "Jabber developer"
-msgstr "desenrolador de Jabber"
-
 #: ../src/gtkdialogs.c:99
+msgid "libfaim maintainer"
+msgstr "mantedor de libfaim"
+
+#: ../src/gtkdialogs.c:100
+msgid "hacker and designated driver [lazy bum]"
+msgstr "hacker e deseñador de controladores [lazy bum]"
+
+#: ../src/gtkdialogs.c:101
+msgid "Jabber developer"
+msgstr "desenrolador de Jabber"
+
+#: ../src/gtkdialogs.c:102
 msgid "original author"
 msgstr "autor orixinal"
 
-#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:160
+#: ../src/gtkdialogs.c:109 ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:164
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:109
+#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:112
 msgid "Bengali"
 msgstr "Bengalí"
 
-#: ../src/gtkdialogs.c:110
+#: ../src/gtkdialogs.c:113
 msgid "Bosnian"
 msgstr "Bosnia"
 
-#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:161 ../src/gtkdialogs.c:162
+#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
 msgid "Catalan"
 msgstr "Catalán"
 
-#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:163
+#: ../src/gtkdialogs.c:115
+msgid "Valencian"
+msgstr "Valenciano"
+
+#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:167
 msgid "Czech"
 msgstr "Checo"
 
-#: ../src/gtkdialogs.c:113
+#: ../src/gtkdialogs.c:117
 msgid "Danish"
 msgstr "Danés"
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:164
+#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:168
 msgid "German"
 msgstr "Alemán"
 
-#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:116
+#: ../src/gtkdialogs.c:119 ../src/gtkdialogs.c:120
 msgid "Greek"
 msgstr "Grego"
 
-#: ../src/gtkdialogs.c:117
+#: ../src/gtkdialogs.c:121
 msgid "Australian English"
 msgstr "Inglés australiano"
 
-#: ../src/gtkdialogs.c:118
+#: ../src/gtkdialogs.c:122
 msgid "Canadian English"
 msgstr "Inglés canadiense"
 
-#: ../src/gtkdialogs.c:119
+#: ../src/gtkdialogs.c:123
 msgid "British English"
 msgstr "Inglés británico"
 
-#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
-#: ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
+#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
 msgid "Spanish"
 msgstr "Español"
 
-#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:125 ../src/gtkdialogs.c:126
 msgid "Persian"
 msgstr "Perso"
 
-#: ../src/gtkdialogs.c:123 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
-#: ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
+#: ../src/gtkdialogs.c:177 ../src/gtkdialogs.c:178
 msgid "French"
 msgstr "Francés"
 
-#: ../src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:129
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../src/gtkdialogs.c:126
+#: ../src/gtkdialogs.c:130
 msgid "Hindi"
 msgstr "Hindú"
 
-#: ../src/gtkdialogs.c:127
+#: ../src/gtkdialogs.c:131
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:175
+#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:179
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:176 ../src/gtkdialogs.c:177
-#: ../src/gtkdialogs.c:178
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:180 ../src/gtkdialogs.c:181
+#: ../src/gtkdialogs.c:182
 msgid "Japanese"
 msgstr "Xaponés"
 
-#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:179
+#: ../src/gtkdialogs.c:134 ../src/gtkdialogs.c:183
 msgid "Georgian"
 msgstr "Xeorxiano"
 
-#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:180
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:184
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../src/gtkdialogs.c:132
+#: ../src/gtkdialogs.c:136
 msgid "Kurdish"
 msgstr "Curdo"
 
-#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
+#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../src/gtkdialogs.c:134
+#: ../src/gtkdialogs.c:138
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../src/gtkdialogs.c:135
+#: ../src/gtkdialogs.c:139
 msgid "Dutch, Flemish"
 msgstr "Holandés, Flamenco"
 
-#: ../src/gtkdialogs.c:136
+#: ../src/gtkdialogs.c:140
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:183
+#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:187
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../src/gtkdialogs.c:139
+#: ../src/gtkdialogs.c:143
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../src/gtkdialogs.c:140
+#: ../src/gtkdialogs.c:144
 msgid "Portuguese-Brazil"
 msgstr "Portugués brasileiro"
 
-#: ../src/gtkdialogs.c:141
+#: ../src/gtkdialogs.c:145
 msgid "Romanian"
 msgstr "Rumano"
 
-#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:184 ../src/gtkdialogs.c:185
+#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:188 ../src/gtkdialogs.c:189
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:147 ../src/gtkdialogs.c:148
 msgid "Serbian"
 msgstr "Servio"
 
-#: ../src/gtkdialogs.c:145
+#: ../src/gtkdialogs.c:149
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:187
+#: ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:191
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:151
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:152
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:153
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:154
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:154
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh eo equipo Gnome-Vi"
 
-#: ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:188
+#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:192
 msgid "Simplified Chinese"
 msgstr "Chinés simplificado"
 
-#: ../src/gtkdialogs.c:152 ../src/gtkdialogs.c:153 ../src/gtkdialogs.c:189
+#: ../src/gtkdialogs.c:156 ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:193
 msgid "Traditional Chinese"
 msgstr "Chinés tradicional"
 
-#: ../src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:163
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:190
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/gtkdialogs.c:230
+#: ../src/gtkdialogs.c:234
 msgid "About Gaim"
 msgstr "Acerca de Gaim"
 
-#: ../src/gtkdialogs.c:254
+#: ../src/gtkdialogs.c:258
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
@@ -3534,61 +3546,59 @@
 "lista completa de persoas que contribuíron. Este programa distribúese "
 "senningunha garantía.<BR><BR>"
 
-#: ../src/gtkdialogs.c:268
+#: ../src/gtkdialogs.c:272
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim en irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:271
+#: ../src/gtkdialogs.c:275
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim en irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:277
+#: ../src/gtkdialogs.c:281
 msgid "Current Developers"
 msgstr "Desenroladores actuais"
 
-#: ../src/gtkdialogs.c:292
+#: ../src/gtkdialogs.c:296
 msgid "Crazy Patch Writers"
 msgstr "Tolos escritores de parches"
 
-#: ../src/gtkdialogs.c:307
+#: ../src/gtkdialogs.c:311
 msgid "Retired Developers"
 msgstr "Desenroladores retirados"
 
-#: ../src/gtkdialogs.c:322
+#: ../src/gtkdialogs.c:326
 msgid "Current Translators"
 msgstr "Traductores actuais"
 
-#: ../src/gtkdialogs.c:342
+#: ../src/gtkdialogs.c:346
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#: ../src/gtkdialogs.c:360
+#: ../src/gtkdialogs.c:364
 msgid "Debugging Information"
 msgstr "Información de depuración"
 
-#: ../src/gtkdialogs.c:566 ../src/gtkdialogs.c:703 ../src/gtkdialogs.c:770
+#: ../src/gtkdialogs.c:570 ../src/gtkdialogs.c:707 ../src/gtkdialogs.c:770
 msgid "_Name"
 msgstr "_Nome"
 
-#: ../src/gtkdialogs.c:571 ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:775
+#: ../src/gtkdialogs.c:575 ../src/gtkdialogs.c:712 ../src/gtkdialogs.c:775
 msgid "_Account"
 msgstr "_Conta"
 
-#: ../src/gtkdialogs.c:579
+#: ../src/gtkdialogs.c:583
 msgid "New Instant Message"
 msgstr "Mensaxe instantánea nova"
 
-#: ../src/gtkdialogs.c:581
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr ""
-"Introduza o nome de usuario ou alias da persoa coa que quere comunicarse."
-
-#: ../src/gtkdialogs.c:716
+#: ../src/gtkdialogs.c:585
+msgid "Please enter the screen name or alias of the person you would like to IM."
+msgstr "Introduza o nome de usuario ou alias da persoa coa que quere comunicarse."
+
+#: ../src/gtkdialogs.c:720
 msgid "Get User Info"
 msgstr "Obter información do usuario"
 
-#: ../src/gtkdialogs.c:718
+#: ../src/gtkdialogs.c:722
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -3617,7 +3627,7 @@
 msgstr "Introduza un alcume para este contacto"
 
 #: ../src/gtkdialogs.c:808 ../src/gtkdialogs.c:830 ../src/gtkdialogs.c:850
-#: ../src/gtkrequest.c:283 ../src/protocols/silc/chat.c:586
+#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "Alcume"
 
@@ -3647,11 +3657,11 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"Está a punto de eliminar o contacto que contén a %s e outro %d amigo da súa"
-"lista de amigos. Quere continuar?"
+"Está a punto de eliminar o contacto que contén a %s e outro %d amigo da "
+"súalista de amigos. Quere continuar?"
 msgstr[1] ""
-"Está a punto de eliminar o contacto que contén a %s e outros %d amigos da súa"
-"lista de amigos. Quere continuar?"
+"Está a punto de eliminar o contacto que contén a %s e outros %d amigos da "
+"súalista de amigos. Quere continuar?"
 
 #: ../src/gtkdialogs.c:893
 msgid "Remove Contact"
@@ -3680,8 +3690,7 @@
 
 #: ../src/gtkdialogs.c:982
 #, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Está a punto de eliminar a %s da súa lista de amigos. Quere continuar?"
 
 #: ../src/gtkdialogs.c:985
@@ -3697,8 +3706,7 @@
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
-msgstr ""
-"Está a punto de eliminar o chat %s da súa lista de amigos. Quere continuar?"
+msgstr "Está a punto de eliminar o chat %s da súa lista de amigos. Quere continuar?"
 
 #: ../src/gtkdialogs.c:1010
 msgid "Remove Chat"
@@ -3743,8 +3751,7 @@
 
 #: ../src/gtkft.c:443
 msgid "There is no application configured to open this type of file."
-msgstr ""
-"Non se configurou ningunha aplicación para abrir este tipo de ficheiro."
+msgstr "Non se configurou ningunha aplicación para abrir este tipo de ficheiro."
 
 #: ../src/gtkft.c:448
 msgid "An error occurred while opening the file."
@@ -3840,40 +3847,39 @@
 msgid "Paste as Plain _Text"
 msgstr "Pegar como _texto plano"
 
-#. XXX: make this new with mnemonic, and HIG-happy after string thaw
-#: ../src/gtkimhtml.c:834 ../src/gtkimhtmltoolbar.c:1030
-msgid "Clear formatting"
-msgstr "Limpar formatos"
+#: ../src/gtkimhtml.c:833
+msgid "_Reset formatting"
+msgstr "_Reiniciar formatos"
+
+#: ../src/gtkimhtml.c:1327
+msgid "Hyperlink color"
+msgstr "Cor de ligazón"
 
 #: ../src/gtkimhtml.c:1328
-msgid "Hyperlink color"
-msgstr "Cor de ligazón"
-
-#: ../src/gtkimhtml.c:1329
 msgid "Color to draw hyperlinks."
 msgstr "Cor para debuxar ligazóns."
 
-#: ../src/gtkimhtml.c:1332
+#: ../src/gtkimhtml.c:1331
 msgid "Hyperlink prelight color"
 msgstr "Cor de ligazón pre-iluminado"
 
-#: ../src/gtkimhtml.c:1333
+#: ../src/gtkimhtml.c:1332
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Cor para debuxar ligazóns cando o rato esté enriba."
 
-#: ../src/gtkimhtml.c:1554
+#: ../src/gtkimhtml.c:1553
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar enderezo E-Mail"
 
-#: ../src/gtkimhtml.c:1566
+#: ../src/gtkimhtml.c:1565
 msgid "_Open Link in Browser"
 msgstr "_Abrir ligazón en navegador"
 
-#: ../src/gtkimhtml.c:1576
+#: ../src/gtkimhtml.c:1575
 msgid "_Copy Link Location"
 msgstr "_Copiar destino da ligazón"
 
-#: ../src/gtkimhtml.c:3273
+#: ../src/gtkimhtml.c:3272
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3883,7 +3889,7 @@
 "\n"
 "Por defecto PNG."
 
-#: ../src/gtkimhtml.c:3276
+#: ../src/gtkimhtml.c:3275
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3893,7 +3899,7 @@
 "\n"
 "Por defecto PNG."
 
-#: ../src/gtkimhtml.c:3289
+#: ../src/gtkimhtml.c:3288
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3904,7 +3910,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3292
+#: ../src/gtkimhtml.c:3291
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3915,11 +3921,11 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3372 ../src/gtkimhtml.c:3384
+#: ../src/gtkimhtml.c:3371 ../src/gtkimhtml.c:3383
 msgid "Save Image"
 msgstr "Gardar imaxe"
 
-#: ../src/gtkimhtml.c:3412
+#: ../src/gtkimhtml.c:3411
 msgid "_Save Image..."
 msgstr "_Gardar imaxe..."
 
@@ -4013,6 +4019,10 @@
 msgid "Background color"
 msgstr "Cor de fondo"
 
+#: ../src/gtkimhtmltoolbar.c:1030
+msgid "Reset formatting"
+msgstr "Reiniciar formatos"
+
 #: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
 msgstr "Inserir ligazón"
@@ -4025,21 +4035,21 @@
 msgid "Insert smiley"
 msgstr "Inserir emoticón"
 
-#: ../src/gtklog.c:202
+#: ../src/gtklog.c:188
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversación en %s de %s</span>"
 
-#: ../src/gtklog.c:207
+#: ../src/gtklog.c:193
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversación con %s en %s</span>"
 
-#: ../src/gtklog.c:258
+#: ../src/gtklog.c:242
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/gtklog.c:311
+#: ../src/gtklog.c:295
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -4047,7 +4057,7 @@
 "Só se rexistrarán os eventos do sistema cando esté activada a opción "
 "\"Rexistrar todos os cambios de estado no rexistro do sistema."
 
-#: ../src/gtklog.c:315
+#: ../src/gtklog.c:299
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -4055,32 +4065,31 @@
 "Só se rexistrarán as mensaxes instantáneas se está activada a preferencia "
 "\"Rexistrar todas as mensaxes instantáneas\"."
 
-#: ../src/gtklog.c:318
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
+#: ../src/gtklog.c:302
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Os chats só serán rexistrados se a opción \"Rexistrar todos os chats\" está "
 "activada nas preferencias"
 
-#: ../src/gtklog.c:322
+#: ../src/gtklog.c:306
 msgid "No logs were found"
 msgstr "Non se atoparon rexistros"
 
-#: ../src/gtklog.c:398
+#: ../src/gtklog.c:382
 msgid "Total log size:"
 msgstr "Tamaño total de rexistro:"
 
-#: ../src/gtklog.c:474
+#: ../src/gtklog.c:458
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversacións en %s"
 
-#: ../src/gtklog.c:482 ../src/gtklog.c:533
+#: ../src/gtklog.c:466 ../src/gtklog.c:517
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversacións con %s"
 
-#: ../src/gtklog.c:558
+#: ../src/gtklog.c:542
 msgid "System Log"
 msgstr "Rexistro do sistema"
 
@@ -4154,34 +4163,34 @@
 "con Sean ou Luke a través doutros protocolos en \n"
 "%scontactinfo.php\n"
 
-#: ../src/gtknotify.c:305
+#: ../src/gtknotify.c:327
 msgid "New Mail"
 msgstr "Correo novo"
 
-#: ../src/gtknotify.c:321
+#: ../src/gtknotify.c:343
 msgid "Open All Messages"
 msgstr "Abrir todas as mensaxes"
 
-#: ../src/gtknotify.c:382 ../src/protocols/jabber/jabber.c:1114
+#: ../src/gtknotify.c:409 ../src/protocols/jabber/jabber.c:1115
 msgid "From"
 msgstr "De"
 
-#: ../src/gtknotify.c:390
+#: ../src/gtknotify.c:418
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../src/gtknotify.c:399
+#: ../src/gtknotify.c:427
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Ten correo!</span>"
 
-#: ../src/gtknotify.c:451
+#: ../src/gtknotify.c:493
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s ten %d mensaxe novo."
 msgstr[1] "%s ten %d mensaxes novas."
 
-#: ../src/gtknotify.c:456
+#: ../src/gtknotify.c:498
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4192,54 +4201,53 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:643 ../src/protocols/sametime/sametime.c:5459
+#: ../src/gtknotify.c:685 ../src/protocols/sametime/sametime.c:5459
 msgid "Search Results"
 msgstr "Resultados da busca"
 
-#: ../src/gtknotify.c:799 ../src/protocols/oscar/oscar.c:5061
+#: ../src/gtknotify.c:841 ../src/protocols/oscar/oscar.c:5061
 #, c-format
 msgid "Info for %s"
 msgstr "Información sobre %s"
 
-#: ../src/gtknotify.c:800 ../src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:842 ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Información de amigos"
 
-#: ../src/gtknotify.c:840
-#, c-format
-msgid "The browser command <b>%s</b> is invalid."
-msgstr "O comando de navegador <b>%s</b> é inválido."
-
-#: ../src/gtknotify.c:842 ../src/gtknotify.c:854 ../src/gtknotify.c:867
-#: ../src/gtknotify.c:992
+#: ../src/gtknotify.c:881
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "O comando de navegador \"%s\" é inválido."
+
+#: ../src/gtknotify.c:883 ../src/gtknotify.c:895 ../src/gtknotify.c:908
+#: ../src/gtknotify.c:1031
 msgid "Unable to open URL"
 msgstr "Non se puido abrir a URL"
 
-#: ../src/gtknotify.c:852 ../src/gtknotify.c:865
-#, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "Erro ao lanzar <b>%s</b>: %s"
-
-#: ../src/gtknotify.c:993
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
+#: ../src/gtknotify.c:893 ../src/gtknotify.c:906
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Erro ao lanzar \"%s\": %s"
+
+#: ../src/gtknotify.c:1032
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Definiuse un comando de navegador 'Manual', pero non se definiu ningún "
 "comando para executalo."
 
-#: ../src/gtkplugin.c:275
+#: ../src/gtkplugin.c:274
 msgid "The following plugins will be unloaded."
 msgstr "Desactivaranse os seguintes complementos."
 
-#: ../src/gtkplugin.c:294
+#: ../src/gtkplugin.c:293
 msgid "Multiple plugins will be unloaded."
 msgstr "Desactivaranse múltiples complementos."
 
-#: ../src/gtkplugin.c:296
+#: ../src/gtkplugin.c:295
 msgid "Unload Plugins"
 msgstr "Desactivar complementos"
 
-#: ../src/gtkplugin.c:410
+#: ../src/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -4250,7 +4258,7 @@
 "<span weight=\"bold\">Sitio web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nome do ficheiro:</span>\t\t%s"
 
-#: ../src/gtkplugin.c:420
+#: ../src/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s\n"
@@ -4261,11 +4269,11 @@
 "<span·foreground=\"#ff0000\"·weight=\"bold\">Erro:·%s\n"
 "Comprobe o sitio web do complemento para obter unha actualización.</span>"
 
-#: ../src/gtkplugin.c:546
+#: ../src/gtkplugin.c:543
 msgid "Configure Pl_ugin"
 msgstr "Configurar _complemento"
 
-#: ../src/gtkplugin.c:604
+#: ../src/gtkplugin.c:601
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalles do complemento</b>"
 
@@ -4715,7 +4723,7 @@
 msgid "Quiet"
 msgstr "Silencio"
 
-#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:666
+#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:670
 msgid "Normal"
 msgstr "Normal"
 
@@ -4862,7 +4870,7 @@
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1847
+#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1851
 msgid "Network"
 msgstr "Rede"
 
@@ -4917,8 +4925,7 @@
 
 #: ../src/gtkprivacy.c:564
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr ""
-"Introduza o nome de usuario ao que quere permitir que contacte con vostede."
+msgstr "Introduza o nome de usuario ao que quere permitir que contacte con vostede."
 
 #: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
 msgid "_Permit"
@@ -4960,45 +4967,57 @@
 msgid "Are you sure you want to block %s?"
 msgstr "Está seguro de que quere bloquear a %s?"
 
-#: ../src/gtkrequest.c:273 ../src/protocols/msn/dialog.c:114
+#: ../src/gtkrequest.c:267 ../src/protocols/msn/dialog.c:114
 #: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
 #: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
 msgid "Yes"
 msgstr "Si"
 
-#: ../src/gtkrequest.c:274 ../src/protocols/msn/dialog.c:115
+#: ../src/gtkrequest.c:268 ../src/protocols/msn/dialog.c:115
 #: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
 msgid "No"
 msgstr "Non"
 
-#: ../src/gtkrequest.c:277
+#: ../src/gtkrequest.c:271
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../src/gtkrequest.c:278 ../src/protocols/msn/msn.c:357
+#: ../src/gtkrequest.c:272 ../src/protocols/msn/msn.c:357
 #: ../src/protocols/silc/util.c:336
 msgid "Close"
 msgstr "Pechar"
 
-#: ../src/gtkrequest.c:1473
+#: ../src/gtkrequest.c:1467
 msgid "That file already exists"
 msgstr "Ese ficheiro xa existe"
 
-#: ../src/gtkrequest.c:1474
+#: ../src/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
 msgstr "Quere sobrescribilo?"
 
-#: ../src/gtkrequest.c:1518 ../src/gtkrequest.c:1559
+#: ../src/gtkrequest.c:1469
+msgid "Overwrite"
+msgstr "Sobreescribir"
+
+#: ../src/gtkrequest.c:1470
+msgid "Choose New Name"
+msgstr "Escoller un novo nome"
+
+#: ../src/gtkrequest.c:1512 ../src/gtkrequest.c:1553
 msgid "Save File..."
 msgstr "Gardar ficheiro..."
 
-#: ../src/gtkrequest.c:1519 ../src/gtkrequest.c:1560
+#: ../src/gtkrequest.c:1513 ../src/gtkrequest.c:1554
 msgid "Open File..."
 msgstr "Abrir ficheiro..."
 
+#: ../src/gtkrequest.c:1601 ../src/gtkrequest.c:1615
+msgid "Select Folder..."
+msgstr "Seleccionar cartafol..."
+
 #: ../src/gtkroomlist.c:287
 msgid "_Add"
 msgstr "_Engadir"
@@ -5029,24 +5048,24 @@
 #. Available status messages are plain text
 #: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
 #: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1421
-#: ../src/protocols/gg/gg.c:1431 ../src/protocols/gg/gg.c:1437
-#: ../src/protocols/gg/gg.c:1446 ../src/protocols/gg/gg.c:1451
-#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1181
-#: ../src/protocols/jabber/jabber.c:1191 ../src/protocols/jabber/jabber.c:1201
-#: ../src/protocols/jabber/jabber.c:1211 ../src/protocols/jabber/jabber.c:1221
-#: ../src/protocols/jabber/jabber.c:1233 ../src/protocols/novell/novell.c:2868
+#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1461
+#: ../src/protocols/gg/gg.c:1471 ../src/protocols/gg/gg.c:1477
+#: ../src/protocols/gg/gg.c:1486 ../src/protocols/gg/gg.c:1491
+#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1182
+#: ../src/protocols/jabber/jabber.c:1192 ../src/protocols/jabber/jabber.c:1202
+#: ../src/protocols/jabber/jabber.c:1212 ../src/protocols/jabber/jabber.c:1222
+#: ../src/protocols/jabber/jabber.c:1234 ../src/protocols/novell/novell.c:2868
 #: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
-#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7794
-#: ../src/protocols/oscar/oscar.c:7808 ../src/protocols/oscar/oscar.c:7813
-#: ../src/protocols/oscar/oscar.c:8022 ../src/protocols/oscar/oscar.c:8034
+#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7801
+#: ../src/protocols/oscar/oscar.c:7816 ../src/protocols/oscar/oscar.c:7821
+#: ../src/protocols/oscar/oscar.c:8030 ../src/protocols/oscar/oscar.c:8042
 #: ../src/protocols/sametime/sametime.c:3274
 #: ../src/protocols/sametime/sametime.c:3280
 #: ../src/protocols/sametime/sametime.c:3286
 #: ../src/protocols/sametime/sametime.c:3365
 #: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3279 ../src/protocols/yahoo/yahoo.c:3285
-#: ../src/protocols/zephyr/zephyr.c:2261
+#: ../src/protocols/yahoo/yahoo.c:3280 ../src/protocols/yahoo/yahoo.c:3286
+#: ../src/protocols/zephyr/zephyr.c:2281
 msgid "Message"
 msgstr "Mensaxe"
 
@@ -5068,13 +5087,13 @@
 msgstr "Diferente"
 
 #: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
-#: ../src/protocols/gg/gg.c:1403 ../src/protocols/gg/gg.c:1408
+#: ../src/protocols/gg/gg.c:1444 ../src/protocols/gg/gg.c:1448
 #: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1152
+#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1153
 #: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
 #: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:849
 #: ../src/protocols/oscar/oscar.c:855 ../src/protocols/oscar/oscar.c:858
-#: ../src/protocols/yahoo/yahoo.c:2881
+#: ../src/protocols/yahoo/yahoo.c:2882
 msgid "Status"
 msgstr "Estado"
 
@@ -5141,13 +5160,12 @@
 msgid "Someone says your name in chat"
 msgstr "Alguén menciona seu nome no chat"
 
-#: ../src/gtksound.c:488
+#: ../src/gtksound.c:485
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr ""
-"Non foi posible reproducir o son porque o ficheiro escollido (%s) non existe."
-
-#: ../src/gtksound.c:504
+msgstr "Non foi posible reproducir o son porque o ficheiro escollido (%s) non existe."
+
+#: ../src/gtksound.c:501
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -5155,7 +5173,7 @@
 "Non foi posible reproducir o son porque escolleuse o método de 'Comando',"
 "pero non se especificou o comando."
 
-#: ../src/gtksound.c:516
+#: ../src/gtksound.c:513
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -5164,18 +5182,14 @@
 "Non foi posible reproducir o son porque o comando de son establecido non se "
 "puido lanzar: %s"
 
-#: ../src/gtkstatusbox.c:366
-msgid "Typing"
-msgstr "Escribindo"
-
 #. connect to the server
 #: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
 #: ../src/protocols/jabber/jabber.c:979 ../src/protocols/msn/session.c:349
 #: ../src/protocols/napster/napster.c:536
 #: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1938
 #: ../src/protocols/sametime/sametime.c:3693
-#: ../src/protocols/simple/simple.c:1594 ../src/protocols/yahoo/yahoo.c:2571
-#: ../src/protocols/zephyr/zephyr.c:1547
+#: ../src/protocols/simple/simple.c:1594 ../src/protocols/yahoo/yahoo.c:2572
+#: ../src/protocols/zephyr/zephyr.c:1565
 msgid "Connecting"
 msgstr "Conectando"
 
@@ -5286,17 +5300,9 @@
 "Arrastrou un lanzado de escritorio. O máis probable é que queira enviar a o "
 "que apunta o lanzador máis que o lanzador en si."
 
-#. Write a local message to this conversation showing that a request for a
-#. * Doodle session has been made
-#.
-#: ../src/gtkwhiteboard.c:344 ../src/protocols/yahoo/yahoo_doodle.c:96
-msgid "Sent Doodle request."
-msgstr "Enviar petición Doodle."
-
 #: ../src/log.c:167
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr ""
-"<b><font color=\"red\">O rexistro non ten función de lectura</font></b>"
+msgstr "<b><font color=\"red\">O rexistro non ten función de lectura</font></b>"
 
 #: ../src/log.c:549
 msgid "HTML"
@@ -5318,7 +5324,7 @@
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1077
+#: ../src/log.c:1083
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5327,7 +5333,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1079
+#: ../src/log.c:1085
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5336,17 +5342,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1136 ../src/log.c:1262
+#: ../src/log.c:1142 ../src/log.c:1273
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr ""
-"<font color=\"red\"><b>Non se puido atopar a ruta do rexistro!</b></font>"
-
-#: ../src/log.c:1148 ../src/log.c:1276
+msgstr "<font color=\"red\"><b>Non se puido atopar a ruta do rexistro!</b></font>"
+
+#: ../src/log.c:1154 ../src/log.c:1287
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Non se puido ler o ficheiro: %s</b></font>"
 
-#: ../src/log.c:1205
+#: ../src/log.c:1216
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA AUTOMÁTICA>: %s\n"
@@ -5359,14 +5364,12 @@
 #: ../src/plugin.c:424
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr ""
-"Non houbo conincidencia no número máxico do complemento %d (necesitaba %d)"
+msgstr "Non houbo conincidencia no número máxico do complemento %d (necesitaba %d)"
 
 #: ../src/plugin.c:441
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr ""
-"Non houbo coincidencia no número de versión ABI %d.%d.x (necesitaba %d.%d.x)"
+msgstr "Non houbo coincidencia no número de versión ABI %d.%d.x (necesitaba %d.%d.x)"
 
 #: ../src/plugin.c:458
 msgid "Plugin does not implement all required functions"
@@ -5409,10 +5412,8 @@
 msgstr "Imposible escoitar as conexións de MI entrantes\n"
 
 #: ../src/protocols/bonjour/bonjour.c:146
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr ""
-"Imposible establecer a conexión co servidor local mDNS. Estase executando?"
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "Imposible establecer a conexión co servidor local mDNS. Estase executando?"
 
 #: ../src/protocols/bonjour/bonjour.c:337
 #: ../src/protocols/sametime/sametime.c:3251
@@ -5455,34 +5456,33 @@
 msgstr "Usuario de Gaim"
 
 #. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:931
+#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:935
 msgid "Hostname"
 msgstr "Nome do servidor"
 
 #. Creating the options for the protocol
 #. port to connect to
 #: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:2048 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1855
+#: ../src/protocols/msn/msn.c:2054 ../src/protocols/napster/napster.c:724
+#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1859
 msgid "Port"
 msgstr "Porto"
 
-#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:562
-#: ../src/protocols/gg/gg.c:971
+#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:605
+#: ../src/protocols/gg/gg.c:1015 ../src/protocols/jabber/jabber.c:770
 msgid "First name"
 msgstr "Nome"
 
-#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:557
+#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:600
+#: ../src/protocols/jabber/jabber.c:775
 msgid "Last name"
 msgstr "Apelidos"
 
-#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/jabber/buddy.c:261
-#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
-#: ../src/protocols/silc/silc.c:695 ../src/protocols/silc/silc.c:935
-#: ../src/protocols/silc/util.c:512
-#: ../src/protocols/yahoo/yahoo_profile.c:1030
-msgid "Email"
-msgstr "Correo electrónico"
+#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/gg/gg.c:468
+#: ../src/protocols/jabber/jabber.c:760 ../src/protocols/silc/silc.c:699
+#: ../src/protocols/silc/silc.c:939
+msgid "E-mail"
+msgstr "E-mail"
 
 #: ../src/protocols/bonjour/jabber.c:357
 #, c-format
@@ -5509,307 +5509,316 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Non se puido enviar a mensaxe, non se puido iniciar a conversación."
 
-#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
-#: ../src/protocols/gg/gg.c:137
+#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2345
+msgid "Invalid proxy settings"
+msgstr "Configuración inválida de proxy"
+
+#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2345
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+"O nome do servidor ou o porto especificados non son válidos para seu tipo de "
+"proxy."
+
+#: ../src/protocols/gg/gg.c:115 ../src/protocols/gg/gg.c:137
+#: ../src/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Erro de token"
 
-#: ../src/protocols/gg/gg.c:81 ../src/protocols/gg/gg.c:103
-#: ../src/protocols/gg/gg.c:138
+#: ../src/protocols/gg/gg.c:116 ../src/protocols/gg/gg.c:138
+#: ../src/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Non se puido obter o token.\n"
 
-#: ../src/protocols/gg/gg.c:226 ../src/protocols/gg/gg.c:245
+#: ../src/protocols/gg/gg.c:269 ../src/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Gardar lista de amigos..."
 
-#: ../src/protocols/gg/gg.c:227
+#: ../src/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "A túa lista de amigos está baleira, non se escribiu nada no ficheiro."
 
-#: ../src/protocols/gg/gg.c:233 ../src/protocols/gg/gg.c:235
+#: ../src/protocols/gg/gg.c:276 ../src/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Non se puido abrir o ficheiro"
 
-#: ../src/protocols/gg/gg.c:246
+#: ../src/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Lista de amigos gardada correctamente!"
 
-#: ../src/protocols/gg/gg.c:264 ../src/protocols/gg/gg.c:265
+#: ../src/protocols/gg/gg.c:307 ../src/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Non se puido cargar a lista de amigos"
 
-#: ../src/protocols/gg/gg.c:281
+#: ../src/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Cargar lista de amigos..."
 
-#: ../src/protocols/gg/gg.c:282
+#: ../src/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Lista de amigos cargada satisfactoriamente!"
 
-#: ../src/protocols/gg/gg.c:293
+#: ../src/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Gardar lista de amigos..."
 
-#: ../src/protocols/gg/gg.c:337
+#: ../src/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "Encher os campos de rexistro."
 
-#: ../src/protocols/gg/gg.c:342
+#: ../src/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "Os contrasinais non coinciden."
 
-#: ../src/protocols/gg/gg.c:351
+#: ../src/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Non se puido rexistrar a conta nova. Ocorreu un erro.\n"
 
-#: ../src/protocols/gg/gg.c:364
+#: ../src/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nova conta rexistrada de Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:365
+#: ../src/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "Rexistro completado satisfactoriamente!"
 
-#: ../src/protocols/gg/gg.c:425 ../src/protocols/jabber/jabber.c:760
-msgid "E-Mail"
-msgstr "Correo electrónico"
-
-#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
-#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1306
+#: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:747
+#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1307
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../src/protocols/gg/gg.c:435 ../src/protocols/gg/gg.c:709
+#: ../src/protocols/gg/gg.c:478 ../src/protocols/gg/gg.c:752
 msgid "Password (retype)"
 msgstr "Contrasinal (reescribir)"
 
-#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
+#: ../src/protocols/gg/gg.c:483 ../src/protocols/gg/gg.c:757
 msgid "Enter current token"
 msgstr "Introduza o token actual"
 
-#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
+#: ../src/protocols/gg/gg.c:489 ../src/protocols/gg/gg.c:763
 msgid "Current token"
 msgstr "Token actual"
 
-#: ../src/protocols/gg/gg.c:450 ../src/protocols/gg/gg.c:451
+#: ../src/protocols/gg/gg.c:493 ../src/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "Rexistrar conta nova de Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:452
+#: ../src/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr "Por favor, encha os seguintes campos"
 
-#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1610
+#: ../src/protocols/gg/gg.c:590 ../src/protocols/gg/gg.c:1657
 msgid "Unable to initiate a new search"
 msgstr "Non se puido iniciar unha nova busca"
 
-#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1611
+#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:1658
 msgid "You have a pending search. Please wait for it to finish."
 msgstr "Ten unha busca pendente. Agarde ata que remate."
 
-#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
-#: ../src/protocols/gg/gg.c:2003 ../src/protocols/jabber/buddy.c:252
+#. General
+#: ../src/protocols/gg/gg.c:610 ../src/protocols/gg/gg.c:1018
+#: ../src/protocols/gg/gg.c:2048 ../src/protocols/jabber/buddy.c:252
 #: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1402
 #: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
-#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
-#: ../src/protocols/yahoo/yahoo_profile.c:1035
+#: ../src/protocols/msn/msn.c:1535 ../src/protocols/silc/buddy.c:1528
+#: ../src/protocols/silc/ops.c:1036 ../src/protocols/silc/ops.c:1179
+#: ../src/protocols/silc/ops.c:1328
+#: ../src/protocols/yahoo/yahoo_profile.c:1041
 msgid "Nickname"
 msgstr "Alcume"
 
-#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
+#: ../src/protocols/gg/gg.c:615 ../src/protocols/gg/gg.c:1021
 #: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6218
 #: ../src/protocols/oscar/oscar.c:6226
 msgid "City"
 msgstr "Cidade"
 
-#: ../src/protocols/gg/gg.c:577
+#: ../src/protocols/gg/gg.c:620
 msgid "Year of birth"
 msgstr "Cumpreanos"
 
-#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1532
+#: ../src/protocols/gg/gg.c:623 ../src/protocols/msn/msn.c:1537
 #: ../src/protocols/oscar/oscar.c:6192
-#: ../src/protocols/yahoo/yahoo_profile.c:1060
+#: ../src/protocols/yahoo/yahoo_profile.c:1066
 msgid "Gender"
 msgstr "Sexo"
 
-#: ../src/protocols/gg/gg.c:581
+#: ../src/protocols/gg/gg.c:624
 msgid "Male or female"
 msgstr "Home ou muller"
 
-#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:625 ../src/protocols/oscar/oscar.c:6192
 msgid "Male"
 msgstr "Home"
 
-#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:626 ../src/protocols/oscar/oscar.c:6192
 msgid "Female"
 msgstr "Muller"
 
-#: ../src/protocols/gg/gg.c:587
+#: ../src/protocols/gg/gg.c:630
 msgid "Only online"
 msgstr "Só conectado"
 
-#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:592
+#: ../src/protocols/gg/gg.c:634 ../src/protocols/gg/gg.c:635
 msgid "Find buddies"
 msgstr "Procurar amigos"
 
-#: ../src/protocols/gg/gg.c:593
+#: ../src/protocols/gg/gg.c:636
 msgid "Please, enter your search criteria below"
 msgstr "Por favor, introduza a continuación o seu criterio de busca"
 
-#: ../src/protocols/gg/gg.c:630
+#: ../src/protocols/gg/gg.c:673
 msgid "Fill in the fields."
 msgstr "Encher os campos."
 
-#: ../src/protocols/gg/gg.c:642
+#: ../src/protocols/gg/gg.c:685
 msgid "Your current password is different from the one that you specified."
 msgstr "Teu contrasinal actual é diferente do primeiro que especificou."
 
-#: ../src/protocols/gg/gg.c:656
+#: ../src/protocols/gg/gg.c:699
 msgid "Unable to change password. Error occured.\n"
 msgstr "Non se puido cambiar o contrasinal. Ocorreu un erro.\n"
 
-#: ../src/protocols/gg/gg.c:665
+#: ../src/protocols/gg/gg.c:708
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Cambiar o contrasinal da conta Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:666
+#: ../src/protocols/gg/gg.c:709
 msgid "Password was changed successfully!"
 msgstr "Cambiouse con éxito o contrasinal!"
 
-#: ../src/protocols/gg/gg.c:699
+#: ../src/protocols/gg/gg.c:742
 msgid "Current password"
 msgstr "Contrasinal actual"
 
-#: ../src/protocols/gg/gg.c:724
+#: ../src/protocols/gg/gg.c:767
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduza o seu contrasinal actual e o contrasinal novo para UIN:"
 
-#: ../src/protocols/gg/gg.c:728 ../src/protocols/gg/gg.c:729
+#: ../src/protocols/gg/gg.c:771 ../src/protocols/gg/gg.c:772
 msgid "Change Gadu-Gadu Password"
 msgstr "Cambiar o contrasinal Gadu-Gadu"
 
-#. TODO: s/screenname/alias/
-#: ../src/protocols/gg/gg.c:804
+#: ../src/protocols/gg/gg.c:846
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Seleccione un chat para o amigo: %s"
 
-#: ../src/protocols/gg/gg.c:807 ../src/protocols/gg/gg.c:808
+#: ../src/protocols/gg/gg.c:849 ../src/protocols/gg/gg.c:850
 msgid "Add to chat..."
 msgstr "Engadir ao chat..."
 
-#: ../src/protocols/gg/gg.c:950
+#: ../src/protocols/gg/gg.c:993
 msgid "No matching users found"
 msgstr "Non se atoparon usuarios coincidintes"
 
-#: ../src/protocols/gg/gg.c:951
+#: ../src/protocols/gg/gg.c:994
 msgid "There are no users matching your search criteria."
 msgstr "Non hai usuarios que coincidan cos seus criterios de busca."
 
-#: ../src/protocols/gg/gg.c:962 ../src/protocols/gg/gg.c:1029
+#: ../src/protocols/gg/gg.c:1006 ../src/protocols/gg/gg.c:1073
 #: ../src/protocols/oscar/oscar.c:6329
 msgid "Unable to display the search results."
 msgstr "Non se poden amosar os resultados da busca."
 
-#: ../src/protocols/gg/gg.c:968 ../src/protocols/oscar/oscar.c:6164
+#: ../src/protocols/gg/gg.c:1012 ../src/protocols/oscar/oscar.c:6164
 msgid "UIN"
 msgstr "UIN"
 
-#: ../src/protocols/gg/gg.c:980
+#: ../src/protocols/gg/gg.c:1024
 msgid "Birth year"
 msgstr "Data de nacemento"
 
-#: ../src/protocols/gg/gg.c:1020
+#: ../src/protocols/gg/gg.c:1064
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directorio público Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:1021
+#: ../src/protocols/gg/gg.c:1065
 msgid "Search results"
 msgstr "Resultados da busca"
 
-#: ../src/protocols/gg/gg.c:1118 ../src/protocols/gg/gg.c:1265
+#: ../src/protocols/gg/gg.c:1162 ../src/protocols/gg/gg.c:1309
 msgid "Unable to read socket"
 msgstr "Non se puido ler o socket"
 
-#: ../src/protocols/gg/gg.c:1201
+#: ../src/protocols/gg/gg.c:1245
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos descargada"
 
-#: ../src/protocols/gg/gg.c:1202
+#: ../src/protocols/gg/gg.c:1246
 msgid "Your buddy list was downloaded from the server."
 msgstr "A túa lista de amigos foi descargada desde o servidor."
 
-#: ../src/protocols/gg/gg.c:1209
+#: ../src/protocols/gg/gg.c:1253
 msgid "Buddy list uploaded"
 msgstr "Lista de amigos subida"
 
-#: ../src/protocols/gg/gg.c:1210
+#: ../src/protocols/gg/gg.c:1254
 msgid "Your buddy list was stored on the server."
 msgstr "A túa lista de amigos foi almacenada no servidor."
 
-#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1532
+#: ../src/protocols/gg/gg.c:1355 ../src/protocols/gg/gg.c:1579
 msgid "Connection failed."
 msgstr "Fallou a conexión."
 
-#: ../src/protocols/gg/gg.c:1445 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/gg/gg.c:1485 ../src/protocols/msn/msn.c:566
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../src/protocols/gg/gg.c:1468
+#: ../src/protocols/gg/gg.c:1508
 msgid "Add to chat"
 msgstr "Engadir ao chat"
 
-#: ../src/protocols/gg/gg.c:1477
+#: ../src/protocols/gg/gg.c:1517
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../src/protocols/gg/gg.c:1481
+#: ../src/protocols/gg/gg.c:1521
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../src/protocols/gg/gg.c:1498
+#: ../src/protocols/gg/gg.c:1538
 msgid "Chat _name:"
 msgstr "_Nome do chat:"
 
-#: ../src/protocols/gg/gg.c:1724
+#: ../src/protocols/gg/gg.c:1769
 msgid "Chat error"
 msgstr "Erro do chat"
 
-#: ../src/protocols/gg/gg.c:1725
+#: ../src/protocols/gg/gg.c:1770
 msgid "This chat name is already in use"
 msgstr "O nome deste chat xa está en uso"
 
-#: ../src/protocols/gg/gg.c:1808
+#: ../src/protocols/gg/gg.c:1853
 msgid "Not connected to the server."
 msgstr "Non conectado ao servidor."
 
-#: ../src/protocols/gg/gg.c:1831
+#: ../src/protocols/gg/gg.c:1876
 msgid "Find buddies..."
 msgstr "Procurar amigos..."
 
-#: ../src/protocols/gg/gg.c:1837
+#: ../src/protocols/gg/gg.c:1882
 msgid "Change password..."
 msgstr "Trocar contrasinal..."
 
-#: ../src/protocols/gg/gg.c:1843
+#: ../src/protocols/gg/gg.c:1888
 msgid "Upload buddylist to Server"
 msgstr "Subir lista de amigos ao servidor"
 
-#: ../src/protocols/gg/gg.c:1847
+#: ../src/protocols/gg/gg.c:1892
 msgid "Download buddylist from Server"
 msgstr "Descargar lista de amigos do servidor"
 
-#: ../src/protocols/gg/gg.c:1851
+#: ../src/protocols/gg/gg.c:1896
 msgid "Delete buddylist from Server"
 msgstr "Borrar lista de amigos do servidor"
 
-#: ../src/protocols/gg/gg.c:1855
+#: ../src/protocols/gg/gg.c:1900
 msgid "Save buddylist to file..."
 msgstr "Gardar lista de amigos ao ficheiro..."
 
-#: ../src/protocols/gg/gg.c:1859
+#: ../src/protocols/gg/gg.c:1904
 msgid "Load buddylist from file..."
 msgstr "Cargar lista de amigos desde ficheiro..."
 
@@ -5824,32 +5833,32 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:1955
+#: ../src/protocols/gg/gg.c:2000
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocolo Gadu-Gadu"
 
 #. summary
-#: ../src/protocols/gg/gg.c:1956
+#: ../src/protocols/gg/gg.c:2001
 msgid "Polish popular IM"
 msgstr "MI polaca moi popular"
 
-#: ../src/protocols/gg/gg.c:2004
+#: ../src/protocols/gg/gg.c:2049
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1582
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1586
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando descoñecido: %s"
 
 #: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
-#: ../src/protocols/silc/silc.c:1290
+#: ../src/protocols/silc/silc.c:1294
 #, c-format
 msgid "current topic is: %s"
 msgstr "o tópico actual é: %s"
 
 #: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
-#: ../src/protocols/silc/silc.c:1294
+#: ../src/protocols/silc/silc.c:1298
 msgid "No topic is set"
 msgstr "Non hai un tópico establecido"
 
@@ -5958,11 +5967,11 @@
 msgstr "Complemento de protocolo IRC menos malo"
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/jabber/jabber.c:1904
+#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/jabber/jabber.c:1905
 #: ../src/protocols/napster/napster.c:719
 #: ../src/protocols/sametime/sametime.c:5638 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1753
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1754
 msgid "Server"
 msgstr "Servidor"
 
@@ -5970,15 +5979,16 @@
 msgid "Encodings"
 msgstr "Codificacións"
 
-#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:229
 #: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
 #: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
 #: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
-#: ../src/protocols/silc/silc.c:929
+#: ../src/protocols/silc/silc.c:933
 msgid "Username"
 msgstr "Nome de usuario"
 
-#: ../src/protocols/irc/irc.c:909
+#: ../src/protocols/irc/irc.c:909 ../src/protocols/irc/msgs.c:230
+#: ../src/protocols/silc/silc.c:937
 msgid "Real name"
 msgstr "Nome real"
 
@@ -5990,160 +6000,159 @@
 msgid "Use SSL"
 msgstr "Usar SSL"
 
-#: ../src/protocols/irc/msgs.c:103
+#: ../src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Modo erróneo"
 
-#: ../src/protocols/irc/msgs.c:114
+#: ../src/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "Foi vetado desde %s."
 
-#: ../src/protocols/irc/msgs.c:115
+#: ../src/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "Vetado"
 
-#: ../src/protocols/irc/msgs.c:132
+#: ../src/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Non se puido vetar a %s: a lista de vetados está chea"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/irc/msgs.c:248
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6165
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/oscar/oscar.c:6165
 #: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Alcume"
 
-#: ../src/protocols/irc/msgs.c:214
+#: ../src/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../src/protocols/irc/msgs.c:215
+#: ../src/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/irc/msgs.c:223 ../src/protocols/irc/msgs.c:229
+#: ../src/protocols/irc/msgs.c:230 ../src/protocols/irc/msgs.c:241
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
-#: ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1040
-msgid "Realname"
-msgstr "Nome real"
-
-#: ../src/protocols/irc/msgs.c:237 ../src/protocols/silc/ops.c:1255
+#: ../src/protocols/irc/msgs.c:241 ../src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Actualmente en"
 
-#: ../src/protocols/irc/msgs.c:242
+#: ../src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Inactivo desde:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "Conectado desde"
 
-#: ../src/protocols/irc/msgs.c:248
+#: ../src/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Adxetivo que o define:</b> Glorioso<br>"
 
-#: ../src/protocols/irc/msgs.c:316
+#: ../src/protocols/irc/msgs.c:326
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s cambiou o tópico a: %s"
 
-#: ../src/protocols/irc/msgs.c:321
+#: ../src/protocols/irc/msgs.c:328
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s quitou o tópico."
+
+#: ../src/protocols/irc/msgs.c:336
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "O tópico de %s é: %s"
 
-#: ../src/protocols/irc/msgs.c:338
+#: ../src/protocols/irc/msgs.c:354
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensaxe descoñecida '%s'"
 
-#: ../src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:355
 msgid "Unknown message"
 msgstr "Mensaxe descoñecida"
 
-#: ../src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:355
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim enviou unha mensaxe que o servidor IRC non puido entender."
 
-#: ../src/protocols/irc/msgs.c:362
+#: ../src/protocols/irc/msgs.c:378
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuarios en %s: %s"
 
-#: ../src/protocols/irc/msgs.c:490
+#: ../src/protocols/irc/msgs.c:506
 msgid "Time Response"
 msgstr "Resposta de hora"
 
-#: ../src/protocols/irc/msgs.c:491
+#: ../src/protocols/irc/msgs.c:507
 msgid "The IRC server's local time is:"
 msgstr "A hora local do servidor de IRC é:"
 
-#: ../src/protocols/irc/msgs.c:502
+#: ../src/protocols/irc/msgs.c:518
 msgid "No such channel"
 msgstr "Non existe ese canle"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:513
+#: ../src/protocols/irc/msgs.c:529
 msgid "no such channel"
 msgstr "non existe o canle"
 
-#: ../src/protocols/irc/msgs.c:516
+#: ../src/protocols/irc/msgs.c:532
 msgid "User is not logged in"
 msgstr "O usuario non está conectado"
 
-#: ../src/protocols/irc/msgs.c:521
+#: ../src/protocols/irc/msgs.c:537
 msgid "No such nick or channel"
 msgstr "Non existe o alcume ou canle"
 
-#: ../src/protocols/irc/msgs.c:541
+#: ../src/protocols/irc/msgs.c:557
 msgid "Could not send"
 msgstr "Non se puido enviar"
 
-#: ../src/protocols/irc/msgs.c:597
+#: ../src/protocols/irc/msgs.c:613
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Para unirse a %s requírese unha invitación."
 
-#: ../src/protocols/irc/msgs.c:598
+#: ../src/protocols/irc/msgs.c:614
 msgid "Invitation only"
 msgstr "Só con invitación"
 
-#: ../src/protocols/irc/msgs.c:699
+#: ../src/protocols/irc/msgs.c:715
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Foi expulsado por %s: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:704 ../src/protocols/silc/ops.c:721
+#: ../src/protocols/irc/msgs.c:720 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: ../src/protocols/irc/msgs.c:727
+#: ../src/protocols/irc/msgs.c:743
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modo (%s %s) por %s"
 
-#: ../src/protocols/irc/msgs.c:812 ../src/protocols/irc/msgs.c:813
+#: ../src/protocols/irc/msgs.c:828 ../src/protocols/irc/msgs.c:829
 msgid "Invalid nickname"
 msgstr "Alcume inválido"
 
-#: ../src/protocols/irc/msgs.c:814
+#: ../src/protocols/irc/msgs.c:830
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6151,7 +6160,7 @@
 "O servidor rexeitou o alcume que escolleu para a súa conta. É posible que "
 "inclúa caracteres inválidos."
 
-#: ../src/protocols/irc/msgs.c:818
+#: ../src/protocols/irc/msgs.c:834
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6159,42 +6168,42 @@
 "O servidor rexeitou o nome que escolleu para a súa conta. É posible que "
 "inclúa caracteres inválidos."
 
-#: ../src/protocols/irc/msgs.c:858
+#: ../src/protocols/irc/msgs.c:873
 msgid "Cannot change nick"
 msgstr "Non se pode cambiar o alcume"
 
-#: ../src/protocols/irc/msgs.c:858
+#: ../src/protocols/irc/msgs.c:873
 msgid "Could not change nick"
 msgstr "Non se puido cambiar o alcume"
 
-#: ../src/protocols/irc/msgs.c:879
+#: ../src/protocols/irc/msgs.c:894
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Abadonou o canle %s%s"
 
-#: ../src/protocols/irc/msgs.c:921
+#: ../src/protocols/irc/msgs.c:936
 msgid "Error: invalid PONG from server"
 msgstr "Erro: PONG inválido do servidor"
 
-#: ../src/protocols/irc/msgs.c:923
+#: ../src/protocols/irc/msgs.c:938
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Reposta PING -- Retraso: %lu segundos"
 
-#: ../src/protocols/irc/msgs.c:998
+#: ../src/protocols/irc/msgs.c:1019
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Non se pode unir a %s:"
 
-#: ../src/protocols/irc/msgs.c:999 ../src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/msgs.c:1020 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Non se pode unir ao canle"
 
-#: ../src/protocols/irc/msgs.c:1033
+#: ../src/protocols/irc/msgs.c:1054
 msgid "Nick or channel is temporarily unavailable."
 msgstr "O alcume ou canle non están temporalmente dispoñibles."
 
-#: ../src/protocols/irc/msgs.c:1045
+#: ../src/protocols/irc/msgs.c:1066
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mensaxes globais de %s"
@@ -6301,7 +6310,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canle]:  Obter a lista dos usuarios que están no canle."
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1742
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1743
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo alcume&gt;:  Cambia seu alcume."
 
@@ -6381,8 +6390,7 @@
 
 #: ../src/protocols/irc/parse.c:142
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr ""
-"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece ou elimina un modo de usuario."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece ou elimina un modo de usuario."
 
 #: ../src/protocols/irc/parse.c:143
 msgid ""
@@ -6396,8 +6404,7 @@
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
-msgstr ""
-"wallops &lt;mensaxe&gt;:  Se non sabe o que é probablemente non poida usalo."
+msgstr "wallops &lt;mensaxe&gt;:  Se non sabe o que é probablemente non poida usalo."
 
 #: ../src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
@@ -6433,8 +6440,7 @@
 
 #: ../src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
-"O servidor require SSL para conectarlle. Non se dispón de soporte TLS/SSL."
+msgstr "O servidor require SSL para conectarlle. Non se dispón de soporte TLS/SSL."
 
 #: ../src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -6515,12 +6521,11 @@
 msgstr "Rexión"
 
 #: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
-#: ../src/protocols/jabber/jabber.c:795
 msgid "Postal Code"
 msgstr "Código postal"
 
 #: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
-#: ../src/protocols/silc/silc.c:939
+#: ../src/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "País"
 
@@ -6529,6 +6534,13 @@
 msgid "Telephone"
 msgstr "Teléfono"
 
+#: ../src/protocols/jabber/buddy.c:261 ../src/protocols/jabber/buddy.c:779
+#: ../src/protocols/jabber/buddy.c:787 ../src/protocols/silc/ops.c:1075
+#: ../src/protocols/silc/util.c:512
+#: ../src/protocols/yahoo/yahoo_profile.c:1036
+msgid "E-Mail"
+msgstr "Correo electrónico"
+
 #: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
 msgid "Organization Name"
 msgstr "Nome da organización"
@@ -6542,7 +6554,7 @@
 msgstr "Rol"
 
 #: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/oscar/oscar.c:6198
+#: ../src/protocols/msn/msn.c:1594 ../src/protocols/oscar/oscar.c:6198
 msgid "Birthday"
 msgstr "Ano de nacemento"
 
@@ -6558,7 +6570,7 @@
 "Todos os elementos seguintes son opcionais. Introduza só a información coa "
 "que se senta cómodo."
 
-#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1907
+#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1908
 msgid "Resource"
 msgstr "Recurso"
 
@@ -6609,12 +6621,12 @@
 msgstr "De-subscribir"
 
 #: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1164
+#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1165
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1189
+#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1190
 msgid "Chatty"
 msgstr "Falador"
 
@@ -6622,8 +6634,8 @@
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1219
-#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8051
+#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1220
+#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8059
 #: ../src/protocols/sametime/sametime.c:3285
 msgid "Do Not Disturb"
 msgstr "Non molestar"
@@ -6638,17 +6650,17 @@
 "Enche un ou máis dos campos amosados a continuación para procurar a un "
 "usuario Jabber que os teña."
 
-#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/jabber/jabber.c:770
-#: ../src/protocols/oscar/oscar.c:6175 ../src/protocols/silc/ops.c:1024
+#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/oscar/oscar.c:6175
+#: ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
 
-#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/jabber/jabber.c:775
-#: ../src/protocols/oscar/oscar.c:6176
+#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/oscar/oscar.c:6176
 msgid "Last Name"
 msgstr "Apelidos"
 
-#: ../src/protocols/jabber/buddy.c:1407
+#: ../src/protocols/jabber/buddy.c:1407 ../src/protocols/novell/novell.c:1490
+#: ../src/protocols/oscar/oscar.c:6178 ../src/protocols/oscar/oscar.c:6185
 msgid "E-Mail Address"
 msgstr "Enderezo de correo electrónico"
 
@@ -6672,7 +6684,7 @@
 msgid "Search Directory"
 msgstr "Procurar directorio"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7546
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7552
 #: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "Sa_la:"
@@ -6787,7 +6799,7 @@
 msgid "Registration Successful"
 msgstr "Éxito no rexistro"
 
-#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1455
+#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1456
 msgid "Unknown Error"
 msgstr "Erro descoñecido"
 
@@ -6804,8 +6816,12 @@
 msgid "State"
 msgstr "Estado"
 
+#: ../src/protocols/jabber/jabber.c:795
+msgid "Postal code"
+msgstr "Código postal"
+
 #: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:697 ../src/protocols/silc/util.c:514
+#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "Teléfono"
 
@@ -6815,8 +6831,7 @@
 
 #: ../src/protocols/jabber/jabber.c:818
 msgid "Please fill out the information below to register your new account."
-msgstr ""
-"Por favor, encha a información abaixo indicada para rexistrar súa nova conta."
+msgstr "Por favor, encha a información abaixo indicada para rexistrar súa nova conta."
 
 #: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
 msgid "Register New Jabber Account"
@@ -6834,329 +6849,329 @@
 msgid "Re-initializing Stream"
 msgstr "Reinicializando fluxo"
 
-#: ../src/protocols/jabber/jabber.c:1068 ../src/protocols/jabber/jabber.c:1433
-#: ../src/protocols/jabber/jabber.c:1474 ../src/protocols/jabber/jabber.c:1508
-#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7841
+#: ../src/protocols/jabber/jabber.c:1069 ../src/protocols/jabber/jabber.c:1434
+#: ../src/protocols/jabber/jabber.c:1475 ../src/protocols/jabber/jabber.c:1509
+#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7849
 msgid "Not Authorized"
 msgstr "Non autorizado"
 
-#: ../src/protocols/jabber/jabber.c:1110
+#: ../src/protocols/jabber/jabber.c:1111
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/protocols/jabber/jabber.c:1112
+#: ../src/protocols/jabber/jabber.c:1113
 msgid "From (To pending)"
 msgstr "Desde (Destino pendente)"
 
-#: ../src/protocols/jabber/jabber.c:1117
+#: ../src/protocols/jabber/jabber.c:1118
 msgid "To"
 msgstr "A"
 
-#: ../src/protocols/jabber/jabber.c:1119
+#: ../src/protocols/jabber/jabber.c:1120
 msgid "None (To pending)"
 msgstr "Ninguén (Destino pendente)"
 
-#: ../src/protocols/jabber/jabber.c:1123
+#: ../src/protocols/jabber/jabber.c:1124
 msgid "Subscription"
 msgstr "Subscrición"
 
-#: ../src/protocols/jabber/jabber.c:1180 ../src/protocols/jabber/jabber.c:1190
-#: ../src/protocols/jabber/jabber.c:1200 ../src/protocols/jabber/jabber.c:1210
-#: ../src/protocols/jabber/jabber.c:1220
+#: ../src/protocols/jabber/jabber.c:1181 ../src/protocols/jabber/jabber.c:1191
+#: ../src/protocols/jabber/jabber.c:1201 ../src/protocols/jabber/jabber.c:1211
+#: ../src/protocols/jabber/jabber.c:1221
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../src/protocols/jabber/jabber.c:1249
+#: ../src/protocols/jabber/jabber.c:1250
 msgid "Password Changed"
 msgstr "Contrasinal modificado"
 
-#: ../src/protocols/jabber/jabber.c:1250
+#: ../src/protocols/jabber/jabber.c:1251
 msgid "Your password has been changed."
 msgstr "Seu contrasinal foi modificado."
 
-#: ../src/protocols/jabber/jabber.c:1254 ../src/protocols/jabber/jabber.c:1255
+#: ../src/protocols/jabber/jabber.c:1255 ../src/protocols/jabber/jabber.c:1256
 msgid "Error changing password"
 msgstr "Erro ao cambiar o contrasinal"
 
-#: ../src/protocols/jabber/jabber.c:1311
+#: ../src/protocols/jabber/jabber.c:1312
 msgid "Password (again)"
 msgstr "Contrasinal (de novo)"
 
-#: ../src/protocols/jabber/jabber.c:1316 ../src/protocols/jabber/jabber.c:1317
+#: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
 msgid "Change Jabber Password"
 msgstr "Cambiar contrasinal de Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1317
+#: ../src/protocols/jabber/jabber.c:1318
 msgid "Please enter your new password"
 msgstr "Por favor, introduza o seu novo contrasinal"
 
-#: ../src/protocols/jabber/jabber.c:1327 ../src/protocols/oscar/oscar.c:8475
-#: ../src/protocols/silc/silc.c:1019
+#: ../src/protocols/jabber/jabber.c:1328 ../src/protocols/oscar/oscar.c:8483
+#: ../src/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "Establecer súa información de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1332 ../src/protocols/oscar/oscar.c:8486
-#: ../src/protocols/silc/silc.c:1015
+#: ../src/protocols/jabber/jabber.c:1333 ../src/protocols/oscar/oscar.c:8494
+#: ../src/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "Trocar contrasinal..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1337
+#: ../src/protocols/jabber/jabber.c:1338
 msgid "Search for Users..."
 msgstr "Procurar usuarios..."
 
-#: ../src/protocols/jabber/jabber.c:1413
+#: ../src/protocols/jabber/jabber.c:1414
 msgid "Bad Request"
 msgstr "Solicitude errónea"
 
-#: ../src/protocols/jabber/jabber.c:1415
+#: ../src/protocols/jabber/jabber.c:1416
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: ../src/protocols/jabber/jabber.c:1417
+#: ../src/protocols/jabber/jabber.c:1418
 msgid "Feature Not Implemented"
 msgstr "Funcionalidade non implementada"
 
-#: ../src/protocols/jabber/jabber.c:1419
+#: ../src/protocols/jabber/jabber.c:1420
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: ../src/protocols/jabber/jabber.c:1421
+#: ../src/protocols/jabber/jabber.c:1422
 msgid "Gone"
 msgstr "Foise"
 
-#: ../src/protocols/jabber/jabber.c:1423 ../src/protocols/jabber/jabber.c:1498
+#: ../src/protocols/jabber/jabber.c:1424 ../src/protocols/jabber/jabber.c:1499
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: ../src/protocols/jabber/jabber.c:1425
+#: ../src/protocols/jabber/jabber.c:1426
 msgid "Item Not Found"
 msgstr "Elemento non atopado"
 
-#: ../src/protocols/jabber/jabber.c:1427
+#: ../src/protocols/jabber/jabber.c:1428
 msgid "Malformed Jabber ID"
 msgstr "ID de Jabber non válido"
 
-#: ../src/protocols/jabber/jabber.c:1429
+#: ../src/protocols/jabber/jabber.c:1430
 msgid "Not Acceptable"
 msgstr "Non aceptable"
 
-#: ../src/protocols/jabber/jabber.c:1431
+#: ../src/protocols/jabber/jabber.c:1432
 msgid "Not Allowed"
 msgstr "Non permitido"
 
-#: ../src/protocols/jabber/jabber.c:1435
+#: ../src/protocols/jabber/jabber.c:1436
 msgid "Payment Required"
 msgstr "Pago necesario"
 
-#: ../src/protocols/jabber/jabber.c:1437
+#: ../src/protocols/jabber/jabber.c:1438
 msgid "Recipient Unavailable"
 msgstr "Destinatario non dispoñible"
 
-#: ../src/protocols/jabber/jabber.c:1441
+#: ../src/protocols/jabber/jabber.c:1442
 msgid "Registration Required"
 msgstr "Rexistro necesario"
 
-#: ../src/protocols/jabber/jabber.c:1443
+#: ../src/protocols/jabber/jabber.c:1444
 msgid "Remote Server Not Found"
 msgstr "Non se atopou o servidor remoto"
 
-#: ../src/protocols/jabber/jabber.c:1445
+#: ../src/protocols/jabber/jabber.c:1446
 msgid "Remote Server Timeout"
 msgstr "Expirou o tempo do servidor remoto"
 
-#: ../src/protocols/jabber/jabber.c:1447
+#: ../src/protocols/jabber/jabber.c:1448
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: ../src/protocols/jabber/jabber.c:1449
+#: ../src/protocols/jabber/jabber.c:1450
 msgid "Service Unavailable"
 msgstr "Servizo non dispoñible"
 
-#: ../src/protocols/jabber/jabber.c:1451
+#: ../src/protocols/jabber/jabber.c:1452
 msgid "Subscription Required"
 msgstr "Subscrición necesaria"
 
-#: ../src/protocols/jabber/jabber.c:1453
+#: ../src/protocols/jabber/jabber.c:1454
 msgid "Unexpected Request"
 msgstr "Solicitude non esperada"
 
-#: ../src/protocols/jabber/jabber.c:1460
+#: ../src/protocols/jabber/jabber.c:1461
 msgid "Authorization Aborted"
 msgstr "Autorización interrumpida"
 
-#: ../src/protocols/jabber/jabber.c:1462
+#: ../src/protocols/jabber/jabber.c:1463
 msgid "Incorrect encoding in authorization"
 msgstr "Codificación incorrecta na autorización"
 
-#: ../src/protocols/jabber/jabber.c:1465
+#: ../src/protocols/jabber/jabber.c:1466
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: ../src/protocols/jabber/jabber.c:1468
+#: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorización inválido"
 
-#: ../src/protocols/jabber/jabber.c:1471
+#: ../src/protocols/jabber/jabber.c:1472
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorización demasiado débil"
 
-#: ../src/protocols/jabber/jabber.c:1476
+#: ../src/protocols/jabber/jabber.c:1477
 msgid "Temporary Authentication Failure"
 msgstr "Fallo temporal da autenticación"
 
-#: ../src/protocols/jabber/jabber.c:1479
+#: ../src/protocols/jabber/jabber.c:1480
 msgid "Authentication Failure"
 msgstr "Fallo de autenticación"
 
-#: ../src/protocols/jabber/jabber.c:1483
+#: ../src/protocols/jabber/jabber.c:1484
 msgid "Bad Format"
 msgstr "Formato erróneo"
 
-#: ../src/protocols/jabber/jabber.c:1485
+#: ../src/protocols/jabber/jabber.c:1486
 msgid "Bad Namespace Prefix"
 msgstr "Prefixo do espacio de nomes erróneo"
 
-#: ../src/protocols/jabber/jabber.c:1488
+#: ../src/protocols/jabber/jabber.c:1489
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"
 
-#: ../src/protocols/jabber/jabber.c:1490 ../src/protocols/silc/ops.c:1728
+#: ../src/protocols/jabber/jabber.c:1491 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Expirou a conexión"
 
-#: ../src/protocols/jabber/jabber.c:1492
+#: ../src/protocols/jabber/jabber.c:1493
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: ../src/protocols/jabber/jabber.c:1494
+#: ../src/protocols/jabber/jabber.c:1495
 msgid "Host Unknown"
 msgstr "Servidor descoñecido"
 
-#: ../src/protocols/jabber/jabber.c:1496
+#: ../src/protocols/jabber/jabber.c:1497
 msgid "Improper Addressing"
 msgstr "Direccionamento incorrecto"
 
-#: ../src/protocols/jabber/jabber.c:1500
+#: ../src/protocols/jabber/jabber.c:1501
 msgid "Invalid ID"
 msgstr "ID non válido"
 
-#: ../src/protocols/jabber/jabber.c:1502
+#: ../src/protocols/jabber/jabber.c:1503
 msgid "Invalid Namespace"
 msgstr "Espacio de nomes non válido"
 
-#: ../src/protocols/jabber/jabber.c:1504
+#: ../src/protocols/jabber/jabber.c:1505
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: ../src/protocols/jabber/jabber.c:1506
+#: ../src/protocols/jabber/jabber.c:1507
 msgid "Non-matching Hosts"
 msgstr "Non existen servidores coincidintes"
 
-#: ../src/protocols/jabber/jabber.c:1510
+#: ../src/protocols/jabber/jabber.c:1511
 msgid "Policy Violation"
 msgstr "Violación da política"
 
-#: ../src/protocols/jabber/jabber.c:1512
+#: ../src/protocols/jabber/jabber.c:1513
 msgid "Remote Connection Failed"
 msgstr "Fallou a conexión remota"
 
-#: ../src/protocols/jabber/jabber.c:1514
+#: ../src/protocols/jabber/jabber.c:1515
 msgid "Resource Constraint"
 msgstr "Restricción de recursos"
 
-#: ../src/protocols/jabber/jabber.c:1516
+#: ../src/protocols/jabber/jabber.c:1517
 msgid "Restricted XML"
 msgstr "XML restrinxido"
 
-#: ../src/protocols/jabber/jabber.c:1518
+#: ../src/protocols/jabber/jabber.c:1519
 msgid "See Other Host"
 msgstr "Ver outros servidores"
 
-#: ../src/protocols/jabber/jabber.c:1520
+#: ../src/protocols/jabber/jabber.c:1521
 msgid "System Shutdown"
 msgstr "Parada do sistema"
 
-#: ../src/protocols/jabber/jabber.c:1522
+#: ../src/protocols/jabber/jabber.c:1523
 msgid "Undefined Condition"
 msgstr "Condición non definida"
 
-#: ../src/protocols/jabber/jabber.c:1524
+#: ../src/protocols/jabber/jabber.c:1525
 msgid "Unsupported Encoding"
 msgstr "Codificación non soportada"
 
-#: ../src/protocols/jabber/jabber.c:1526
+#: ../src/protocols/jabber/jabber.c:1527
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de Stanza non soportado"
 
-#: ../src/protocols/jabber/jabber.c:1528
+#: ../src/protocols/jabber/jabber.c:1529
 msgid "Unsupported Version"
 msgstr "Versión non soportada"
 
-#: ../src/protocols/jabber/jabber.c:1530
+#: ../src/protocols/jabber/jabber.c:1531
 msgid "XML Not Well Formed"
 msgstr "XML mal formado"
 
-#: ../src/protocols/jabber/jabber.c:1532
+#: ../src/protocols/jabber/jabber.c:1533
 msgid "Stream Error"
 msgstr "Erro de fluxo"
 
-#: ../src/protocols/jabber/jabber.c:1599
+#: ../src/protocols/jabber/jabber.c:1600
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Non puido vetar ao usuario %s"
 
-#: ../src/protocols/jabber/jabber.c:1619
+#: ../src/protocols/jabber/jabber.c:1620
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliación descoñecida: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1624
+#: ../src/protocols/jabber/jabber.c:1625
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Non se puido afiliar ao usuario %s coma \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1643
+#: ../src/protocols/jabber/jabber.c:1644
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol descoñecido: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1650
+#: ../src/protocols/jabber/jabber.c:1651
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Non se puido establecer o rol \"%s\" para o usuario: %s"
 
-#: ../src/protocols/jabber/jabber.c:1703
+#: ../src/protocols/jabber/jabber.c:1704
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Non puido expulsar ao usuario %s"
 
-#: ../src/protocols/jabber/jabber.c:1734
+#: ../src/protocols/jabber/jabber.c:1735
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar unha sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1738
+#: ../src/protocols/jabber/jabber.c:1739
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar unha sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1747
+#: ../src/protocols/jabber/jabber.c:1748
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Abandonar a sala."
 
-#: ../src/protocols/jabber/jabber.c:1752
+#: ../src/protocols/jabber/jabber.c:1753
 msgid "register:  Register with a chat room."
 msgstr "register: Rexistrarse nunha sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1758
+#: ../src/protocols/jabber/jabber.c:1759
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novo tópico]:  Ver ou cambiar o tópico."
 
-#: ../src/protocols/jabber/jabber.c:1764
+#: ../src/protocols/jabber/jabber.c:1765
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [sala]:  Vetar a un usuario da sala."
 
-#: ../src/protocols/jabber/jabber.c:1770
+#: ../src/protocols/jabber/jabber.c:1771
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -7164,7 +7179,7 @@
 "affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: "
 "Establecer a afiliación dun usuario á sala."
 
-#: ../src/protocols/jabber/jabber.c:1776
+#: ../src/protocols/jabber/jabber.c:1777
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -7172,22 +7187,20 @@
 "role &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Establecer "
 "o rol dun usuario na sala."
 
-#: ../src/protocols/jabber/jabber.c:1782
+#: ../src/protocols/jabber/jabber.c:1783
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaxe]:  Invitar un usuario á sala."
 
-#: ../src/protocols/jabber/jabber.c:1788
+#: ../src/protocols/jabber/jabber.c:1789
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr ""
-"join: &lt;sala&gt; [servidor]:  Unirse a unha sala no servidor indicado."
-
-#: ../src/protocols/jabber/jabber.c:1794
+msgstr "join: &lt;sala&gt; [servidor]:  Unirse a unha sala no servidor indicado."
+
+#: ../src/protocols/jabber/jabber.c:1795
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuario&gt; [sala]:  Botar a un usuario da sala."
 
-#: ../src/protocols/jabber/jabber.c:1799
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+#: ../src/protocols/jabber/jabber.c:1800
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;usuario&gt; &lt;mensaxe&gt;:  Enviar unha mensaxe en privado a un "
 "usuario."
@@ -7202,60 +7215,60 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1882 ../src/protocols/jabber/jabber.c:1884
+#: ../src/protocols/jabber/jabber.c:1883 ../src/protocols/jabber/jabber.c:1885
 msgid "Jabber Protocol Plugin"
 msgstr "Complemento de protocolo Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1910
+#: ../src/protocols/jabber/jabber.c:1911
 msgid "Use TLS if available"
 msgstr "Usar TLS se está dispoñible"
 
-#: ../src/protocols/jabber/jabber.c:1915
+#: ../src/protocols/jabber/jabber.c:1916
 msgid "Require TLS"
 msgstr "Require TLS"
 
-#: ../src/protocols/jabber/jabber.c:1918
+#: ../src/protocols/jabber/jabber.c:1919
 msgid "Force old (port 5223) SSL"
 msgstr "Forzar SSL antigo (porto 5223)"
 
-#: ../src/protocols/jabber/jabber.c:1923
+#: ../src/protocols/jabber/jabber.c:1924
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación en claro sobre canles non cifrados"
 
-#: ../src/protocols/jabber/jabber.c:1928 ../src/protocols/simple/simple.c:1759
+#: ../src/protocols/jabber/jabber.c:1929 ../src/protocols/simple/simple.c:1760
 msgid "Connect port"
 msgstr "Conectar co porto"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/silc/silc.c:1851
+#: ../src/protocols/jabber/jabber.c:1933 ../src/protocols/silc/silc.c:1855
 msgid "Connect server"
 msgstr "Conectar co servidor"
 
-#: ../src/protocols/jabber/message.c:114
+#: ../src/protocols/jabber/message.c:108
 #, c-format
 msgid "Message from %s"
 msgstr "Mensaxe de %s"
 
-#: ../src/protocols/jabber/message.c:178
+#: ../src/protocols/jabber/message.c:172
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s cambiou o tópico a: %s"
 
-#: ../src/protocols/jabber/message.c:180
+#: ../src/protocols/jabber/message.c:174
 #, c-format
 msgid "The topic is: %s"
 msgstr "O tópico é: %s"
 
-#: ../src/protocols/jabber/message.c:230
+#: ../src/protocols/jabber/message.c:224
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Fallou o envío da mensaxe a %s: %s"
 
-#: ../src/protocols/jabber/message.c:233
+#: ../src/protocols/jabber/message.c:227
 msgid "Jabber Message Error"
 msgstr "Mensaxe de erro de Jabber"
 
-#: ../src/protocols/jabber/message.c:300
+#: ../src/protocols/jabber/message.c:295
 #, c-format
 msgid " (Code %s)"
 msgstr " (Código %s)"
@@ -7274,21 +7287,21 @@
 msgstr "O usuario %s quere engadir a %s a súa lista de amigos."
 
 #: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:4805
-#: ../src/protocols/oscar/oscar.c:7476
+#: ../src/protocols/oscar/oscar.c:7482
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:4807
-#: ../src/protocols/oscar/oscar.c:7477
+#: ../src/protocols/oscar/oscar.c:7483
 msgid "_Deny"
 msgstr "_Denegar"
 
-#: ../src/protocols/jabber/presence.c:380
 #: ../src/protocols/jabber/presence.c:381
+#: ../src/protocols/jabber/presence.c:382
 msgid "Create New Room"
 msgstr "Crear unha sala nova"
 
-#: ../src/protocols/jabber/presence.c:382
+#: ../src/protocols/jabber/presence.c:383
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -7296,32 +7309,32 @@
 "Vai crear unha sala nova. Desexa configurala ou aceptar os valores por "
 "omisión?"
 
-#: ../src/protocols/jabber/presence.c:384
+#: ../src/protocols/jabber/presence.c:386
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../src/protocols/jabber/presence.c:386
+#: ../src/protocols/jabber/presence.c:388
 msgid "_Accept Defaults"
 msgstr "_Aceptar valores por omisión"
 
-#: ../src/protocols/jabber/presence.c:423
+#: ../src/protocols/jabber/presence.c:426
 #, c-format
 msgid "Error in chat %s"
 msgstr "Erro no chat %s"
 
-#: ../src/protocols/jabber/presence.c:426
+#: ../src/protocols/jabber/presence.c:429
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erro ao unirse ao chat %s"
 
-#: ../src/protocols/jabber/si.c:726
+#: ../src/protocols/jabber/si.c:728
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Non se puido enviar o ficheiro %s, o usuario non soporta transferencias de "
 "ficheiros"
 
-#: ../src/protocols/jabber/si.c:727 ../src/protocols/jabber/si.c:728
+#: ../src/protocols/jabber/si.c:729 ../src/protocols/jabber/si.c:730
 msgid "File Send Failed"
 msgstr "Fallou no envío do ficheiro"
 
@@ -7358,7 +7371,7 @@
 
 #: ../src/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
-msgstr "Dirección de correo electrónico inválida"
+msgstr "Enderezo de correo electrónico inválido"
 
 #: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -7392,7 +7405,7 @@
 msgid "Not on list"
 msgstr "Non está na lista"
 
-#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:690
+#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:705
 msgid "User is offline"
 msgstr "O usuario está desconectado"
 
@@ -7634,7 +7647,7 @@
 
 #: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
 #: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3247
-#: ../src/protocols/yahoo/yahoo.c:2881 ../src/protocols/yahoo/yahoo.c:2887
+#: ../src/protocols/yahoo/yahoo.c:2882 ../src/protocols/yahoo/yahoo.c:2888
 #, c-format
 msgid ""
 "\n"
@@ -7648,24 +7661,24 @@
 msgstr "Tenlle"
 
 #: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2710 ../src/protocols/yahoo/yahoo.c:3289
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3290
 msgid "Be Right Back"
 msgstr "Volvo enseguida"
 
 #: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
 #: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
 #: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2712 ../src/protocols/yahoo/yahoo.c:3292
+#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3293
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2720
-#: ../src/protocols/yahoo/yahoo.c:3304
+#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2721
+#: ../src/protocols/yahoo/yahoo.c:3305
 msgid "On the Phone"
 msgstr "Ao teléfono"
 
-#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2724
-#: ../src/protocols/yahoo/yahoo.c:3310
+#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2725
+#: ../src/protocols/yahoo/yahoo.c:3311
 msgid "Out to Lunch"
 msgstr "Saín a xantar"
 
@@ -7718,80 +7731,225 @@
 msgstr "Non se puido conectar ao servidor."
 
 #: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
-#: ../src/protocols/zephyr/zephyr.c:721 ../src/protocols/zephyr/zephyr.c:1136
+#: ../src/protocols/zephyr/zephyr.c:736 ../src/protocols/zephyr/zephyr.c:1153
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alcume:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1816
-#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1056
+#: ../src/protocols/msn/msn.c:1373 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../src/util.c:1055
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1456
+#: ../src/protocols/msn/msn.c:1463
 msgid "MSN Profile"
 msgstr "Perfil MSN"
 
-#: ../src/protocols/msn/msn.c:1461 ../src/protocols/msn/msn.c:1800
+#: ../src/protocols/msn/msn.c:1468 ../src/protocols/msn/msn.c:1794
 #: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "Erro ao obter o perfil"
 
-#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:6204
-#: ../src/protocols/yahoo/yahoo_profile.c:1050
+#: ../src/protocols/msn/msn.c:1536 ../src/protocols/oscar/oscar.c:6204
+#: ../src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Age"
 msgstr "Edade"
 
-#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1065
+#: ../src/protocols/msn/msn.c:1538 ../src/protocols/yahoo/yahoo_profile.c:1071
 msgid "Occupation"
 msgstr "Ocupación"
 
-#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1480
-#: ../src/protocols/yahoo/yahoo_profile.c:1045
+#: ../src/protocols/msn/msn.c:1539 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1729
-#: ../src/protocols/msn/msn.c:1735 ../src/protocols/msn/msn.c:1742
+#: ../src/protocols/msn/msn.c:1544 ../src/protocols/msn/msn.c:1723
+#: ../src/protocols/msn/msn.c:1729 ../src/protocols/msn/msn.c:1736
 msgid "Hobbies and Interests"
 msgstr "Aficións e intereses"
 
-#: ../src/protocols/msn/msn.c:1545 ../src/protocols/msn/msn.c:1663
-#: ../src/protocols/msn/msn.c:1669 ../src/protocols/msn/msn.c:1676
-#: ../src/protocols/msn/msn.c:1684 ../src/protocols/msn/msn.c:1691
+#: ../src/protocols/msn/msn.c:1550 ../src/protocols/msn/msn.c:1657
+#: ../src/protocols/msn/msn.c:1663 ../src/protocols/msn/msn.c:1670
+#: ../src/protocols/msn/msn.c:1678 ../src/protocols/msn/msn.c:1685
 msgid "A Little About Me"
 msgstr "Un pouco sobre min"
 
+#: ../src/protocols/msn/msn.c:1556
+#, c-format
+msgid "%s<b>General</b><br>%s"
+msgstr "%s<b>Xeral</b><br>%s"
+
 #. Social
-#: ../src/protocols/msn/msn.c:1563 ../src/protocols/yahoo/yahoo_profile.c:1055
+#: ../src/protocols/msn/msn.c:1565 ../src/protocols/yahoo/yahoo_profile.c:1061
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1751
-#: ../src/protocols/msn/msn.c:1757 ../src/protocols/yahoo/yahoo_profile.c:1107
+#: ../src/protocols/msn/msn.c:1566
+msgid "Interests"
+msgstr "Interés"
+
+#: ../src/protocols/msn/msn.c:1567
+msgid "Pets"
+msgstr "Mascotas"
+
+#: ../src/protocols/msn/msn.c:1568
+msgid "Hometown"
+msgstr "Cidade"
+
+#: ../src/protocols/msn/msn.c:1569
+msgid "Places Lived"
+msgstr "Lugares nos que viviu"
+
+#: ../src/protocols/msn/msn.c:1570
+msgid "Fashion"
+msgstr "Moderno"
+
+#: ../src/protocols/msn/msn.c:1571
+msgid "Humor"
+msgstr "Humor"
+
+#: ../src/protocols/msn/msn.c:1572
+msgid "Music"
+msgstr "Música"
+
+#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1745
+#: ../src/protocols/msn/msn.c:1751 ../src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Favorite Quote"
 msgstr "Cita preferida"
 
-#: ../src/protocols/msn/msn.c:1700 ../src/protocols/msn/msn.c:1706
-#: ../src/protocols/msn/msn.c:1713 ../src/protocols/msn/msn.c:1720
+#: ../src/protocols/msn/msn.c:1577
+#, c-format
+msgid "%s<b>Social</b><br>%s"
+msgstr "%s<b>Social</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1586
+msgid "Significant Other"
+msgstr "Outro significativo"
+
+#: ../src/protocols/msn/msn.c:1587
+msgid "Home Phone"
+msgstr "Teléfono de casa"
+
+#: ../src/protocols/msn/msn.c:1588
+msgid "Home Phone 2"
+msgstr "Teléfono de casa 2"
+
+#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:6216
+msgid "Home Address"
+msgstr "Domicilio"
+
+#: ../src/protocols/msn/msn.c:1590
+msgid "Personal Mobile"
+msgstr "Móbil persoal"
+
+#: ../src/protocols/msn/msn.c:1591
+msgid "Home Fax"
+msgstr "Fax de casa"
+
+#: ../src/protocols/msn/msn.c:1592
+msgid "Personal E-Mail"
+msgstr "Correo-e persoal"
+
+#: ../src/protocols/msn/msn.c:1593
+msgid "Personal IM"
+msgstr "MI persoal"
+
+#: ../src/protocols/msn/msn.c:1595
+msgid "Anniversary"
+msgstr "Aniversario"
+
+#: ../src/protocols/msn/msn.c:1596 ../src/protocols/msn/msn.c:1620
+msgid "Notes"
+msgstr "Notas"
+
+#: ../src/protocols/msn/msn.c:1600
+#, c-format
+msgid "<br><b>Personal</b><br>%s"
+msgstr "<br><b>Persoal</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1607 ../src/protocols/silc/ops.c:1044
+msgid "Job Title"
+msgstr "Traballo"
+
+#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:6233
+msgid "Company"
+msgstr "Compañía"
+
+#: ../src/protocols/msn/msn.c:1609 ../src/protocols/novell/novell.c:1482
+msgid "Department"
+msgstr "Departamento"
+
+#: ../src/protocols/msn/msn.c:1610
+msgid "Profession"
+msgstr "Profesión"
+
+#: ../src/protocols/msn/msn.c:1611
+msgid "Work Phone"
+msgstr "Teléfono do traballo"
+
+#: ../src/protocols/msn/msn.c:1612
+msgid "Work Phone 2"
+msgstr "Teléfono do traballo"
+
+#: ../src/protocols/msn/msn.c:1613 ../src/protocols/oscar/oscar.c:6224
+msgid "Work Address"
+msgstr "Enderezo do traballo"
+
+#: ../src/protocols/msn/msn.c:1614
+msgid "Work Mobile"
+msgstr "Móbil do traballo"
+
+#: ../src/protocols/msn/msn.c:1615
+msgid "Work Pager"
+msgstr "Paxinador do traballo"
+
+#: ../src/protocols/msn/msn.c:1616
+msgid "Work Fax"
+msgstr "Fax do traballo"
+
+#: ../src/protocols/msn/msn.c:1617
+msgid "Work E-Mail"
+msgstr "Correo-e do traballo"
+
+#: ../src/protocols/msn/msn.c:1618
+msgid "Work IM"
+msgstr "MI do traballo"
+
+#: ../src/protocols/msn/msn.c:1619
+msgid "Start Date"
+msgstr "Data de inicio"
+
+#: ../src/protocols/msn/msn.c:1624
+#, c-format
+msgid "<br><b>Business</b><br>%s"
+msgstr "<br><b>Ocupacións</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1635
+#, c-format
+msgid "<hr><b>Contact Info</b>%s%s"
+msgstr "<hr><b>Info de contacto</b>%s%s"
+
+#: ../src/protocols/msn/msn.c:1694 ../src/protocols/msn/msn.c:1700
+#: ../src/protocols/msn/msn.c:1707 ../src/protocols/msn/msn.c:1714
 msgid "Favorite Things"
 msgstr "Cousas preferidas"
 
-#: ../src/protocols/msn/msn.c:1765
+#: ../src/protocols/msn/msn.c:1759
 msgid "Last Updated"
 msgstr "Última actualización"
 
-#: ../src/protocols/msn/msn.c:1777 ../src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1771 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Páxina persoal"
 
-#: ../src/protocols/msn/msn.c:1802
+#: ../src/protocols/msn/msn.c:1796
 msgid "The user has not created a public profile."
 msgstr "O usuario non creou un perfil público."
 
-#: ../src/protocols/msn/msn.c:1803
+#: ../src/protocols/msn/msn.c:1797
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7801,7 +7959,7 @@
 "que ou ben o usuario non existe ou que o usuario existe pero non creou un "
 "perfil público."
 
-#: ../src/protocols/msn/msn.c:1807
+#: ../src/protocols/msn/msn.c:1801
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7809,8 +7967,13 @@
 "Gaim non puido atopar información no perfil de usuario. É probable que o "
 "usuario non exista."
 
-#: ../src/protocols/msn/msn.c:1813 ../src/protocols/msn/msn.c:1816
-#: ../src/protocols/yahoo/yahoo_profile.c:1202
+#. put a link to the actual profile URL
+#: ../src/protocols/msn/msn.c:1806
+#, c-format
+msgid "<hr><b>%s:</b> "
+msgstr "<hr><b>%s:</b> "
+
+#: ../src/protocols/msn/msn.c:1806 ../src/protocols/yahoo/yahoo_profile.c:1208
 msgid "Profile URL"
 msgstr "URL do perfil"
 
@@ -7824,23 +7987,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2022 ../src/protocols/msn/msn.c:2024
+#: ../src/protocols/msn/msn.c:2028 ../src/protocols/msn/msn.c:2030
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
-#: ../src/protocols/msn/msn.c:2043
+#: ../src/protocols/msn/msn.c:2049
 msgid "Login server"
 msgstr "Servidor de conexión"
 
-#: ../src/protocols/msn/msn.c:2052
+#: ../src/protocols/msn/msn.c:2058
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: ../src/protocols/msn/msn.c:2057
+#: ../src/protocols/msn/msn.c:2063
 msgid "Show custom smileys"
 msgstr "Amosar emoticóns personalizados"
 
-#: ../src/protocols/msn/msn.c:2065
+#: ../src/protocols/msn/msn.c:2071
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para chamar a súa atención"
 
@@ -7981,8 +8144,7 @@
 msgstr "Non se puido autenticar: %s"
 
 #: ../src/protocols/msn/session.c:329
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Súa lista de amigos MSN está indispoñible temporalmente. Por favor, espere e "
 "volva a tentalo máis tarde."
@@ -8023,39 +8185,35 @@
 msgid "Out To Lunch"
 msgstr "Saín a comer"
 
-#: ../src/protocols/msn/switchboard.c:408
+#: ../src/protocols/msn/switchboard.c:406
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Posiblemente non se puido enviar a mensaxe porque expirou a conexión:"
 
-#: ../src/protocols/msn/switchboard.c:416
+#: ../src/protocols/msn/switchboard.c:414
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr ""
-"Non se puido enviar a mensaxe, non está permitido mentras sexa invisible:"
-
-#: ../src/protocols/msn/switchboard.c:420
+msgstr "Non se puido enviar a mensaxe, non está permitido mentras sexa invisible:"
+
+#: ../src/protocols/msn/switchboard.c:418
 msgid "Message could not be sent because the user is offline:"
 msgstr "Non se puido enviar a mensaxe porque o usuario non está conectado:"
 
-#: ../src/protocols/msn/switchboard.c:424
+#: ../src/protocols/msn/switchboard.c:422
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Non se puido enviar a mensaxe porque se produciu un erro na conexión:"
 
-#: ../src/protocols/msn/switchboard.c:428
+#: ../src/protocols/msn/switchboard.c:426
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr ""
-"Non se puido enviar a mensaxe porque estamos enviando demasiado rápido:"
-
-#: ../src/protocols/msn/switchboard.c:432
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
-msgstr ""
-"Non se puido enviar a mensaxe porque se produciu un erro co switchboard:"
-
-#: ../src/protocols/msn/switchboard.c:440
+msgstr "Non se puido enviar a mensaxe porque estamos enviando demasiado rápido:"
+
+#: ../src/protocols/msn/switchboard.c:430
+msgid "Message could not be sent because an error with the switchboard occurred:"
+msgstr "Non se puido enviar a mensaxe porque se produciu un erro co switchboard:"
+
+#: ../src/protocols/msn/switchboard.c:438
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Non se puido enviar a mensaxe porque se produciu un erro descoñecido:"
 
-#: ../src/protocols/msn/switchboard.c:961
+#: ../src/protocols/msn/switchboard.c:959
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s acáballe de dar un cobazo!"
@@ -8065,11 +8223,11 @@
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "O usuario %s (%s) quere engadir a %s a súa lista de amigos."
 
-#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:914
+#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:915
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:916
+#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:917
 msgid "Deny"
 msgstr "Denegar"
 
@@ -8083,12 +8241,12 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "O usuario %s quitouno da súa lista de amigos."
 
-#: ../src/protocols/msn/userlist.c:678
+#: ../src/protocols/msn/userlist.c:679
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Imposible engadir \"%s\"."
 
-#: ../src/protocols/msn/userlist.c:680
+#: ../src/protocols/msn/userlist.c:681
 msgid "The screen name specified is invalid."
 msgstr "O nome especificado é inválido."
 
@@ -8133,8 +8291,8 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../src/protocols/napster/napster.c:507
 #: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2238 ../src/protocols/yahoo/yahoo.c:2265
-#: ../src/protocols/yahoo/yahoo.c:2348 ../src/protocols/yahoo/yahoo.c:2363
+#: ../src/protocols/yahoo/yahoo.c:2239 ../src/protocols/yahoo/yahoo.c:2266
+#: ../src/protocols/yahoo/yahoo.c:2349 ../src/protocols/yahoo/yahoo.c:2364
 #: ../src/protocols/yahoo/yahoo_filexfer.c:74
 #: ../src/protocols/yahoo/yahoo_filexfer.c:137
 #: ../src/protocols/yahoo/ycht.c:540
@@ -8320,8 +8478,7 @@
 #: ../src/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr ""
-"Non se puido enviar unha mensaxe a %s. Non se puido crear a conferencia (%s)."
+msgstr "Non se puido enviar unha mensaxe a %s. Non se puido crear a conferencia (%s)."
 
 #: ../src/protocols/novell/novell.c:537
 #, c-format
@@ -8389,10 +8546,6 @@
 msgid "Telephone Number"
 msgstr "Número de teléfono"
 
-#: ../src/protocols/novell/novell.c:1482
-msgid "Department"
-msgstr "Departamento"
-
 #: ../src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Título"
@@ -8401,11 +8554,6 @@
 msgid "Mailstop"
 msgstr "Buzón de correo"
 
-#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6178
-#: ../src/protocols/oscar/oscar.c:6185
-msgid "Email Address"
-msgstr "Enderezo electrónico"
-
 #: ../src/protocols/novell/novell.c:1506
 msgid "User ID"
 msgstr "ID de usuario"
@@ -8472,8 +8620,7 @@
 
 #: ../src/protocols/novell/novell.c:2070
 #, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "Non parece que %s estea conectado e non recibiu a mensaxe que acaba de "
 "enviar."
@@ -8632,12 +8779,12 @@
 msgid "AIM Direct IM"
 msgstr "MI Directo AIM"
 
-#: ../src/protocols/oscar/oscar.c:708 ../src/protocols/silc/silc.c:693
+#: ../src/protocols/oscar/oscar.c:708 ../src/protocols/silc/silc.c:697
 #: ../src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8166
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8174
 msgid "Get File"
 msgstr "Recibir ficheiro"
 
@@ -8709,15 +8856,15 @@
 msgid "Camera"
 msgstr "Cámara"
 
-#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8028
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8036
 msgid "Free For Chat"
 msgstr "Dispoñible para conversar"
 
-#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8056
+#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8064
 msgid "Not Available"
 msgstr "Non dispoñible"
 
-#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8046
+#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8054
 msgid "Occupied"
 msgstr "Ocupado"
 
@@ -8842,12 +8989,12 @@
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
-">Advanced."
+" Try enabling proxy servers for file transfers in Accounts -> %s -> Edit "
+"Account -> Advanced."
 msgstr ""
 "Rematou o tempo da transferencia do ficheiro %s.\n"
 " Tente activar o servidor proxy para as transferencias de ficheiros en "
-"Contas->%s->Editar conta->Avanzado."
+"Contas -> %s -> Editar conta -> Avanzado."
 
 #: ../src/protocols/oscar/oscar.c:2338
 #: ../src/protocols/yahoo/yahoo_filexfer.c:253
@@ -8867,8 +9014,7 @@
 
 #: ../src/protocols/oscar/oscar.c:2668
 msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr ""
-"Non se puido crear o socket de escoita ou non hai conexión ao proxy AOL."
+msgstr "Non se puido crear o socket de escoita ou non hai conexión ao proxy AOL."
 
 #: ../src/protocols/oscar/oscar.c:2906 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
@@ -8881,8 +9027,7 @@
 #. service temporarily unavailable
 #: ../src/protocols/oscar/oscar.c:2915
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr ""
-"O servizo de Mensaxería Instantánea AOL está temporalmente non dispoñible."
+msgstr "O servizo de Mensaxería Instantánea AOL está temporalmente non dispoñible."
 
 #: ../src/protocols/oscar/oscar.c:2920
 msgid ""
@@ -8895,8 +9040,7 @@
 #: ../src/protocols/oscar/oscar.c:2925
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-"A versión do cliente que usa é demasiado antiga. Por favor, actualícea en %s"
+msgstr "A versión do cliente que usa é demasiado antiga. Por favor, actualícea en %s"
 
 #: ../src/protocols/oscar/oscar.c:2953
 msgid "Internal Error"
@@ -8957,8 +9101,7 @@
 
 #: ../src/protocols/oscar/oscar.c:4597
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Por favor, autoríceme para que poida engadirlle a miña lista de amigos."
+msgstr "Por favor, autoríceme para que poida engadirlle a miña lista de amigos."
 
 #: ../src/protocols/oscar/oscar.c:4605
 msgid "Authorization Request Message:"
@@ -8987,7 +9130,7 @@
 
 #: ../src/protocols/oscar/oscar.c:4681 ../src/protocols/oscar/oscar.c:4687
 #: ../src/protocols/oscar/oscar.c:4791 ../src/protocols/oscar/oscar.c:4815
-#: ../src/protocols/oscar/oscar.c:7462 ../src/protocols/oscar/oscar.c:7514
+#: ../src/protocols/oscar/oscar.c:7468 ../src/protocols/oscar/oscar.c:7520
 msgid "No reason given."
 msgstr "Non se indicou un razón."
 
@@ -9004,7 +9147,7 @@
 "O usuario %u quere engadir a %s á súa lista de amigos polo seguinte motivo:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4803 ../src/protocols/oscar/oscar.c:7474
+#: ../src/protocols/oscar/oscar.c:4803 ../src/protocols/oscar/oscar.c:7480
 msgid "Authorization Request"
 msgstr "Solicitude de autorización"
 
@@ -9065,7 +9208,7 @@
 msgstr ""
 "Recibiu unha mensaxe de correo electrónico de ICQ de %s [%s]\n"
 "\n"
-"Mensaxe:\n"
+"A mensaxe é:\n"
 "%s"
 
 #: ../src/protocols/oscar/oscar.c:4868
@@ -9097,10 +9240,8 @@
 
 #: ../src/protocols/oscar/oscar.c:4980
 #, c-format
-msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
+msgid "You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "Vostede perdeu %hu mensaxe de %s porque foi mandado damasiado rápido"
 msgstr[1] "Perdéronse %hu mensaxes de %s porque foron mandadas demasiado rápido"
 
@@ -9167,7 +9308,7 @@
 msgstr "Conectado desde"
 
 #: ../src/protocols/oscar/oscar.c:5262
-#: ../src/protocols/yahoo/yahoo_profile.c:1153
+#: ../src/protocols/yahoo/yahoo_profile.c:1159
 msgid "Member Since"
 msgstr "Membro desde"
 
@@ -9231,26 +9372,14 @@
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: ../src/protocols/oscar/oscar.c:6216
-msgid "Home Address"
-msgstr "Domicilio"
-
 #: ../src/protocols/oscar/oscar.c:6220 ../src/protocols/oscar/oscar.c:6228
 msgid "Zip Code"
 msgstr "Código postal"
 
-#: ../src/protocols/oscar/oscar.c:6224
-msgid "Work Address"
-msgstr "Enderezo do traballo"
-
 #: ../src/protocols/oscar/oscar.c:6232
 msgid "Work Information"
 msgstr "Información do traballo"
 
-#: ../src/protocols/oscar/oscar.c:6233
-msgid "Company"
-msgstr "Compañía"
-
 #: ../src/protocols/oscar/oscar.c:6234
 msgid "Division"
 msgstr "Sección"
@@ -9277,12 +9406,12 @@
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
 msgid "No results found for e-mail address %s"
-msgstr "Non se atoparon resultados para o enderezo de correo %s"
+msgstr "Non se atoparon resultados para o enderezo de correo-e %s"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Debería recibir unha mensaxe solicitando confirmación de %s."
+msgstr "Debería recibir un correo-e solicitando confirmación de %s."
 
 #: ../src/protocols/oscar/oscar.c:6389
 msgid "Account Confirmation Requested"
@@ -9304,8 +9433,7 @@
 #: ../src/protocols/oscar/oscar.c:6426
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr ""
-"Erro 0x%04x: Non se pode dar formato ao nome de usuario porque é inválido."
+msgstr "Erro 0x%04x: Non se pode dar formato ao nome de usuario porque é inválido."
 
 #: ../src/protocols/oscar/oscar.c:6429
 #, c-format
@@ -9367,8 +9495,7 @@
 msgstr "O enderezo de correo electrónico de %s é %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Non se enviou a súa imaxe MI. Debe estar directamente conectado para enviar "
 "imaxes MI."
@@ -9399,14 +9526,14 @@
 "Excedeuse o límite de %d byte de lonxitude na mensaxe de ausencia. Gaim "
 "truncouno."
 msgstr[1] ""
-"Excedeuse o límite de %d bytes de lonxitude na mensaxe de "
-"ausencia. Gaim truncouno."
+"Excedeuse o límite de %d bytes de lonxitude na mensaxe de ausencia. Gaim "
+"truncouno."
 
 #: ../src/protocols/oscar/oscar.c:6795
 msgid "Profile too long."
 msgstr "Perfil demasiado longo."
 
-#: ../src/protocols/oscar/oscar.c:6837
+#: ../src/protocols/oscar/oscar.c:6843
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9418,14 +9545,14 @@
 "Excedeuse o límite de %d byte de lonxitude na mensaxe de ausencia. Gaim "
 "truncouno."
 msgstr[1] ""
-"Excedeuse o límite de %d bytes de lonxitude na mensaxe de "
-"ausencia. Gaim truncouno."
-
-#: ../src/protocols/oscar/oscar.c:6842
+"Excedeuse o límite de %d bytes de lonxitude na mensaxe de ausencia. Gaim "
+"truncouno."
+
+#: ../src/protocols/oscar/oscar.c:6848
 msgid "Away message too long."
 msgstr "Mensaxe de ausencia demasiado longo."
 
-#: ../src/protocols/oscar/oscar.c:6911
+#: ../src/protocols/oscar/oscar.c:6917
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9436,16 +9563,16 @@
 "nome de usuario deben comezar con letras só poden conter letras, número e "
 "espacios, ou conter só números."
 
-#: ../src/protocols/oscar/oscar.c:6913 ../src/protocols/oscar/oscar.c:7320
-#: ../src/protocols/oscar/oscar.c:7334
+#: ../src/protocols/oscar/oscar.c:6919 ../src/protocols/oscar/oscar.c:7326
+#: ../src/protocols/oscar/oscar.c:7340
 msgid "Unable To Add"
 msgstr "Non se puido engadir"
 
-#: ../src/protocols/oscar/oscar.c:7020
+#: ../src/protocols/oscar/oscar.c:7026
 msgid "Unable To Retrieve Buddy List"
 msgstr "Non se puido obter a lista de amigos"
 
-#: ../src/protocols/oscar/oscar.c:7021
+#: ../src/protocols/oscar/oscar.c:7027
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -9454,13 +9581,13 @@
 "Gaim non pode obter neste momento a lista de amigos dos servidores de AIM. A "
 "lista non borrou, e seguramente volverá a estar dispoñible nunhas horas."
 
-#: ../src/protocols/oscar/oscar.c:7218 ../src/protocols/oscar/oscar.c:7219
-#: ../src/protocols/oscar/oscar.c:7224 ../src/protocols/oscar/oscar.c:7378
-#: ../src/protocols/oscar/oscar.c:7379 ../src/protocols/oscar/oscar.c:7384
+#: ../src/protocols/oscar/oscar.c:7224 ../src/protocols/oscar/oscar.c:7225
+#: ../src/protocols/oscar/oscar.c:7230 ../src/protocols/oscar/oscar.c:7384
+#: ../src/protocols/oscar/oscar.c:7385 ../src/protocols/oscar/oscar.c:7390
 msgid "Orphans"
 msgstr "Orfos"
 
-#: ../src/protocols/oscar/oscar.c:7318
+#: ../src/protocols/oscar/oscar.c:7324
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9469,11 +9596,11 @@
 "Non se puido engadir o amigo %s porque hai demasiados contactos na lista de "
 "amigos. Por favor, elimine un e volva a probar."
 
-#: ../src/protocols/oscar/oscar.c:7318 ../src/protocols/oscar/oscar.c:7332
+#: ../src/protocols/oscar/oscar.c:7324 ../src/protocols/oscar/oscar.c:7338
 msgid "(no name)"
 msgstr "(sen nome)"
 
-#: ../src/protocols/oscar/oscar.c:7332
+#: ../src/protocols/oscar/oscar.c:7338
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9484,7 +9611,7 @@
 "habitual é que chegou ao máximo número de amigos permitidos na súa lista de "
 "amigos."
 
-#: ../src/protocols/oscar/oscar.c:7415
+#: ../src/protocols/oscar/oscar.c:7421
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9493,11 +9620,11 @@
 "O usuario %s deulle permiso para engadirlle a súa lista de amigos. Desexa "
 "facelo?"
 
-#: ../src/protocols/oscar/oscar.c:7421
+#: ../src/protocols/oscar/oscar.c:7427
 msgid "Authorization Given"
 msgstr "Autorización otorgada"
 
-#: ../src/protocols/oscar/oscar.c:7465
+#: ../src/protocols/oscar/oscar.c:7471
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9507,18 +9634,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:7510
+#: ../src/protocols/oscar/oscar.c:7516
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr ""
-"O usuario %s autorizou a súa solicitude de engadilo a súa lista de amigos."
-
-#: ../src/protocols/oscar/oscar.c:7511
+msgstr "O usuario %s autorizou a súa solicitude de engadilo a súa lista de amigos."
+
+#: ../src/protocols/oscar/oscar.c:7517
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:7514
+#: ../src/protocols/oscar/oscar.c:7520
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9529,91 +9655,90 @@
 "seguinte razón:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:7515
+#: ../src/protocols/oscar/oscar.c:7521
 msgid "Authorization Denied"
 msgstr "Autorización denegada"
 
-#: ../src/protocols/oscar/oscar.c:7552 ../src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:7558 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Troco:"
 
-#: ../src/protocols/oscar/oscar.c:7588
+#: ../src/protocols/oscar/oscar.c:7594
 msgid "Invalid chat name specified."
 msgstr "Especificouse un nome de chat inválido."
 
-#: ../src/protocols/oscar/oscar.c:7658
+#: ../src/protocols/oscar/oscar.c:7664
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr ""
-"Non se enviou súa imaxe MI. Non se poden enviar imaxes MI en chats AIM."
-
-#: ../src/protocols/oscar/oscar.c:7813
+msgstr "Non se enviou súa imaxe MI. Non se poden enviar imaxes MI en chats AIM."
+
+#: ../src/protocols/oscar/oscar.c:7821
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obtendo)</i>"
 
-#: ../src/protocols/oscar/oscar.c:8119
+#: ../src/protocols/oscar/oscar.c:8127
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: ../src/protocols/oscar/oscar.c:8120
+#: ../src/protocols/oscar/oscar.c:8128
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: ../src/protocols/oscar/oscar.c:8139
+#: ../src/protocols/oscar/oscar.c:8147
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: ../src/protocols/oscar/oscar.c:8146
+#: ../src/protocols/oscar/oscar.c:8154
 msgid "Get Status Msg"
 msgstr "Obter msx de estado"
 
-#: ../src/protocols/oscar/oscar.c:8159
+#: ../src/protocols/oscar/oscar.c:8167
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: ../src/protocols/oscar/oscar.c:8178
+#: ../src/protocols/oscar/oscar.c:8186
 msgid "Re-request Authorization"
 msgstr "Solicitar autorización outra vez"
 
-#: ../src/protocols/oscar/oscar.c:8235
+#: ../src/protocols/oscar/oscar.c:8243
 msgid "Require authorization"
 msgstr "Pedir autorización"
 
-#: ../src/protocols/oscar/oscar.c:8238
+#: ../src/protocols/oscar/oscar.c:8246
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Capacidade web (se activa isto fará que reciba SPAM!)"
 
-#: ../src/protocols/oscar/oscar.c:8243
+#: ../src/protocols/oscar/oscar.c:8251
 msgid "ICQ Privacy Options"
 msgstr "Opcións de privacidade ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8260
+#: ../src/protocols/oscar/oscar.c:8268
 msgid "The new formatting is invalid."
 msgstr "O novo formato é inválido."
 
-#: ../src/protocols/oscar/oscar.c:8261
+#: ../src/protocols/oscar/oscar.c:8269
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "O formato do nome de usuario só pode cambiar na capitalización e espacio en "
 "branco."
 
-#: ../src/protocols/oscar/oscar.c:8268
+#: ../src/protocols/oscar/oscar.c:8276
 msgid "New screen name formatting:"
 msgstr "Novo formato do nome de usuario:"
 
-#: ../src/protocols/oscar/oscar.c:8320
+#: ../src/protocols/oscar/oscar.c:8328
 msgid "Change Address To:"
 msgstr "Cambiar enderezo a:"
 
-#: ../src/protocols/oscar/oscar.c:8365
+#: ../src/protocols/oscar/oscar.c:8373
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>vostede non está agardando autorización</i>"
 
-#: ../src/protocols/oscar/oscar.c:8368
+#: ../src/protocols/oscar/oscar.c:8376
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Agardando a autorización dos seguintes amigos"
 
-#: ../src/protocols/oscar/oscar.c:8369
+#: ../src/protocols/oscar/oscar.c:8377
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9621,61 +9746,61 @@
 "Pode volver a pedir autorización a estos amigos premendo o botón dereito do "
 "rato sobre eles e escollendo \"Solicitar autorización outra vez.\""
 
-#: ../src/protocols/oscar/oscar.c:8386
+#: ../src/protocols/oscar/oscar.c:8394
 msgid "Find Buddy by E-Mail"
-msgstr "Buscar un amigo polo correo electrónico"
-
-#: ../src/protocols/oscar/oscar.c:8387
+msgstr "Procurar un amigo polo correo electrónico"
+
+#: ../src/protocols/oscar/oscar.c:8395
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo polo enderezo de correo electrónico"
 
-#: ../src/protocols/oscar/oscar.c:8388
+#: ../src/protocols/oscar/oscar.c:8396
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Escriba o enderezo de correo electrónico do amigo que está buscando."
 
-#: ../src/protocols/oscar/oscar.c:8481
+#: ../src/protocols/oscar/oscar.c:8489
 msgid "Set User Info (URL)..."
 msgstr "Establecer súa información de usuario (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:8492
+#: ../src/protocols/oscar/oscar.c:8500
 msgid "Change Password (URL)"
 msgstr "Trocar contrasinal (URL)"
 
-#: ../src/protocols/oscar/oscar.c:8496
+#: ../src/protocols/oscar/oscar.c:8504
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar reenvío de MI (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8506
+#: ../src/protocols/oscar/oscar.c:8514
 msgid "Set Privacy Options..."
 msgstr "Establecer opcións de privacidade..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:8513
+#: ../src/protocols/oscar/oscar.c:8521
 msgid "Format Screen Name..."
 msgstr "Formato do nome de usuario..."
 
-#: ../src/protocols/oscar/oscar.c:8517
-msgid "Confirm Account"
-msgstr "Confirmar conta"
-
-#: ../src/protocols/oscar/oscar.c:8521
-msgid "Display Currently Registered Address"
-msgstr "Mostrar enderezo rexistrado actualmente"
-
 #: ../src/protocols/oscar/oscar.c:8525
+msgid "Confirm Account"
+msgstr "Confirmar conta"
+
+#: ../src/protocols/oscar/oscar.c:8529
+msgid "Display Currently Registered Address"
+msgstr "Mostrar enderezo rexistrado actualmente"
+
+#: ../src/protocols/oscar/oscar.c:8533
 msgid "Change Currently Registered Address..."
 msgstr "Cambiar o enderezo rexistrado..."
 
-#: ../src/protocols/oscar/oscar.c:8532
+#: ../src/protocols/oscar/oscar.c:8540
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Amosar amigos pendentes de autorización"
 
-#: ../src/protocols/oscar/oscar.c:8538
+#: ../src/protocols/oscar/oscar.c:8546
 msgid "Search for Buddy by E-Mail..."
-msgstr "Buscar amigo por correo electrónico..."
-
-#: ../src/protocols/oscar/oscar.c:8543
+msgstr "Procurar un amigo por correo electrónico..."
+
+#: ../src/protocols/oscar/oscar.c:8551
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a través da súa información"
 
@@ -9689,23 +9814,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:8721 ../src/protocols/oscar/oscar.c:8723
+#: ../src/protocols/oscar/oscar.c:8729 ../src/protocols/oscar/oscar.c:8731
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Complemento de protocolo AIM/ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8742
+#: ../src/protocols/oscar/oscar.c:8750
 msgid "Auth host"
 msgstr "Servidor de autenticación"
 
-#: ../src/protocols/oscar/oscar.c:8745
+#: ../src/protocols/oscar/oscar.c:8753
 msgid "Auth port"
 msgstr "Porto de autenticación"
 
-#: ../src/protocols/oscar/oscar.c:8748 ../src/protocols/zephyr/zephyr.c:2900
+#: ../src/protocols/oscar/oscar.c:8756 ../src/protocols/zephyr/zephyr.c:2920
 msgid "Encoding"
 msgstr "Codificación"
 
-#: ../src/protocols/oscar/oscar.c:8752
+#: ../src/protocols/oscar/oscar.c:8760
 msgid ""
 "Use AIM/ICQ proxy server\n"
 "(slower, but usually works)"
@@ -9782,8 +9907,7 @@
 
 #: ../src/protocols/sametime/sametime.c:1605
 #, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
+msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Un administrador de Sametime eviou o seguinte anuncio no servidor %s"
 
 #: ../src/protocols/sametime/sametime.c:1610
@@ -10142,8 +10266,7 @@
 #: ../src/protocols/sametime/sametime.c:5485
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr ""
-"O identificador '%s' non coincide con ningún usuario na comunidade Sametime."
+msgstr "O identificador '%s' non coincide con ningún usuario na comunidade Sametime."
 
 #: ../src/protocols/sametime/sametime.c:5489
 msgid "No Matches"
@@ -10379,57 +10502,56 @@
 msgid "Robot"
 msgstr "Robot"
 
-#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:668
+#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:672
 #: ../src/protocols/silc/util.c:473
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:670
+#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
 #: ../src/protocols/silc/util.c:475
 msgid "Sad"
 msgstr "Triste"
 
-#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:672
+#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
 #: ../src/protocols/silc/util.c:477
 msgid "Angry"
 msgstr "Furioso"
 
-#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
 #: ../src/protocols/silc/util.c:479
 msgid "Jealous"
 msgstr "Celoso"
 
-#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:676
+#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
 #: ../src/protocols/silc/util.c:481
 msgid "Ashamed"
 msgstr "Avergoñado"
 
-#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:678
+#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
 #: ../src/protocols/silc/util.c:483
 msgid "Invincible"
 msgstr "Invencible"
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:485
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "Enamorado"
 
-#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:682
+#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
 #: ../src/protocols/silc/util.c:487
 msgid "Sleepy"
 msgstr "Durmido"
 
-#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
 #: ../src/protocols/silc/util.c:489
 msgid "Bored"
 msgstr "Aburrido"
 
-#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:686
+#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
 #: ../src/protocols/silc/util.c:491
 msgid "Excited"
 msgstr "Excitado"
 
-#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:688
+#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
 #: ../src/protocols/silc/util.c:493
 msgid "Anxious"
 msgstr "Ansioso"
@@ -10455,7 +10577,7 @@
 msgstr "Dispositivo"
 
 #: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
-#: ../src/protocols/silc/silc.c:736 ../src/protocols/silc/silc.c:738
+#: ../src/protocols/silc/silc.c:740 ../src/protocols/silc/silc.c:742
 msgid "Timezone"
 msgstr "Zona horaria"
 
@@ -10594,7 +10716,7 @@
 msgstr "Nome do grupo"
 
 #: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
-#: ../src/protocols/silc/silc.c:944
+#: ../src/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr "Contrasinal"
 
@@ -10681,8 +10803,7 @@
 
 #: ../src/protocols/silc/chat.c:1096
 #, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
+msgid "You have to join the %s channel before you are able to join the private group"
 msgstr "Ten que unirse ao canle %s antes de poder unirse ao grupo privado"
 
 #: ../src/protocols/silc/chat.c:1098
@@ -10693,15 +10814,15 @@
 msgid "Cannot join private group"
 msgstr "Non se pode unir a un grupo privado"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
 msgid "Call Command"
 msgstr "Comando de chamada"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr "Non se pode chamar o comando"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1153
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr "Comando descoñecido"
 
@@ -10808,15 +10929,11 @@
 msgid "Birth Day"
 msgstr "Día de nacemento"
 
-#: ../src/protocols/silc/ops.c:1044
-msgid "Job Title"
-msgstr "Traballo"
-
 #: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Rol laboral"
 
-#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:937
+#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:941
 msgid "Organization"
 msgstr "Organización"
 
@@ -10824,10 +10941,6 @@
 msgid "Unit"
 msgstr "Unidade"
 
-#: ../src/protocols/silc/ops.c:1075
-msgid "EMail"
-msgstr "Correo electrónico"
-
 #: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Nota"
@@ -10836,6 +10949,11 @@
 msgid "Join Chat"
 msgstr "Unirse a un Chat"
 
+#: ../src/protocols/silc/ops.c:1183 ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1046
+msgid "Real Name"
+msgstr "Nome real"
+
 #: ../src/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "Texto de estado"
@@ -10852,7 +10970,7 @@
 msgid "_More..."
 msgstr "_Máis..."
 
-#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1003
+#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1007
 msgid "Detach From Server"
 msgstr "Desligar do servidor"
 
@@ -10964,8 +11082,7 @@
 msgstr "Fallou o troco de claves"
 
 #: ../src/protocols/silc/ops.c:1722
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Produciuse un erro ao retomar a sesión desligada. Prema Reconectar para "
 "crear unha nova conexión."
@@ -10975,7 +11092,7 @@
 msgstr "Desconectado polo servidor"
 
 #: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
-#: ../src/protocols/silc/silc.c:195
+#: ../src/protocols/silc/silc.c:199
 msgid "Resuming session"
 msgstr "Reanudando a sesión"
 
@@ -10993,8 +11110,7 @@
 
 #: ../src/protocols/silc/ops.c:1938
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr ""
-"Fallo: Existe unha diferencia nas versións, por favor, actualice seu cliente"
+msgstr "Fallo: Existe unha diferencia nas versións, por favor, actualice seu cliente"
 
 #: ../src/protocols/silc/ops.c:1941
 msgid "Failure: Remote does not trust/support your public key"
@@ -11071,49 +11187,53 @@
 msgid "Unsupported public key type"
 msgstr "Tipo de clave pública non sopotada"
 
-#: ../src/protocols/silc/silc.c:155
+#: ../src/protocols/silc/silc.c:158
 msgid "Connection failed"
 msgstr "Fallou a conexión"
 
-#: ../src/protocols/silc/silc.c:187
+#: ../src/protocols/silc/silc.c:191
 msgid "Cannot initialize SILC Client connection"
 msgstr "Non se puido inicializar a conexión do cliente SILC"
 
-#: ../src/protocols/silc/silc.c:198
+#: ../src/protocols/silc/silc.c:202
 msgid "Performing key exchange"
 msgstr "Realizando troco de claves"
 
-#: ../src/protocols/silc/silc.c:283
+#: ../src/protocols/silc/silc.c:287
 msgid "Out of memory"
 msgstr "Sen memoria"
 
-#: ../src/protocols/silc/silc.c:324
+#: ../src/protocols/silc/silc.c:328
 msgid "Cannot initialize SILC protocol"
 msgstr "Non se puido inicializar o protocolo SILC"
 
-#: ../src/protocols/silc/silc.c:331
+#: ../src/protocols/silc/silc.c:335
 msgid "Cannot find/access ~/.silc directory"
 msgstr "Non se pode atopar ou acceder ao directorio ~/.silc"
 
 #. Progress
-#: ../src/protocols/silc/silc.c:336
+#: ../src/protocols/silc/silc.c:340
 msgid "Connecting to SILC Server"
 msgstr "Conectando co servidor SILC"
 
-#: ../src/protocols/silc/silc.c:345
+#: ../src/protocols/silc/silc.c:349
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Non se puido cargar a chave pública SILC: %s"
 
-#: ../src/protocols/silc/silc.c:365
+#: ../src/protocols/silc/silc.c:369
 msgid "Unable to create connection"
 msgstr "Imposible crear a conexión"
 
-#: ../src/protocols/silc/silc.c:664
+#: ../src/protocols/silc/silc.c:668
 msgid "Your Current Mood"
 msgstr "Seu estado de ánimo actual"
 
-#: ../src/protocols/silc/silc.c:691
+#: ../src/protocols/silc/silc.c:684
+msgid "In love"
+msgstr "Enamorado"
+
+#: ../src/protocols/silc/silc.c:695
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11121,43 +11241,43 @@
 "\n"
 "Seus métodos de contacto preferidos"
 
-#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/util.c:518
+#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:518
 msgid "SMS"
 msgstr "SMS"
 
-#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:520
+#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:520
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:522
-msgid "Video Conferencing"
+#: ../src/protocols/silc/silc.c:707
+msgid "Video conferencing"
 msgstr "Vídeo conferencia"
 
-#: ../src/protocols/silc/silc.c:708
+#: ../src/protocols/silc/silc.c:712
 msgid "Your Current Status"
 msgstr "Seu estado actual"
 
-#: ../src/protocols/silc/silc.c:715
+#: ../src/protocols/silc/silc.c:719
 msgid "Online Services"
 msgstr "Servizos en liña"
 
-#: ../src/protocols/silc/silc.c:718
+#: ../src/protocols/silc/silc.c:722
 msgid "Let others see what services you are using"
 msgstr "Permitir que outros consulten que servizos está empregando"
 
-#: ../src/protocols/silc/silc.c:724
+#: ../src/protocols/silc/silc.c:728
 msgid "Let others see what computer you are using"
 msgstr "Permitir que outros consulten qué ordenador está empregando"
 
-#: ../src/protocols/silc/silc.c:731
+#: ../src/protocols/silc/silc.c:735
 msgid "Your VCard File"
 msgstr "Seu ficheiro VCard"
 
-#: ../src/protocols/silc/silc.c:743 ../src/protocols/silc/silc.c:744
+#: ../src/protocols/silc/silc.c:747 ../src/protocols/silc/silc.c:748
 msgid "User Online Status Attributes"
 msgstr "Atributos do estado do usuario en liña"
 
-#: ../src/protocols/silc/silc.c:745
+#: ../src/protocols/silc/silc.c:749
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -11167,172 +11287,167 @@
 "liña así como súa información persoal. Por favor, encha a información que "
 "desexa que outros usuarios vexan de vostede."
 
-#: ../src/protocols/silc/silc.c:785 ../src/protocols/silc/silc.c:791
-#: ../src/protocols/silc/silc.c:1431
+#: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
+#: ../src/protocols/silc/silc.c:1435
 msgid "Message of the Day"
 msgstr "Mensaxe do día"
 
-#: ../src/protocols/silc/silc.c:785
+#: ../src/protocols/silc/silc.c:789
 msgid "No Message of the Day available"
 msgstr "Non hai dispoñible un mensaxe do día"
 
-#: ../src/protocols/silc/silc.c:786 ../src/protocols/silc/silc.c:1426
+#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1430
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Non hai unha mensaxe do día asociada con esta conexión"
 
-#: ../src/protocols/silc/silc.c:837 ../src/protocols/silc/silc.c:881
-#: ../src/protocols/silc/silc.c:952 ../src/protocols/silc/silc.c:953
+#: ../src/protocols/silc/silc.c:841 ../src/protocols/silc/silc.c:885
+#: ../src/protocols/silc/silc.c:956 ../src/protocols/silc/silc.c:957
 msgid "Create New SILC Key Pair"
 msgstr "Creando o novo par de claves SILC..."
 
-#: ../src/protocols/silc/silc.c:837
+#: ../src/protocols/silc/silc.c:841
 msgid "Passphrases do not match"
 msgstr "Os contrasinais non coinciden."
 
-#: ../src/protocols/silc/silc.c:881
+#: ../src/protocols/silc/silc.c:885
 msgid "Key Pair Generation failed"
 msgstr "Fallou a xeneración de claves"
 
-#: ../src/protocols/silc/silc.c:920
+#: ../src/protocols/silc/silc.c:924
 msgid "Key length"
 msgstr "Lonxitude da clave"
 
-#: ../src/protocols/silc/silc.c:922
+#: ../src/protocols/silc/silc.c:926
 msgid "Public key file"
 msgstr "Ficheiro de clave pública"
 
-#: ../src/protocols/silc/silc.c:924
+#: ../src/protocols/silc/silc.c:928
 msgid "Private key file"
 msgstr "Ficheiro de clave privada"
 
-#: ../src/protocols/silc/silc.c:933
-msgid "Real Name"
-msgstr "Nome real"
-
-#: ../src/protocols/silc/silc.c:947
-msgid "Re-type Passphrase"
-msgstr "Reescribir contrasinal"
-
-#: ../src/protocols/silc/silc.c:954
+#: ../src/protocols/silc/silc.c:951
+msgid "Passphrase (retype)"
+msgstr "Contrasinal (reescribir)"
+
+#: ../src/protocols/silc/silc.c:958
 msgid "Generate Key Pair"
 msgstr "Xerar par de claves"
 
-#: ../src/protocols/silc/silc.c:998
+#: ../src/protocols/silc/silc.c:1002
 msgid "Online Status"
 msgstr "Estado en liña"
 
-#: ../src/protocols/silc/silc.c:1007
+#: ../src/protocols/silc/silc.c:1011
 msgid "View Message of the Day"
 msgstr "Amosar mensaxe do sía"
 
-#: ../src/protocols/silc/silc.c:1011
+#: ../src/protocols/silc/silc.c:1015
 msgid "Create SILC Key Pair..."
 msgstr "Crear par de claves SILC..."
 
-#: ../src/protocols/silc/silc.c:1110
+#: ../src/protocols/silc/silc.c:1114
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "O usuario <I>%s</I> non está na rede"
 
-#: ../src/protocols/silc/silc.c:1302
+#: ../src/protocols/silc/silc.c:1306
 msgid "Topic too long"
 msgstr "Tópico demasiado longo"
 
-#: ../src/protocols/silc/silc.c:1383
+#: ../src/protocols/silc/silc.c:1387
 msgid "You must specify a nick"
 msgstr "Debe especificar un alcume"
 
-#: ../src/protocols/silc/silc.c:1485
+#: ../src/protocols/silc/silc.c:1489
 #, c-format
 msgid "channel %s not found"
 msgstr "non se atopou o canle %s"
 
-#: ../src/protocols/silc/silc.c:1490
+#: ../src/protocols/silc/silc.c:1494
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "os modos do canle de %s son: %s"
 
-#: ../src/protocols/silc/silc.c:1492
+#: ../src/protocols/silc/silc.c:1496
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "non se definiron modos de canle para %s"
 
-#: ../src/protocols/silc/silc.c:1505
+#: ../src/protocols/silc/silc.c:1509
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Non se puideron fixar os modos de canle para %s"
 
-#: ../src/protocols/silc/silc.c:1535
+#: ../src/protocols/silc/silc.c:1539
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Comando descoñecido: %s, (pode ser un erro de Gaim)"
 
-#: ../src/protocols/silc/silc.c:1598
+#: ../src/protocols/silc/silc.c:1602
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canle]:  Abandonar un chat"
 
-#: ../src/protocols/silc/silc.c:1602
+#: ../src/protocols/silc/silc.c:1606
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canle]:  Abandonar o chat"
 
-#: ../src/protocols/silc/silc.c:1606
+#: ../src/protocols/silc/silc.c:1610
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;novo tópico&gt;]:  Ver ou trocar o tópico"
 
-#: ../src/protocols/silc/silc.c:1611
+#: ../src/protocols/silc/silc.c:1615
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;canle&gt; [&lt;contrasinal&gt;]:  Unirse a un chat nesta rede"
 
-#: ../src/protocols/silc/silc.c:1615
+#: ../src/protocols/silc/silc.c:1619
 msgid "list:  List channels on this network"
 msgstr "list:  Amosar os canles nesta rede"
 
-#: ../src/protocols/silc/silc.c:1619
+#: ../src/protocols/silc/silc.c:1623
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;alcume&gt;:  Ver información do alcume"
 
-#: ../src/protocols/silc/silc.c:1623 ../src/protocols/zephyr/zephyr.c:2602
+#: ../src/protocols/silc/silc.c:1627 ../src/protocols/zephyr/zephyr.c:2622
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr ""
-"msg &lt;alcume&gt; &lt;mensaxe&gt;:  Enviar unha mensaxe privada a un usuario"
-
-#: ../src/protocols/silc/silc.c:1627
+msgstr "msg &lt;alcume&gt; &lt;mensaxe&gt;:  Enviar unha mensaxe privada a un usuario"
+
+#: ../src/protocols/silc/silc.c:1631
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;alcume&gt; [&lt;mensaxe&gt;]:  Enviar unha mensaxe privada ao "
 "usuario"
 
-#: ../src/protocols/silc/silc.c:1631
+#: ../src/protocols/silc/silc.c:1635
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Amosar a mensaxe do día do servidor"
 
-#: ../src/protocols/silc/silc.c:1635
+#: ../src/protocols/silc/silc.c:1639
 msgid "detach:  Detach this session"
 msgstr "detach:  Desligar esta sesión"
 
-#: ../src/protocols/silc/silc.c:1639
+#: ../src/protocols/silc/silc.c:1643
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [mensaxe]:  Desconecta do servidor actual opcionalmente indicando unha "
 "mensaxe"
 
-#: ../src/protocols/silc/silc.c:1643
+#: ../src/protocols/silc/silc.c:1647
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comando&gt;:  Executar un comando calquera do cliente silc"
 
-#: ../src/protocols/silc/silc.c:1649
-msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr "kill &lt;alcume&gt; [-pubkey|&lt;razón&gt;]:  Matar un alcume"
-
 #: ../src/protocols/silc/silc.c:1653
-msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;novo alcume&gt;:  Troca seu alcume"
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;alcume&gt; [-pubkey|&lt;razón&gt;]:  Matar un alcume"
 
 #: ../src/protocols/silc/silc.c:1657
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;novo alcume&gt;:  Troca seu alcume"
+
+#: ../src/protocols/silc/silc.c:1661
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;alcume&gt;:  Amosar información do alcume"
 
-#: ../src/protocols/silc/silc.c:1661
+#: ../src/protocols/silc/silc.c:1665
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11340,7 +11455,7 @@
 "cmode &lt;canle&gt; [+|-&lt;modos&gt;] [argumentos]:  Cambia ou mostra os "
 "modos do canle"
 
-#: ../src/protocols/silc/silc.c:1665
+#: ../src/protocols/silc/silc.c:1669
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11348,15 +11463,15 @@
 "cumode &lt;canle&gt; +|-&lt;modos&gt; &lt;alcume&gt;:  Cambio os modos do "
 "usuario ou do canle"
 
-#: ../src/protocols/silc/silc.c:1669
+#: ../src/protocols/silc/silc.c:1673
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos de usuario&gt;:  Establecer seus modos na rede"
 
-#: ../src/protocols/silc/silc.c:1673
+#: ../src/protocols/silc/silc.c:1677
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;alcume&gt; [-pubkey]:  Obter privilexios de operador"
 
-#: ../src/protocols/silc/silc.c:1677
+#: ../src/protocols/silc/silc.c:1681
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -11364,38 +11479,37 @@
 "invite &lt;canle&gt; [-|+]&lt;alcume&gt;:  invita un alcume ou engade/"
 "elimina o alcume da lista de invitados para o canle"
 
-#: ../src/protocols/silc/silc.c:1681
+#: ../src/protocols/silc/silc.c:1685
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr ""
-"kick &lt;canle&gt; &lt;alcume&gt; [comentario]:  Botar a un cliente do canle"
-
-#: ../src/protocols/silc/silc.c:1685
+msgstr "kick &lt;canle&gt; &lt;alcume&gt; [comentario]:  Botar a un cliente do canle"
+
+#: ../src/protocols/silc/silc.c:1689
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]:  Consulta detalles administrativos do servidor"
 
-#: ../src/protocols/silc/silc.c:1689
+#: ../src/protocols/silc/silc.c:1693
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canle&gt; +|-&lt;alcume&gt;]:  Vetar a un cliente do canle"
 
-#: ../src/protocols/silc/silc.c:1693
+#: ../src/protocols/silc/silc.c:1697
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;alcume|servidor&gt;:  Obtén a clave pública do servidor ou do "
 "cliente"
 
-#: ../src/protocols/silc/silc.c:1697
+#: ../src/protocols/silc/silc.c:1701
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Amosa as estatísticas do servidor e da rede"
 
-#: ../src/protocols/silc/silc.c:1701
+#: ../src/protocols/silc/silc.c:1705
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Enviar un PING ao servidor ao que está conectado"
 
-#: ../src/protocols/silc/silc.c:1706
+#: ../src/protocols/silc/silc.c:1710
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;canle&gt;:  Obtén a lista dos usuarios que están no canle"
 
-#: ../src/protocols/silc/silc.c:1710
+#: ../src/protocols/silc/silc.c:1714
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11412,60 +11526,60 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1819
+#: ../src/protocols/silc/silc.c:1823
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1821
+#: ../src/protocols/silc/silc.c:1825
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocolo de conferencia segura en vivo en Internet (SILC)"
 
-#: ../src/protocols/silc/silc.c:1858
+#: ../src/protocols/silc/silc.c:1862
 msgid "Public Key file"
 msgstr "Ficheiro de clave pública"
 
-#: ../src/protocols/silc/silc.c:1862
+#: ../src/protocols/silc/silc.c:1866
 msgid "Private Key file"
 msgstr "Ficheiro de clave privada"
 
-#: ../src/protocols/silc/silc.c:1872
+#: ../src/protocols/silc/silc.c:1876
 msgid "Cipher"
 msgstr "Cipher"
 
-#: ../src/protocols/silc/silc.c:1882
+#: ../src/protocols/silc/silc.c:1886
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../src/protocols/silc/silc.c:1885
+#: ../src/protocols/silc/silc.c:1889
 msgid "Public key authentication"
 msgstr "Autenticación de clave pública"
 
-#: ../src/protocols/silc/silc.c:1888
+#: ../src/protocols/silc/silc.c:1892
 msgid "Reject watching by other users"
 msgstr "Impedir que outros usuarios vexan"
 
-#: ../src/protocols/silc/silc.c:1891
+#: ../src/protocols/silc/silc.c:1895
 msgid "Block invites"
 msgstr "Bloquear invitacións"
 
-#: ../src/protocols/silc/silc.c:1894
+#: ../src/protocols/silc/silc.c:1898
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear MIs que non fagan un troco de claves"
 
-#: ../src/protocols/silc/silc.c:1897
+#: ../src/protocols/silc/silc.c:1901
 msgid "Reject online status attribute requests"
 msgstr "Rexeitar solicitudes dos atributos do estado de liña"
 
-#: ../src/protocols/silc/silc.c:1900
+#: ../src/protocols/silc/silc.c:1904
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensaxes ao encerado"
 
-#: ../src/protocols/silc/silc.c:1903
+#: ../src/protocols/silc/silc.c:1907
 msgid "Automatically open whiteboard"
 msgstr "Abrir o encerado automaticamente"
 
-#: ../src/protocols/silc/silc.c:1906
+#: ../src/protocols/silc/silc.c:1910
 msgid "Digitally sign and verify all messages"
 msgstr "Asinar dixitalmente todas as mensaxes instantáneas"
 
@@ -11488,8 +11602,8 @@
 
 #: ../src/protocols/silc/util.c:318
 #, c-format
-msgid "EMail: \t\t%s\n"
-msgstr "EMail: \t\t%s\n"
+msgid "E-Mail: \t\t%s\n"
+msgstr "E-Mail: \t\t%s\n"
 
 #: ../src/protocols/silc/util.c:320
 #, c-format
@@ -11513,7 +11627,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key length: \t%d bits\n"
+msgid "Key Length: \t%d bits\n"
 msgstr "Lonxitude da clave: \t%d bits\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11544,6 +11658,10 @@
 msgid "Paging"
 msgstr "Enviar"
 
+#: ../src/protocols/silc/util.c:522
+msgid "Video Conferencing"
+msgstr "Vídeo conferencia"
+
 #: ../src/protocols/silc/util.c:540
 msgid "Computer"
 msgstr "Ordenador"
@@ -11606,36 +11724,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1733
+#: ../src/protocols/simple/simple.c:1734
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Complemento de protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1734
+#: ../src/protocols/simple/simple.c:1735
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "O complemento de protocolo SIP/SIMPLE"
 
-#: ../src/protocols/simple/simple.c:1756
+#: ../src/protocols/simple/simple.c:1757
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Estado público (nota: todos poderán velo)"
 
-#: ../src/protocols/simple/simple.c:1762
+#: ../src/protocols/simple/simple.c:1763
 msgid "Use UDP"
 msgstr "Usar UDP"
 
-#: ../src/protocols/simple/simple.c:1764
+#: ../src/protocols/simple/simple.c:1765
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../src/protocols/simple/simple.c:1766
+#: ../src/protocols/simple/simple.c:1767
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/protocols/simple/simple.c:1768
+#: ../src/protocols/simple/simple.c:1769
 msgid "Auth User"
 msgstr "Usuario de autenticación"
 
-#: ../src/protocols/simple/simple.c:1770
+#: ../src/protocols/simple/simple.c:1771
 msgid "Auth Domain"
 msgstr "Dominio de autenticación"
 
@@ -11886,11 +12004,11 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "Súa mensaxe Yahoo! non se enviou."
 
-#: ../src/protocols/yahoo/yahoo.c:765 ../src/protocols/yahoo/yahoo.c:3562
+#: ../src/protocols/yahoo/yahoo.c:766 ../src/protocols/yahoo/yahoo.c:3563
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: ../src/protocols/yahoo/yahoo.c:810
+#: ../src/protocols/yahoo/yahoo.c:811
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaxe do sistema Yahoo! para %s:"
@@ -11898,23 +12016,23 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: ../src/protocols/yahoo/yahoo.c:906
+#: ../src/protocols/yahoo/yahoo.c:907
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "O usuario %s quere engadir a %s a súa lista de amigos %s%s."
 
-#: ../src/protocols/yahoo/yahoo.c:912
+#: ../src/protocols/yahoo/yahoo.c:913
 msgid "Message (optional) :"
 msgstr "Mensaxe (opcional) :"
 
-#: ../src/protocols/yahoo/yahoo.c:954
+#: ../src/protocols/yahoo/yahoo.c:955
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "O usuario %s rechazou súa solicitude de engadilo a súa lista de amigos (de "
 "forma retroactiva)."
 
-#: ../src/protocols/yahoo/yahoo.c:957
+#: ../src/protocols/yahoo/yahoo.c:958
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11923,11 +12041,11 @@
 "O usuario %s negou (de forma retroactiva) súa solicitude de engadilo a súa "
 "lista de amigos pola seguinte razón: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:960
+#: ../src/protocols/yahoo/yahoo.c:961
 msgid "Add buddy rejected"
 msgstr "Rechazouse a adición do amigo"
 
-#: ../src/protocols/yahoo/yahoo.c:1703
+#: ../src/protocols/yahoo/yahoo.c:1704
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11938,11 +12056,11 @@
 "Esta versión de Gaim posiblemente non sexa capaz de conectarse a Yahoo. "
 "Comprobe %s para obter unha actualización."
 
-#: ../src/protocols/yahoo/yahoo.c:1706
+#: ../src/protocols/yahoo/yahoo.c:1707
 msgid "Failed Yahoo! Authentication"
 msgstr "Fallou a autenticación en Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo.c:1772
+#: ../src/protocols/yahoo/yahoo.c:1773
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11951,19 +12069,19 @@
 "Intentou ignorar a %s, pero o usuario está na súa lista de amigos. Se "
 "selecciona \"Si\" eliminaráselle e ignorarase a este amigo."
 
-#: ../src/protocols/yahoo/yahoo.c:1775
+#: ../src/protocols/yahoo/yahoo.c:1776
 msgid "Ignore buddy?"
 msgstr "Ignorar amigo?"
 
-#: ../src/protocols/yahoo/yahoo.c:1809
+#: ../src/protocols/yahoo/yahoo.c:1810
 msgid "Invalid username."
 msgstr "Nome de usuario inválido."
 
-#: ../src/protocols/yahoo/yahoo.c:1820
+#: ../src/protocols/yahoo/yahoo.c:1821
 msgid "Normal authentication failed!"
 msgstr "Fallou a autenticación habitual!"
 
-#: ../src/protocols/yahoo/yahoo.c:1821
+#: ../src/protocols/yahoo/yahoo.c:1822
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -11975,139 +12093,138 @@
 "cambiou. Gaim tentará conectarse a través da autenticación de Mensaxería web "
 "que poderá dar lugar a un acceso a menos funcionalidades e funcións."
 
-#: ../src/protocols/yahoo/yahoo.c:1829
+#: ../src/protocols/yahoo/yahoo.c:1830
 msgid "Incorrect password."
 msgstr "Contrasinal incorrecto."
 
-#: ../src/protocols/yahoo/yahoo.c:1832
+#: ../src/protocols/yahoo/yahoo.c:1833
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr ""
-"Súa conta está bloqueada. Por favor, conéctese ao servidor de web de Yahoo!."
-
-#: ../src/protocols/yahoo/yahoo.c:1835
+msgstr "Súa conta está bloqueada. Por favor, conéctese ao servidor de web de Yahoo!."
+
+#: ../src/protocols/yahoo/yahoo.c:1836
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Erro descoñecido número %d. Se se conecta ao servidor de web de Yahoo! é "
 "posible que isto arrégrese."
 
-#: ../src/protocols/yahoo/yahoo.c:1889
+#: ../src/protocols/yahoo/yahoo.c:1890
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Non se puido engadir ao amigo %s ao grupo %s da lista no servidor para a "
 "conta %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1892
+#: ../src/protocols/yahoo/yahoo.c:1893
 msgid "Could not add buddy to server list"
 msgstr "Non se puido engadir o amigo á lista do servidor"
 
-#: ../src/protocols/yahoo/yahoo.c:2011
+#: ../src/protocols/yahoo/yahoo.c:2012
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../src/protocols/yahoo/yahoo.c:2150 ../src/protocols/yahoo/yahoo.c:2297
-#: ../src/protocols/yahoo/yahoo.c:2312 ../src/protocols/yahoo/ycht.c:472
+#: ../src/protocols/yahoo/yahoo.c:2151 ../src/protocols/yahoo/yahoo.c:2298
+#: ../src/protocols/yahoo/yahoo.c:2313 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "Non se puido ler"
 
-#: ../src/protocols/yahoo/yahoo.c:2336 ../src/protocols/yahoo/yahoo.c:2493
-#: ../src/protocols/yahoo/yahoo.c:2595 ../src/protocols/yahoo/yahoo.c:2605
+#: ../src/protocols/yahoo/yahoo.c:2337 ../src/protocols/yahoo/yahoo.c:2494
+#: ../src/protocols/yahoo/yahoo.c:2596 ../src/protocols/yahoo/yahoo.c:2606
 #: ../src/protocols/yahoo/yahoochat.c:1447
 #: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "Problema de conexión"
 
-#: ../src/protocols/yahoo/yahoo.c:2714 ../src/protocols/yahoo/yahoo.c:3295
+#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3296
 msgid "Not at Home"
 msgstr "Fora da casa"
 
-#: ../src/protocols/yahoo/yahoo.c:2716 ../src/protocols/yahoo/yahoo.c:3298
+#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3299
 msgid "Not at Desk"
 msgstr "Lexos do escritorio"
 
-#: ../src/protocols/yahoo/yahoo.c:2718 ../src/protocols/yahoo/yahoo.c:3301
+#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3302
 msgid "Not in Office"
 msgstr "Fora da oficina"
 
-#: ../src/protocols/yahoo/yahoo.c:2722 ../src/protocols/yahoo/yahoo.c:3307
+#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3308
 msgid "On Vacation"
 msgstr "De vacacións"
 
-#: ../src/protocols/yahoo/yahoo.c:2726 ../src/protocols/yahoo/yahoo.c:3313
+#: ../src/protocols/yahoo/yahoo.c:2727 ../src/protocols/yahoo/yahoo.c:3314
 msgid "Stepped Out"
 msgstr "Abandonou"
 
-#: ../src/protocols/yahoo/yahoo.c:2819 ../src/protocols/yahoo/yahoo.c:2849
+#: ../src/protocols/yahoo/yahoo.c:2820 ../src/protocols/yahoo/yahoo.c:2850
 msgid "Not on server list"
 msgstr "Non está na lista do servidor"
 
-#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2925
+#: ../src/protocols/yahoo/yahoo.c:2867 ../src/protocols/yahoo/yahoo.c:2926
 msgid "Appear Online"
 msgstr "Parecer conectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2869 ../src/protocols/yahoo/yahoo.c:2946
+#: ../src/protocols/yahoo/yahoo.c:2870 ../src/protocols/yahoo/yahoo.c:2947
 msgid "Appear Permanently Offline"
 msgstr "Parecer permanentemente desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2888
+#: ../src/protocols/yahoo/yahoo.c:2889
 msgid "Presence"
 msgstr "Presencia"
 
-#: ../src/protocols/yahoo/yahoo.c:2931
+#: ../src/protocols/yahoo/yahoo.c:2932
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2940
+#: ../src/protocols/yahoo/yahoo.c:2941
 msgid "Don't Appear Permanently Offline"
 msgstr "Non aparecer sempre desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2988
+#: ../src/protocols/yahoo/yahoo.c:2989
 msgid "Join in Chat"
 msgstr "Unirse a un chat"
 
-#: ../src/protocols/yahoo/yahoo.c:2994
+#: ../src/protocols/yahoo/yahoo.c:2995
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"
 
-#: ../src/protocols/yahoo/yahoo.c:3022
+#: ../src/protocols/yahoo/yahoo.c:3023
 msgid "Presence Settings"
 msgstr "Configuración do entorno"
 
-#: ../src/protocols/yahoo/yahoo.c:3028
+#: ../src/protocols/yahoo/yahoo.c:3029
 msgid "Start Doodling"
 msgstr "Iniciar Doodle"
 
-#: ../src/protocols/yahoo/yahoo.c:3060
+#: ../src/protocols/yahoo/yahoo.c:3061
 msgid "Active which ID?"
 msgstr "Que ID quere activar?"
 
-#: ../src/protocols/yahoo/yahoo.c:3069
+#: ../src/protocols/yahoo/yahoo.c:3070
 msgid "Join who in chat?"
 msgstr "Xuntarse con quen nun chat?"
 
-#: ../src/protocols/yahoo/yahoo.c:3079
+#: ../src/protocols/yahoo/yahoo.c:3080
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../src/protocols/yahoo/yahoo.c:3083
+#: ../src/protocols/yahoo/yahoo.c:3084
 msgid "Join User in Chat..."
 msgstr "Xuntarse cun usuario nun chat..."
 
-#: ../src/protocols/yahoo/yahoo.c:3621
+#: ../src/protocols/yahoo/yahoo.c:3622
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;sala&gt;:  Unirse a unha sala na rede de Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3626
+#: ../src/protocols/yahoo/yahoo.c:3627
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Amosar as canles da rede Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3630
+#: ../src/protocols/yahoo/yahoo.c:3631
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Avisar a un contacto para chamar súa atención"
 
-#: ../src/protocols/yahoo/yahoo.c:3634
+#: ../src/protocols/yahoo/yahoo.c:3635
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitar ao usuario o comezo dunha sesión Doodle"
 
@@ -12121,58 +12238,65 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3727 ../src/protocols/yahoo/yahoo.c:3729
+#: ../src/protocols/yahoo/yahoo.c:3728 ../src/protocols/yahoo/yahoo.c:3730
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3746
+#: ../src/protocols/yahoo/yahoo.c:3747
 msgid "Yahoo Japan"
 msgstr "Yahoo Xapón"
 
-#: ../src/protocols/yahoo/yahoo.c:3749
+#: ../src/protocols/yahoo/yahoo.c:3750
 msgid "Pager host"
 msgstr "Servidor de buscapersoas"
 
-#: ../src/protocols/yahoo/yahoo.c:3752
+#: ../src/protocols/yahoo/yahoo.c:3753
 msgid "Japan Pager host"
 msgstr "Servidor de buscapersoas xaponés"
 
-#: ../src/protocols/yahoo/yahoo.c:3755
+#: ../src/protocols/yahoo/yahoo.c:3756
 msgid "Pager port"
 msgstr "Porto do buscapersoas"
 
-#: ../src/protocols/yahoo/yahoo.c:3758
+#: ../src/protocols/yahoo/yahoo.c:3759
 msgid "File transfer host"
 msgstr "Servidor de transferencia de ficheiros"
 
-#: ../src/protocols/yahoo/yahoo.c:3761
+#: ../src/protocols/yahoo/yahoo.c:3762
 msgid "Japan file transfer host"
 msgstr "Servidor de transferencia de ficheiros xaponés"
 
-#: ../src/protocols/yahoo/yahoo.c:3764
+#: ../src/protocols/yahoo/yahoo.c:3765
 msgid "File transfer port"
 msgstr "Porto de transferencia de ficheiros"
 
-#: ../src/protocols/yahoo/yahoo.c:3767
+#: ../src/protocols/yahoo/yahoo.c:3768
 msgid "Chat room locale"
 msgstr "Ubicación da sala de chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3770
+#: ../src/protocols/yahoo/yahoo.c:3771
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar as invitacións a salas de conferencias ou chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3774
+#: ../src/protocols/yahoo/yahoo.c:3775
 msgid "Chat room list URL"
 msgstr "Url de lista de salas de chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3777
+#: ../src/protocols/yahoo/yahoo.c:3778
 msgid "YCHT host"
 msgstr "Servidor YCHT"
 
-#: ../src/protocols/yahoo/yahoo.c:3780
+#: ../src/protocols/yahoo/yahoo.c:3781
 msgid "YCHT port"
 msgstr "Porto YCHT"
 
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../src/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr "Enviar petición Doodle."
+
 #. TODO: what to do here - do we really have to disconnect?
 #: ../src/protocols/yahoo/yahoo_packet.c:265
 msgid "Write Error"
@@ -12195,64 +12319,61 @@
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr ""
-"Síntoo, os perfiles con contido só para adultos non están soportados aínda."
+msgstr "Síntoo, os perfiles con contido só para adultos non están soportados aínda."
 
 #: ../src/protocols/yahoo/yahoo_profile.c:830
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
-msgstr ""
-"Se desexa ver este perfil, debería visitar este ligazón co seu navegador web"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1006
+msgstr "Se desexa ver este perfil, debería visitar este ligazón co seu navegador web"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1078
-#: ../src/protocols/yahoo/yahoo_profile.c:1082
-#: ../src/protocols/yahoo/yahoo_profile.c:1086
+#: ../src/protocols/yahoo/yahoo_profile.c:1084
+#: ../src/protocols/yahoo/yahoo_profile.c:1088
+#: ../src/protocols/yahoo/yahoo_profile.c:1092
 msgid "Hobbies"
 msgstr "Aficións"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1096
-#: ../src/protocols/yahoo/yahoo_profile.c:1100
+#: ../src/protocols/yahoo/yahoo_profile.c:1102
+#: ../src/protocols/yahoo/yahoo_profile.c:1106
 msgid "Latest News"
 msgstr "Últimas noticias"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1121
+#: ../src/protocols/yahoo/yahoo_profile.c:1127
 msgid "Home Page"
 msgstr "Páxina persoal"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1136
+#: ../src/protocols/yahoo/yahoo_profile.c:1142
 msgid "Cool Link 1"
 msgstr "Ligazón interesante 1"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1141
+#: ../src/protocols/yahoo/yahoo_profile.c:1147
 msgid "Cool Link 2"
 msgstr "Ligazón interesante 2"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1145
+#: ../src/protocols/yahoo/yahoo_profile.c:1151
 msgid "Cool Link 3"
 msgstr "Ligazón interesante 3"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1158
+#: ../src/protocols/yahoo/yahoo_profile.c:1164
 msgid "Last Update"
 msgstr "Última actualización"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1164
+#: ../src/protocols/yahoo/yahoo_profile.c:1170
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Información de usuario de %s non dispoñible"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1170
+#: ../src/protocols/yahoo/yahoo_profile.c:1176
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
-msgstr ""
-"Síntoo, este perfil parece estar nun idioma ou formato aínda non soportado."
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1186
+msgstr "Síntoo, este perfil parece estar nun idioma ou formato aínda non soportado."
+
+#: ../src/protocols/yahoo/yahoo_profile.c:1192
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -12260,7 +12381,7 @@
 "Non se puido obter o perfil do usuario. Isto é usualmente un problema "
 "temporal no lado do servidor. Por favor, probe de novo máis tarde."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1189
+#: ../src/protocols/yahoo/yahoo_profile.c:1195
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -12270,15 +12391,14 @@
 "usuario non existe. Nembargantes, a vece Yahoo! faia ao buscar un perfil de "
 "usuario. Se está seguro de que o usuario existe inténteo de novo máis tarde."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1197
+#: ../src/protocols/yahoo/yahoo_profile.c:1203
 msgid "The user's profile is empty."
 msgstr "O perfil do usuario está baleiro."
 
 #: ../src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s declinou súa invitación de conferencia na sala \"%s\" porque \"%s\"."
+msgstr "%s declinou súa invitación de conferencia na sala \"%s\" porque \"%s\"."
 
 #: ../src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
@@ -12350,7 +12470,7 @@
 msgid "Connection problem with the YCHT server."
 msgstr "Produciuse un problema ao conectarse co servidor YCHT."
 
-#: ../src/protocols/zephyr/zephyr.c:331
+#: ../src/protocols/zephyr/zephyr.c:346
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -12358,80 +12478,79 @@
 "(Houbo un erro convertindo esta mensaxe.\tComprobe a opción de "
 "'Codificación' no Editor de contas)"
 
-#: ../src/protocols/zephyr/zephyr.c:686
+#: ../src/protocols/zephyr/zephyr.c:701
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Non se puido enviar ao chat %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1134
+#: ../src/protocols/zephyr/zephyr.c:734 ../src/protocols/zephyr/zephyr.c:1151
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Usuario:</b> %s<br>"
 
-#: ../src/protocols/zephyr/zephyr.c:723 ../src/protocols/zephyr/zephyr.c:1139
+#: ../src/protocols/zephyr/zephyr.c:738 ../src/protocols/zephyr/zephyr.c:1156
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Agochado ou non conectado"
 
-#: ../src/protocols/zephyr/zephyr.c:728 ../src/protocols/zephyr/zephyr.c:1141
+#: ../src/protocols/zephyr/zephyr.c:743 ../src/protocols/zephyr/zephyr.c:1158
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>En %s desde %s"
 
-#: ../src/protocols/zephyr/zephyr.c:1472 ../src/protocols/zephyr/zephyr.c:1473
+#: ../src/protocols/zephyr/zephyr.c:1490 ../src/protocols/zephyr/zephyr.c:1491
 msgid "Anyone"
 msgstr "Calquera"
 
-#: ../src/protocols/zephyr/zephyr.c:2278
+#: ../src/protocols/zephyr/zephyr.c:2298
 msgid "_Class:"
 msgstr "_Clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2284
+#: ../src/protocols/zephyr/zephyr.c:2304
 msgid "_Instance:"
 msgstr "_Instancia:"
 
-#: ../src/protocols/zephyr/zephyr.c:2290
+#: ../src/protocols/zephyr/zephyr.c:2310
 msgid "_Recipient:"
 msgstr "_Destinatario:"
 
-#: ../src/protocols/zephyr/zephyr.c:2301
+#: ../src/protocols/zephyr/zephyr.c:2321
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Fallou o intento de suscrición a %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:2607
+#: ../src/protocols/zephyr/zephyr.c:2627
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;alcume&gt;: Localiza un usuario"
 
-#: ../src/protocols/zephyr/zephyr.c:2612
+#: ../src/protocols/zephyr/zephyr.c:2632
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;alcume&gt;: Localiza un usuario"
 
-#: ../src/protocols/zephyr/zephyr.c:2617
+#: ../src/protocols/zephyr/zephyr.c:2637
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;instancia&gt;: Fixar a instancia a empregar nesta clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2622
+#: ../src/protocols/zephyr/zephyr.c:2642
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instancia&gt;: Fixar a instancia a empregar nesta clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2627
+#: ../src/protocols/zephyr/zephyr.c:2647
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instancia&gt;: Fixar a instancia a empregar nesta clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2633
+#: ../src/protocols/zephyr/zephyr.c:2653
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;clase&gt; &lt;instancia&gt; &lt;destinatario&gt;: Unirse a un novo "
 "chat"
 
-#: ../src/protocols/zephyr/zephyr.c:2638
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+#: ../src/protocols/zephyr/zephyr.c:2658
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instancia&gt;: Enviar unha mensaxe a &lt;mensaxe,<i>instancia</i>,"
 "*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2644
+#: ../src/protocols/zephyr/zephyr.c:2664
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -12439,7 +12558,7 @@
 "zci &lt;clase&gt; &lt;instance&gt;: Enviar unha mensaxe a &lt;<i>clase</i>,"
 "<i>instancia</i>,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2650
+#: ../src/protocols/zephyr/zephyr.c:2670
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -12447,7 +12566,7 @@
 "zcir &lt;clase&gt; &lt;instancia&gt; &lt;destinatario&gt;: Enviar unha "
 "mensaxe a &lt;<i>clase</i>,<i>instancia</i>,<i>destinatario</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2656
+#: ../src/protocols/zephyr/zephyr.c:2676
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -12455,15 +12574,15 @@
 "zir &lt;instancia&gt; &lt;destinatario&gt;: Enviar unha mensaxe a &lt;"
 "MENSAXE,<i>instancia</i>,<i>destinatario</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2661
+#: ../src/protocols/zephyr/zephyr.c:2681
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;clase&gt;: Enviar unha mensaxe a &lt;<i>clase</i>,PERSOAL,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2767
+#: ../src/protocols/zephyr/zephyr.c:2787
 msgid "Resubscribe"
 msgstr "Re-suscribir"
 
-#: ../src/protocols/zephyr/zephyr.c:2770
+#: ../src/protocols/zephyr/zephyr.c:2790
 msgid "Retrieve subscriptions from server"
 msgstr "Obter as suscricións do servidor"
 
@@ -12477,58 +12596,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2855 ../src/protocols/zephyr/zephyr.c:2857
+#: ../src/protocols/zephyr/zephyr.c:2875 ../src/protocols/zephyr/zephyr.c:2877
 msgid "Zephyr Protocol Plugin"
 msgstr "Complemento de protocolo Zephyr"
 
-#: ../src/protocols/zephyr/zephyr.c:2882
+#: ../src/protocols/zephyr/zephyr.c:2902
 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2885
+#: ../src/protocols/zephyr/zephyr.c:2905
 msgid "Export to .zephyr.subs"
 msgstr "Exportar a .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2888
+#: ../src/protocols/zephyr/zephyr.c:2908
 msgid "Import from .anyone"
 msgstr "Importar desde .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2891
+#: ../src/protocols/zephyr/zephyr.c:2911
 msgid "Import from .zephyr.subs"
 msgstr "Importar desde .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2894
+#: ../src/protocols/zephyr/zephyr.c:2914
 msgid "Realm"
 msgstr "Reino"
 
-#: ../src/protocols/zephyr/zephyr.c:2897
+#: ../src/protocols/zephyr/zephyr.c:2917
 msgid "Exposure"
 msgstr "Exposición"
 
-#: ../src/proxy.c:1205 ../src/proxy.c:1261 ../src/proxy.c:1309
-#: ../src/proxy.c:1336
+#: ../src/proxy.c:1216 ../src/proxy.c:1272 ../src/proxy.c:1320
+#: ../src/proxy.c:1347
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Erro de conexión no proxy %d"
 
 #. Forbidden
-#: ../src/proxy.c:1325
+#: ../src/proxy.c:1336
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Acceso denegado: o servidor proxy non permite túneles no porto %d."
 
-#: ../src/proxy.c:2325
-msgid "Invalid proxy settings"
-msgstr "Configuración inválida de proxy"
-
-#: ../src/proxy.c:2325
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-"O nome do servidor ou o porto especificados non son válidos para seu tipo de "
-"proxy."
-
 #: ../src/savedstatuses.c:514
 msgid "saved statuses"
 msgstr "estados gardados"
@@ -12537,12 +12644,12 @@
 msgid "I'm not here right now"
 msgstr "Non estou aquí agora"
 
-#: ../src/server.c:225
+#: ../src/server.c:227
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s agora se chama %s.\n"
 
-#: ../src/server.c:675
+#: ../src/server.c:681
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -12551,12 +12658,12 @@
 "%s invitou a %s á sala de chat %s:\n"
 "%s"
 
-#: ../src/server.c:680
+#: ../src/server.c:686
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s invitou a %s á sala de chat %s\n"
 
-#: ../src/server.c:684
+#: ../src/server.c:690
 msgid "Accept chat invitation?"
 msgstr "Aceptar a invitación de chat?"
 
@@ -12572,57 +12679,52 @@
 msgid "Mobile"
 msgstr "Móbil"
 
-#: ../src/status.c:623
-#, c-format
-msgid "%s signed on"
-msgstr "%s conectouse"
-
-#: ../src/status.c:627
-#, c-format
-msgid "%s came back"
-msgstr "%s volveu"
-
-#: ../src/status.c:634
-#, c-format
-msgid "%s signed off"
-msgstr "%s desconectouse"
-
-#: ../src/status.c:638
-#, c-format
-msgid "%s went away"
-msgstr "%s marchouse"
-
-#: ../src/status.c:1317
+#: ../src/status.c:622
+#, c-format
+msgid "%s changed status from %s to %s"
+msgstr "%s cambiou o estado de %s a %s"
+
+#: ../src/status.c:632
+#, c-format
+msgid "%s is now %s"
+msgstr "%s chámase agora %s"
+
+#: ../src/status.c:637
+#, fuzzy, c-format
+msgid "%s is no longer %s"
+msgstr "%s xa non está inactivo."
+
+#: ../src/status.c:1320
 #, c-format
 msgid "%s became idle"
 msgstr "%s agora está inactivo"
 
-#: ../src/status.c:1330
+#: ../src/status.c:1337
 #, c-format
 msgid "%s became unidle"
 msgstr "%s agora está activo"
 
-#: ../src/status.c:1392
+#: ../src/status.c:1403
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s agora está inactivo"
 
-#: ../src/status.c:1394
+#: ../src/status.c:1405
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s agora está activo"
 
-#: ../src/util.c:670
+#: ../src/util.c:679
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2460
+#: ../src/util.c:2455
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erro lendo %s"
 
-#: ../src/util.c:2461
+#: ../src/util.c:2456
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12631,158 +12733,57 @@
 "Atopouse un erro ao ler o seu %s. Non se cargou e o ficheiro antigo foi "
 "renomeado a %s~."
 
-#: ../src/util.c:2900
+#: ../src/util.c:2895
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../src/util.c:2903
+#: ../src/util.c:2898
 msgid "Unknown."
 msgstr "Descoñecido."
 
-#: ../src/util.c:2929
+#: ../src/util.c:2924
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../src/util.c:2941
+#: ../src/util.c:2936
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: ../src/util.c:2949
+#: ../src/util.c:2944
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../src/util.c:2955
+#: ../src/util.c:2950
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../src/util.c:2963
+#: ../src/util.c:2958
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../src/util.c:2969
+#: ../src/util.c:2964
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../src/util.c:3444
+#: ../src/util.c:3431
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Erro abrindo a conexión.\n"
 
-#~ msgid ""
-#~ "You missed %hu message from %s because the rate limit has been exceeded."
-#~ "You missed %hu messages from %s because the rate limit has been exceeded."
-#~ msgstr ""
-#~ "Perdeu %hu mensaxe de %s porque foi mandado demasiado rápido.Perdéronse %"
-#~ "hu mensaxes de %s porque foron mandadas demasiado rápido."
-
-#~ msgid ""
-#~ "You are about to remove the contact containing %s and %d other buddy from "
-#~ "your buddy list.  Do you want to continue?You are about to remove the "
-#~ "contact containing %s and %d other buddies from your buddy list.  Do you "
-#~ "want to continue?"
-#~ msgstr ""
-#~ "Está a punto de borrar o contacto que contén a %s e a outro %d amigo da "
-#~ "súa lista de amigos. Quere continuar?Está a punto de borrar o contacto "
-#~ "que contén a %s e a outros %d amigos da súa lista de amigos. Quere "
-#~ "continuar?"
-
-#, fuzzy
-#~ msgid "%s<b>General</b><br>%s"
-#~ msgstr "<b>Usuario externo</b><br>"
-
-#, fuzzy
-#~ msgid "Interested in"
-#~ msgstr "Inserir ligazón"
-
-#, fuzzy
-#~ msgid "Pets"
-#~ msgstr "Portos"
-
-#, fuzzy
-#~ msgid "Hometown"
-#~ msgstr "Servidor descoñecido"
-
-#, fuzzy
-#~ msgid "Places lived"
-#~ msgstr "Lugar pechado"
-
-#, fuzzy
-#~ msgid "%s<b>Social</b><br>%s"
-#~ msgstr "<b>Alcume:</b> %s<br>"
-
-#, fuzzy
-#~ msgid "Home phone"
-#~ msgstr "Páxina persoal"
-
-#, fuzzy
-#~ msgid "Home phone 2"
-#~ msgstr "Páxina persoal"
-
-#, fuzzy
-#~ msgid "Home address"
-#~ msgstr "Domicilio"
-
-#, fuzzy
-#~ msgid "Personal Mobile"
-#~ msgstr "Título"
-
-#, fuzzy
-#~ msgid "Home fax"
-#~ msgstr "Páxina persoal"
-
-#, fuzzy
-#~ msgid "Personal e-mail"
-#~ msgstr "Título"
-
-#, fuzzy
-#~ msgid "Personal IM"
-#~ msgstr "Título"
-
-#, fuzzy
-#~ msgid "Notes"
-#~ msgstr "Nota"
-
-#, fuzzy
-#~ msgid "<br><b>Personal</b><br>%s"
-#~ msgstr "<br><b>Tópico do canle:</b><br>%s"
-
-#, fuzzy
-#~ msgid "Job title"
-#~ msgstr "Traballo"
-
-#, fuzzy
-#~ msgid "Profession"
-#~ msgstr "Cargo"
-
-#, fuzzy
-#~ msgid "Work address"
-#~ msgstr "Enderezo do traballo"
-
-#, fuzzy
-#~ msgid "Start date"
-#~ msgstr "Última actualización"
-
-#, fuzzy
-#~ msgid "<br><b>Business</b><br>%s"
-#~ msgstr "<br><b>Tópico do canle:</b><br>%s"
-
-#, fuzzy
-#~ msgid "<hr><b>%s:</b> "
-#~ msgstr "<b>%s:</b> "