Mercurial > pidgin

diff po/gl.po @ 20236:60485bc8ff7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
applied changes from 98c6a98c20211da70f7a11c8b1e6aeb73621fbce through 71a27720e49364f4f24fc09309442fc3a2c17bc9
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 15:54:45 +0000
parents e5b23336e52f
children 15ad77c653ad
line wrap: on
line diff
--- a/po/gl.po	Fri Sep 28 15:53:46 2007 +0000
+++ b/po/gl.po	Fri Sep 28 15:54:45 2007 +0000
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2007.
+#: ../libpurple/certificate.c:543
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-20 03:22-0400\n"
+"POT-Creation-Date: 2007-09-25 01:15-0700\n"
 "PO-Revision-Date: 2007-08-20 13:55+0200\n"
 "Last-Translator: Frco. Javier Rial Rodríguez <fjrial@cesga.es>\n"
 "Language-Team: Galician <mancomun@mancomun.org>\n"
@@ -17,10 +18,8 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
-#: ../finch/finch.c:417
+#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
+#: ../finch/finch.c:418
 msgid "Finch"
 msgstr "Pidgin"
 
@@ -50,24 +49,26 @@
 "  -n, --nologin       non iniciar a sesión automaticamente\n"
 "  -v, --version       mostrar a versión actual e saír\n"
 
-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"%s atopou erros migrando as súas configuracións de %s a %s. Investigue "
-"e complete a migración manualmente. Informe deste erro en "
-"http://developer.pidgin.im"
-
-#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
-#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1464
+"%s atopou erros migrando as súas configuracións de %s a %s. Investigue e "
+"complete a migración manualmente. Informe deste erro en http://developer."
+"pidgin.im"
+
+#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
+#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1515
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
@@ -75,82 +76,86 @@
 msgid "Error"
 msgstr "Erro"
 
-#: ../finch/gntaccount.c:123
+#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "A conta non foi engadida"
 
-#: ../finch/gntaccount.c:124
+#: ../finch/gntaccount.c:125
 msgid "Screenname of an account must be non-empty."
 msgstr "O nome de usuario da conta non pode estar baleiro."
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "Notificacións de correo novo"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Lembrar o contrasinal"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
 msgstr "Non hai complementos de protocolo instalados."
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Probablemente olvidaches executar 'make install'.)"
 
-#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4023
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4322
 msgid "Modify Account"
 msgstr "Modificar a conta"
 
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "Nova conta"
 
-#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../finch/gntaccount.c:523
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../finch/gntaccount.c:529
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Screen name:"
 msgstr "Nome de usuario:"
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:420
-#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2212 ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1046 ../finch/gntstatus.c:144 ../finch/gntstatus.c:481
-#: ../finch/gntstatus.c:606 ../libpurple/account.c:984
-#: ../libpurple/account.c:1234 ../libpurple/account.c:1269
-#: ../libpurple/conversation.c:1173 ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:661
-#: ../libpurple/protocols/gg/gg.c:798 ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1826
-#: ../libpurple/protocols/jabber/buddy.c:1862
+#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
+#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
+#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntcertmgr.c:91
+#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
+#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
+#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
+#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/gg/gg.c:884
+#: ../libpurple/protocols/jabber/buddy.c:728
+#: ../libpurple/protocols/jabber/buddy.c:2416
+#: ../libpurple/protocols/jabber/buddy.c:2452
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6042
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/jabber/jabber.c:1017
+#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usernick.c:78
+#: ../libpurple/protocols/jabber/xdata.c:400
+#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/msn/msn.c:362
+#: ../libpurple/protocols/oscar/oscar.c:6092
+#: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
@@ -162,12 +167,12 @@
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3389
-#: ../libpurple/protocols/sametime/sametime.c:3475
-#: ../libpurple/protocols/sametime/sametime.c:3646
-#: ../libpurple/protocols/sametime/sametime.c:5398
-#: ../libpurple/protocols/sametime/sametime.c:5488
-#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc/buddy.c:1191
@@ -184,163 +189,166 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1016
-#: ../libpurple/protocols/yahoo/yahoo.c:3398
-#: ../libpurple/protocols/yahoo/yahoo.c:3409 ../pidgin/gtkaccount.c:1917
-#: ../pidgin/gtkaccount.c:2511 ../pidgin/gtkblist.c:5925
-#: ../pidgin/gtkdialogs.c:750 ../pidgin/gtkdialogs.c:888
-#: ../pidgin/gtkdialogs.c:980 ../pidgin/gtkdialogs.c:1000
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1046
-#: ../pidgin/gtkdialogs.c:1094 ../pidgin/gtkdialogs.c:1135
-#: ../pidgin/gtkdialogs.c:1191 ../pidgin/gtkdialogs.c:1230
-#: ../pidgin/gtkdialogs.c:1257 ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
-#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1573
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:6267
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:767
+#: ../pidgin/gtkdialogs.c:906 ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1018 ../pidgin/gtkdialogs.c:1042
+#: ../pidgin/gtkdialogs.c:1064 ../pidgin/gtkdialogs.c:1112
+#: ../pidgin/gtkdialogs.c:1153 ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1248 ../pidgin/gtkdialogs.c:1275
+#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
+#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
+#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
+#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1574
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1043 ../finch/gntstatus.c:484
-#: ../finch/gntstatus.c:594 ../libpurple/account.c:1268
-#: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
-#: ../pidgin/gtkrequest.c:276
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
+#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
+#: ../pidgin/gtkrequest.c:277
 msgid "Save"
 msgstr "Gardar"
 
-#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1909
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Está seguro de que quere borrar %s?"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "Borrar a conta"
 
 #. Delete button
-#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
-#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1916 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
+#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
+#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2118 ../finch/gntui.c:81
-#: ../pidgin/gtkaccount.c:2334 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:675
 msgid "You can enable/disable accounts from the following list."
 msgstr "Pode activar/desactivar contas da seguinte lista."
 
 #. Add button
-#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
-#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2305
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:383 ../finch/gntpounce.c:713
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2510
-#: ../pidgin/gtkblist.c:5924 ../pidgin/gtkconv.c:1654
-#: ../pidgin/gtkrequest.c:274
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:6266 ../pidgin/gtkconv.c:1712
+#: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Engadir"
 
 #. Modify button
-#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2457
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s fixo a %s un contacto seu %s%s"
 
-#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2509
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Quere engadir o contacto á súa lista?"
 
-#: ../finch/gntaccount.c:933 ../pidgin/gtkaccount.c:2567
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s quere engadir a %s á súa lista de contactos%s%s"
 
-#: ../finch/gntaccount.c:958 ../finch/gntaccount.c:961
-#: ../finch/gntaccount.c:988 ../pidgin/gtkaccount.c:2590
-#: ../pidgin/gtkaccount.c:2596
+#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Autorizar o contacto?"
 
-#: ../finch/gntaccount.c:965 ../finch/gntaccount.c:992
-#: ../pidgin/gtkaccount.c:2591 ../pidgin/gtkaccount.c:2597
+#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../finch/gntaccount.c:966 ../finch/gntaccount.c:993
-#: ../pidgin/gtkaccount.c:2592 ../pidgin/gtkaccount.c:2598
+#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Rexeitar"
 
-#: ../finch/gntblist.c:288
+#: ../finch/gntblist.c:289
 msgid "You must provide a screename for the buddy."
 msgstr "Debe especificarlle un nome de usuario ao contacto."
 
-#: ../finch/gntblist.c:290
+#: ../finch/gntblist.c:291
 msgid "You must provide a group."
 msgstr "Debe especificar un grupo."
 
-#: ../finch/gntblist.c:292
+#: ../finch/gntblist.c:293
 msgid "You must select an account."
 msgstr "Debe seleccionar unha conta."
 
-#: ../finch/gntblist.c:294
+#: ../finch/gntblist.c:295
 msgid "The selected account is not online."
 msgstr "A conta seleccionada non está conectada."
 
-#: ../finch/gntblist.c:299
+#: ../finch/gntblist.c:300
 msgid "Error adding buddy"
 msgstr "Erro ao engadir un contacto"
 
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2858
-#: ../pidgin/gtkaccount.c:1990 ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2884
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "Nome de usuario"
 
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
+#: ../libpurple/protocols/msn/msn.c:1507
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:999
-#: ../pidgin/gtkdialogs.c:1023 ../pidgin/gtkdialogs.c:1045
-#: ../pidgin/gtkrequest.c:277
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1041 ../pidgin/gtkdialogs.c:1063
+#: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
 msgid "Group"
 msgstr "Grupo"
 
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
+#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2986 ../pidgin/gtknotify.c:488
-#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../pidgin/gtkblist.c:3206 ../pidgin/gtknotify.c:503
+#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Conta"
 
-#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
+#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -349,176 +357,183 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3243 ../pidgin/gtkblist.c:5431
+#: ../libpurple/protocols/yahoo/yahoo.c:3342 ../pidgin/gtkblist.c:5772
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Engadir contacto"
 
-#: ../finch/gntblist.c:340
+#: ../finch/gntblist.c:341
 msgid "Please enter buddy information."
 msgstr "Introduza a información do contacto."
 
-#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "Conversas"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:617
+#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
+#: ../libpurple/protocols/jabber/jabber.c:927
+#: ../libpurple/protocols/msn/msn.c:1694 ../libpurple/protocols/msn/msn.c:1759
+#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
+#: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nome"
 
-#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
+#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
 msgid "Auto-join"
 msgstr "Conectar automaticamente"
 
-#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5810
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6154
 msgid "Add Chat"
 msgstr "Engadir conversa"
 
-#: ../finch/gntblist.c:419
+#: ../finch/gntblist.c:420
 msgid "You can edit more information from the context menu later."
 msgstr "Pode editar máis información desde o menu de contexto máis tarde."
 
-#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
 msgid "Error adding group"
 msgstr "Erro ao engadir o grupo"
 
-#: ../finch/gntblist.c:433
+#: ../finch/gntblist.c:434
 msgid "You must give a name for the group to add."
 msgstr "Debe proporcionarlle un nome ao grupo que quere engadir."
 
-#: ../finch/gntblist.c:446
+#: ../finch/gntblist.c:447
 msgid "A group with the name already exists."
 msgstr "Xa existe un grupo con ese nome."
 
-#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5921
+#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6263
 msgid "Add Group"
 msgstr "Engadir un grupo"
 
-#: ../finch/gntblist.c:453
+#: ../finch/gntblist.c:454
 msgid "Enter the name of the group"
 msgstr "Introduza o nome do grupo"
 
-#: ../finch/gntblist.c:801
+#: ../finch/gntblist.c:802
 msgid "Edit Chat"
 msgstr "Editar a conversa"
 
-#: ../finch/gntblist.c:801
+#: ../finch/gntblist.c:802
 msgid "Please Update the necessary fields."
 msgstr "Actualice os campos necesarios."
 
-#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
+#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Editar"
 
-#: ../finch/gntblist.c:827
+#: ../finch/gntblist.c:828
 msgid "Edit Settings"
 msgstr "Editar a configuración"
 
-#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Information"
 msgstr "Información"
 
-#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Retrieving..."
 msgstr "Recuperando..."
 
-#: ../finch/gntblist.c:903 ../finch/gntconv.c:431
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:534
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Obter información"
 
-#: ../finch/gntblist.c:907
+#: ../finch/gntblist.c:908
 msgid "Add Buddy Pounce"
 msgstr "Engadir aviso de contacto"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:914 ../finch/gntconv.c:443
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1602
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1660
 msgid "Send File"
 msgstr "Enviar o ficheiro"
 
-#: ../finch/gntblist.c:918
+#: ../finch/gntblist.c:919
 msgid "View Log"
 msgstr "Ver o rexistro"
 
-#: ../finch/gntblist.c:999
+#: ../finch/gntblist.c:1000
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Introduza o novo nome para %s"
 
-#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
+#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../finch/gntblist.c:1001
+#: ../finch/gntblist.c:1002
 msgid "Set Alias"
 msgstr "Establecer alias"
 
-#: ../finch/gntblist.c:1002
+#: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
 msgstr "Introduza unha cadea baleira para restablecer o nome."
 
-#: ../finch/gntblist.c:1078
+#: ../finch/gntblist.c:1079
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "Ao eliminar este contacto, eliminará tameń todos os contactos que contén"
-
-#: ../finch/gntblist.c:1086
+msgstr ""
+"Ao eliminar este contacto, eliminará tameń todos os contactos que contén"
+
+#: ../finch/gntblist.c:1087
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Ao eliminar este grupo, eliminará tamén todos os contactos do grupo"
 
-#: ../finch/gntblist.c:1091
+#: ../finch/gntblist.c:1092
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Está seguro de que quere borrar %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1094
+#: ../finch/gntblist.c:1095
 msgid "Confirm Remove"
 msgstr "Confirmar a eliminación"
 
-#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1651 ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtkstatusbox.c:263
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
+#: ../pidgin/gtkconv.c:1709 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Eliminar"
 
 #. Buddy List
-#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2297 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4267
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2355 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4566
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Lista de contactos"
 
-#: ../finch/gntblist.c:1256
+#: ../finch/gntblist.c:1257
 msgid "Place tagged"
 msgstr "Lugares etiquetados"
 
-#: ../finch/gntblist.c:1261
+#: ../finch/gntblist.c:1262
 msgid "Toggle Tag"
 msgstr "Cambiar etiqueta"
 
 #. General
-#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
-#: ../libpurple/protocols/gg/gg.c:2202
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1627
-#: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:2207
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1247
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2399
+#: ../libpurple/protocols/jabber/jabber.c:937
+#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1590
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1636
+#: ../libpurple/protocols/msn/msn.c:1515 ../libpurple/protocols/msn/msn.c:1697
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -528,29 +543,29 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3230
 msgid "Nickname"
 msgstr "Alias"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:333
-#: ../libpurple/protocols/jabber/buddy.c:647
-#: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:2997
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3038
-#: ../pidgin/gtkblist.c:3443 ../pidgin/gtkprefs.c:1920
+#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2908
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258
+#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927
 msgid "Idle"
 msgstr "Inactivo"
 
-#: ../finch/gntblist.c:1333
+#: ../finch/gntblist.c:1334
 msgid "On Mobile"
 msgstr "No móbil"
 
-#: ../finch/gntblist.c:1414
+#: ../finch/gntblist.c:1415
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -559,12 +574,12 @@
 "Conectado: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:1423
+#: ../finch/gntblist.c:1424
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Conta: %s (%s)"
 
-#: ../finch/gntblist.c:1435
+#: ../finch/gntblist.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -573,47 +588,53 @@
 "\n"
 "Visto por última vez: hai %s"
 
-#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "Novo..."
 
-#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "Gardado..."
 
-#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:86
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
+#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:255 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../finch/gntblist.c:2193 ../pidgin/gtkdialogs.c:731
-#: ../pidgin/gtkdialogs.c:869 ../pidgin/gtkdialogs.c:950
+#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:748
+#: ../pidgin/gtkdialogs.c:887 ../pidgin/gtkdialogs.c:968
 msgid "_Name"
 msgstr "_Nome"
 
-#: ../finch/gntblist.c:2198 ../pidgin/gtkdialogs.c:736
-#: ../pidgin/gtkdialogs.c:874 ../pidgin/gtkdialogs.c:955
+#: ../finch/gntblist.c:2210 ../pidgin/gtkdialogs.c:753
+#: ../pidgin/gtkdialogs.c:892 ../pidgin/gtkdialogs.c:973
 msgid "_Account"
 msgstr "_Conta"
 
-#: ../finch/gntblist.c:2206 ../pidgin/gtkdialogs.c:744
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:761
 msgid "New Instant Message"
 msgstr "Mensaxe instantánea nova"
 
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:746
-msgid "Please enter the screen name or alias of the person you would like to IM."
-msgstr "Introduza o nome de usuario ou o alias da persoa con quen quere comunicarse."
-
-#: ../finch/gntblist.c:2211 ../finch/gntnotify.c:79 ../libpurple/account.c:983
-#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
-#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
-#: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6041
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:763
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+"Introduza o nome de usuario ou o alias da persoa con quen quere comunicarse."
+
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
+#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
+#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
+#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
+#: ../libpurple/protocols/jabber/jabber.c:1736
+#: ../libpurple/protocols/jabber/xdata.c:399
+#: ../libpurple/protocols/msn/msn.c:289 ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:323 ../libpurple/protocols/msn/msn.c:340
+#: ../libpurple/protocols/oscar/oscar.c:6091
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -630,54 +651,173 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1015
-#: ../libpurple/protocols/yahoo/yahoo.c:3397
-#: ../libpurple/protocols/yahoo/yahoo.c:3408 ../pidgin/gtkblist.c:4022
-#: ../pidgin/gtkdialogs.c:749 ../pidgin/gtkdialogs.c:887
-#: ../pidgin/gtkdialogs.c:979 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
+#: ../libpurple/protocols/yahoo/yahoo.c:3507 ../pidgin/gtkblist.c:4321
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:766
+#: ../pidgin/gtkdialogs.c:905 ../pidgin/gtkdialogs.c:997
+#: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "Aceptar"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2231 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
+#: ../finch/gntblist.c:2261 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
 msgid "Options"
 msgstr "Opcións"
 
-#: ../finch/gntblist.c:2237
+#: ../finch/gntblist.c:2267
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2241
-msgid "Show empty groups"
+#: ../finch/gntblist.c:2271
+msgid "Show"
+msgstr ""
+
+#: ../finch/gntblist.c:2276
+#, fuzzy
+msgid "Empty groups"
 msgstr "Mostrar grupos baleiros"
 
-#: ../finch/gntblist.c:2247
-msgid "Show offline buddies"
+#: ../finch/gntblist.c:2282
+#, fuzzy
+msgid "Offline buddies"
 msgstr "Mostrar contactos desconectados"
 
-#: ../finch/gntblist.c:2253
-msgid "Sort by status"
-msgstr "Ordenar por estado"
-
-#: ../finch/gntblist.c:2257
-msgid "Sort alphabetically"
-msgstr "Ordenar alfabeticamente"
-
-#: ../finch/gntblist.c:2261
-msgid "Sort by log size"
-msgstr "Ordenar por tamaño de rexistro"
-
-#: ../finch/gntconn.c:110
+#: ../finch/gntblist.c:2288
+#, fuzzy
+msgid "Sort"
+msgstr "Porto"
+
+#: ../finch/gntblist.c:2293
+#, fuzzy
+msgid "By Status"
+msgstr "Por estado"
+
+#: ../finch/gntblist.c:2297 ../pidgin/gtkblist.c:4106
+msgid "Alphabetically"
+msgstr "Alfabeticamente"
+
+#: ../finch/gntblist.c:2301
+#, fuzzy
+msgid "By Log Size"
+msgstr "Por tamaño de rexistro"
+
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+#, fuzzy
+msgid "Certificate Import"
+msgstr "Conectar co porto"
+
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgid "Specify a hostname"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+msgid "Type the host name this certificate is for."
+msgstr ""
+
+#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+msgid "Certificate Import Error"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
+msgid "X.509 certificate import failed"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
+#, fuzzy
+msgid "Select a PEM certificate"
+msgstr "Seleccionar un ficheiro"
+
+#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+msgid "Certificate Export Error"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
+msgid "X.509 certificate export failed"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
+msgid "PEM X.509 Certificate Export"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:188
+#, fuzzy, c-format
+msgid "Certificate for %s"
+msgstr "Estado para %s"
+
+#: ../finch/gntcertmgr.c:195
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:198
+msgid "SSL Host Certificate"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+msgid "Confirm certificate delete"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+msgid "Certificate Manager"
+msgstr ""
+
+#. Creating the user splits
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr "Nome do servidor"
+
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1688
+#: ../pidgin/gtkdebug.c:835
+msgid "Info"
+msgstr "Info"
+
+#. Close button
+#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:406
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../pidgin/gtkrequest.c:273
+msgid "Close"
+msgstr "Pechar"
+
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:113
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s desconectado."
 
-#: ../finch/gntconn.c:114
+#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
@@ -687,44 +827,55 @@
 msgstr ""
 "%s\n"
 "\n"
-"Pidgin non tentará reconectar a conta ata que vostede corrixa o erro "
-"e a volva activar."
-
-#: ../finch/gntconv.c:118
+"Pidgin non tentará reconectar a conta ata que vostede corrixa o erro e a "
+"volva activar."
+
+#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4323
+msgid "Re-enable Account"
+msgstr "Reactivar conta"
+
+#: ../finch/gntconv.c:139
 msgid "No such command."
 msgstr "Non existe o comando."
 
-#: ../finch/gntconv.c:122 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:530
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "Erro de sintaxe: O número de argumentos para ese comando non é correcto."
-
-#: ../finch/gntconv.c:127 ../pidgin/gtkconv.c:501
+msgstr ""
+"Erro de sintaxe: O número de argumentos para ese comando non é correcto."
+
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:536
 msgid "Your command failed for an unknown reason."
 msgstr "O seu comando fallou por motivos descoñecidos."
 
-#: ../finch/gntconv.c:132 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:543
 msgid "That command only works in chats, not IMs."
 msgstr "Ese comando só funciona en conversas, non en MI."
 
-#: ../finch/gntconv.c:135 ../pidgin/gtkconv.c:511
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:546
 msgid "That command only works in IMs, not chats."
 msgstr "Ese comando só funciona en MI, non en conversas."
 
-#: ../finch/gntconv.c:139 ../pidgin/gtkconv.c:516
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:551
 msgid "That command doesn't work on this protocol."
 msgstr "Ese comando non funciona neste protocolo."
 
-#: ../finch/gntconv.c:225
+#: ../finch/gntconv.c:168
+#, fuzzy
+msgid "Message was not sent, because you are not signed on."
+msgstr ""
+"Non se puido enviar a mensaxe porque estamos a enviar demasiado rápido:"
+
+#: ../finch/gntconv.c:251
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:248
+#: ../finch/gntconv.c:274
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:253 ../finch/gntconv.c:672
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
 #, c-format
 msgid ""
 "\n"
@@ -733,48 +884,71 @@
 "\n"
 "%s está a escribir..."
 
-#: ../finch/gntconv.c:272
+#: ../finch/gntconv.c:298
 msgid "You have left this chat."
 msgstr "Abandonou esta conversa."
 
-#: ../finch/gntconv.c:366
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1415
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"Iniciuose o rexistro. A partir de agora rexistraranse todas as mensaxes "
+"desta conversa."
+
+#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1423
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Detívose o rexistro. Non se rexistrarán mensaxes desta conversa de agora en "
+"adiante."
+
+#: ../finch/gntconv.c:469
 msgid "Send To"
 msgstr "Enviar a"
 
-#: ../finch/gntconv.c:410
+#: ../finch/gntconv.c:513
 msgid "Conversation"
 msgstr "Conversa"
 
-#: ../finch/gntconv.c:416
+#: ../finch/gntconv.c:519
 msgid "Clear Scrollback"
 msgstr "Limpar o historial da conversa"
 
-#: ../finch/gntconv.c:420 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Mostrar marcas de tempo"
 
-#: ../finch/gntconv.c:436
+#: ../finch/gntconv.c:539
 msgid "Add Buddy Pounce..."
 msgstr "Engadir aviso de contacto..."
 
-#: ../finch/gntconv.c:638
+#: ../finch/gntconv.c:554
+#, fuzzy
+msgid "Enable Logging"
+msgstr "/Opcións/Activar rexistro"
+
+#: ../finch/gntconv.c:560
+#, fuzzy
+msgid "Enable Sounds"
+msgstr "Activar os sons:"
+
+#: ../finch/gntconv.c:766
 msgid "<AUTO-REPLY> "
 msgstr "<RESPOSTA AUTOMÁTICA>"
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:760
+#: ../finch/gntconv.c:889
 msgid "List of users:\n"
 msgstr "Lista de usuarios:\n"
 
-#: ../finch/gntconv.c:905 ../pidgin/gtkconv.c:338
+#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:370
 msgid "Supported debug options are:  version"
 msgstr "As opcións de depuración soportadas son:  version"
 
-#: ../finch/gntconv.c:940 ../pidgin/gtkconv.c:387
+#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:422
 msgid "No such command (in this context)."
 msgstr "Non existe o comando (neste contexto)."
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:390
+#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:425
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -782,21 +956,21 @@
 "Usar \"/help &lt;comando&gt;\" para obter axuda dun comando específico.\n"
 "Os seguintes comandos están dispoñibles neste contexto:\n"
 
-#: ../finch/gntconv.c:1001 ../pidgin/gtkconv.c:7350
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7642
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
-"say &lt;mensaxe&gt;:  Envía unha mensaxe como se non se estivese a utilizar"
-"un comando."
-
-#: ../finch/gntconv.c:1004 ../pidgin/gtkconv.c:7353
+"say &lt;mensaxe&gt;:  Envía unha mensaxe como se non se estivese a "
+"utilizarun comando."
+
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7645
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;acción&gt;:  Envía unha acción estilo IRC a un contacto ou a unha "
 "conversa."
 
-#: ../finch/gntconv.c:1007 ../pidgin/gtkconv.c:7356
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7648
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -804,43 +978,43 @@
 "debug&lt;opción&gt;:  Envía información de depuración sobre a conversa "
 "actual."
 
-#: ../finch/gntconv.c:1010 ../pidgin/gtkconv.c:7359
+#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7651
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Limpa o historial da conversa."
 
-#: ../finch/gntconv.c:1013 ../pidgin/gtkconv.c:7365
+#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7657
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Axuda sobre un comando específico."
 
-#: ../finch/gntconv.c:1016
+#: ../finch/gntconv.c:1163
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Amosa a lista de usuarios na conversa"
 
-#: ../finch/gntconv.c:1021
+#: ../finch/gntconv.c:1168
 msgid "plugins: Show the plugins window."
 msgstr "complementos: Mostra a ventá de complementos."
 
-#: ../finch/gntconv.c:1024
+#: ../finch/gntconv.c:1171
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostra a lista de contactos."
 
-#: ../finch/gntconv.c:1027
+#: ../finch/gntconv.c:1174
 msgid "accounts: Show the accounts window."
 msgstr "contas: Mostra a ventá de contas."
 
-#: ../finch/gntconv.c:1030
+#: ../finch/gntconv.c:1177
 msgid "debugwin: Show the debug window."
 msgstr "depuración: Mostra a ventá de depuración."
 
-#: ../finch/gntconv.c:1033
+#: ../finch/gntconv.c:1180
 msgid "prefs: Show the preference window."
 msgstr "preferencias: Mostra a ventá de preferencias."
 
-#: ../finch/gntconv.c:1036
+#: ../finch/gntconv.c:1183
 msgid "statuses: Show the savedstatuses window."
 msgstr "estados: Mostrar a ventá de estados gardardos."
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:84 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "Ventá de depuración"
 
@@ -848,194 +1022,186 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
+#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "Limpar"
 
-#: ../finch/gntdebug.c:261
+#: ../finch/gntdebug.c:262
 msgid "Filter: "
 msgstr "Filtro: "
 
-#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
+#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
+#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Transferencia de ficheiros - %d%% de %d ficheiros"
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:85
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
+#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
+#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
 msgid "File Transfers"
 msgstr "Transferencia de ficheiros"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:201
 msgid "Speed"
 msgstr "Velocidade"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Restante"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:337
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
-#: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2670
-#: ../libpurple/protocols/oscar/oscar.c:3748
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4151
-#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:3082
-#: ../pidgin/gtkblist.c:3095 ../pidgin/gtkblist.c:3097
-#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
+#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/jabber/buddy.c:778
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/msn/msn.c:596 ../libpurple/protocols/msn/msn.c:603
+#: ../libpurple/protocols/novell/novell.c:2840
+#: ../libpurple/protocols/oscar/oscar.c:821
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:2696
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3247 ../pidgin/gtkblist.c:3302
+#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "Estado"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:211
 msgid "Close this window when all transfers finish"
 msgstr "Pechar está ventá cando rematen todas as transferencias"
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:218
 msgid "Clear finished transfers"
 msgstr "Limpar transferencias rematadas"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:232
 msgid "Stop"
 msgstr "Parar"
 
-#. Close button
-#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
-#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2484
-#: ../pidgin/gtkrequest.c:272
-msgid "Close"
-msgstr "Pechar"
-
-#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr "Agardando o comezo da transferencia"
 
-#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr "Fallou"
 
-#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1115
+#: ../finch/gntft.c:431
+#, c-format
+msgid "The file was saved as %s."
+msgstr ""
+
+#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
+#: ../pidgin/gtkft.c:1116
 msgid "Finished"
 msgstr "Rematado"
 
-#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:386
 msgid "Transferring"
 msgstr "Transferindo"
 
-#: ../finch/gntnotify.c:164
+#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "Correos electrónicos"
 
-#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
 msgid "You have mail!"
 msgstr "Ten un correo!"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:510
 msgid "Sender"
 msgstr "Remitente"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:517
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../finch/gntnotify.c:200
+#: ../finch/gntnotify.c:201
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) ten %d mensaxe nova."
 msgstr[1] "%s (%s) ten %d mensaxe nova."
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
+#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr "Correo novo"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:923
+#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
 msgid "Info for %s"
 msgstr "Información sobre %s"
 
-#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:924
+#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:941
 msgid "Buddy Information"
 msgstr "Información do contacto"
 
-#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:380 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1630 ../pidgin/gtkdebug.c:834
-msgid "Info"
-msgstr "Info"
-
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1591
+#: ../finch/gntnotify.c:389 ../pidgin/gtkconv.c:1649
 msgid "IM"
 msgstr "MI"
 
-#: ../finch/gntnotify.c:388
+#: ../finch/gntnotify.c:392
 msgid "Join"
 msgstr "Unirse"
 
-#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3474
+#: ../finch/gntnotify.c:395 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Convidar"
 
-#: ../finch/gntnotify.c:394
+#: ../finch/gntnotify.c:398
 msgid "(none)"
 msgstr "(ningún)"
 
-#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
+#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
 msgid "ERROR"
 msgstr "ERRO"
 
-#: ../finch/gntplugin.c:74
+#: ../finch/gntplugin.c:75
 msgid "loading plugin failed"
 msgstr "Fallou ao cargar o complemento"
 
-#: ../finch/gntplugin.c:83
+#: ../finch/gntplugin.c:84
 msgid "unloading plugin failed"
 msgstr "Fallou ao desactivar o complemento"
 
-#: ../finch/gntplugin.c:128
+#: ../finch/gntplugin.c:129
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1052,19 +1218,19 @@
 "Sitio web: %s\n"
 "Nome de ficheiro: %s\n"
 
-#: ../finch/gntplugin.c:186
+#: ../finch/gntplugin.c:187
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "O complemento precisa ser cargado antes de poder configuralo."
 
-#: ../finch/gntplugin.c:234
+#: ../finch/gntplugin.c:235
 msgid "No configuration options for this plugin."
 msgstr "Non existen opcións de configuración para este complemento."
 
-#: ../finch/gntplugin.c:259
+#: ../finch/gntplugin.c:260
 msgid "You can (un)load plugins from the following list."
 msgstr "Pode (des)cargar complementos da seguinte lista."
 
-#: ../finch/gntplugin.c:314
+#: ../finch/gntplugin.c:315
 msgid "Configure Plugin"
 msgstr "Configurar o complemento"
 
@@ -1073,350 +1239,363 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:88 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2062
+#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2069
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../finch/gntpounce.c:182 ../pidgin/gtkpounce.c:255
+#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Indique o contacto sobre o que avisar."
 
-#. Create the window.
-#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "New Buddy Pounce"
 msgstr "Novo aviso de contacto"
 
-#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "Edit Buddy Pounce"
 msgstr "Editar aviso de contacto"
 
-#: ../finch/gntpounce.c:332
+#: ../finch/gntpounce.c:333
 msgid "Pounce Who"
 msgstr "Quen avisa"
 
 #. Account:
-#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
+#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Conta:"
 
-#: ../finch/gntpounce.c:357
+#: ../finch/gntpounce.c:358
 msgid "Buddy name:"
 msgstr "Nome do contacto:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
+#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
 msgid "Pounce When Buddy..."
 msgstr "Avisar cando un contacto..."
 
-#: ../finch/gntpounce.c:375
-msgid "Signs on"
-msgstr "Está conectado"
-
 #: ../finch/gntpounce.c:376
-msgid "Signs off"
-msgstr "Está desconectado"
+msgid "Signs on"
+msgstr "Está conectado"
 
 #: ../finch/gntpounce.c:377
+msgid "Signs off"
+msgstr "Está desconectado"
+
+#: ../finch/gntpounce.c:378
 msgid "Goes away"
 msgstr "Está ausente"
 
-#: ../finch/gntpounce.c:378
-msgid "Returns from away"
-msgstr "Deixa de estar ausente"
-
 #: ../finch/gntpounce.c:379
-msgid "Becomes idle"
-msgstr "Está inactivo"
+msgid "Returns from away"
+msgstr "Deixa de estar ausente"
 
 #: ../finch/gntpounce.c:380
+msgid "Becomes idle"
+msgstr "Está inactivo"
+
+#: ../finch/gntpounce.c:381
 msgid "Is no longer idle"
 msgstr "Deixa de estar inactivo"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:382
 msgid "Starts typing"
 msgstr "Comeza a escribir"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:383
 msgid "Pauses while typing"
 msgstr "Fai unha pausa ao escribir"
 
-#: ../finch/gntpounce.c:383
+#: ../finch/gntpounce.c:384
 msgid "Stops typing"
 msgstr "Deixa de escribir"
 
-#: ../finch/gntpounce.c:384
+#: ../finch/gntpounce.c:385
 msgid "Sends a message"
 msgstr "Envía unha mensaxe"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
+#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
 msgid "Action"
 msgstr "Acción"
 
-#: ../finch/gntpounce.c:415
+#: ../finch/gntpounce.c:416
 msgid "Open an IM window"
 msgstr "Abre unha ventá de MI"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:417
 msgid "Pop up a notification"
 msgstr "Notificación cunha ventá emerxente"
 
-#: ../finch/gntpounce.c:417
-msgid "Send a message"
-msgstr "Enviar unha mensaxe"
-
 #: ../finch/gntpounce.c:418
+msgid "Send a message"
+msgstr "Enviar unha mensaxe"
+
+#: ../finch/gntpounce.c:419
 msgid "Execute a command"
 msgstr "Executar un comando"
 
-#: ../finch/gntpounce.c:419
+#: ../finch/gntpounce.c:420
 msgid "Play a sound"
 msgstr "Reproducir un son"
 
-#: ../finch/gntpounce.c:447
+#: ../finch/gntpounce.c:448
 msgid "Pounce only when my status is not available"
 msgstr "Só avisar cando o meu estado é non dispoñible"
 
-#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
+#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
 msgid "Recurring"
 msgstr "Recorrente"
 
-#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:618
+#, fuzzy
+msgid "Cannot create pounce"
+msgstr "Non se pode cambiar o alias"
+
+#: ../finch/gntpounce.c:619
+#, fuzzy
+msgid "You do not have any accounts."
+msgstr "Debe seleccionar unha conta."
+
+#: ../finch/gntpounce.c:620
+msgid "You must create an account first before you can create a pounce."
+msgstr ""
+
+#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Está seguro de que quere borrar o aviso sobre %s para %s?"
 
-#: ../finch/gntpounce.c:685 ../finch/gntui.c:83 ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
 msgid "Buddy Pounces"
 msgstr "Avisos de contacto"
 
-#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s comezou a escribirlle (%s)"
 
-#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s fixo unha pausa ao escribirlle (%s)"
 
-#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s conectouse (%s)"
 
-#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s volveu da súa inactividade (%s)"
 
-#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s deixou de estar ausente (%s)"
 
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s deixou de escribirlle (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s desconectouse (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s está inactivo (%s)"
 
-#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s marchou. (%s)"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s envioulle unha mensaxe. (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso descoñecido. Por favor, informe disto!"
 
-#: ../finch/gntprefs.c:91
+#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "Baseado no uso do teclado"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1925
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
 msgid "From last sent message"
 msgstr "Desde a última mensaxe enviada"
 
-#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1924 ../pidgin/gtkprefs.c:1938
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
+#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nunca"
 
-#: ../finch/gntprefs.c:183
+#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "Mostrar tempos de ausencia"
 
-#: ../finch/gntprefs.c:184
+#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "Mostrar contactos desconectados"
 
-#: ../finch/gntprefs.c:191
+#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "Notificarlle aos contactos cando lles está a escribir"
 
-#: ../finch/gntprefs.c:197
+#: ../finch/gntprefs.c:198
 msgid "Log format"
 msgstr "Formato de rexistro"
 
-#: ../finch/gntprefs.c:198
-msgid "Log IMs"
-msgstr "Rexistrar MI"
-
 #: ../finch/gntprefs.c:199
-msgid "Log chats"
-msgstr "Rexistrar as conversas"
+msgid "Log IMs"
+msgstr "Rexistrar MI"
 
 #: ../finch/gntprefs.c:200
+msgid "Log chats"
+msgstr "Rexistrar as conversas"
+
+#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Rexistrar os eventos de cambios de estado"
 
-#: ../finch/gntprefs.c:206
+#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
 msgstr "Mostrar o tempo de inactividade"
 
-#: ../finch/gntprefs.c:207
+#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
 msgstr "Cambiar o estado cando estea inactivo"
 
-#: ../finch/gntprefs.c:208
+#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr "Minutos antes de cambiar o estado"
 
-#: ../finch/gntprefs.c:209
+#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr "Cambiar o estado a"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2028
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversas"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1464 ../pidgin/gtkprefs.c:2039
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046
 msgid "Logging"
 msgstr "Rexistro"
 
-#: ../finch/gntrequest.c:563
+#: ../finch/gntrequest.c:583
 msgid "Not implemented yet."
 msgstr "Funcionalidade non implementada."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
+#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Gardar ficheiro..."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
+#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Abrir ficheiro..."
 
-#: ../finch/gntsound.c:94 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
 msgid "Buddy logs in"
 msgstr "Conéctase un contacto"
 
-#: ../finch/gntsound.c:95 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
 msgid "Buddy logs out"
 msgstr "Desconéctase un contacto"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
 msgid "Message received"
 msgstr "Mensaxe recibida"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message received begins conversation"
 msgstr "Mensaxe recibida que comeza unha conversa"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Message sent"
 msgstr "Mensaxe enviada"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person enters chat"
 msgstr "Alguén entra na conversa"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "Person leaves chat"
 msgstr "Alguén deixa a conversa"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "You talk in chat"
 msgstr "Participa na conversa"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
 msgid "Others talk in chat"
 msgstr "Conversan outros"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:74
+#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
 msgid "Someone says your screen name in chat"
 msgstr "Alguén menciona o seu nome na conversa"
 
-#: ../finch/gntsound.c:357 ../pidgin/gtksound.c:310
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
 msgid "GStreamer Failure"
 msgstr "Fallo de GStreamer"
 
-#: ../finch/gntsound.c:358 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
 msgid "GStreamer failed to initialize."
 msgstr "O GStreamer errou ao iniciar."
 
-#: ../finch/gntsound.c:706 ../finch/gntsound.c:792 ../pidgin/gtkprefs.c:1584
-#: ../pidgin/gtkprefs.c:1673 ../pidgin/gtkprefs.c:1867
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589
+#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874
 msgid "(default)"
 msgstr "(por defecto)"
 
-#: ../finch/gntsound.c:719
+#: ../finch/gntsound.c:729
 msgid "Select Sound File ..."
 msgstr "Elixir ficheiro de son ..."
 
-#: ../finch/gntsound.c:894
+#: ../finch/gntsound.c:904
 msgid "Sound Preferences"
 msgstr "Preferencias de son"
 
-#: ../finch/gntsound.c:905
+#: ../finch/gntsound.c:915
 msgid "Profiles"
 msgstr "Perfís"
 
-#: ../finch/gntsound.c:944 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../finch/gntsound.c:947
+#: ../finch/gntsound.c:957
 msgid "Console Beep"
 msgstr "Bip da consola"
 
-#: ../finch/gntsound.c:948 ../pidgin/gtkprefs.c:1716
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
 msgid "Command"
 msgstr "Comando"
 
-#: ../finch/gntsound.c:949
+#: ../finch/gntsound.c:959
 msgid "No Sound"
 msgstr "Sen son"
 
-#: ../finch/gntsound.c:951 ../pidgin/gtkprefs.c:1707
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
 msgid "Sound Method"
 msgstr "Método para reproducir sons"
 
-#: ../finch/gntsound.c:956
+#: ../finch/gntsound.c:966
 msgid "Method: "
 msgstr "Método:"
 
-#: ../finch/gntsound.c:963
+#: ../finch/gntsound.c:973
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1426,190 +1605,226 @@
 "(%s para nome de ficheiro)"
 
 #. Sound options
-#: ../finch/gntsound.c:971 ../pidgin/gtkprefs.c:1751
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
 msgid "Sound Options"
 msgstr "Opcións de son"
 
-#: ../finch/gntsound.c:972
+#: ../finch/gntsound.c:982
 msgid "Sounds when conversation has focus"
 msgstr "Sons cando a conversa ten o _foco"
 
-#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1758 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
+#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Sempre"
 
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763
 msgid "Only when available"
 msgstr "Só cando estea dispoñible"
 
-#: ../finch/gntsound.c:982 ../pidgin/gtkprefs.c:1757
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
 msgid "Only when not available"
 msgstr "Só cando estea non dispoñible"
 
-#: ../finch/gntsound.c:989
+#: ../finch/gntsound.c:999
 msgid "Volume(0-100):"
 msgstr "Volume(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1006 ../pidgin/gtkprefs.c:1793
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
 msgid "Sound Events"
 msgstr "Eventos de son"
 
-#: ../finch/gntsound.c:1008 ../pidgin/gtkprefs.c:1852
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
 msgid "Event"
 msgstr "Evento"
 
-#: ../finch/gntsound.c:1008
+#: ../finch/gntsound.c:1020
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../finch/gntsound.c:1027 ../pidgin/gtkprefs.c:1871
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
 msgid "Test"
 msgstr "Probar"
 
-#: ../finch/gntsound.c:1030 ../pidgin/gtkprefs.c:1875
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: ../finch/gntsound.c:1033 ../pidgin/gtkprefs.c:1879
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
 msgid "Choose..."
 msgstr "Escoller..."
 
-#: ../finch/gntstatus.c:137
+#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Está seguro de que quere borrar \"%s\""
 
-#: ../finch/gntstatus.c:140
+#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Borrar estado"
 
-#: ../finch/gntstatus.c:175 ../pidgin/gtksavedstatuses.c:596
+#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Estados gardados"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:973
-#: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:499
+#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
+#: ../libpurple/protocols/jabber/buddy.c:298
+#: ../libpurple/protocols/jabber/buddy.c:1359
+#: ../libpurple/protocols/novell/novell.c:1486
+#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Título"
 
-#: ../finch/gntstatus.c:182 ../pidgin/gtksavedstatuses.c:514
+#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Tipo"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:249
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
 #: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:339
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
-#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
-#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5502
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
+#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1624
+#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/msn/msn.c:634 ../libpurple/protocols/msn/msn.c:641
+#: ../libpurple/protocols/msn/msn.c:648 ../libpurple/protocols/msn/msn.c:655
+#: ../libpurple/protocols/msn/msn.c:661 ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/myspace/myspace.c:148
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/novell/novell.c:2946
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/novell/novell.c:2958
+#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5784
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/oscar/oscar.c:5807
+#: ../libpurple/protocols/oscar/oscar.c:5814
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3651
-#: ../libpurple/protocols/yahoo/yahoo.c:3657
+#: ../libpurple/protocols/yahoo/yahoo.c:3750
+#: ../libpurple/protocols/yahoo/yahoo.c:3756
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
 msgstr "Mensaxe"
 
 #. Use
-#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Usar"
 
-#: ../finch/gntstatus.c:300
-msgid "Invalid title"
-msgstr "O título non é válido"
-
 #: ../finch/gntstatus.c:301
+msgid "Invalid title"
+msgstr "O título non é válido"
+
+#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "Introduza un título non baleiro para o estado."
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "Título duplicado"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "Introduza un título diferente para o estado."
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Estado secundario"
 
-#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Mensaxe:"
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Editar estado"
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Usar un estado diferente para as contas seguintes"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "Gardar e usar"
 
-#: ../finch/gntui.c:87 ../pidgin/gtkprefs.c:2030
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr ""
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../finch/gntui.c:89
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Estados"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#, fuzzy
+msgid "Error loading the plugin."
+msgstr "Ocorreron erros ao descargar o complemento."
+
+#: ../finch/plugins/gntclipboard.c:116
+#, fuzzy
+msgid "Couldn't find X display"
+msgstr "Non se puido abrir o ficheiro"
+
+#: ../finch/plugins/gntclipboard.c:122
+#, fuzzy
+msgid "Couldn't find window"
+msgstr "Non se puido abrir o ficheiro"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Complemento de portapapeis"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
-"Cando cambia o contido do portapapeis de gnt, os contidos póñense dispoñibles nas "
-"X, se é posible."
+"Cando cambia o contido do portapapeis de gnt, os contidos póñense "
+"dispoñibles nas X, se é posible."
 
 #: ../finch/plugins/gntgf.c:231
 #, c-format
@@ -1672,16 +1887,16 @@
 msgid "Toaster plugin"
 msgstr "Complemento de ventá emerxente"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:123
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Conversa con %s en %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:150
 msgid "History Plugin Requires Logging"
 msgstr "O complemento de historial require conectarse"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:151
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1690,18 +1905,18 @@
 msgstr ""
 "Pode activar o rexistro en Ferramentas -> Preferencias -> Rexistro.\n"
 "\n"
-"A activación do rexistro das mensaxes instantáneas e/ou das conversas activará o "
-"historial para os mesmos tipos de conversa."
+"A activación do rexistro das mensaxes instantáneas e/ou das conversas "
+"activará o historial para os mesmos tipos de conversa."
 
 #: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "Historial"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:194
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Mostra as conversas rexistradas previamente nas novas conversas."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:195
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1725,90 +1940,91 @@
 msgid "Lastlog plugin."
 msgstr "Complemento de Lastlog."
 
-#: ../libpurple/account.c:790
+#: ../libpurple/account.c:791
 msgid "accounts"
 msgstr "contas"
 
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
 msgid "Password is required to sign on."
 msgstr "O contrasinal é necesario para iniciar a sesión."
 
-#: ../libpurple/account.c:963
+#: ../libpurple/account.c:992
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Introducir o contrasinal para %s (%s)"
 
-#: ../libpurple/account.c:970
+#: ../libpurple/account.c:999
 msgid "Enter Password"
 msgstr "Introducir o contrasinal"
 
-#: ../libpurple/account.c:975
+#: ../libpurple/account.c:1004
 msgid "Save password"
 msgstr "Gardar o contrasinal"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+#: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Falta o complemento de protocolo para %s"
 
-#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4019
+#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
+#: ../pidgin/gtkblist.c:4318
 msgid "Connection Error"
 msgstr "Erro de conexión"
 
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "New passwords do not match."
 msgstr "Os novos contrasinais non coinciden."
 
-#: ../libpurple/account.c:1179
+#: ../libpurple/account.c:1208
 msgid "Fill out all fields completely."
 msgstr "Encha todos os campos completamente."
 
-#: ../libpurple/account.c:1202
+#: ../libpurple/account.c:1231
 msgid "Original password"
 msgstr "Contrasinal orixinal"
 
-#: ../libpurple/account.c:1209
+#: ../libpurple/account.c:1238
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: ../libpurple/account.c:1216
+#: ../libpurple/account.c:1245
 msgid "New password (again)"
 msgstr "Novo contrasinal (outra vez)"
 
-#: ../libpurple/account.c:1222
+#: ../libpurple/account.c:1251
 #, c-format
 msgid "Change password for %s"
 msgstr "Modificar o contrasinal de %s"
 
-#: ../libpurple/account.c:1230
+#: ../libpurple/account.c:1259
 msgid "Please enter your current password and your new password."
 msgstr "Introduza o contrasinal actual e o novo."
 
-#: ../libpurple/account.c:1261
+#: ../libpurple/account.c:1290
 #, c-format
 msgid "Change user information for %s"
 msgstr "Modificar a información do usuario %s"
 
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Establecer a información de usuario"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:1462
-#: ../libpurple/protocols/jabber/buddy.c:1479
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
+#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2836
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5321 ../pidgin/plugins/gevolution/gevolution.c:96
-#: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3242 ../pidgin/gtkblist.c:5662
+#: ../pidgin/plugins/gevolution/gevo-util.c:67
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Contactos"
 
@@ -1816,24 +2032,175 @@
 msgid "buddy list"
 msgstr "lista de contactos"
 
-#: ../libpurple/connection.c:106
+#: ../libpurple/certificate.c:545
+msgid "(DOES NOT MATCH)"
+msgstr ""
+
+#. Make messages
+#: ../libpurple/certificate.c:549
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr ""
+
+#: ../libpurple/certificate.c:550
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:555
+msgid "Single-use Certificate Verification"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:872
+msgid "Certificate Authorities"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1040
+msgid "SSL Peers Cache"
+msgstr ""
+
+#. Make messages
+#: ../libpurple/certificate.c:1171
+#, fuzzy, c-format
+msgid "Accept certificate for %s?"
+msgstr "Aceptar o convite para conversar?"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1177
+msgid "SSL Certificate Verification"
+msgstr ""
+
+#. Number of actions
+#: ../libpurple/certificate.c:1186
+#, fuzzy
+msgid "Accept"
+msgstr "_Aceptar"
+
+#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr "Rexeitar"
+
+#: ../libpurple/certificate.c:1188
+msgid "_View Certificate..."
+msgstr ""
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1288
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1313
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+
+#: ../libpurple/certificate.c:1331
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr ""
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+#, fuzzy
+msgid "SSL Certificate Error"
+msgstr "Erro de escritura"
+
+#: ../libpurple/certificate.c:1340
+#, fuzzy
+msgid "Invalid certificate chain"
+msgstr "O título non é válido"
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1360
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1382
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+
+#: ../libpurple/certificate.c:1408
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+
+#: ../libpurple/certificate.c:1417
+msgid "Invalid certificate authority signature"
+msgstr ""
+
+#. Make messages
+#: ../libpurple/certificate.c:1882
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1891
+#, fuzzy
+msgid "Certificate Information"
+msgstr "Información do servidor"
+
+#: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "Erro de rexistro"
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:180
+#, fuzzy
+msgid "Unregistration Error"
+msgstr "Erro de rexistro"
+
+#: ../libpurple/connection.c:350
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s conectouse"
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:380
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s desconectouse"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1750
-#: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/msn/servconn.c:141
+#: ../libpurple/protocols/msn/session.c:361
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
@@ -1855,40 +2222,40 @@
 msgid "Unable to send message."
 msgstr "Non se puido enviar a mensaxe."
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "Enviar a mensaxe"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "_Enviar a mensaxe"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entrou na sala."
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entrou na sala."
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "Agora chámase %s"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s chámase agora %s"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s saíu da sala."
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s saíu da sala (%s)."
@@ -1908,23 +2275,25 @@
 msgid "Failed to get serv name: %s"
 msgstr "Fallou ao buscar o nome do servidor: %s"
 
-#: ../libpurple/dbus-server.h:84
+#: ../libpurple/dbus-server.h:85
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr "O servidor D-BUS de Purple non está executándose polo motivo amosado a continuación"
-
-#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+msgstr ""
+"O servidor D-BUS de Purple non está executándose polo motivo amosado a "
+"continuación"
+
+#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Sen nome"
 
-#: ../libpurple/dnsquery.c:510
+#: ../libpurple/dnsquery.c:511
 msgid "Unable to create new resolver process\n"
 msgstr "Non é posible crear un novo proceso resolvedor\n"
 
-#: ../libpurple/dnsquery.c:515
+#: ../libpurple/dnsquery.c:516
 msgid "Unable to send request to resolver process\n"
 msgstr "Non é posible enviar a solicitude ao proceso resolvedor\n"
 
-#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -1933,13 +2302,13 @@
 "Erro ao resolver %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
-#: ../libpurple/dnsquery.c:830
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
+#: ../libpurple/dnsquery.c:831
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Erro ao resolver %s: %d"
 
-#: ../libpurple/dnsquery.c:573
+#: ../libpurple/dnsquery.c:574
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -1948,20 +2317,20 @@
 "Erro ao ler desde o proceso resolvedor:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:577
+#: ../libpurple/dnsquery.c:578
 msgid "EOF while reading from resolver process"
 msgstr "EOF ao ler desde o proceso resolvedor"
 
-#: ../libpurple/dnsquery.c:760
+#: ../libpurple/dnsquery.c:761
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Fallo ao crear o fío: %s"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 msgid "Unknown reason"
 msgstr "Razón descoñecida"
 
-#: ../libpurple/ft.c:207
+#: ../libpurple/ft.c:209
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1970,7 +2339,7 @@
 "Erro ao ler %s:\n"
 "%s.\n"
 
-#: ../libpurple/ft.c:211
+#: ../libpurple/ft.c:213
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1979,7 +2348,7 @@
 "Erro ao escribir %s:\n"
 "%s.\n"
 
-#: ../libpurple/ft.c:215
+#: ../libpurple/ft.c:217
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1988,39 +2357,39 @@
 "Erro ao acceder a %s:\n"
 "%s.\n"
 
-#: ../libpurple/ft.c:251
+#: ../libpurple/ft.c:253
 msgid "Directory is not writable."
 msgstr "Non se pode escribir no directorio."
 
-#: ../libpurple/ft.c:266
+#: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
 msgstr "Non se pode enviar un ficheiro de 0 bytes."
 
-#: ../libpurple/ft.c:276
+#: ../libpurple/ft.c:278
 msgid "Cannot send a directory."
 msgstr "Non se pode enviar un directorio."
 
-#: ../libpurple/ft.c:285
+#: ../libpurple/ft.c:287
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s non é un ficheiro regular. Non se sobrescribirá.\n"
 
-#: ../libpurple/ft.c:345
+#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s quere enviarlle %s (%s)"
 
-#: ../libpurple/ft.c:352
+#: ../libpurple/ft.c:354
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s quere enviarlle un ficheiro"
 
-#: ../libpurple/ft.c:395
+#: ../libpurple/ft.c:397
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Aceptar a solicitude de transferencia de ficheiro de %s?"
 
-#: ../libpurple/ft.c:399
+#: ../libpurple/ft.c:401
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2031,60 +2400,60 @@
 "Servidor remoto: %s\n"
 "Porto remoto: %d"
 
-#: ../libpurple/ft.c:434
+#: ../libpurple/ft.c:436
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s ofrécese para envialle o ficheiro %s"
 
-#: ../libpurple/ft.c:486
+#: ../libpurple/ft.c:488
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s non é un nome de ficheiro válido.\n"
 
-#: ../libpurple/ft.c:507
+#: ../libpurple/ft.c:509
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Ofrécese para enviar %s a %s"
 
-#: ../libpurple/ft.c:519
+#: ../libpurple/ft.c:521
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Iniciando transferencia de %s desde %s"
 
-#: ../libpurple/ft.c:680
+#: ../libpurple/ft.c:682
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Completouse a transferencia do ficheiro %s"
 
-#: ../libpurple/ft.c:683
+#: ../libpurple/ft.c:685
 msgid "File transfer complete"
 msgstr "Transferencia de ficheiros completa"
 
-#: ../libpurple/ft.c:1101
+#: ../libpurple/ft.c:1103
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Cancelou a transferencia de %s"
 
-#: ../libpurple/ft.c:1106
+#: ../libpurple/ft.c:1108
 msgid "File transfer cancelled"
 msgstr "Transferencia de ficheiros cancelada"
 
-#: ../libpurple/ft.c:1164
+#: ../libpurple/ft.c:1166
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelou a transferencia de %s"
 
-#: ../libpurple/ft.c:1169
+#: ../libpurple/ft.c:1171
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancelou a transferencia de ficheiros"
 
-#: ../libpurple/ft.c:1226
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "A transferencia de ficheiros a %s fallou."
 
-#: ../libpurple/ft.c:1228
+#: ../libpurple/ft.c:1230
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "A transferencia de ficheiro desde %s fallou."
@@ -2161,55 +2530,73 @@
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
-msgstr "Verdadeiro se o comando específicado na chave de \"command\" debería manipular os URL \"aim\"."
+msgstr ""
+"Verdadeiro se o comando específicado na chave de \"command\" debería "
+"manipular os URL \"aim\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
-msgstr "Verdadeiro se o comando específicado na chave de \"command\" debería manipular os URL \"gg\"."
+msgstr ""
+"Verdadeiro se o comando específicado na chave de \"command\" debería "
+"manipular os URL \"gg\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
-msgstr "Verdadeiro se o comando específicado na chave de \"command\" debería manipular os URL \"icq\"."
+msgstr ""
+"Verdadeiro se o comando específicado na chave de \"command\" debería "
+"manipular os URL \"icq\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
-msgstr "Verdadeiro se o comando específicado na chave de \"command\" debería manipular os URL \"irc\"."
+msgstr ""
+"Verdadeiro se o comando específicado na chave de \"command\" debería "
+"manipular os URL \"irc\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
-msgstr "Verdadeiro se o comando específicado na chave de \"command\" debería manipular os URL \"msnim\"."
+msgstr ""
+"Verdadeiro se o comando específicado na chave de \"command\" debería "
+"manipular os URL \"msnim\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
-msgstr "Verdadeiro se o comando específicado na chave de \"command\" debería manipular os URL \"sip\"."
+msgstr ""
+"Verdadeiro se o comando específicado na chave de \"command\" debería "
+"manipular os URL \"sip\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
-msgstr "Verdadeiro se o comando específicado na chave de \"command\" debería manipular URL \"xmpp\"."
+msgstr ""
+"Verdadeiro se o comando específicado na chave de \"command\" debería "
+"manipular URL \"xmpp\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
-msgstr "Verdadeiro se o comando específicado na chave de \"command\" debería manipular os URL \"ymsgr\"."
+msgstr ""
+"Verdadeiro se o comando específicado na chave de \"command\" debería "
+"manipular os URL \"ymsgr\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
-msgstr "Verdadeiro se o comando usado para manipular este tipo de URL debe ser executado nun terminal."
+msgstr ""
+"Verdadeiro se o comando usado para manipular este tipo de URL debe ser "
+"executado nun terminal."
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
@@ -2243,31 +2630,32 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Se o comando específicado debería manipular os URL \"ymsgr\""
 
-#: ../libpurple/log.c:182
+#: ../libpurple/log.c:183
 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>"
-
-#: ../libpurple/log.c:597
+msgstr ""
+"<b><font color=\"red\">O rexistro non ten función de lectura</font></b>"
+
+#: ../libpurple/log.c:598
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:611
+#: ../libpurple/log.c:612
 msgid "Plain text"
 msgstr "Texto plano"
 
-#: ../libpurple/log.c:625
+#: ../libpurple/log.c:626
 msgid "Old flat format"
 msgstr "Formato plano antigo"
 
-#: ../libpurple/log.c:838
+#: ../libpurple/log.c:839
 msgid "Logging of this conversation failed."
 msgstr "O rexistro desta conversa fallou."
 
-#: ../libpurple/log.c:1281
+#: ../libpurple/log.c:1282
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1365
+#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2276,7 +2664,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1367
+#: ../libpurple/log.c:1368
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2285,16 +2673,18 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
+#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>Non se puido encontrar o camiño do rexistro!</b></font>"
-
-#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
+msgstr ""
+"<font color=\"red\"><b>Non se puido encontrar o camiño do rexistro!</b></"
+"font>"
+
+#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
 #, 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>"
 
-#: ../libpurple/log.c:1499
+#: ../libpurple/log.c:1500
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA AUTOMÁTICA>: %s\n"
@@ -2311,12 +2701,14 @@
 #: ../libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr "Non houbo coincidencia no número máxico do complemento %d (necesitaba %d)"
+msgstr ""
+"Non houbo coincidencia no número máxico do complemento %d (necesitaba %d)"
 
 #: ../libpurple/plugin.c:465
 #, 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)"
 
 #: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
@@ -2328,8 +2720,8 @@
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-"Non se atopou o complemento necesario %s. Instala este "
-"complemento e inténtao novamente."
+"Non se atopou o complemento necesario %s. Instala este complemento e "
+"inténtao novamente."
 
 #: ../libpurple/plugin.c:552
 msgid "Unable to load the plugin"
@@ -2359,12 +2751,16 @@
 
 #: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
-msgstr "Autoaceptar as peticións de transferencia de ficheiros dos usuarios seleccionados."
+msgstr ""
+"Autoaceptar as peticións de transferencia de ficheiros dos usuarios "
+"seleccionados."
 
 #: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "Completada a transferencia aceptada automaticamente do ficheiro \"%s\" desde \"%s\"."
+msgstr ""
+"Completada a transferencia aceptada automaticamente do ficheiro \"%s\" desde "
+"\"%s\"."
 
 #: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
@@ -2385,14 +2781,14 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1451
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5889
-#: ../libpurple/protocols/oscar/oscar.c:6115
-#: ../libpurple/protocols/oscar/oscar.c:6185 ../libpurple/request.h:1387
-#: ../libpurple/request.h:1397
+#: ../libpurple/protocols/oscar/oscar.c:1453
+#: ../libpurple/protocols/oscar/oscar.c:2229
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5884
+#: ../libpurple/protocols/oscar/oscar.c:5939
+#: ../libpurple/protocols/oscar/oscar.c:6165
+#: ../libpurple/protocols/oscar/oscar.c:6235 ../libpurple/request.h:1388
+#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -2423,18 +2819,20 @@
 
 #: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
-msgstr "Rexeitar automaticamente de usuarios que non están na lista de contactos"
+msgstr ""
+"Rexeitar automaticamente de usuarios que non están na lista de contactos"
 
 #: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"Notificar cunha ventá enerxente cando se completa unha transferencia de ficheiros aceptada automaticamente\n"
+"Notificar cunha ventá enerxente cando se completa unha transferencia de "
+"ficheiros aceptada automaticamente\n"
 "(Só cando non hai unha conversa co remitente)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1800
 msgid "Notes"
 msgstr "Anotacións"
 
@@ -2454,20 +2852,22 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Anotacións de contactos"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Almacenar anotacións de contactos particulares."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "Engade a opción para almacenar anotacións para os contactos da súa lista de amigos."
+msgstr ""
+"Engade a opción para almacenar anotacións para os contactos da súa lista de "
+"amigos."
 
 #. *< type
 #. *< ui_requirement
@@ -2652,8 +3052,8 @@
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
 msgstr ""
-"Este complemento oculta as mensaxes de Unirse/Deixar en salas grandes, excepto as "
-"de aqueles usuarios que toman parte activa nunha conversa."
+"Este complemento oculta as mensaxes de Unirse/Deixar en salas grandes, "
+"excepto as de aqueles usuarios que toman parte activa nunha conversa."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
@@ -2690,7 +3090,9 @@
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
-msgstr "Está actualmente desconectado. As mensaxes non se recibirán a non ser que inicie sesión."
+msgstr ""
+"Está actualmente desconectado. As mensaxes non se recibirán a non ser que "
+"inicie sesión."
 
 #: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
@@ -2795,7 +3197,8 @@
 "Cando vexa os rexistros, este complemento incluirá rexistros doutros "
 "clientes de MI. Actualmente, isto inclúe Adium, MSN Messenger e Trillian.\n"
 "\n"
-"AVISO: Este complemento é todavía unha versión alfa e pode producir erros con frecuencia. Úseo baixo a súa responsabilidade!"
+"AVISO: Este complemento é todavía unha versión alfa e pode producir erros "
+"con frecuencia. Úseo baixo a súa responsabilidade!"
 
 #: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
@@ -2831,8 +3234,8 @@
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
 msgstr ""
-"Engade unha liña en branco ás mensaxes para que o resto da mensaxe apareza"
-"debaixo do nome de usuario na ventá de conversa."
+"Engade unha liña en branco ás mensaxes para que o resto da mensaxe "
+"aparezadebaixo do nome de usuario na ventá de conversa."
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
@@ -2850,52 +3253,53 @@
 "O resto das mensaxes serán gardadas como avisos. Pode editar/eliminar os "
 "avisos na ventá de diálogo 'Avisos de amigo'."
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
-"\"%s\" está actualmente fóra de liña. Quere gardar o resto de mensaxes nun aviso "
-"e enviarllas automaticamente cando \"%s\" volva conectarse?"
-
-#: ../libpurple/plugins/offlinemsg.c:156
+"\"%s\" está actualmente fóra de liña. Quere gardar o resto de mensaxes nun "
+"aviso e enviarllas automaticamente cando \"%s\" volva conectarse?"
+
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Mensaxe sen conexión"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr "Pode editar/eliminar o aviso desde a ventá de diálogo 'Avisos de amigos'"
-
-#: ../libpurple/plugins/offlinemsg.c:161
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
-#: ../libpurple/protocols/novell/novell.c:1917
+msgstr ""
+"Pode editar/eliminar o aviso desde a ventá de diálogo 'Avisos de amigos'"
+
+#: ../libpurple/plugins/offlinemsg.c:165
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/novell/novell.c:1919
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
 msgid "Yes"
 msgstr "Si"
 
-#: ../libpurple/plugins/offlinemsg.c:162
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/plugins/offlinemsg.c:166
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/novell/novell.c:1920
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
 msgid "No"
 msgstr "Non"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Gardar as mensaxes sen conexión en aviso"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Non preguntar. Gardar sempre en avisos."
 
@@ -2929,8 +3333,8 @@
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
-"Provoca que aparezan ventás de conversa cando outros usuarios comezan unha conversa contigo.  "
-"Isto funciona para AIM, ICQ, XMPP, Sametime e Yahoo!"
+"Provoca que aparezan ventás de conversa cando outros usuarios comezan unha "
+"conversa contigo.  Isto funciona para AIM, ICQ, XMPP, Sametime e Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
@@ -2989,6 +3393,50 @@
 msgid "Tests to see that most things are working."
 msgstr "Fai probas para determinar se a maior parte das cousas funcionan."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:725
+msgid "X.509 Certificates"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+msgid "Provides SSL support through GNUTLS."
+msgstr "Proporciona soporte SSL a través de GNUTLS."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-nss.c:810
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-nss.c:813
+#: ../libpurple/plugins/ssl/ssl-nss.c:815
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Proporciona soporte SSL a través do NSS de Mozilla."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3007,44 +3455,6 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Proporciona un wrapper para as bibliotecas de soporte de SSL."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
-msgid "Provides SSL support through GNUTLS."
-msgstr "Proporciona soporte SSL a través de GNUTLS."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Proporciona soporte SSL a través do NSS de Mozilla."
-
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
@@ -3109,21 +3519,22 @@
 "Notifica nunha ventá de conversa cando un contacto se ausenta, volve ou está "
 "inactivo."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Cargador de complementos Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Prové soporte para cargar complementos Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
+#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
-"Non é posible detectar a intalación de ActiveTCL. Se quere empregar complementos de TCL, precisa "
-"instalar ActiveTCL desde o enderezo http://www.activestate.com\n"
+"Non é posible detectar a intalación de ActiveTCL. Se quere empregar "
+"complementos de TCL, precisa instalar ActiveTCL desde o enderezo http://www."
+"activestate.com\n"
 
 #. Send a message about the connection error
 #: ../libpurple/protocols/bonjour/bonjour.c:112
@@ -3131,29 +3542,31 @@
 msgstr "Imposible escoitar as conexións de MI entrantes\n"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:137
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr "Imposible establecer a conexión co servidor local mDNS. Estase a executar?"
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+"Imposible establecer a conexión co servidor local mDNS. Estase a executar?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/bonjour/bonjour.c:614
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:942
 msgid "First name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/bonjour/bonjour.c:617
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:947
 msgid "Last name"
 msgstr "Apelidos"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:350
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:295
+#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:1335
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3162,13 +3575,13 @@
 msgid "E-Mail"
 msgstr "Correo electrónico"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:623
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
 msgid "AIM Account"
 msgstr "Conta de AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:356
-#: ../libpurple/protocols/bonjour/bonjour.c:626
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "XMPP Account"
 msgstr "Conta de XMPP"
 
@@ -3182,27 +3595,18 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:460
-#: ../libpurple/protocols/bonjour/bonjour.c:462
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Complemento de protocolo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:505
-#: ../libpurple/protocols/bonjour/bonjour.c:512
-#: ../libpurple/protocols/bonjour/bonjour.c:561
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Persoa Purple"
 
-#. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:610
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
-msgid "Hostname"
-msgstr "Nome do servidor"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:620
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/jabber/jabber.c:932
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3214,38 +3618,38 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:383
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s pechou a conversa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:435
-#: ../libpurple/protocols/bonjour/jabber.c:658
-#: ../libpurple/protocols/bonjour/jabber.c:676
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Non se puido enviar a mensaxe, non se puido iniciar a conversa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:581
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "Non se puido abrir o conectador"
 
-#: ../libpurple/protocols/bonjour/jabber.c:589
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Erro ao establecer as opcións do conectador"
 
-#: ../libpurple/protocols/bonjour/jabber.c:613
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "Non se pode ligar o conectador ao porto"
 
-#: ../libpurple/protocols/bonjour/jabber.c:621
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "Non se pode escoitar o conectador"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
 msgid "Invalid proxy settings"
 msgstr "Configuración incorrecta de proxy"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3269,7 +3673,8 @@
 
 #: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr "A súa lista de contactos está baleira, non se escribiu nada no ficheiro."
+msgstr ""
+"A súa lista de contactos está baleira, non se escribiu nada no ficheiro."
 
 #: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
@@ -3315,47 +3720,49 @@
 msgid "Registration completed successfully!"
 msgstr "O rexistro completouse satisfactoriamente!"
 
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/jabber/jabber.c:913
+#: ../libpurple/protocols/jabber/jabber.c:916
+#: ../libpurple/protocols/jabber/jabber.c:1722
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "Contrasinal (reescribir)"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "Introduza o token actual"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "Token actual"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "Rexistrar conta nova de Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "Encha os seguintes campos"
 
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3757
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:957
+#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3798
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Cidade"
 
-#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "Data de nacemento"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1699
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3728
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
@@ -3363,242 +3770,242 @@
 msgid "Gender"
 msgstr "Sexo"
 
-#: ../libpurple/protocols/gg/gg.c:646
+#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "Home ou muller"
 
-#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/oscar/oscar.c:3728
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Home"
 
-#: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3728
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Muller"
 
-#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "En liña só"
 
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "Buscar contactos"
 
-#: ../libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr "Introduza debaixo o seu criterio de busca"
 
-#: ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr "Encher os campos."
 
-#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr "O contrasinal actual é diferente do que especificou."
 
-#: ../libpurple/protocols/gg/gg.c:722
+#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Non se puido modificar o contrasinal. Produciuse un erro.\n"
 
-#: ../libpurple/protocols/gg/gg.c:731
+#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Modificar o contrasinal da conta Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:732
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr "Modificouse con éxito o contrasinal!"
 
-#: ../libpurple/protocols/gg/gg.c:765
+#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "Contrasinal actual"
 
-#: ../libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduza o seu contrasinal actual e o contrasinal novo para UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Modificar o contrasinal Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Seleccione unha conversa para o contacto: %s"
 
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "Engadir á conversa..."
 
-#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1466
-#: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:5602
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:2999 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3082 ../pidgin/gtkblist.c:3419
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
+#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../libpurple/protocols/gg/gg.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/novell/novell.c:2821
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3001 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
+#: ../libpurple/protocols/yahoo/yahoo.c:3100 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Dispoñible"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4504
-#: ../libpurple/protocols/oscar/oscar.c:5580
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2824
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:4543
+#: ../libpurple/protocols/oscar/oscar.c:5630
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3553
-#: ../libpurple/protocols/yahoo/yahoo.c:3627 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1934
-#: ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3652
+#: ../libpurple/protocols/yahoo/yahoo.c:3726 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkstatusbox.c:1058
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2669
-#: ../libpurple/protocols/oscar/oscar.c:3667
+#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2695
+#: ../libpurple/protocols/oscar/oscar.c:3695
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
-#: ../libpurple/protocols/jabber/buddy.c:1623
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3678
+#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:3706
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "Data de nacemento"
 
-#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3907
 msgid "Unable to display the search results."
 msgstr "Non se poden mostrar os resultados da busca."
 
-#: ../libpurple/protocols/gg/gg.c:1166
+#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directorio público Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "Resultados da busca"
 
-#: ../libpurple/protocols/gg/gg.c:1210
+#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr "Non se atoparon usuarios coincidentes"
 
-#: ../libpurple/protocols/gg/gg.c:1211
+#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr "Non hai usuarios que coincidan cos seus criterios de busca."
 
-#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "Non se puido ler o conectador "
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr "Lista de contactos descargada"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr "Lista de contactos descargada desde o servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1398
+#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr "Lista de contactos subida"
 
-#: ../libpurple/protocols/gg/gg.c:1399
+#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr "Lista de contactos almacenada no servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "Fallou a conexión."
 
-#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:621
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../libpurple/protocols/gg/gg.c:1639
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "Engadir á conversa"
 
-#: ../libpurple/protocols/gg/gg.c:1648
+#: ../libpurple/protocols/gg/gg.c:1653
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../libpurple/protocols/gg/gg.c:1652
+#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../libpurple/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "_Nome da conversa:"
 
-#: ../libpurple/protocols/gg/gg.c:1909
+#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "Erro da conversa"
 
-#: ../libpurple/protocols/gg/gg.c:1910
+#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "O nome desta conversa xa está en uso"
 
-#: ../libpurple/protocols/gg/gg.c:1993
+#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "Non conectado ao servidor."
 
-#: ../libpurple/protocols/gg/gg.c:2016
+#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "Buscar contactos..."
 
-#: ../libpurple/protocols/gg/gg.c:2022
+#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "Modificar contrasinal..."
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "Subir a lista de contactos ao servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "Descargar a lista de contactos do servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "Borrar a lista de contactos do servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2040
+#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr "Gardar a lista de contactos no ficheiro..."
 
-#: ../libpurple/protocols/gg/gg.c:2044
+#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr "Cargar a lista de contactos desde un ficheiro..."
 
@@ -3613,16 +4020,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2148
+#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocolo Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2149
+#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr "Polish popular IM"
 
-#: ../libpurple/protocols/gg/gg.c:2203
+#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
@@ -3652,7 +4059,7 @@
 #: ../libpurple/protocols/irc/dcc_send.c:337
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
 msgid "File Transfer Failed"
 msgstr "Fallou a transferencia do ficheiro"
 
@@ -3679,7 +4086,8 @@
 msgstr "MOTD para %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2354
 msgid "Server has disconnected"
 msgstr "O servidor desconectouse"
 
@@ -3693,7 +4101,7 @@
 msgstr "_Canle:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Contrasinal:"
 
@@ -3701,65 +4109,62 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "Os alias de IRC non poden ter espazos en branco"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1285
+#: ../libpurple/protocols/jabber/jabber.c:1280
+#: ../libpurple/protocols/msn/session.c:384
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:1287
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3724
-#: ../libpurple/protocols/simple/simple.c:1676
-#: ../libpurple/protocols/yahoo/yahoo.c:2844
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1718
+#: ../libpurple/protocols/yahoo/yahoo.c:2938
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Conectando"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:610
+#: ../libpurple/protocols/jabber/jabber.c:1095
 msgid "SSL support unavailable"
 msgstr "Soporte SSL non dispoñible"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:318
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1591
+#: ../libpurple/protocols/simple/simple.c:1633
 msgid "Couldn't create socket"
 msgstr "Non se puido crear o conectador "
 
-#: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/oscar/oscar.c:1281
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2467
+#: ../libpurple/protocols/oscar/oscar.c:1283
 msgid "Couldn't connect to host"
 msgstr "Non se puido conectar ao servidor"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "Fallou a conexión"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "Fallou na negociación SSL"
-
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Read error"
 msgstr "Erro de lectura"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/irc/irc.c:776
+#: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Asunto"
 
@@ -3771,47 +4176,48 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "Complemento de protocolo IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Complemento de protocolo IRC menos malo"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2297
+#: ../libpurple/protocols/oscar/oscar.c:6669
 #: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1898
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2302
+#: ../libpurple/protocols/oscar/oscar.c:6672
 #: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Porto"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Codificacións"
 
-#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:904
+#: ../libpurple/protocols/jabber/jabber.c:907
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -3827,7 +4233,7 @@
 msgid "Username"
 msgstr "Nome de usuario"
 
-#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3837,7 +4243,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Usar SSL"
 
@@ -3868,7 +4274,7 @@
 msgstr " <i>(identificado)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3668
+#: ../libpurple/protocols/oscar/oscar.c:3696
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -3993,8 +4399,8 @@
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"O servidor rexeitou o alias que escolleu. É posible que "
-"inclúa caracteres non válidos."
+"O servidor rexeitou o alias que escolleu. É posible que inclúa caracteres "
+"non válidos."
 
 #: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
@@ -4076,8 +4482,8 @@
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &lt;alias1&gt; [alias2] ...: Silenciar a alguén e impedirlle"
-"falar na canle se está moderada (+m). Só o pode facer un operador de canle."
+"devoice &lt;alias1&gt; [alias2] ...: Silenciar a alguén e impedirllefalar na "
+"canle se está moderada (+m). Só o pode facer un operador de canle."
 
 #: ../libpurple/protocols/irc/parse.c:127
 msgid ""
@@ -4132,23 +4538,23 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;alias|canle&gt;:  Establece ou elimina "
-"un modo de canle ou de usuario."
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;alias|canle&gt;:  Establece ou elimina un "
+"modo de canle ou de usuario."
 
 #: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"msg &lt;nick&gt; &lt;message&gt;:  Enviarlle unha mensaxe privada a un usuario "
-"(o oposto a unha canle)."
+"msg &lt;nick&gt; &lt;message&gt;:  Enviarlle unha mensaxe privada a un "
+"usuario (o oposto a unha canle)."
 
 #: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canle]:  Obter a lista dos usuarios que están na canle."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1830
+#: ../libpurple/protocols/jabber/jabber.c:2299
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo alias&gt;:  Cambia o seu alias."
 
@@ -4161,8 +4567,8 @@
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"op &lt;alcume1&gt; [alcume2] ...:  Darlle estado de operador de canle a outra "
-"persoa. Só o pode facer un operador de canle."
+"op &lt;alcume1&gt; [alcume2] ...:  Darlle estado de operador de canle a "
+"outra persoa. Só o pode facer un operador de canle."
 
 #: ../libpurple/protocols/irc/parse.c:140
 msgid ""
@@ -4189,8 +4595,8 @@
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
-"ping [alias]:  Pregunta canto atraso ten un usuario (ou o servidor se non "
-"se especifica un usuario)."
+"ping [alias]:  Pregunta canto atraso ten un usuario (ou o servidor se non se "
+"especifica un usuario)."
 
 #: ../libpurple/protocols/irc/parse.c:144
 msgid ""
@@ -4228,7 +4634,8 @@
 
 #: ../libpurple/protocols/irc/parse.c:150
 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."
 
 #: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
@@ -4239,14 +4646,15 @@
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"voice &lt;alias1&gt; [alias2] ...:  Darlle a posibilidade de falar na "
-"canle a alguén. Só o pode facer un operador de canle."
+"voice &lt;alias1&gt; [alias2] ...:  Darlle a posibilidade de falar na canle "
+"a alguén. Só o pode facer un operador de canle."
 
 #: ../libpurple/protocols/irc/parse.c:153
 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."
 
 #: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
@@ -4276,53 +4684,73 @@
 msgid "Disconnected."
 msgstr "Desconectado."
 
-#: ../libpurple/protocols/jabber/auth.c:52
+#: ../libpurple/protocols/jabber/adhoccommands.c:137
+#: ../libpurple/protocols/jabber/jabber.c:671
+#: ../libpurple/protocols/jabber/jabber.c:701
+#: ../libpurple/protocols/jabber/jabber.c:1887
+msgid "Unknown Error"
+msgstr "Erro descoñecido"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:139
+#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#, fuzzy
+msgid "Ad-Hoc Command Failed"
+msgstr "Comando desactivado"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:176
+#, fuzzy
+msgid "execute"
+msgstr "Non se agardaba"
+
+#: ../libpurple/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "O servidor require TLS/SSL para iniciar a sesión. Non se dispón de soporte TLS/SSL."
-
-#: ../libpurple/protocols/jabber/auth.c:115
+msgstr ""
+"O servidor require TLS/SSL para iniciar a sesión. Non se dispón de soporte "
+"TLS/SSL."
+
+#: ../libpurple/protocols/jabber/auth.c:116
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "O servidor solicita autenticación con texto plano sobre unha canle non "
 "cifrada"
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:508
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"%s require autenticación con texto plano sobre canles non cifradas.  Permitir "
-"isto e continuar coa autenticación?"
-
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+"%s require autenticación con texto plano sobre canles non cifradas.  "
+"Permitir isto e continuar coa autenticación?"
+
+#: ../libpurple/protocols/jabber/auth.c:321
+#: ../libpurple/protocols/jabber/auth.c:322
+#: ../libpurple/protocols/jabber/auth.c:510
+#: ../libpurple/protocols/jabber/auth.c:511
+#: ../libpurple/protocols/jabber/auth.c:598
+#: ../libpurple/protocols/jabber/auth.c:599
 msgid "Plaintext Authentication"
 msgstr "Autenticación con texto plano"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:334
+#: ../libpurple/protocols/jabber/auth.c:523
+#: ../libpurple/protocols/jabber/auth.c:610
 msgid "Server does not use any supported authentication method"
 msgstr "O servidor non usa un método de autenticación coñecido"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
-#: ../libpurple/protocols/jabber/jabber.c:115
+#: ../libpurple/protocols/jabber/auth.c:462
+#: ../libpurple/protocols/jabber/auth.c:561
+#: ../libpurple/protocols/jabber/auth.c:776
+#: ../libpurple/protocols/jabber/auth.c:917
+#: ../libpurple/protocols/jabber/auth.c:942
+#: ../libpurple/protocols/jabber/auth.c:961
+#: ../libpurple/protocols/jabber/jabber.c:123
 msgid "Invalid response from server."
 msgstr "Resposta inválida do servidor."
 
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:600
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4330,113 +4758,114 @@
 "O servidor solicita autenticación con texto sobre unha canle non cifrada. "
 "Quere permitir isto e continuar co proceso de autenticación?"
 
-#: ../libpurple/protocols/jabber/auth.c:769
-#: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:797
+#: ../libpurple/protocols/jabber/auth.c:820
 msgid "Invalid challenge from server"
 msgstr "Desafío inválido do servidor"
 
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:892
 msgid "SASL error"
 msgstr "Erro de SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:1219
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:1231
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Apelidos"
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:842
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "Nome propio"
 
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/jabber.c:977
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "Rúa"
 
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:890
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "Enderezo estendido"
 
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:898
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "Localidade"
 
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "Rexión"
 
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:906
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:293
+#: ../libpurple/protocols/jabber/buddy.c:1295
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "País"
 
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:963
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "Nome da organización"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:967
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "Grupo de traballo"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:976
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "Papel"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/jabber/buddy.c:300
+#: ../libpurple/protocols/jabber/buddy.c:1250
+#: ../libpurple/protocols/msn/msn.c:1768
+#: ../libpurple/protocols/oscar/oscar.c:3745
 msgid "Birthday"
 msgstr "Ano de nacemento"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3093
-#: ../pidgin/gtkprefs.c:738
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3314
+#: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Descrición"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "Editar vCard de XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4444,186 +4873,487 @@
 "Todos os elementos seguintes son opcionais. Introduza só a información coa "
 "que se sinta cómodo."
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libpurple/protocols/jabber/buddy.c:659
-#: ../libpurple/protocols/jabber/buddy.c:700
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#: ../libpurple/protocols/jabber/buddy.c:669
-#: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../libpurple/protocols/jabber/si.c:853
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+#, fuzzy
+msgid "Service Discovery Info"
+msgstr "Establecer a información do directorio"
+
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
+msgid "Service Discovery Items"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
+#, fuzzy
+msgid "Extended Stanza Addressing"
+msgstr "Enderezo estendido"
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+#, fuzzy
+msgid "Multi-User Chat"
+msgstr "Alias na conversa"
+
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
+#, fuzzy
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "O usuario non ten información no directorio."
+
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
+msgid "In-Band Bytestreams"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
+#, fuzzy
+msgid "Ad-Hoc Commands"
+msgstr "Comando"
+
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
+msgid "PubSub Service"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
+msgid "SOCKS5 Bytestreams"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
+msgid "Out of Band Data"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
+#, fuzzy
+msgid "XHTML-IM"
+msgstr "HTML"
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+#, fuzzy
+msgid "In-Band Registration"
+msgstr "Erro de rexistro"
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+#, fuzzy
+msgid "User Location"
+msgstr "Localización"
+
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
+#, fuzzy
+msgid "User Avatar"
+msgstr "Busca de usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
+#, fuzzy
+msgid "Chat State Notifications"
+msgstr "Notificación do estado dos contactos"
+
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+#, fuzzy
+msgid "Software Version"
+msgstr "Versión non soportada"
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+#, fuzzy
+msgid "Stream Initiation"
+msgstr "Orientación"
+
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr "Transferencia de ficheiros"
+
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+#, fuzzy
+msgid "User Mood"
+msgstr "Modos de usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
+#, fuzzy
+msgid "User Activity"
+msgstr "Límite de usuarios"
+
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
+#, fuzzy
+msgid "Entity Capabilities"
+msgstr "Capacidades"
+
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
+msgid "Encrypted Session Negotiations"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
+#, fuzzy
+msgid "User Tune"
+msgstr "Nome de usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
+#, fuzzy
+msgid "Roster Item Exchange"
+msgstr "MI con intercambio de chave"
+
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
+#, fuzzy
+msgid "Reachability Address"
+msgstr "Enderezo de correo electrónico"
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+#, fuzzy
+msgid "User Profile"
+msgstr "Perfil"
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+#, fuzzy
+msgid "Jingle"
+msgstr "Unirse"
+
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "Jingle Audio"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+#, fuzzy
+msgid "User Nickname"
+msgstr "Nome de usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Jingle ICE UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Jingle ICE TCP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+msgid "Jingle Raw UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
+#, fuzzy
+msgid "Jingle Video"
+msgstr "Vídeo en directo"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "Jingle DTMF"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+#, fuzzy
+msgid "Message Receipts"
+msgstr "Mensaxe recibida"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+#, fuzzy
+msgid "Public Key Publishing"
+msgstr "Babbleprint da chave pública"
+
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+#, fuzzy
+msgid "User Chatting"
+msgstr "Opcións de usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+#, fuzzy
+msgid "User Browsing"
+msgstr "Modos de usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+#, fuzzy
+msgid "User Gaming"
+msgstr "Nome de usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+#, fuzzy
+msgid "User Viewing"
+msgstr "Límite de usuarios"
+
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+#, fuzzy
+msgid "Stanza Encryption"
+msgstr "Cifraxe Trillian"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Entity Time"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "Delayed Delivery"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Collaborative Data Objects"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "File Repository and Sharing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "STUN Service Discovery for Jingle"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Simplified Encrypted Session Negotiation"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Hop Check"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/oscar/oscar.c:2902
+msgid "Capabilities"
+msgstr "Capacidades"
+
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/jabber/buddy.c:1237
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Nome do medio"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3756
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:952
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Enderezo"
 
-#: ../libpurple/protocols/jabber/buddy.c:886
+#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "Non ocultarse de"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "Ocultarse temporalmente de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "Cancelar a notificación de presenza"
 
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "(Volver a) pedir autorización"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1437
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "De-subscribir"
 
-#: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/buddy.c:1988
+#, fuzzy
+msgid "Log In"
+msgstr "Xa está conectado"
+
+#: ../libpurple/protocols/jabber/buddy.c:1992
+#, fuzzy
+msgid "Log Out"
+msgstr "Rexistrar as conversas"
+
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Falador"
 
-#: ../libpurple/protocols/jabber/buddy.c:1474
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "Ausencia estendida"
 
-#: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/jabber/jabber.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:727
+#: ../libpurple/protocols/oscar/oscar.c:5806
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Non molestar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1621
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1625
-#: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3679
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/oscar/oscar.c:3707
 msgid "Last Name"
 msgstr "Apelidos"
 
-#: ../libpurple/protocols/jabber/buddy.c:1657
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "Os resultados da súa busca son os seguintes"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1732
+#: ../libpurple/protocols/jabber/buddy.c:2322
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
-"Localizar un contacto introducindo os criterios de busca nos seguintes campos. Nota: cada campo admite"
-"comodíns (%)"
-
-#: ../libpurple/protocols/jabber/buddy.c:1752
+"Localizar un contacto introducindo os criterios de busca nos seguintes "
+"campos. Nota: cada campo admitecomodíns (%)"
+
+#: ../libpurple/protocols/jabber/buddy.c:2342
 msgid "Directory Query Failed"
 msgstr "Fallou o directorio de consultas"
 
-#: ../libpurple/protocols/jabber/buddy.c:1753
+#: ../libpurple/protocols/jabber/buddy.c:2343
 msgid "Could not query the directory server."
 msgstr "Non se puido procurar no servidor de directorio."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instrucións do servidor: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:2384
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "Encher nun ou máis campos para buscar usuarios XMPP que poidan coincidir."
-
-#: ../libpurple/protocols/jabber/buddy.c:1814
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3682
-#: ../libpurple/protocols/oscar/oscar.c:3691
+msgstr ""
+"Encher nun ou máis campos para buscar usuarios XMPP que poidan coincidir."
+
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/novell/novell.c:1490
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3719
 msgid "E-Mail Address"
 msgstr "Enderezo de correo electrónico"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2414
 msgid "Search for XMPP users"
 msgstr "Localizar usuarios XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1825
+#: ../libpurple/protocols/jabber/buddy.c:2415
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1840
+#: ../libpurple/protocols/jabber/buddy.c:2430
 msgid "Invalid Directory"
 msgstr "Directorio inválido"
 
-#: ../libpurple/protocols/jabber/buddy.c:1857
+#: ../libpurple/protocols/jabber/buddy.c:2447
 msgid "Enter a User Directory"
 msgstr "Introducir un directorio de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:1858
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Select a user directory to search"
 msgstr "Seleccione un directorio de usuario para buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1861
+#: ../libpurple/protocols/jabber/buddy.c:2451
 msgid "Search Directory"
 msgstr "Buscar directorio"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5290
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Sala:"
 
@@ -4713,25 +5443,29 @@
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-#: ../libpurple/protocols/jabber/jabber.c:84
+#: ../libpurple/protocols/jabber/jabber.c:92
 msgid "Error initializing session"
 msgstr "Erro ao inicializar a sesión"
 
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:145
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:259
+#: ../libpurple/protocols/jabber/jabber.c:312
+#: ../libpurple/protocols/jabber/jabber.c:340
 msgid "Write error"
 msgstr "Erro de escritura"
 
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:408
+#: ../libpurple/protocols/jabber/jabber.c:445
 msgid "Read Error"
 msgstr "Erro de lectura"
 
-#: ../libpurple/protocols/jabber/jabber.c:467
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2495
+#: ../libpurple/protocols/jabber/jabber.c:482
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/protocols/yahoo/yahoo.c:2557
+#: ../libpurple/protocols/yahoo/yahoo.c:2589
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4740,55 +5474,72 @@
 "Non se puido establecer unha conexión co servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:529
 msgid "Unable to create socket"
 msgstr "Non se puido crear o conectador "
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:575
+#: ../libpurple/protocols/jabber/jabber.c:1063
 msgid "Invalid XMPP ID"
 msgstr "ID de XMPP non válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:580
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID de XMPP non válido. Debe establecerse o dominio."
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:656
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Rexistro de %s@%s con éxito"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:662
+#, fuzzy, c-format
+msgid "Registration to %s successful"
+msgstr "Rexistro de %s@%s con éxito"
+
+#: ../libpurple/protocols/jabber/jabber.c:664
+#: ../libpurple/protocols/jabber/jabber.c:665
 msgid "Registration Successful"
 msgstr "Éxito no rexistro"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Unknown Error"
-msgstr "Erro descoñecido"
-
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:673
+#: ../libpurple/protocols/jabber/jabber.c:674
 msgid "Registration Failed"
 msgstr "Fallou o rexistro"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:692
+#, fuzzy, c-format
+msgid "Registration from %s successfully removed"
+msgstr "Rexistro de %s@%s con éxito"
+
+#: ../libpurple/protocols/jabber/jabber.c:694
+#: ../libpurple/protocols/jabber/jabber.c:695
+#, fuzzy
+msgid "Unregistration Successful"
+msgstr "Éxito no rexistro"
+
+#: ../libpurple/protocols/jabber/jabber.c:703
+#: ../libpurple/protocols/jabber/jabber.c:704
+#, fuzzy
+msgid "Unregistration Failed"
+msgstr "Fallou o rexistro"
+
+#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:865
 msgid "Already Registered"
 msgstr "Xa está rexistrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3758
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/jabber/jabber.c:962
+#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "State"
 msgstr "Estado"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:967
 msgid "Postal code"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:972
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4798,376 +5549,568 @@
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:982
 msgid "Date"
 msgstr "Data"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:987
+#, fuzzy
+msgid "Unregister"
+msgstr "Rexistrar"
+
+#: ../libpurple/protocols/jabber/jabber.c:994
+#, fuzzy
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr "Cubre a información que se indica abaixo para rexistrar a nova conta."
+
+#: ../libpurple/protocols/jabber/jabber.c:997
 msgid "Please fill out the information below to register your new account."
 msgstr "Cubre a información que se indica abaixo para rexistrar a nova conta."
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:1005
+#: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "Register New XMPP Account"
 msgstr "Rexistrar unha nova conta XMPP"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1523
+#: ../libpurple/protocols/jabber/jabber.c:1007
+#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Register"
 msgstr "Rexistrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1012
+#, fuzzy, c-format
+msgid "Change Account Registration at %s"
+msgstr "Modificar a información do usuario %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1013
+#, fuzzy, c-format
+msgid "Register New Account at %s"
+msgstr "Rexistrar unha nova conta XMPP"
+
+#: ../libpurple/protocols/jabber/jabber.c:1016
+#, fuzzy
+msgid "Change Registration"
+msgstr "Cambiar o estado a"
+
+#: ../libpurple/protocols/jabber/jabber.c:1120
+#: ../libpurple/protocols/jabber/jabber.c:1121
+#, fuzzy
+msgid "Error unregistering account"
+msgstr "Erro ao cambiar a información da conta"
+
+#: ../libpurple/protocols/jabber/jabber.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:1127
+#, fuzzy
+msgid "Account successfully unregistered"
+msgstr "Creou con éxito un Qun "
+
+#: ../libpurple/protocols/jabber/jabber.c:1284
 msgid "Initializing Stream"
 msgstr "Inicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/jabber/jabber.c:1289
+#, fuzzy
+msgid "Initializing SSL/TLS"
+msgstr "Inicializando fluxo"
+
+#: ../libpurple/protocols/jabber/jabber.c:1293
+#: ../libpurple/protocols/msn/session.c:390
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1302
 msgid "Re-initializing Stream"
 msgstr "Reinicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5550
+#: ../libpurple/protocols/jabber/jabber.c:1396
+#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1909
+#: ../libpurple/protocols/jabber/jabber.c:1945
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:5600
 msgid "Not Authorized"
 msgstr "Non autorizado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "Both"
 msgstr "Ambos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1444
 msgid "From (To pending)"
 msgstr "Desde (Destino pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1446
 msgid "From"
 msgstr "De"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1449
 msgid "To"
 msgstr "A"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1451
 msgid "None (To pending)"
 msgstr "Ninguén (Destino pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1453
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ningún"
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1456
 msgid "Subscription"
 msgstr "Subscrición"
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1466
+#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1625
+#: ../libpurple/protocols/jabber/usermood.c:166
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "Estado de ánimo"
+
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#, fuzzy
+msgid "Mood Text"
+msgstr "Tipo de sangue"
+
+#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#, fuzzy
+msgid "Tune Artist"
+msgstr "Artistas"
+
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1628
+#, fuzzy
+msgid "Tune Title"
+msgstr "Título"
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1606
+#: ../libpurple/protocols/jabber/jabber.c:1629
+msgid "Tune Album"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Tune Genre"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1608
+#: ../libpurple/protocols/jabber/jabber.c:1631
+#, fuzzy
+msgid "Tune Comment"
+msgstr "Comentario de contacto"
+
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1632
+msgid "Tune Track"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1633
+msgid "Tune Time"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1542
+#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1634
+msgid "Tune Year"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1635
+msgid "Tune URL"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1637
+#, fuzzy
+msgid "Allow Buzz"
+msgstr "Permitir"
+
+#: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Password Changed"
 msgstr "Contrasinal modificado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Your password has been changed."
 msgstr "O contrasinal foi modificado."
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Error changing password"
 msgstr "Erro ao cambiar o contrasinal"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1728
 msgid "Password (again)"
 msgstr "Contrasinal (de novo)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1734
+#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Change XMPP Password"
 msgstr "Cambiar contrasinal XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Please enter your new password"
 msgstr "Introduza o novo contrasinal"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/jabber/jabber.c:1749
+#: ../libpurple/protocols/oscar/oscar.c:6386
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Establecer a información de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/jabber/jabber.c:1754
+#: ../libpurple/protocols/oscar/oscar.c:6397
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Modificar o contrasinal..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1759
 msgid "Search for Users..."
 msgstr "Localizar usuarios..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Bad Request"
 msgstr "Solicitude errónea"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Conflict"
 msgstr "Conflito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Feature Not Implemented"
 msgstr "Funcionalidade non implementada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1851
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Gone"
 msgstr "Desapareceu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Item Not Found"
 msgstr "Elemento non atopado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Malformed XMPP ID"
 msgstr "ID de XMPP inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Not Acceptable"
 msgstr "Non aceptable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Not Allowed"
 msgstr "Non permitido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Payment Required"
 msgstr "Pagamento necesario"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Recipient Unavailable"
 msgstr "Destinatario non dispoñible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Registration Required"
 msgstr "Rexistro necesario"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Remote Server Not Found"
 msgstr "Non se atopou o servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Remote Server Timeout"
 msgstr "Tempo de espera do servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Service Unavailable"
 msgstr "Servizo non dispoñible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Subscription Required"
 msgstr "Subscrición necesaria"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1885
 msgid "Unexpected Request"
 msgstr "Solicitude non esperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Authorization Aborted"
 msgstr "Autorización interrumpida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Incorrect encoding in authorization"
 msgstr "Codificación incorrecta na autorización"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Invalid authzid"
 msgstr "Authzid non válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorización non válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1903
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorización demasiado feble"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Temporary Authentication Failure"
 msgstr "Fallo temporal da autenticación"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Authentication Failure"
 msgstr "Fallo de autenticación"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Bad Format"
 msgstr "Formato erróneo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Bad Namespace Prefix"
 msgstr "Prefixo do espazo de nomes erróneo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1925
 msgid "Resource Conflict"
 msgstr "Conflito de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1927
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Tempo de espera da conexión"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1929
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1931
 msgid "Host Unknown"
 msgstr "Servidor descoñecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Improper Addressing"
 msgstr "Direccionamento incorrecto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Invalid ID"
 msgstr "ID non válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Invalid Namespace"
 msgstr "Espazo de nomes non válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1941
 msgid "Invalid XML"
 msgstr "XML non válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1943
 msgid "Non-matching Hosts"
 msgstr "Non existen servidores coincidentes"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Policy Violation"
 msgstr "Violación da política"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Remote Connection Failed"
 msgstr "Fallou a conexión remota"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Resource Constraint"
 msgstr "Restrición de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1953
 msgid "Restricted XML"
 msgstr "XML restrinxido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "See Other Host"
 msgstr "Ver outros servidores"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "System Shutdown"
 msgstr "Parada do sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1959
 msgid "Undefined Condition"
 msgstr "Condición non definida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1961
 msgid "Unsupported Encoding"
 msgstr "Codificación non soportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1963
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de estrofa non soportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Unsupported Version"
 msgstr "Versión non soportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1967
 msgid "XML Not Well Formed"
 msgstr "XML mal formado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1969
 msgid "Stream Error"
 msgstr "Erro de fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:2052
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Non puido vedar o usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:2072
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliación descoñecida: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:2077
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Non se puido afiliar o usuario %s como \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:2096
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Papel descoñecido: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:2101
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Non se puido establecer o papel \"%s\" para o usuario: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Non puido expulsar o usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:2185
+#, fuzzy, c-format
+msgid "Unable to ping user %s"
+msgstr "Non puido vedar o usuario %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:2207
+#: ../libpurple/protocols/jabber/jabber.c:2217
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2213
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2239
+#, fuzzy, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr ""
+"Non se puido enviar o ficheiro %s, o usuario non soporta transferencias de "
+"ficheiros"
+
+#: ../libpurple/protocols/jabber/jabber.c:2250
+#: ../libpurple/protocols/yahoo/yahoo.c:4118
+msgid "Buzz"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2251
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "%s conectouse."
+
+#: ../libpurple/protocols/jabber/jabber.c:2252
+#: ../libpurple/protocols/yahoo/yahoo.c:4120
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2291
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar unha sala de conversa."
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:2295
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar unha sala de conversa."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:2304
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Abandonar a sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:2309
 msgid "register:  Register with a chat room."
 msgstr "register: Rexistrarse nunha sala de conversa."
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:2315
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novo asunto]:  Ver ou cambiar o asunto."
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:2321
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [sala]:  Vedar un usuario da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1858
+#: ../libpurple/protocols/jabber/jabber.c:2327
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5175,7 +6118,7 @@
 "affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: "
 "Establecer a afiliación dun usuario coa sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1864
+#: ../libpurple/protocols/jabber/jabber.c:2333
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5183,24 +6126,35 @@
 "role &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Establecer "
 "o papel dun usuario na sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:2339
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaxe]:  Convidar un usuario á sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:2345
 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."
-
-#: ../libpurple/protocols/jabber/jabber.c:1882
+msgstr ""
+"join: &lt;sala&gt; [servidor]:  Unirse a unha sala no servidor indicado."
+
+#: ../libpurple/protocols/jabber/jabber.c:2351
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuario&gt; [sala]:  Botar un usuario da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+#: ../libpurple/protocols/jabber/jabber.c:2356
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;usuario&gt; &lt;mensaxe&gt;:  Enviarlle unha mensaxe privada a un "
 "usuario."
 
+#: ../libpurple/protocols/jabber/jabber.c:2362
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2367
+#: ../libpurple/protocols/yahoo/yahoo.c:4144
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: Avisar a un contacto para chamar a súa atención"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5211,166 +6165,239 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:169
-#: ../libpurple/protocols/jabber/libxmpp.c:171
+#: ../libpurple/protocols/jabber/libxmpp.c:170
+#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
 msgstr "Complemento de protocolo XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:210
+msgid "Require SSL/TLS"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Force old (port 5223) SSL"
 msgstr "Forzar SSL antigo (porto 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:219
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación con texto plano sobre as canles non cifradas"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/jabber/libxmpp.c:224
+#: ../libpurple/protocols/myspace/myspace.c:3275
+#: ../libpurple/protocols/simple/simple.c:1904
 msgid "Connect port"
 msgstr "Conectar co porto"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/jabber/libxmpp.c:228
+#: ../libpurple/protocols/myspace/myspace.c:3272
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Conectar co servidor"
 
-#: ../libpurple/protocols/jabber/message.c:102
+#: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s saíu da conversa."
 
-#: ../libpurple/protocols/jabber/message.c:153
+#: ../libpurple/protocols/jabber/message.c:161
 #, c-format
 msgid "Message from %s"
 msgstr "Mensaxe de %s"
 
-#: ../libpurple/protocols/jabber/message.c:217
+#: ../libpurple/protocols/jabber/message.c:225
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s cambiou o asunto a: %s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:227
 #, c-format
 msgid "The topic is: %s"
 msgstr "O asunto é: %s"
 
-#: ../libpurple/protocols/jabber/message.c:267
+#: ../libpurple/protocols/jabber/message.c:275
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Fallou o envío da mensaxe a %s: %s"
 
-#: ../libpurple/protocols/jabber/message.c:270
+#: ../libpurple/protocols/jabber/message.c:278
 msgid "XMPP Message Error"
 msgstr "Mensaxe de erro de XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:359
+#: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
 msgstr " (Código %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr "Erro de tratamento XML"
 
-#: ../libpurple/protocols/jabber/presence.c:292
+#: ../libpurple/protocols/jabber/presence.c:422
 msgid "Unknown Error in presence"
 msgstr "Erro descoñecido en presenza"
 
-#: ../libpurple/protocols/jabber/presence.c:366
-#: ../libpurple/protocols/jabber/presence.c:367
+#: ../libpurple/protocols/jabber/presence.c:503
+#: ../libpurple/protocols/jabber/presence.c:504
 msgid "Create New Room"
 msgstr "Crear unha sala nova"
 
-#: ../libpurple/protocols/jabber/presence.c:368
+#: ../libpurple/protocols/jabber/presence.c:505
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
-msgstr "Vai crear unha sala nova. Desexa configurala ou aceptar os valores predeterminados?"
-
-#: ../libpurple/protocols/jabber/presence.c:374
+msgstr ""
+"Vai crear unha sala nova. Desexa configurala ou aceptar os valores "
+"predeterminados?"
+
+#: ../libpurple/protocols/jabber/presence.c:511
 msgid "_Configure Room"
 msgstr "_Configurar a sala"
 
-#: ../libpurple/protocols/jabber/presence.c:375
+#: ../libpurple/protocols/jabber/presence.c:512
 msgid "_Accept Defaults"
 msgstr "_Aceptar os valores predeterminados"
 
-#: ../libpurple/protocols/jabber/presence.c:417
+#: ../libpurple/protocols/jabber/presence.c:554
 #, c-format
 msgid "Error in chat %s"
 msgstr "Erro na conversa %s"
 
-#: ../libpurple/protocols/jabber/presence.c:421
+#: ../libpurple/protocols/jabber/presence.c:558
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erro ao unirse á conversa %s"
 
-#: ../libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:775
 #, 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"
 
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Fallou o envío do ficheiro"
 
-#: ../libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Non se puido enviar o ficheiro a %s, JID inválido"
 
-#: ../libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Non se puido enviar o ficheiro a %s, o usuario non está conectado"
 
-#: ../libpurple/protocols/jabber/si.c:836
+#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "Non se puido enviar o ficheiro a %s, non está subscrito á presenza do usuario"
-
-#: ../libpurple/protocols/jabber/si.c:851
+msgstr ""
+"Non se puido enviar o ficheiro a %s, non está subscrito á presenza do usuario"
+
+#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
 msgstr "Seleccione o recurso de %s ao que quere enviar o ficheiro"
 
-#: ../libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr "Seleccione o recurso"
 
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/jabber/usermood.c:179
+#: ../libpurple/protocols/jabber/usermood.c:180
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "Modos de usuario"
+
+#: ../libpurple/protocols/jabber/usermood.c:181
+msgid "Please select your mood from the list."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usernick.c:78
+#, fuzzy
+msgid "Set"
+msgstr "_Establecer"
+
+#: ../libpurple/protocols/jabber/usermood.c:191
+#, fuzzy
+msgid "Set Mood..."
+msgstr "Enviar MI..."
+
+#: ../libpurple/protocols/jabber/usernick.c:76
+#, fuzzy
+msgid "Set User Nickname"
+msgstr "Establecer un límite de usuarios"
+
+#: ../libpurple/protocols/jabber/usernick.c:76
+#, fuzzy
+msgid "Please specify a new nickname for you."
+msgstr "Introduza o novo nome para %s"
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usernick.c:100
+#, fuzzy
+msgid "Set Nickname..."
+msgstr "Alias"
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+#, fuzzy
+msgid "Actions"
+msgstr "Acción"
+
+#: ../libpurple/protocols/jabber/xdata.c:380
+#, fuzzy
+msgid "Select an action"
+msgstr "Seleccionar un ficheiro"
+
+#: ../libpurple/protocols/msn/contact.c:207
+#, fuzzy
+msgid "Unable to connect to contact server"
+msgstr "Non se puido conectar ao servidor."
+
+#: ../libpurple/protocols/msn/contact.c:954
+#, fuzzy
+msgid "Unable to retrieve MSN Address Book"
+msgstr "Seleccionar libro de enderezos de Notes"
+
+#: ../libpurple/protocols/msn/dialog.c:118
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problema de sincronización da lista de contactos en %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
-"%s está na lista local dentro do grupo \"%s\" mais non na lista do "
-"servidor. Desexa engadir este contacto?"
-
-#: ../libpurple/protocols/msn/dialog.c:124
+"%s está na lista local dentro do grupo \"%s\" mais non na lista do servidor. "
+"Desexa engadir este contacto?"
+
+#: ../libpurple/protocols/msn/dialog.c:132
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 msgstr ""
-"%s está na lista local mais non está na lista do servidor. Desexa "
-"engadir este contacto?"
+"%s está na lista local mais non está na lista do servidor. Desexa engadir "
+"este contacto?"
 
 #: ../libpurple/protocols/msn/error.c:36
 msgid "Unable to parse message"
@@ -5470,7 +6497,7 @@
 msgstr "Demasiados resultados dun FND"
 
 #: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Not logged in"
 msgstr "Non iniciou a sesión"
 
@@ -5565,10 +6592,10 @@
 msgstr "Servidor moi ocupado"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:1380
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"
 
@@ -5602,378 +6629,395 @@
 msgid "MSN Error: %s\n"
 msgstr "Erro MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
-msgid "You have just sent a Nudge!"
-msgstr "Acaba de enviar un cobadazo!"
-
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:130
+msgid "Nudge"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:131
+#, fuzzy, c-format
+msgid "%s has nudged you!"
+msgstr "%s conectouse."
+
+#: ../libpurple/protocols/msn/msn.c:132
+#, c-format
+msgid "Nudging %s..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "O novo nome do contacto MSN é demasiado longo."
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:285
 msgid "Set your friendly name."
 msgstr "Establecer o seu nome de contacto."
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:286
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Este é o nome co que lle verán outros usuarios MSN."
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:304
 msgid "Set your home phone number."
 msgstr "Establecer o número de teléfono do seu domicilio."
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:321
 msgid "Set your work phone number."
 msgstr "Establecer o número de teléfono do seu traballo."
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:338
 msgid "Set your mobile phone number."
 msgstr "Establecer o seu número de teléfono móbil."
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:353
 msgid "Allow MSN Mobile pages?"
 msgstr "Quere permitir páxinas de MSN Mobile?"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:354
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
-"Quere permitir ou rexeitar que a xente na súa lista de "
-"contactos lle envíe mensaxes a través de MSN Mobile ao seu "
-"teléfono móbil (ou outro dispositivo móbil)?"
-
-#: ../libpurple/protocols/msn/msn.c:329
+"Quere permitir ou rexeitar que a xente na súa lista de contactos lle envíe "
+"mensaxes a través de MSN Mobile ao seu teléfono móbil (ou outro dispositivo "
+"móbil)?"
+
+#: ../libpurple/protocols/msn/msn.c:360
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:361
 msgid "Disallow"
 msgstr "Rexeitar"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:377
 msgid "This Hotmail account may not be active."
 msgstr "Esta conta de Hotmail talvez non estea activa."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:403
 msgid "Send a mobile message."
 msgstr "Enviar unha mensaxe a un móbil."
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:405
 msgid "Page"
 msgstr "Páxina"
 
-#: ../libpurple/protocols/msn/msn.c:521
-msgid "Has you"
-msgstr "Tenlle"
-
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2977
-#: ../libpurple/protocols/yahoo/yahoo.c:3661
+#: ../libpurple/protocols/msn/msn.c:610 ../libpurple/protocols/msn/msn.c:635
+#: ../libpurple/protocols/msn/msn.c:642 ../libpurple/protocols/msn/msn.c:649
+#: ../libpurple/protocols/msn/msn.c:656 ../libpurple/protocols/msn/msn.c:662
+#: ../libpurple/protocols/msn/msn.c:668
+#, fuzzy
+msgid "Current media"
+msgstr "Token actual"
+
+#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3760
 msgid "Be Right Back"
 msgstr "Volvo deseguida"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/msn/msn.c:654 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2827
+#: ../libpurple/protocols/novell/novell.c:2957
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2979
-#: ../libpurple/protocols/yahoo/yahoo.c:3664
+#: ../libpurple/protocols/yahoo/yahoo.c:3078
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2987
-#: ../libpurple/protocols/yahoo/yahoo.c:3676
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/yahoo/yahoo.c:3086
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "On the Phone"
 msgstr "Ao teléfono"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2991
-#: ../libpurple/protocols/yahoo/yahoo.c:3682
+#: ../libpurple/protocols/msn/msn.c:666
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "Out to Lunch"
 msgstr "Saín xantar"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:697
 msgid "Set Friendly Name..."
 msgstr "Establecer o nome do contacto..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:702
 msgid "Set Home Phone Number..."
 msgstr "Establecer o número de teléfono do seu domicilio..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:706
 msgid "Set Work Phone Number..."
 msgstr "Establecer o número de teléfono do seu traballo..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:710
 msgid "Set Mobile Phone Number..."
 msgstr "Establecer o número do teléfono móbil..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:716
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Activar/Desactivar dispositivos móbiles..."
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:721
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitir/Rexeitar páxinas de móbiles..."
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:732
 msgid "Open Hotmail Inbox"
 msgstr "Abrir o correo de entrada de Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:756
 msgid "Send to Mobile"
 msgstr "Enviar a un móbil"
 
-#: ../libpurple/protocols/msn/msn.c:660
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:766
+#: ../libpurple/protocols/novell/novell.c:3413
 msgid "Initiate _Chat"
 msgstr "Iniciar a _conversa"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:804
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr "Necesítase o soporte SSL para MSN. Instale unha biblioteca SSL soportada."
-
-#: ../libpurple/protocols/msn/msn.c:723
+msgstr ""
+"Necesítase o soporte SSL para MSN. Instale unha biblioteca SSL soportada."
+
+#: ../libpurple/protocols/msn/msn.c:832
 msgid "Failed to connect to server."
 msgstr "Non se puido conectar ao servidor."
 
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msn/msn.c:1620 ../libpurple/protocols/msn/msn.c:1968
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Erro ao obter o perfil"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1691 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "Xeral"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/msn/msn.c:1698
+#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/oscar/oscar.c:3751
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Idade"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1700
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Ocupación"
 
-#: ../libpurple/protocols/msn/msn.c:1560
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1701
+#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/novell/novell.c:1480
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Localización"
 
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1706 ../libpurple/protocols/msn/msn.c:1898
+#: ../libpurple/protocols/msn/msn.c:1904 ../libpurple/protocols/msn/msn.c:1911
 msgid "Hobbies and Interests"
 msgstr "Afeccións e intereses"
 
-#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msn/msn.c:1838 ../libpurple/protocols/msn/msn.c:1845
+#: ../libpurple/protocols/msn/msn.c:1853 ../libpurple/protocols/msn/msn.c:1860
 msgid "A Little About Me"
 msgstr "Un pouco sobre min"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1729
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1731
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1732
 msgid "Interests"
 msgstr "Interese"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1733
 msgid "Pets"
 msgstr "Mascotas"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1734
 msgid "Hometown"
 msgstr "Cidade"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1735
 msgid "Places Lived"
 msgstr "Lugares en que vivin"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1736
 msgid "Fashion"
 msgstr "Moderno"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1737
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1738
 msgid "Music"
 msgstr "Música"
 
-#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1739 ../libpurple/protocols/msn/msn.c:1920
+#: ../libpurple/protocols/msn/msn.c:1926
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Cita preferida"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1756
 msgid "Contact Info"
 msgstr "Información de contactos"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1757
 msgid "Personal"
 msgstr "Persoal"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1760
 msgid "Significant Other"
 msgstr "Outro significativo"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1761
 msgid "Home Phone"
 msgstr "Teléfono da casa"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1762
 msgid "Home Phone 2"
 msgstr "Teléfono da casa 2"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/msn/msn.c:1763
+#: ../libpurple/protocols/oscar/oscar.c:3789
 msgid "Home Address"
 msgstr "Domicilio"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1764
 msgid "Personal Mobile"
 msgstr "Móbil persoal"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1765
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1766
 msgid "Personal E-Mail"
 msgstr "Correo electrónico persoal"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1767
 msgid "Personal IM"
 msgstr "MI persoal"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1769
 msgid "Anniversary"
 msgstr "Aniversario"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1785
 msgid "Work"
 msgstr "Traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1787
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Posto de traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/oscar/oscar.c:3810
 msgid "Company"
 msgstr "Compañía"
 
-#: ../libpurple/protocols/msn/msn.c:1648
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Departamento"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1790
 msgid "Profession"
 msgstr "Profesión"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1791
 msgid "Work Phone"
 msgstr "Teléfono do traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1792
 msgid "Work Phone 2"
 msgstr "Teléfono do traballo 2"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Work Address"
 msgstr "Enderezo do traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1794
 msgid "Work Mobile"
 msgstr "Móbil do traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1795
 msgid "Work Pager"
 msgstr "Buscapersoas do traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1796
 msgid "Work Fax"
 msgstr "Fax do traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1797
 msgid "Work E-Mail"
 msgstr "Correo electrónico do traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1798
 msgid "Work IM"
 msgstr "MI do traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1799
 msgid "Start Date"
 msgstr "Data de inicio"
 
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1869 ../libpurple/protocols/msn/msn.c:1875
+#: ../libpurple/protocols/msn/msn.c:1882 ../libpurple/protocols/msn/msn.c:1889
 msgid "Favorite Things"
 msgstr "Cousas preferidas"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1934
 msgid "Last Updated"
 msgstr "Última actualización"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1945
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Páxina persoal"
 
-#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1969
 msgid "The user has not created a public profile."
 msgstr "O usuario non creou un perfil público."
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1970
 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 "
 "public profile."
 msgstr ""
-"MSN indicou que non puido localizar un perfil para ese usuario. Isto significa "
-"que ou ben o usuario non existe ou que o usuario existe mais non creou un "
-"perfil público."
-
-#: ../libpurple/protocols/msn/msn.c:1833
+"MSN indicou que non puido localizar un perfil para ese usuario. Isto "
+"significa que ou ben o usuario non existe ou que o usuario existe mais non "
+"creou un perfil público."
+
+#: ../libpurple/protocols/msn/msn.c:1974
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
-"Non se puido atopar información no perfil do usuario. É probable que o usuario "
-"non exista."
-
-#: ../libpurple/protocols/msn/msn.c:1841
+"Non se puido atopar información no perfil do usuario. É probable que o "
+"usuario non exista."
+
+#: ../libpurple/protocols/msn/msn.c:1982
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL do perfil"
@@ -5988,96 +7032,106 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
-msgid "MSN Protocol Plugin"
-msgstr "Complemento de protocolo MSN"
-
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2269 ../libpurple/protocols/msn/msn.c:2271
+#, fuzzy
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Complemento de protocolo de Mensaxería GroupWise de Novell"
+
+#: ../libpurple/protocols/msn/msn.c:2306
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2311
+#, fuzzy
+msgid "HTTP Method Server"
+msgstr "Servidor de proba IPC"
+
+#: ../libpurple/protocols/msn/msn.c:2316
 msgid "Show custom smileys"
 msgstr "Mostrar as emoticonas personalizadas"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2324
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para chamar a súa atención"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:133
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
-msgid "Unable to connect"
-msgstr "Non se puido conectar"
-
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/nexus.c:137
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr ""
+
+#: ../libpurple/protocols/msn/nexus.c:275
+#, fuzzy
+msgid "Windows Live ID authentication Failed"
+msgstr "Fallo: Fallou a autenticación"
+
+#: ../libpurple/protocols/msn/notification.c:191
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s non é un nome de grupo válido."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:197
+#: ../libpurple/protocols/msn/notification.c:938
+#: ../libpurple/protocols/msn/session.c:369
 msgid "Unknown error."
 msgstr "Erro descoñecido."
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:200
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s en %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:518
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s acáballe de dar un cobadazo!"
+
+#: ../libpurple/protocols/msn/notification.c:843
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Erro descoñecido"
+
+#: ../libpurple/protocols/msn/notification.c:844
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "Imposible engadir o usuario"
+
+#: ../libpurple/protocols/msn/notification.c:904
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Non se puido engadir o usuario a %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:908
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Non se puido bloquear o usuario en %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:912
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Non se puido permitir ao usuario en %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:920
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "Non se puido engadir a %s porque a súa lista de contactos está chea."
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:929
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s non é un nome válido de conta passport."
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:934
 msgid "Service Temporarily Unavailable."
 msgstr "Servizo non dispoñible temporalmente."
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1272
 msgid "Unable to rename group"
 msgstr "Non se puido cambiar o nome do grupo"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1327
 msgid "Unable to delete group"
 msgstr "Non se puido borrar o grupo"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1943
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6094,29 +7148,53 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-"O servidor de MSN desconectarase para as tarefas de mantemento en %d minutos. "
-"Desconectaraselle automaticamente nese momento. Remate calquera "
+"O servidor de MSN desconectarase para as tarefas de mantemento en %d "
+"minutos. Desconectaraselle automaticamente nese momento. Remate calquera "
 "conversa activa.\n"
 "\n"
-"Despois de que rematen as tarefas de mantemento poderá conectarse con "
-"éxito de novo."
+"Despois de que rematen as tarefas de mantemento poderá conectarse con éxito "
+"de novo."
 msgstr[1] ""
-"O servidor de MSN desconectarase para as tarefas de mantemento en %d minutos. "
-"Desconectaraselle automaticamente nese momento. Remate calquera "
+"O servidor de MSN desconectarase para as tarefas de mantemento en %d "
+"minutos. Desconectaraselle automaticamente nese momento. Remate calquera "
 "conversa activa.\n"
 "\n"
-"Despois de que rematen as tarefas de mantemento poderá conectarse con "
-"éxito de novo."
+"Despois de que rematen as tarefas de mantemento poderá conectarse con éxito "
+"de novo."
+
+#: ../libpurple/protocols/msn/oim.c:141
+#, fuzzy
+msgid "Unable to connect to OIM server"
+msgstr "Non se puido conectar ao servidor."
 
 #: ../libpurple/protocols/msn/servconn.c:135
-msgid "Writing error"
-msgstr "Erro de escritura"
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "Non se puido conectar"
 
 #: ../libpurple/protocols/msn/servconn.c:137
+msgid "Writing error"
+msgstr "Erro de escritura"
+
+#: ../libpurple/protocols/msn/servconn.c:139
 msgid "Reading error"
 msgstr "Erro de lectura"
 
-#: ../libpurple/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/msn/servconn.c:146
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -6125,55 +7203,60 @@
 "Erro de conexión do servidor %s :\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:336
 msgid "Our protocol is not supported by the server."
 msgstr "O servidor non soporta o noso protocolo."
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:340
 msgid "Error parsing HTTP."
 msgstr "Erro na análise HTTP."
 
-#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/msn/session.c:344
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "Conectouse desde outra localización."
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:349
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "Os servidores MSN non están dispoñibles temporalmente. Agarde e volva tentalo máis tarde."
-
-#: ../libpurple/protocols/msn/session.c:315
+msgstr ""
+"Os servidores MSN non están dispoñibles temporalmente. Agarde e volva "
+"tentalo máis tarde."
+
+#: ../libpurple/protocols/msn/session.c:354
 msgid "The MSN servers are going down temporarily."
 msgstr "Os servidores MSN van sufrir un apagado temporal."
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:359
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Non se puido autenticar: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr "A lista de contactos MSN non está dispoñible temporalmente. Agarde e volva a tentalo máis tarde."
-
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:364
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+"A lista de contactos MSN non está dispoñible temporalmente. Agarde e volva a "
+"tentalo máis tarde."
+
+#: ../libpurple/protocols/msn/session.c:385
+#: ../libpurple/protocols/msn/session.c:387
 msgid "Handshaking"
 msgstr "Negociación"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:388
 msgid "Starting authentication"
 msgstr "Comezando coa autenticación"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:389
 msgid "Getting cookie"
 msgstr "Obtendo unha cookie"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:391
 msgid "Sending cookie"
 msgstr "Enviando cookie"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:392
 msgid "Retrieving buddy list"
 msgstr "Recuperando a lista de contactos"
 
@@ -6191,11 +7274,14 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr "Posiblemente non se puido enviar a mensaxe porque se excedeu o tempo de espera:"
+msgstr ""
+"Posiblemente non se puido enviar a mensaxe porque se excedeu o tempo de "
+"espera:"
 
 #: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr "Non se puido enviar a mensaxe, non está permitido mentres sexa invisible:"
+msgstr ""
+"Non se puido enviar a mensaxe, non está permitido mentres sexa invisible:"
 
 #: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
@@ -6207,48 +7293,463 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "Non se puido enviar a mensaxe porque estamos a enviar demasiado rápido:"
+msgstr ""
+"Non se puido enviar a mensaxe porque estamos a enviar demasiado rápido:"
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
-"Non se puido enviar a mensaxe porque non se puido establecer unha conexión co "
-"servidor. É probable que sexa un problema do servidor, inténteo de novo nuns minutos."
+"Non se puido enviar a mensaxe porque non se puido establecer unha conexión "
+"co servidor. É probable que sexa un problema do servidor, inténteo de novo "
+"nuns minutos."
 
 #: ../libpurple/protocols/msn/switchboard.c:431
-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 coa centraliña:"
+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 coa centraliña:"
 
 #: ../libpurple/protocols/msn/switchboard.c:439
 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:"
 
-#: ../libpurple/protocols/msn/switchboard.c:963
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s acáballe de dar un cobadazo!"
-
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:243
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "O usuario %s engadiulle á súa lista de contactos."
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "O usuario %s eliminoulle da súa lista de contactos."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Imposible engadir \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
 msgid "The screen name specified is invalid."
 msgstr "O nome especificado é incorrecto."
 
+#: ../libpurple/protocols/myspace/myspace.c:111
+#, fuzzy
+msgid "Missing Cipher"
+msgstr "Cifrado"
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr ""
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1798
+msgid "MySpaceIM Error"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:349
+#, fuzzy
+msgid "Reading challenge"
+msgstr "Erro de lectura"
+
+#: ../libpurple/protocols/myspace/myspace.c:355
+#, fuzzy
+msgid "Unexpected challenge length from server"
+msgstr "Desafío inválido do servidor"
+
+#: ../libpurple/protocols/myspace/myspace.c:359
+#, fuzzy
+msgid "Logging in"
+msgstr "Rexistro"
+
+#: ../libpurple/protocols/myspace/myspace.c:1278
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr ""
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1321
+#, fuzzy
+msgid "New mail messages"
+msgstr "Enviar unha mensaxe"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New blog comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New profile comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1324
+msgid "New friend requests!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1325
+msgid "New picture comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1355
+msgid "MySpace"
+msgstr ""
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1538
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Conectado"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+#: ../libpurple/protocols/myspace/myspace.c:1551
+#, fuzzy
+msgid "No username set"
+msgstr "Sen nome"
+
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1777
+#, fuzzy, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "O proceso devolveu o código de erro %d"
+
+#: ../libpurple/protocols/myspace/myspace.c:1970
+#: ../libpurple/protocols/myspace/myspace.c:2004
+#, fuzzy
+msgid "Failed to add buddy"
+msgstr "Non se puido unir o contacto á conversa"
+
+#: ../libpurple/protocols/myspace/myspace.c:1970
+#, fuzzy
+msgid "'addbuddy' command failed."
+msgstr "Cargar a lista de contactos desde un ficheiro..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2004
+#: ../libpurple/protocols/myspace/myspace.c:2245
+#, fuzzy
+msgid "persist command failed"
+msgstr "Fallou o servidor centraliña"
+
+#: ../libpurple/protocols/myspace/myspace.c:2113
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2114
+#, fuzzy
+msgid "User lookup"
+msgstr "Salas de usuarios"
+
+#: ../libpurple/protocols/myspace/myspace.c:2226
+#: ../libpurple/protocols/myspace/myspace.c:2245
+#: ../libpurple/protocols/myspace/myspace.c:2267
+#, fuzzy
+msgid "Failed to remove buddy"
+msgstr "Non se puido unir o contacto á conversa"
+
+#: ../libpurple/protocols/myspace/myspace.c:2226
+msgid "'delbuddy' command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2267
+#, fuzzy
+msgid "blocklist command failed"
+msgstr "Fallou o servidor centraliña"
+
+#: ../libpurple/protocols/myspace/myspace.c:2313
+#, fuzzy
+msgid "Invalid input condition"
+msgstr "Rematando a conexión"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2331
+#: ../libpurple/protocols/myspace/myspace.c:2362
+#, fuzzy
+msgid "Read buffer full"
+msgstr "Cola chea"
+
+#: ../libpurple/protocols/myspace/myspace.c:2400
+#, fuzzy
+msgid "Unparseable message"
+msgstr "Non se puido interpretar a mensaxe"
+
+#: ../libpurple/protocols/myspace/myspace.c:2469
+#, fuzzy, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Non se puido conectar ao servidor"
+
+#: ../libpurple/protocols/myspace/myspace.c:2640
+#, fuzzy
+msgid "IM Friends"
+msgstr "Ventás de M_I"
+
+#: ../libpurple/protocols/myspace/myspace.c:2739
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2740
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "Resposta inválida do servidor."
+
+#: ../libpurple/protocols/myspace/myspace.c:2792
+#: ../libpurple/protocols/myspace/myspace.c:2857
+msgid "Add friends from MySpace.com"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2793
+#, fuzzy
+msgid "Importing friends failed"
+msgstr "Fallou ao cargar o complemento"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2849
+#, fuzzy
+msgid "Find people..."
+msgstr "Buscar contactos..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2852
+#, fuzzy
+msgid "Change IM name..."
+msgstr "Modificar contrasinal..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3154
+msgid "myim URL handler"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3155
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3156
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3279
+msgid "Show display name in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3282
+msgid "Show headline in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3287
+#, fuzzy
+msgid "Send emoticons"
+msgstr "Opcións de son"
+
+#: ../libpurple/protocols/myspace/myspace.c:3292
+msgid "Screen resolution (dots per inch)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3295
+msgid "Base font size (points)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:95
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "Usuario"
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/oscar/oscar.c:2960
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../libpurple/protocols/myspace/user.c:124
+#, fuzzy
+msgid "Headline"
+msgstr "_Identificador:"
+
+#: ../libpurple/protocols/myspace/user.c:129
+#, fuzzy
+msgid "Song"
+msgstr "Sons"
+
+#: ../libpurple/protocols/myspace/user.c:134
+msgid "Total Friends"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:145
+#: ../libpurple/protocols/myspace/user.c:148
+#: ../libpurple/protocols/myspace/user.c:151
+#, fuzzy
+msgid "Client Version"
+msgstr "Pechar a conversa"
+
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:177
+msgid "Zap"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, fuzzy, c-format
+msgid "%s has zapped you!"
+msgstr "%s conectouse."
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "Zapping %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:45
+msgid "Whack"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, fuzzy, c-format
+msgid "%s has whacked you!"
+msgstr "O usuario bloqueoulle"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "Whacking %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy
+msgid "Torch"
+msgstr "Asunto"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy, c-format
+msgid "%s has torched you!"
+msgstr "O usuario bloqueoulle"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "Torching %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:47
+msgid "Smooch"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, fuzzy, c-format
+msgid "%s has smooched you!"
+msgstr "%s conectouse."
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "Smooching %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:48
+msgid "Hug"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, fuzzy, c-format
+msgid "%s has hugged you!"
+msgstr "%s conectouse."
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "Hugging %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy
+msgid "Slap"
+msgstr "Durmido"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy, c-format
+msgid "%s has slapped you!"
+msgstr "%s conectouse."
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Slapping %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, fuzzy
+msgid "Goose"
+msgstr "Desapareceu"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, fuzzy, c-format
+msgid "%s has goosed you!"
+msgstr "%s marchou."
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, fuzzy, c-format
+msgid "Goosing %s..."
+msgstr "Buscando %s"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+msgid "High-five"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, fuzzy, c-format
+msgid "%s has high-fived you!"
+msgstr "%s conectouse."
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "High-fiving %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:52
+msgid "Punk"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, fuzzy, c-format
+msgid "%s has punk'd you!"
+msgstr "%s conectouse."
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "Punking %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+msgid "Raspberry"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, fuzzy, c-format
+msgid "%s has raspberried you!"
+msgstr "%s conectouse."
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Raspberrying %s..."
+msgstr ""
+
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Non se recibiron os parámetros necesarios"
@@ -6383,41 +7884,42 @@
 msgid "Login failed (%s)."
 msgstr "Fallou o inicio de sesión (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:249
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Non se puido enviar a mensaxe. Non se puideron obter os detalles do usuario "
 "(%s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:398
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Non se puido engadir %s á súa lista de contactos (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:424
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Non se puido enviar a mensaxe (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:495
+#: ../libpurple/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Non se puido convidar o usuario (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:534
 #, 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)."
-
-#: ../libpurple/protocols/novell/novell.c:537
+msgstr ""
+"Non se puido enviar unha mensaxe a %s. Non se puido crear a conferencia (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:539
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Non se puido enviar a mensaxe. Non se puido crear a conferencia (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:586
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -6426,7 +7928,7 @@
 "Non se puido mover o usuario %s ao cartafol %s na lista do servidor. "
 "Produciuse un erro ao crear o cartafol (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:634
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -6435,62 +7937,62 @@
 "Non se puido engadir na súa lista de contactos a %s. Produciuse un erro ao "
 "crear o cartafol na lista do servidor (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:707
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Non se puideron obter os detalles do usuario %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:753
+#: ../libpurple/protocols/novell/novell.c:899
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Non se puido engadir o usuario á lista de privacidade (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:800
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Non se puido engadir %s á súa lista de rexeitados (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:853
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Non se puido engadir %s á súa lista de permitidos (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:921
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Non se puido eliminar %s da lista de privacidade (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:944
+#: ../libpurple/protocols/novell/novell.c:1649
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Non se puideron modificar as opcións de privacidade do servidor (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Non se puido crear a conferencia (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1123
+#: ../libpurple/protocols/novell/novell.c:1694
 msgid "Error communicating with server. Closing connection."
 msgstr "Erro ao se comunicar co servidor. Pecharase a conexión."
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "Número de teléfono"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Título"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "Caixa de correo"
 
-#: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4123
+#: ../libpurple/protocols/novell/novell.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "ID de usuario"
 
@@ -6500,41 +8002,41 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1517
 msgid "Full name"
 msgstr "Nome completo"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1639
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferencia GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
+#: ../libpurple/protocols/novell/novell.c:1670
 msgid "Unable to make SSL connection to server."
 msgstr "Non se puido establecer unha conexión SSL co servidor."
 
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1722
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1734
 msgid "Unable to connect to server."
 msgstr "Non se puido conectar ao servidor."
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1737
 msgid "Waiting for response..."
 msgstr "Agardando unha resposta..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1872
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "Convidouse a %s a esta conversa."
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1900
 msgid "Invitation to Conversation"
 msgstr "Convite para unha conversa"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1901
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6545,18 +8047,18 @@
 "\n"
 "Enviado: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1903
 msgid "Would you like to join the conversation?"
 msgstr "Desexa unirse á conversa?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2017
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Foi desconectado porque se conectou desde outra estación de traballo."
 
-#: ../libpurple/protocols/novell/novell.c:2069
-#, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
+#: ../libpurple/protocols/novell/novell.c:2074
+#, c-format
+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 lle acaba de "
 "enviar."
@@ -6565,19 +8067,19 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2172
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
-"Non se puido contactar co servidor. Indique o enderezo do "
-"servidor co que desexa conectar."
-
-#: ../libpurple/protocols/novell/novell.c:2195
+"Non se puido contactar co servidor. Indique o enderezo do servidor co que "
+"desexa conectar."
+
+#: ../libpurple/protocols/novell/novell.c:2200
 msgid "Error. SSL support is not installed."
 msgstr "Erro. O soporte SSL non está instalado."
 
-#: ../libpurple/protocols/novell/novell.c:2504
+#: ../libpurple/protocols/novell/novell.c:2509
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Pechouse esta conferencia. Non se poden enviar máis mensaxes."
 
@@ -6591,33 +8093,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3523
+#: ../libpurple/protocols/novell/novell.c:3525
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Mensaxería GroupWise de Novell"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3550
 msgid "Server address"
 msgstr "Enderezo do servidor"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3554
 msgid "Server port"
 msgstr "Porto do servidor"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2374
-#: ../libpurple/protocols/yahoo/yahoo.c:2541
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2468
+#: ../libpurple/protocols/yahoo/yahoo.c:2635
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
+#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
+#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
 msgid "Server closed the connection."
 msgstr "O servidor pechou a conexión."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2368
-#: ../libpurple/protocols/yahoo/yahoo.c:2535 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2462
+#: ../libpurple/protocols/yahoo/yahoo.c:2629 ../libpurple/proxy.c:593
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
+#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6626,10 +8128,10 @@
 "Perdeuse a conexión co servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
-#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
-#: ../libpurple/proxy.c:1461
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
+#: ../libpurple/proxy.c:1478
 msgid "Received invalid data on connection with server."
 msgstr "Recibíronse datos non válidos na conexión co servidor."
 
@@ -6664,7 +8166,7 @@
 msgstr "Complemento de protocolo ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4279
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codificación"
@@ -6694,108 +8196,108 @@
 msgid "Direct IM established"
 msgstr "MI directa establecida"
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "O ficheiro %s é %s, que é maior que o tamaño máximo de %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:115
+#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid error"
 msgstr "Erro inválido"
 
-#: ../libpurple/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid SNAC"
 msgstr "SNAC inválido"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to host"
 msgstr "Taxa de mensaxes para o servidor"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to client"
 msgstr "Taxa de mensaxes para o cliente"
 
-#: ../libpurple/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service unavailable"
 msgstr "Servizo non dispoñible"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service not defined"
 msgstr "Servizo non definido"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by host"
 msgstr "Non soportado polo servidor"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by client"
 msgstr "Non soportado polo cliente"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Refused by client"
 msgstr "Rexeitado polo cliente"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Reply too big"
 msgstr "Resposta demasiado grande"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
-msgid "Responses lost"
-msgstr "Respostas perdidas"
-
 #: ../libpurple/protocols/oscar/oscar.c:128
-msgid "Request denied"
-msgstr "Solicitude rexeitada"
+msgid "Responses lost"
+msgstr "Respostas perdidas"
 
 #: ../libpurple/protocols/oscar/oscar.c:129
+msgid "Request denied"
+msgstr "Solicitude rexeitada"
+
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Busted SNAC payload"
 msgstr "Carga de SNAC destrozada"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Insufficient rights"
 msgstr "Dereitos insuficientes"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "In local permit/deny"
 msgstr "Na lista local de autorizar/rexeitar"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (sender)"
 msgstr "Demasiado malvado (remitente)"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
-msgid "Too evil (receiver)"
-msgstr "Demasiado malvado (destinatario)"
-
 #: ../libpurple/protocols/oscar/oscar.c:134
-msgid "User temporarily unavailable"
-msgstr "Usuario temporalmente non dispoñible"
+msgid "Too evil (receiver)"
+msgstr "Demasiado malvado (destinatario)"
 
 #: ../libpurple/protocols/oscar/oscar.c:135
+msgid "User temporarily unavailable"
+msgstr "Usuario temporalmente non dispoñible"
+
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "No match"
 msgstr "Non houbo coincidencia"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
-msgid "List overflow"
-msgstr "Límite da lista excedido"
-
 #: ../libpurple/protocols/oscar/oscar.c:137
+msgid "List overflow"
+msgstr "Límite da lista excedido"
+
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Request ambiguous"
 msgstr "Solicitude ambigüa"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Queue full"
 msgstr "Cola chea"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
+#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Not while on AOL"
 msgstr "Non mentres está en AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:347
+#: ../libpurple/protocols/oscar/oscar.c:348
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6806,31 +8308,32 @@
 "empregar unha codificación diferente da esperada. Se sabe cal está "
 "empregando pode especificalo nas opcións avanzadas de conta para AIM/ICQ)"
 
-#: ../libpurple/protocols/oscar/oscar.c:456
+#: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"(Produciuse un erro ao recibir esta mensaxe. Pode deberse a que vostede e mais %s teñen seleccionada"
-"unha codificación diferente ou que %s ten un cliente con erros.)"
+"(Produciuse un erro ao recibir esta mensaxe. Pode deberse a que vostede e "
+"mais %s teñen seleccionadaunha codificación diferente ou que %s ten un "
+"cliente con erros.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2376
-#: ../pidgin/gtkutils.c:2406
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
+#: ../pidgin/gtkutils.c:2417
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Icona de contacto"
 
-#: ../libpurple/protocols/oscar/oscar.c:641
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "Voz"
 
-#: ../libpurple/protocols/oscar/oscar.c:644
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "MI Directa AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:647
+#: ../libpurple/protocols/oscar/oscar.c:648
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -6838,125 +8341,125 @@
 msgid "Chat"
 msgstr "Conversa"
 
-#: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:5958
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:6008
 msgid "Get File"
 msgstr "Recibir ficheiro"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Xogos"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "Extensións"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Enviar lista de contactos"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "Conexión directa ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:681
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "Antigo ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:684
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr "Cifraxe Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:687
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:690
+#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:693
+#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "Seguridade activada"
 
-#: ../libpurple/protocols/oscar/oscar.c:696
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "Vídeoconversa"
 
-#: ../libpurple/protocols/oscar/oscar.c:700
+#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:703
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "Vídeo en directo"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "Cámara"
 
-#: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:725
+#: ../libpurple/protocols/oscar/oscar.c:5778
 msgid "Free For Chat"
 msgstr "Dispoñible para conversar"
 
-#: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:729
+#: ../libpurple/protocols/oscar/oscar.c:5813
 msgid "Not Available"
 msgstr "Non dispoñible"
 
-#: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/oscar/oscar.c:734
+#: ../libpurple/protocols/oscar/oscar.c:735
 msgid "Web Aware"
 msgstr "Visible na Web"
 
-#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:2995 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/yahoo/yahoo.c:3094 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/oscar/oscar.c:738
+#: ../libpurple/protocols/oscar/oscar.c:739
 msgid "Online"
 msgstr "Conectado"
 
-#: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3675
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1123
+#: ../libpurple/protocols/oscar/oscar.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3703
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128
 msgid "IP Address"
 msgstr "Enderezo IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:845
+#: ../libpurple/protocols/oscar/oscar.c:2887
 msgid "Warning Level"
 msgstr "Nivel de aviso"
 
-#: ../libpurple/protocols/oscar/oscar.c:854
+#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Comentario de contacto"
 
-#: ../libpurple/protocols/oscar/oscar.c:994
+#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6965,7 +8468,7 @@
 "Non se puido conectar ao servidor de autenticación:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1002
+#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6974,53 +8477,55 @@
 "Non se puido conectar ao servidor BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1042
+#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "Enviouse o nome de usuario"
 
-#: ../libpurple/protocols/oscar/oscar.c:1047
+#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "Conexión establecida, cookie enviada"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1076
+#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "Rematando a conexión"
 
-#: ../libpurple/protocols/oscar/oscar.c:1258
+#: ../libpurple/protocols/oscar/oscar.c:1260
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must be a valid email address, or start with a letter "
 "and contain only letters, numbers and spaces, or contain only numbers."
 msgstr ""
-"Non se puido iniciar a sesión: Non se iniciou a sesión como %s porque o nome de usuario é "
-"inválido.  Os nomes de usuario teñen que ser unha dirección de correo electrónico válida ou "
-"comezar cunha letra e conter só letras, números e espazos, ou conter só números."
-
-#: ../libpurple/protocols/oscar/oscar.c:1343
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+"Non se puido iniciar a sesión: Non se iniciou a sesión como %s porque o nome "
+"de usuario é inválido.  Os nomes de usuario teñen que ser unha dirección de "
+"correo electrónico válida ou comezar cunha letra e conter só letras, números "
+"e espazos, ou conter só números."
+
+#: ../libpurple/protocols/oscar/oscar.c:1345
+#: ../libpurple/protocols/yahoo/yahoo.c:2104
 msgid "Invalid screen name."
 msgstr "Nome de usuario incorrecto."
 
-#: ../libpurple/protocols/oscar/oscar.c:1350
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:2031
+#: ../libpurple/protocols/oscar/oscar.c:1352
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:2125
 msgid "Incorrect password."
 msgstr "Contrasinal incorrecto."
 
-#: ../libpurple/protocols/oscar/oscar.c:1355
+#: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
 msgstr "A conta está deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1359
+#: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "O servizo de mensaxería instantánea AOL non está dispoñible temporalmente."
-
-#: ../libpurple/protocols/oscar/oscar.c:1364
-#: ../libpurple/protocols/oscar/oscar.c:1375
+msgstr ""
+"O servizo de mensaxería instantánea AOL non está dispoñible temporalmente."
+
+#: ../libpurple/protocols/oscar/oscar.c:1366
+#: ../libpurple/protocols/oscar/oscar.c:1377
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -7028,44 +8533,44 @@
 "Conectouse e desconectouse demasiadas veces. Agarde dez minutos e inténteo "
 "de novo. Se segue a intentalo, pode que necesite agardar máis tempo."
 
-#: ../libpurple/protocols/oscar/oscar.c:1369
+#: ../libpurple/protocols/oscar/oscar.c:1371
 #, 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. Actualízea en %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1408
+#: ../libpurple/protocols/oscar/oscar.c:1410
 msgid "Could Not Connect"
 msgstr "Non se puido conectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1412
+#: ../libpurple/protocols/oscar/oscar.c:1414
 msgid "Received authorization"
 msgstr "Recibiuse a autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:1434
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "The SecurID key entered is invalid."
 msgstr "A clave SecurID que se introduciu non é válida."
 
-#: ../libpurple/protocols/oscar/oscar.c:1447
+#: ../libpurple/protocols/oscar/oscar.c:1449
 msgid "Enter SecurID"
 msgstr "Introduza o SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1448
+#: ../libpurple/protocols/oscar/oscar.c:1450
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduza o díxito de seis números que aparece na pantalla."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1450
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6114 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1452
+#: ../libpurple/protocols/oscar/oscar.c:2228
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:6164 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1489
-#: ../libpurple/protocols/oscar/oscar.c:1532
+#: ../libpurple/protocols/oscar/oscar.c:1491
+#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7074,74 +8579,76 @@
 "Talvez sexa desconectado en breve. Pode querer usar TOC ata que se resolva "
 "isto. Comprobe %s para as novidades."
 
-#: ../libpurple/protocols/oscar/oscar.c:1492
-#: ../libpurple/protocols/oscar/oscar.c:1535
+#: ../libpurple/protocols/oscar/oscar.c:1494
+#: ../libpurple/protocols/oscar/oscar.c:1537
 msgid "Unable to get a valid AIM login hash."
 msgstr "Non se puido obter un hash de inicio de sesión AIM válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1620
+#: ../libpurple/protocols/oscar/oscar.c:1622
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Talvez sexa desconectado en breve. Comprobe %s para actualizacións."
 
-#: ../libpurple/protocols/oscar/oscar.c:1623
+#: ../libpurple/protocols/oscar/oscar.c:1625
 msgid "Unable to get a valid login hash."
 msgstr "Non se puido obter un hash de inicio de sesión válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:1655
 msgid "Password sent"
 msgstr "Contrasinal enviado"
 
-#: ../libpurple/protocols/oscar/oscar.c:1708
+#: ../libpurple/protocols/oscar/oscar.c:1711
 msgid "Unable to initialize connection"
 msgstr "Non é posible comezar a conexión"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2198
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autoríceme para que poida engadirlle á miña lista de contactos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2226
 msgid "Authorization Request Message:"
 msgstr "Mensaxe de solicitude de autorización:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2227
 msgid "Please authorize me!"
 msgstr "Por favor, autoríceme!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5211
-#: ../libpurple/protocols/yahoo/yahoo.c:1014
+#: ../libpurple/protocols/oscar/oscar.c:2268
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
 msgid "No reason given."
 msgstr "Non se indicou unha razón."
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "Mensaxe de autorización rexeitada:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"O usuario %u rexeitou a súa soliciude de engadilos a súa lista de contactos pola "
-"seguinte razón:\n"
+"O usuario %u rexeitou a súa soliciude de engadilos a súa lista de contactos "
+"pola seguinte razón:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2418
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "Autorización ICQ rexeitada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2425
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr "O usuario %u autorizou a súa solicitude de engadilos á súa lista de contactos."
-
-#: ../libpurple/protocols/oscar/oscar.c:2433
+msgstr ""
+"O usuario %u autorizou a súa solicitude de engadilos á súa lista de "
+"contactos."
+
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7154,7 +8661,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2441
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7167,7 +8674,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2449
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7180,59 +8687,61 @@
 "A mensaxe é:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "O usuario ICQ %u envioulle un contacto: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Desexa engadir este contacto á lista de contactos?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "_Engadir"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2566
+#: ../libpurple/protocols/oscar/oscar.c:2592
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Perdeuse %hu mensaxe de %s porque non era válida."
 msgstr[1] "Perdeuse %hu mensaxe de %s porque non era válida."
 
-#: ../libpurple/protocols/oscar/oscar.c:2575
+#: ../libpurple/protocols/oscar/oscar.c:2601
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Perdeuse %hu mensaxe de %s porque era demasiado longa."
 msgstr[1] "Perdeuse %hu mensaxe de %s porque era demasiado longa."
 
-#: ../libpurple/protocols/oscar/oscar.c:2584
-#, 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."
+#: ../libpurple/protocols/oscar/oscar.c:2610
+#, 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."
 msgstr[0] "Perdeu %hu mensaxe de %s porque se mandou damasiado rápido."
 msgstr[1] "Perdeu %hu mensaxe de %s porque se mandou damasiado rápido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2593
+#: ../libpurple/protocols/oscar/oscar.c:2619
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Perdeuse %hu mensaxe de %s porque el/ela foi moi malvado/a."
 msgstr[1] "Perdeuse %hu mensaxe de %s porque el/ela foi moi malvado/a."
 
-#: ../libpurple/protocols/oscar/oscar.c:2602
+#: ../libpurple/protocols/oscar/oscar.c:2628
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Perdeuse %hu mensaxe de %s porque es moi malvado/a."
 msgstr[1] "Perdeuse %hu mensaxe de %s porque es moi malvado/a."
 
-#: ../libpurple/protocols/oscar/oscar.c:2611
+#: ../libpurple/protocols/oscar/oscar.c:2637
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7240,55 +8749,47 @@
 msgstr[1] "Perdeuse %hu mensaxe de %s por motivos descoñecidos."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2792
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Non se puido enviar a mensaxe: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2766
-#: ../libpurple/protocols/oscar/oscar.c:2771
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2792
+#: ../libpurple/protocols/oscar/oscar.c:2797
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Unknown reason."
 msgstr "Razón descoñecida."
 
-#: ../libpurple/protocols/oscar/oscar.c:2769
+#: ../libpurple/protocols/oscar/oscar.c:2795
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Non se puido enviar a mensaxe a %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2861
 #, c-format
 msgid "User information not available: %s"
 msgstr "Información de usuario non dispoñible: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2892
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2897
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Membro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
-msgid "Capabilities"
-msgstr "Capacidades"
-
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2932
 msgid "Available Message"
 msgstr "Mensaxe dispoñible"
 
-#: ../libpurple/protocols/oscar/oscar.c:2934
-msgid "Profile"
-msgstr "Perfil"
-
-#: ../libpurple/protocols/oscar/oscar.c:3014
+#: ../libpurple/protocols/oscar/oscar.c:3040
 msgid "Your AIM connection may be lost."
 msgstr "Pode que se perdese a conexión AIM."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3202
+#: ../libpurple/protocols/oscar/oscar.c:3228
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7296,91 +8797,90 @@
 "[Non se puido mostrar unha mensaxe deste usuario porque contén caracteres "
 "incorrectos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3366
+#: ../libpurple/protocols/oscar/oscar.c:3392
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
-"A última acción que se intentou non se puido realizar porque superou o límite "
-"na taxa de envío de mensaxes. Agarde 10 segundos e volva a "
-"intentalo."
-
-#: ../libpurple/protocols/oscar/oscar.c:3449
+"A última acción que se intentou non se puido realizar porque superou o "
+"límite na taxa de envío de mensaxes. Agarde 10 segundos e volva a intentalo."
+
+#: ../libpurple/protocols/oscar/oscar.c:3475
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Desconectouse da sala de conversa: %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3697
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Teléfono móbil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3727
+#: ../libpurple/protocols/oscar/oscar.c:3755
 msgid "Personal Web Page"
 msgstr "Sitio web persoal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3787
+#: ../libpurple/protocols/oscar/oscar.c:3800
 msgid "Zip Code"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Division"
 msgstr "Sección"
 
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3812
 msgid "Position"
 msgstr "Cargo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Web Page"
 msgstr "Páxina web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "Work Information"
 msgstr "Información do traballo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3845
+#: ../libpurple/protocols/oscar/oscar.c:3873
 msgid "Pop-Up Message"
 msgstr "Mensaxe emerxente"
 
-#: ../libpurple/protocols/oscar/oscar.c:3885
+#: ../libpurple/protocols/oscar/oscar.c:3913
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "O seguinte nome de usuario está asociado a %s"
 msgstr[1] "O seguinte nome de usuario está asociado a %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3890
+#: ../libpurple/protocols/oscar/oscar.c:3918
 msgid "Screen name"
 msgstr "Nome de usuario"
 
-#: ../libpurple/protocols/oscar/oscar.c:3916
+#: ../libpurple/protocols/oscar/oscar.c:3944
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Non se atoparon resultados para o enderezo de correo electrónico %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3965
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Debería recibir un correo electrónico. solicitando confirmación de %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3939
+#: ../libpurple/protocols/oscar/oscar.c:3967
 msgid "Account Confirmation Requested"
 msgstr "Confirmación de conta solicitada"
 
-#: ../libpurple/protocols/oscar/oscar.c:3970
+#: ../libpurple/protocols/oscar/oscar.c:3998
 msgid "Error Changing Account Info"
 msgstr "Erro ao cambiar a información da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7389,12 +8889,13 @@
 "Erro 0x%04x: Non se lle pode dar formato ao nome de usuario porque o nome "
 "solicitado difire do orixinal."
 
-#: ../libpurple/protocols/oscar/oscar.c:3976
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, 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 é incorrecto."
-
-#: ../libpurple/protocols/oscar/oscar.c:3979
+msgstr ""
+"Erro 0x%04x: Non se pode dar formato ao nome de usuario porque é incorrecto."
+
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7403,68 +8904,69 @@
 "Erro 0x%04x: Non se pode dar formato ao nome de usuario porque o nome "
 "solicitado é demasiado longo."
 
-#: ../libpurple/protocols/oscar/oscar.c:3982
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque xa existe unha "
-"solicitude pendente para este usuario."
-
-#: ../libpurple/protocols/oscar/oscar.c:3985
+"Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque xa "
+"existe unha solicitude pendente para este usuario."
+
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque o enderezo "
-"dado ten demasiados nomes asociados."
-
-#: ../libpurple/protocols/oscar/oscar.c:3988
+"Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque o "
+"enderezo dado ten demasiados nomes asociados."
+
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-"Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque o enderezo "
-"dado é incorrecto."
-
-#: ../libpurple/protocols/oscar/oscar.c:3991
+"Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque o "
+"enderezo dado é incorrecto."
+
+#: ../libpurple/protocols/oscar/oscar.c:4019
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro descoñecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4029
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "O enderezo de correo electrónico de %s é %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4031
 msgid "Account Info"
 msgstr "Información da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4175
-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+#: ../libpurple/protocols/oscar/oscar.c:4214
+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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4446
+#: ../libpurple/protocols/oscar/oscar.c:4485
 msgid "Unable to set AIM profile."
 msgstr "Non se puido establecer o perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4447
+#: ../libpurple/protocols/oscar/oscar.c:4486
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
-"Probablemente intentou establecer o seu perfil antes de que o procedemento de "
-"inicio de sesión se completase. O perfil non se establecerá, inténteo novamente cando xa "
-"estea conectado completamente."
-
-#: ../libpurple/protocols/oscar/oscar.c:4461
+"Probablemente intentou establecer o seu perfil antes de que o procedemento "
+"de inicio de sesión se completase. O perfil non se establecerá, inténteo "
+"novamente cando xa estea conectado completamente."
+
+#: ../libpurple/protocols/oscar/oscar.c:4500
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7479,11 +8981,11 @@
 "Excedeuse a lonxitude máxima de %d byte do perfil de usuario.  Eliminouse o "
 "excedente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4466
+#: ../libpurple/protocols/oscar/oscar.c:4505
 msgid "Profile too long."
 msgstr "Perfil demasiado longo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4511
+#: ../libpurple/protocols/oscar/oscar.c:4550
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7492,99 +8994,101 @@
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"Excedeuse a lonxitude máxima de %d byte da mensaxe de ausencia.  Eliminouse o "
-"excedente."
+"Excedeuse a lonxitude máxima de %d byte da mensaxe de ausencia.  Eliminouse "
+"o excedente."
 msgstr[1] ""
-"Excedeuse a lonxitude máxima de %d byte da mensaxe de ausencia.  Eliminouse o "
-"excedente."
-
-#: ../libpurple/protocols/oscar/oscar.c:4516
+"Excedeuse a lonxitude máxima de %d byte da mensaxe de ausencia.  Eliminouse "
+"o excedente."
+
+#: ../libpurple/protocols/oscar/oscar.c:4555
 msgid "Away message too long."
 msgstr "Mensaxe de ausencia demasiado longa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4585
+#: ../libpurple/protocols/oscar/oscar.c:4624
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
 "must be a valid email address, or start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
-"Non se puido engadir o contacto %s porque o nome de usuario é inválido.  Os nomes de usuario "
-"deben ser un enderezo de correo electrónico válidos, ou comezar cunha letra e conter só "
-"letras, números e espazos, ou só conter números."
-
-#: ../libpurple/protocols/oscar/oscar.c:4587
-#: ../libpurple/protocols/oscar/oscar.c:5020
-#: ../libpurple/protocols/oscar/oscar.c:5035
+"Non se puido engadir o contacto %s porque o nome de usuario é inválido.  Os "
+"nomes de usuario deben ser un enderezo de correo electrónico válidos, ou "
+"comezar cunha letra e conter só letras, números e espazos, ou só conter "
+"números."
+
+#: ../libpurple/protocols/oscar/oscar.c:4626
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "Non se puido engadir"
 
-#: ../libpurple/protocols/oscar/oscar.c:4696
+#: ../libpurple/protocols/oscar/oscar.c:4735
 msgid "Unable To Retrieve Buddy List"
 msgstr "Non se puido obter a lista de contactos"
 
-#: ../libpurple/protocols/oscar/oscar.c:4697
+#: ../libpurple/protocols/oscar/oscar.c:4736
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
 msgstr ""
-"Os servidores de AIM non son capaces de enviar a súa lista de contactos.  A súa lista "
-"de contactos non se perdeu, e probablemente volva a estar dispoñible nunhas horas."
-
-#: ../libpurple/protocols/oscar/oscar.c:4879
-#: ../libpurple/protocols/oscar/oscar.c:4881
-#: ../libpurple/protocols/oscar/oscar.c:5089
-#: ../libpurple/protocols/oscar/oscar.c:5090
-#: ../libpurple/protocols/oscar/oscar.c:5095
+"Os servidores de AIM non son capaces de enviar a súa lista de contactos.  A "
+"súa lista de contactos non se perdeu, e probablemente volva a estar "
+"dispoñible nunhas horas."
+
+#: ../libpurple/protocols/oscar/oscar.c:4918
+#: ../libpurple/protocols/oscar/oscar.c:4920
+#: ../libpurple/protocols/oscar/oscar.c:5136
+#: ../libpurple/protocols/oscar/oscar.c:5137
+#: ../libpurple/protocols/oscar/oscar.c:5142
 msgid "Orphans"
 msgstr "Orfos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5054
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"Non se puido engadir o contacto %s porque hai demasiados contactos na "
-"lista de contactos. Elimina un e volve probar."
-
-#: ../libpurple/protocols/oscar/oscar.c:5018
-#: ../libpurple/protocols/oscar/oscar.c:5033
+"Non se puido engadir o contacto %s porque hai demasiados contactos na lista "
+"de contactos. Elimina un e volve probar."
+
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
 msgid "(no name)"
 msgstr "(sen nome)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5032
+#: ../libpurple/protocols/oscar/oscar.c:5068
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Non se puido engadir o contacto %s por unha razón descoñecida."
 
-#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5174
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
-"O usuario %s deulle permiso para engadilo nas súas listas de contactos. Desexa "
-"engadilos a eles?"
-
-#: ../libpurple/protocols/oscar/oscar.c:5134
+"O usuario %s deulle permiso para engadilo nas súas listas de contactos. "
+"Desexa engadilos a eles?"
+
+#: ../libpurple/protocols/oscar/oscar.c:5182
 msgid "Authorization Given"
 msgstr "Autorización concedida"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5207
+#: ../libpurple/protocols/oscar/oscar.c:5255
 #, 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 engadilos á súa lista de "
 "contactos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5208
+#: ../libpurple/protocols/oscar/oscar.c:5256
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5259
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7595,51 +9099,52 @@
 "seguinte razón:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5260
 msgid "Authorization Denied"
 msgstr "Autorización denegada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5248
+#: ../libpurple/protocols/oscar/oscar.c:5296
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "Int_ercambio:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5288
+#: ../libpurple/protocols/oscar/oscar.c:5336
 msgid "Invalid chat name specified."
 msgstr "Especificouse un nome de conversa incorrecto."
 
-#: ../libpurple/protocols/oscar/oscar.c:5357
+#: ../libpurple/protocols/oscar/oscar.c:5405
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "Non se enviou a imaxe MI. Non se poden enviar imaxes MI en conversas AIM."
-
-#: ../libpurple/protocols/oscar/oscar.c:5517
-#: ../libpurple/protocols/oscar/oscar.c:5522
+msgstr ""
+"Non se enviou a imaxe MI. Non se poden enviar imaxes MI en conversas AIM."
+
+#: ../libpurple/protocols/oscar/oscar.c:5567
+#: ../libpurple/protocols/oscar/oscar.c:5572
 msgid "Away Message"
 msgstr "Mensaxe de ausencia"
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5572
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obtendo)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5772
 msgid "iTunes Music Store Link"
 msgstr "LIgazón a tenda de música iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5880
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de contacto para %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5881
 msgid "Buddy Comment:"
 msgstr "Comentario de contacto:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5878
+#: ../libpurple/protocols/oscar/oscar.c:5928
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Pediu abrir unha conexión MI directa con %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5932
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7647,140 +9152,141 @@
 "Como isto revela o seu enderezo IP, pode ser considerado como un risco de "
 "privacidade. Quere continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5888
-#: ../libpurple/protocols/oscar/peer.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/oscar/oscar.c:5973
 msgid "Get AIM Info"
 msgstr "Obter informaciónde AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5929
+#: ../libpurple/protocols/oscar/oscar.c:5979
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de contacto"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:5987
 msgid "Get Status Msg"
 msgstr "Obter mensaxe de estado"
 
-#: ../libpurple/protocols/oscar/oscar.c:5950
+#: ../libpurple/protocols/oscar/oscar.c:6000
 msgid "Direct IM"
 msgstr "MI directa"
 
-#: ../libpurple/protocols/oscar/oscar.c:5972
+#: ../libpurple/protocols/oscar/oscar.c:6022
 msgid "Re-request Authorization"
 msgstr "Solicitar unha autorización outra vez"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6081
 msgid "Require authorization"
 msgstr "Pedir unha autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:6034
+#: ../libpurple/protocols/oscar/oscar.c:6084
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Capacidade web (habilitar isto pode provocar que reciba SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/oscar.c:6089
 msgid "ICQ Privacy Options"
 msgstr "Opcións de privacidade ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6108
 msgid "The new formatting is invalid."
 msgstr "O novo formato é incorrecto."
 
-#: ../libpurple/protocols/oscar/oscar.c:6059
+#: ../libpurple/protocols/oscar/oscar.c:6109
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "O formato do nome de usuario só pode modificar a capitalización e espazos en "
 "branco."
 
-#: ../libpurple/protocols/oscar/oscar.c:6112
+#: ../libpurple/protocols/oscar/oscar.c:6162
 msgid "Change Address To:"
 msgstr "Cambiar o enderezo a:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6158
+#: ../libpurple/protocols/oscar/oscar.c:6208
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>vostede non está agardando autorización</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Agardando a autorización dos seguintes contactos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"Pode volver pedir autorización a estes contactos ao premer o botón dereito do "
-"rato sobre eles e escoller\"Solicitar autorización outra vez.\""
-
-#: ../libpurple/protocols/oscar/oscar.c:6179
+"Pode volver pedir autorización a estes contactos ao premer o botón dereito "
+"do rato sobre eles e escoller\"Solicitar autorización outra vez.\""
+
+#: ../libpurple/protocols/oscar/oscar.c:6229
 msgid "Find Buddy by E-Mail"
 msgstr "Buscar un contacto polo correo electrónico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6180
+#: ../libpurple/protocols/oscar/oscar.c:6230
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar un contacto polo enderezo de correo electrónico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6181
+#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Escriba o enderezo de correo electrónico do contacto que está a buscar."
-
-#: ../libpurple/protocols/oscar/oscar.c:6184
+msgstr ""
+"Escriba o enderezo de correo electrónico do contacto que está a buscar."
+
+#: ../libpurple/protocols/oscar/oscar.c:6234
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6342
+#: ../libpurple/protocols/oscar/oscar.c:6392
 msgid "Set User Info (URL)..."
 msgstr "Editar a información de usuario (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6353
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Change Password (URL)"
 msgstr "Modificar contrasinal (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6407
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar o reenvío de MI (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/oscar/oscar.c:6417
 msgid "Set Privacy Options..."
 msgstr "Editar opcións de privacidade..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6374
+#: ../libpurple/protocols/oscar/oscar.c:6424
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6428
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar o enderezo rexistrado actualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6432
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Cambiar o enderezo de correo actualmente rexistrado..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6389
+#: ../libpurple/protocols/oscar/oscar.c:6439
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar contactos pendentes de autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:6395
+#: ../libpurple/protocols/oscar/oscar.c:6445
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Buscar un contacto polo enderezo de correo electrónico..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6450
 msgid "Search for Buddy by Information"
 msgstr "Localizar un contacto pola súa información"
 
-#: ../libpurple/protocols/oscar/oscar.c:6468
+#: ../libpurple/protocols/oscar/oscar.c:6518
 msgid "Use recent buddies group"
 msgstr "Usar un grupo de contactos recente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6521
 msgid "Show how long you have been idle"
 msgstr "Mostrar o tempo que estivo inactivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/oscar/oscar.c:6676
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7788,33 +9294,34 @@
 "Empregar sempre o servidor proxy ICQ para a transferencia de arquivos\n"
 "(máis lento, pero non revela o seu enderezo IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Preguntando a %s para conectarnos a %s: %hu para MI Directa."
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Intento de conectarse a %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
 msgid "Attempting to connect via proxy server."
 msgstr "Intento de conectarse ao servidor por medio do proxy."
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s vén de solicitar conectar directamente con: %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1037
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
-"Requírese una conexión directa entre os dous ordenadores e é preciso empregar imaxes MI. O seu enderezo IP será revelado e isto pode ter riscos de "
-"privacidade."
+"Requírese una conexión directa entre os dous ordenadores e é preciso "
+"empregar imaxes MI. O seu enderezo IP será revelado e isto pode ter riscos "
+"de privacidade."
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
@@ -7986,7 +9493,9 @@
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
 "%s."
-msgstr "Aínda non está soportado establecer unha cara á medida. Elixa unha imaxe de %s."
+msgstr ""
+"Aínda non está soportado establecer unha cara á medida. Elixa unha imaxe de %"
+"s."
 
 #: ../libpurple/protocols/qq/buddy_info.c:577
 #: ../libpurple/protocols/qq/buddy_info.c:590
@@ -8013,14 +9522,6 @@
 msgid "Sorry, you are not my type..."
 msgstr "Síntoo, non é o meu tipo..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
-msgid "Reject"
-msgstr "Rexeitar"
-
 #: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr "Engadir contacto con fallo na solicitude de autorización"
@@ -8140,12 +9641,14 @@
 #: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
-msgstr "A súa petición para unirse ao grupo %d foi rexeitada polo administrador %d"
+msgstr ""
+"A súa petición para unirse ao grupo %d foi rexeitada polo administrador %d"
 
 #: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
-msgstr "A súa petición para unirse ao grupo %d foi aprobada polo administrador %d"
+msgstr ""
+"A súa petición para unirse ao grupo %d foi aprobada polo administrador %d"
 
 #: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
@@ -8268,7 +9771,7 @@
 msgid "Error requesting login token"
 msgstr "Erro na solicitude de inicio de sesión"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:488
 msgid "Unable to login, check debug log"
 msgstr "Non é posible iniciar a sesión, comprobe o rexistro de depuración"
 
@@ -8426,7 +9929,8 @@
 msgstr "Foi engadido por %s"
 
 #: ../libpurple/protocols/qq/sys_msg.c:169
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "Quere engadilo?"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
@@ -8460,10 +9964,6 @@
 msgid "%s is not in your buddy list"
 msgstr " %s non está na súa lista de contactos"
 
-#: ../libpurple/protocols/qq/sys_msg.c:263
-msgid "Would you like to add him?"
-msgstr "Quere engadilo?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Conexión pechada (escribindo)"
@@ -8527,13 +10027,10 @@
 msgid "Starting Services"
 msgstr "Iniciando servizos"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Conectado"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, 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 enviou o seguinte anuncio ao servidor %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:1650
@@ -8551,7 +10048,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3727
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Non se puido conectar ao servidor"
 
@@ -8572,66 +10069,62 @@
 msgid "Place Closed"
 msgstr "Lugar pechado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Micrófono"
 
+#: ../libpurple/protocols/sametime/sametime.c:3230
+msgid "Speakers"
+msgstr "Altofalantes"
+
 #: ../libpurple/protocols/sametime/sametime.c:3231
-msgid "Speakers"
-msgstr "Altofalantes"
-
-#: ../libpurple/protocols/sametime/sametime.c:3232
 msgid "Video Camera"
 msgstr "Videocámara"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
-msgid "File Transfer"
-msgstr "Transferencia de ficheiros"
-
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Admitidos"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4120
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Usuario externo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Crear conferencia co usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
-"Introduza un tema para a nova conferencia, e unha mensaxe de "
-"convite que se enviará a %s"
-
-#: ../libpurple/protocols/sametime/sametime.c:3386
+"Introduza un tema para a nova conferencia, e unha mensaxe de convite que se "
+"enviará a %s"
+
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Nova conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Crear"
 
-#: ../libpurple/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Conferencias dispoñibles"
 
-#: ../libpurple/protocols/sametime/sametime.c:3459
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Crear unha nova conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Convidar ao usuario a unha conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3467
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -8642,27 +10135,27 @@
 "Seleccione \"Crear nova conferencia\" se quere crear unha nova conferencia "
 "para convidar a este usuario."
 
-#: ../libpurple/protocols/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Convidar a unha conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3563
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Convidar a unha conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3568
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Enviar anuncio de PROBA"
 
-#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4417
 msgid "Topic:"
 msgstr "Asunto:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3615
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Non se especificou o servidor de comunidade Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3637
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8671,59 +10164,59 @@
 "Non se configurou ningún enderezo IP ou nome de equipo para a conta "
 "Meanwhile %s. Introduza un máis abaixo para continuar o rexistro."
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Configuración da conexión Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3643
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Non se especificou un servidor de comunidade Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4024
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4323
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Descoñecido (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4138
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Último cliente coñecido"
 
-#: ../libpurple/protocols/sametime/sametime.c:4302
-#: ../libpurple/protocols/sametime/sametime.c:5507
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Nome de usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:4305
-#: ../libpurple/protocols/sametime/sametime.c:5510
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Introduciuse un ID de usuario ambiguo"
 
-#: ../libpurple/protocols/sametime/sametime.c:4330
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
-"O identificador '%s' pode referirse a calquera dos seguintes usuarios. Seleccione o usuario da lista amosada para engadilo á súa lista de "
-"contactos."
-
-#: ../libpurple/protocols/sametime/sametime.c:4335
+"O identificador '%s' pode referirse a calquera dos seguintes usuarios. "
+"Seleccione o usuario da lista amosada para engadilo á súa lista de contactos."
+
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Non se puido engadir o usuario: usuario non atopado"
 
-#: ../libpurple/protocols/sametime/sametime.c:4421
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8732,11 +10225,7 @@
 "O identificador '%s' non coincide con ningún usuario na comunidade Sametime. "
 "Eliminouse esta entrada da lista de contactos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4426
-msgid "Unable to add user"
-msgstr "Imposible engadir o usuario"
-
-#: ../libpurple/protocols/sametime/sametime.c:5012
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8745,63 +10234,63 @@
 "Erro ao ler o ficheiro %s: \n"
 "%s.\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5147
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de contactos almacenada remotamente"
 
-#: ../libpurple/protocols/sametime/sametime.c:5152
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Modo de almacenaxe da lista de contactos"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Só lista de contactos local"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Combinar a lista desde o servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Combinar e gardar a lista no servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5161
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Sincronizar a lista co servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importar a lista Sametime para a conta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5256
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar a lista Sametime para a conta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "É imposible engadir o grupo: o grupo existe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Un grupo chamado '%s' xa existe na lista de contactos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5314
-#: ../libpurple/protocols/sametime/sametime.c:5444
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "É imposible engadir o grupo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Coincidencias posibles"
 
+#: ../libpurple/protocols/sametime/sametime.c:5388
+msgid "Notes Address Book group results"
+msgstr "Resultados dos grupos do libro de enderezos de Notes"
+
 #: ../libpurple/protocols/sametime/sametime.c:5389
-msgid "Notes Address Book group results"
-msgstr "Resultados dos grupos do libro de enderezos de Notes"
-
-#: ../libpurple/protocols/sametime/sametime.c:5390
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8809,31 +10298,31 @@
 "to your buddy list."
 msgstr ""
 "É posible que o identificador '%s' se refira a calquera dos grupos do libro "
-"de enderezos de Notes. Escolla o grupo máis axeitado da lista que se mostra abaixo "
-"para engadilo á lista de contactos."
-
-#: ../libpurple/protocols/sametime/sametime.c:5395
+"de enderezos de Notes. Escolla o grupo máis axeitado da lista que se mostra "
+"abaixo para engadilo á lista de contactos."
+
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Seleccionar libro de enderezos de Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5438
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "É imposible engadir o grupo: non se atopou"
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
-"O identificador '%s' non coincide con ningún dos grupos do libro "
-"de enderezos de Notes da comunidade Sametime."
+"O identificador '%s' non coincide con ningún dos grupos do libro de "
+"enderezos de Notes da comunidade Sametime."
+
+#: ../libpurple/protocols/sametime/sametime.c:5480
+msgid "Notes Address Book Group"
+msgstr "Grupo do libro de enderezos de Notes"
 
 #: ../libpurple/protocols/sametime/sametime.c:5481
-msgid "Notes Address Book Group"
-msgstr "Grupo do libro de enderezos de Notes"
-
-#: ../libpurple/protocols/sametime/sametime.c:5482
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8841,12 +10330,12 @@
 "Introduza o nome dun grupo do libro de enderezos de Notes no campo a "
 "continuación para engadir o grupo e os seus membros á súa lista de contactos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados da busca para '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8857,29 +10346,29 @@
 "continuación. Pode engadir estes usuarios á súa lista de contactos ou "
 "enviarlles mensaxes cos botóns de acción que se amosan abaixo."
 
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:726
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:755
 msgid "Search Results"
 msgstr "Resultados da busca"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Non houbo coincidencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5565
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, 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."
-
-#: ../libpurple/protocols/sametime/sametime.c:5569
+msgstr ""
+"O identificador '%s' non coincide con ningún usuario na comunidade Sametime."
+
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Non houbo coincidencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Localizar un usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:5607
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -8887,32 +10376,32 @@
 "Introduza o nome ou o identificador parcial no campo amosado debaixo para "
 "localizar usuarios coincidentes na comunidade Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Busca de usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Importar a lista Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5627
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Exportar a lista Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Engadir grupo do libro de enderezos de Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Busca de usuario..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5741
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Forzar inicio de sesión (ignorar redireccións do servidor)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5751
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Ocultar a identificación do cliente"
 
@@ -9000,7 +10489,9 @@
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
-msgstr "Recibiuse unha solicitude de %s para a negociación da chave . Desexa efectuar a negociación?"
+msgstr ""
+"Recibiuse unha solicitude de %s para a negociación da chave . Desexa "
+"efectuar a negociación?"
 
 #: ../libpurple/protocols/silc/buddy.c:302
 #: ../libpurple/protocols/silc10/buddy.c:299
@@ -9151,8 +10642,8 @@
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
-"Atopouse máis dun usuario coa mesma chave pública. Seleccione na lista o usuario que "
-"desexa engadir á lista de contactos."
+"Atopouse máis dun usuario coa mesma chave pública. Seleccione na lista o "
+"usuario que desexa engadir á lista de contactos."
 
 #: ../libpurple/protocols/silc/buddy.c:1187
 #: ../libpurple/protocols/silc10/buddy.c:1185
@@ -9160,8 +10651,8 @@
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
-"Atopouse máis dun usuario co mesmo nome. Seleccione na lista amosada o usuario que desexa "
-"engadir á lista de contactos."
+"Atopouse máis dun usuario co mesmo nome. Seleccione na lista amosada o "
+"usuario que desexa engadir á lista de contactos."
 
 #: ../libpurple/protocols/silc/buddy.c:1474
 #: ../libpurple/protocols/silc10/buddy.c:1474
@@ -9298,13 +10789,6 @@
 msgid "User Modes"
 msgstr "Modos de usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr "Estado de ánimo"
-
 #: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1224
 #: ../libpurple/protocols/silc10/buddy.c:1562
@@ -9485,9 +10969,9 @@
 msgstr ""
 "Utilízase a autenticación da canle para prever o acceso non autorizado. A "
 "autenticación pode estar baseada nun contrasinal ou en sinaturas dixitais. "
-"Se se estableceu unha frase contrasinal, precisarase ésta para unirse á canle. Só poderán "
-"conectarse os usuarios que están na lista de chaves públicas se se "
-"utilizan chaves públicas para o unirse á canle."
+"Se se estableceu unha frase contrasinal, precisarase ésta para unirse á "
+"canle. Só poderán conectarse os usuarios que están na lista de chaves "
+"públicas se se utilizan chaves públicas para o unirse á canle."
 
 #: ../libpurple/protocols/silc/chat.c:444
 #: ../libpurple/protocols/silc/chat.c:445
@@ -9543,8 +11027,8 @@
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
-"Establecer un límite de usuarios na canle. Poñer a cero para restaurar o límite de "
-"usuarios."
+"Establecer un límite de usuarios na canle. Poñer a cero para restaurar o "
+"límite de usuarios."
 
 #: ../libpurple/protocols/silc/chat.c:907
 #: ../libpurple/protocols/silc10/chat.c:891
@@ -9609,7 +11093,8 @@
 #: ../libpurple/protocols/silc/chat.c:1045
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, 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 á canle %s antes de poder unirse ao grupo privado"
 
 #: ../libpurple/protocols/silc/chat.c:1047
@@ -9970,13 +11455,6 @@
 msgstr "Estatísticas de rede"
 
 #: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping"
-msgstr "Ping"
-
-#: ../libpurple/protocols/silc/ops.c:1596
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Fallou o ping"
@@ -10029,8 +11507,8 @@
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
-"Recibiuse a chave pública de %s. A súa copia local non coincide coa "
-"chave recibida. Desexa aceptar a chave pública de todas as maneiras?"
+"Recibiuse a chave pública de %s. A súa copia local non coincide coa chave "
+"recibida. Desexa aceptar a chave pública de todas as maneiras?"
 
 #: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
@@ -10081,7 +11559,8 @@
 
 #: ../libpurple/protocols/silc/silc.c:238
 #: ../libpurple/protocols/silc10/ops.c:1714
-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 desconectada. Prema Reconectar para "
 "crear unha nova conexión."
@@ -10132,7 +11611,7 @@
 msgstr "O seu estado de ánimo actual"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1638
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643
 msgid "Normal"
 msgstr "Normal"
 
@@ -10213,8 +11692,8 @@
 "about yourself."
 msgstr ""
 "Pode permitir que outros usuarios consulten a información do seu estado en "
-"liña así como a súa información persoal. Cubra a información que "
-"desexa que outros usuarios vexan de vostede."
+"liña así como a súa información persoal. Cubra a información que desexa que "
+"outros usuarios vexan de vostede."
 
 #: ../libpurple/protocols/silc/silc.c:859
 #: ../libpurple/protocols/silc/silc.c:865
@@ -10362,7 +11841,8 @@
 #: ../libpurple/protocols/silc/silc.c:1666
 #: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;canle&gt; [&lt;contrasinal&gt;]:  Unirse a unha conversa nesta rede"
+msgstr ""
+"join &lt;canle&gt; [&lt;contrasinal&gt;]:  Unirse a unha conversa nesta rede"
 
 #: ../libpurple/protocols/silc/silc.c:1670
 #: ../libpurple/protocols/silc10/silc.c:1599
@@ -10430,8 +11910,8 @@
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
-"cmode &lt;canle&gt; [+|-&lt;modos&gt;] [argumentos]:  Cambia ou mostra os modos "
-"da canle"
+"cmode &lt;canle&gt; [+|-&lt;modos&gt;] [argumentos]:  Cambia ou mostra os "
+"modos da canle"
 
 #: ../libpurple/protocols/silc/silc.c:1720
 #: ../libpurple/protocols/silc10/silc.c:1649
@@ -10450,7 +11930,8 @@
 #: ../libpurple/protocols/silc/silc.c:1728
 #: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;alias&gt; [-pubkey]:  Obter privilexios de operador do servidor"
+msgstr ""
+"oper &lt;alias&gt; [-pubkey]:  Obter privilexios de operador do servidor"
 
 #: ../libpurple/protocols/silc/silc.c:1732
 #: ../libpurple/protocols/silc10/silc.c:1661
@@ -10458,13 +11939,14 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"invite &lt;canle&gt; [-|+]&lt;aliasgt;:  convida un alias ou engade/"
-"elimina o alias da lista de convidados para a canle"
+"invite &lt;canle&gt; [-|+]&lt;aliasgt;:  convida un alias ou engade/elimina "
+"o alias da lista de convidados para a canle"
 
 #: ../libpurple/protocols/silc/silc.c:1736
 #: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr "kick &lt;canle&gt; &lt;alias&gt; [comentario]:  Botar un cliente da canle"
+msgstr ""
+"kick &lt;canle&gt; &lt;alias&gt; [comentario]:  Botar un cliente da canle"
 
 #: ../libpurple/protocols/silc/silc.c:1740
 #: ../libpurple/protocols/silc10/silc.c:1669
@@ -10528,7 +12010,7 @@
 msgstr "Protocolo de conferencia segura en vivo na Internet (SILC)"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2031
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038
 msgid "Network"
 msgstr "Rede"
 
@@ -10786,28 +12268,34 @@
 msgstr "Non se puido escribir"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1489
+#: ../libpurple/protocols/simple/simple.c:1531
 msgid "Could not connect"
 msgstr "Non se puido conectar"
 
-#: ../libpurple/protocols/simple/simple.c:1523
+#: ../libpurple/protocols/simple/simple.c:1061
+#, fuzzy
+msgid "Unknown server response."
+msgstr "Razón descoñecida."
+
 #: ../libpurple/protocols/simple/simple.c:1565
-#: ../libpurple/protocols/simple/simple.c:1578
-#: ../libpurple/protocols/simple/simple.c:1629
+#: ../libpurple/protocols/simple/simple.c:1607
+#: ../libpurple/protocols/simple/simple.c:1620
+#: ../libpurple/protocols/simple/simple.c:1671
 msgid "Could not create listen socket"
 msgstr "Non se puido crear o conectador para escoitar"
 
-#: ../libpurple/protocols/simple/simple.c:1546
+#: ../libpurple/protocols/simple/simple.c:1588
 msgid "Couldn't resolve host"
 msgstr "Non se puido resolver o servidor"
 
-#: ../libpurple/protocols/simple/simple.c:1637
+#: ../libpurple/protocols/simple/simple.c:1679
 msgid "Could not resolve hostname"
 msgstr "Non se puido obter o nome do host"
 
-#: ../libpurple/protocols/simple/simple.c:1654
+#: ../libpurple/protocols/simple/simple.c:1696
 msgid "SIP screen names may not contain whitespaces or @ symbols"
-msgstr "Os nomes de usuario SIP non poden conter espazos en branco nin o símbolo @"
+msgstr ""
+"Os nomes de usuario SIP non poden conter espazos en branco nin o símbolo @"
 
 #. *< type
 #. *< ui_requirement
@@ -10817,36 +12305,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1829
+#: ../libpurple/protocols/simple/simple.c:1872
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Complemento de protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1830
+#: ../libpurple/protocols/simple/simple.c:1873
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "O complemento de protocolo SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/simple/simple.c:1901
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publicar estado (nota: todos poderán velo)"
 
-#: ../libpurple/protocols/simple/simple.c:1864
+#: ../libpurple/protocols/simple/simple.c:1907
 msgid "Use UDP"
 msgstr "Usar UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1866
+#: ../libpurple/protocols/simple/simple.c:1909
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1868
+#: ../libpurple/protocols/simple/simple.c:1911
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1913
 msgid "Auth User"
 msgstr "Usuario de autenticación"
 
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1915
 msgid "Auth Domain"
 msgstr "Dominio de autenticación"
 
@@ -10893,8 +12381,7 @@
 #: ../libpurple/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
-"A mensaxe foi descartada, está a exceder o límite de velocidade do "
-"servidor."
+"A mensaxe foi descartada, está a exceder o límite de velocidade do servidor."
 
 #: ../libpurple/protocols/toc/toc.c:506
 #, c-format
@@ -11007,8 +12494,8 @@
 msgid "Password Change Successful"
 msgstr "O contrasinal modificouse con éxito"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5883
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5871
+#: ../pidgin/gtkblist.c:6227
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -11072,45 +12559,45 @@
 msgid "TOC Protocol Plugin"
 msgstr "Complemento de protocolo TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:823
+#: ../libpurple/protocols/yahoo/yahoo.c:784
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "A súa mensaxe Yahoo! non se enviou."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:895
-#, c-format
-msgid "%s just sent you a Buzz!"
-msgstr "%s acaba de darlle un cobadazo!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:959
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaxe do sistema Yahoo! para %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1013
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
 msgid "Authorization denied message:"
 msgstr "Mensaxe de autorización rexeitada:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1142
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"O usuario %s rexeitou a súa solicitude de engadilos á súa lista"
-"(de forma retroactiva)."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1145
+#: ../libpurple/protocols/yahoo/yahoo.c:1046
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"O usuario %s rexeitou (de forma retroactiva) a súa solicitude de engadilos á súa "
-"lista pola seguinte razón: %s."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1148
+"O usuario %s rexeitou (de forma retroactiva) a súa solicitude de engadilos á "
+"súa lista pola seguinte razón: %s."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+"O usuario %s rexeitou a súa solicitude de engadilos á súa lista(de forma "
+"retroactiva)."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1051
 msgid "Add buddy rejected"
 msgstr "Rexeitouse engadir o contacto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1899
+#: ../libpurple/protocols/yahoo/yahoo.c:1993
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11118,14 +12605,14 @@
 "Check %s for updates."
 msgstr ""
 "O servidor de Yahoo pediu o uso dun método de autenticación non recoñecido. "
-"Probablemente non será capaz de conectarse con Yahoo.  "
-"Comprobe se hai actualizacións de %s."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1902
+"Probablemente non será capaz de conectarse con Yahoo.  Comprobe se hai "
+"actualizacións de %s."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 msgid "Failed Yahoo! Authentication"
 msgstr "Fallou a autenticación en Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1968
+#: ../libpurple/protocols/yahoo/yahoo.c:2062
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11134,52 +12621,52 @@
 "Intentou ignorar a %s, mais o usuario está na súa lista de contactos. Se "
 "selecciona \"Si\" eliminarase e ignorarase este contacto."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1971
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 msgid "Ignore buddy?"
 msgstr "Ignorar o contacto?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2034
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "A conta está bloqueada. Inicie sesión no sitio web de Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2037
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Erro descoñecido número %d. Se inicia sesión no sitio web de Yahoo! é "
 "posible que isto se arranxe."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2091
+#: ../libpurple/protocols/yahoo/yahoo.c:2185
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Non se puido engadir o contacto %s ao grupo %s á lista no servidor para a "
 "conta %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2094
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 msgid "Could not add buddy to server list"
 msgstr "Non se puido engadir o contacto á lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2213
+#: ../libpurple/protocols/yahoo/yahoo.c:2307
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2556
+#: ../libpurple/protocols/yahoo/yahoo.c:2650
 msgid "Received unexpected HTTP response from server."
 msgstr "Recibiuse unha resposta HTTP inesperada do servidor."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2580
-#: ../libpurple/protocols/yahoo/yahoo.c:2766
-#: ../libpurple/protocols/yahoo/yahoo.c:2869
-#: ../libpurple/protocols/yahoo/yahoo.c:2879
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2674
+#: ../libpurple/protocols/yahoo/yahoo.c:2860
+#: ../libpurple/protocols/yahoo/yahoo.c:2963
+#: ../libpurple/protocols/yahoo/yahoo.c:2973
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problema de conexión"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2606
+#: ../libpurple/protocols/yahoo/yahoo.c:2700
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11188,7 +12675,7 @@
 "Perdeuse a conexión con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2631
+#: ../libpurple/protocols/yahoo/yahoo.c:2725
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11197,111 +12684,103 @@
 "Non se puido establecer unha conexión con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2981
-#: ../libpurple/protocols/yahoo/yahoo.c:3667
+#: ../libpurple/protocols/yahoo/yahoo.c:3080
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Not at Home"
 msgstr "Fóra da casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2983
-#: ../libpurple/protocols/yahoo/yahoo.c:3670
+#: ../libpurple/protocols/yahoo/yahoo.c:3082
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Desk"
 msgstr "Lonxe do escritorio"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoo.c:3673
+#: ../libpurple/protocols/yahoo/yahoo.c:3084
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not in Office"
 msgstr "Fóra da oficina"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2989
-#: ../libpurple/protocols/yahoo/yahoo.c:3679
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On Vacation"
 msgstr "De vacacións"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2993
-#: ../libpurple/protocols/yahoo/yahoo.c:3685
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Stepped Out"
 msgstr "Abandonou"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3086
-#: ../libpurple/protocols/yahoo/yahoo.c:3116
+#: ../libpurple/protocols/yahoo/yahoo.c:3185
+#: ../libpurple/protocols/yahoo/yahoo.c:3215
 msgid "Not on server list"
 msgstr "Non incluído na lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3133
-#: ../libpurple/protocols/yahoo/yahoo.c:3191
+#: ../libpurple/protocols/yahoo/yahoo.c:3232
+#: ../libpurple/protocols/yahoo/yahoo.c:3290
 msgid "Appear Online"
 msgstr "Aparecer conectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
-#: ../libpurple/protocols/yahoo/yahoo.c:3212
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3311
 msgid "Appear Permanently Offline"
 msgstr "Aparecer permanentemente desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3154
+#: ../libpurple/protocols/yahoo/yahoo.c:3253
 msgid "Presence"
 msgstr "Presenza"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3197
+#: ../libpurple/protocols/yahoo/yahoo.c:3296
 msgid "Appear Offline"
 msgstr "Aparecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3206
+#: ../libpurple/protocols/yahoo/yahoo.c:3305
 msgid "Don't Appear Permanently Offline"
 msgstr "Non aparecer sempre desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3353
 msgid "Join in Chat"
 msgstr "Unirse a unha conversa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3260
+#: ../libpurple/protocols/yahoo/yahoo.c:3359
 msgid "Initiate Conference"
 msgstr "Iniciar unha conferencia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3288
+#: ../libpurple/protocols/yahoo/yahoo.c:3387
 msgid "Presence Settings"
 msgstr "Configuración da presenza"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3294
+#: ../libpurple/protocols/yahoo/yahoo.c:3393
 msgid "Start Doodling"
 msgstr "Comezar Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3395
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
 msgid "Activate which ID?"
 msgstr "Que ID activar?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3406
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "Join whom in chat?"
 msgstr "A quen quere unir á conversa?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3418
+#: ../libpurple/protocols/yahoo/yahoo.c:3517
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3422
+#: ../libpurple/protocols/yahoo/yahoo.c:3521
 msgid "Join User in Chat..."
 msgstr "Unir a un usuario á conversa..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3427
+#: ../libpurple/protocols/yahoo/yahoo.c:3526
 msgid "Open Inbox"
 msgstr "Abrir a caixa de entrada"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3947
-msgid "You have just sent a Buzz!"
-msgstr "Acaba de enviar un cobadazo!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4006
+#: ../libpurple/protocols/yahoo/yahoo.c:4135
 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"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4011
+#: ../libpurple/protocols/yahoo/yahoo.c:4140
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Mostrar as canles da rede Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4015
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: Avisar a un contacto para chamar a súa atención"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4019
+#: ../libpurple/protocols/yahoo/yahoo.c:4148
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitarlle ao usuario o comezo dunha sesión Doodle"
 
@@ -11315,130 +12794,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4227
-#: ../libpurple/protocols/yahoo/yahoo.c:4229
+#: ../libpurple/protocols/yahoo/yahoo.c:4357
+#: ../libpurple/protocols/yahoo/yahoo.c:4359
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4252
+#: ../libpurple/protocols/yahoo/yahoo.c:4382
 msgid "Yahoo Japan"
 msgstr "Yahoo Xapón"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4255
+#: ../libpurple/protocols/yahoo/yahoo.c:4385
 msgid "Pager server"
 msgstr "Servidor do buscapersoas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4258
+#: ../libpurple/protocols/yahoo/yahoo.c:4388
 msgid "Japan Pager server"
 msgstr "Servidor de buscapersoas xaponés"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4261
+#: ../libpurple/protocols/yahoo/yahoo.c:4391
 msgid "Pager port"
 msgstr "Porto do buscapersoas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4264
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "File transfer server"
 msgstr "Servidor de transferencia de ficheiros"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4267
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "Japan file transfer server"
 msgstr "Servidor de transferencia de ficheiros xaponés"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4270
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "File transfer port"
 msgstr "Porto de transferencia de ficheiros"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4273
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Chat room locale"
 msgstr "Localización da sala de conversa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4276
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar os convites a salas de conferencias ou de conversa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4284
+#: ../libpurple/protocols/yahoo/yahoo.c:4414
 msgid "Chat room list URL"
 msgstr "Url de lista de salas da conversa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4287
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "Yahoo Chat server"
 msgstr "Servidor de conversa de Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4290
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Yahoo Chat port"
 msgstr "Porto de conversa de Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s declinou o seu convite de conferencia na sala \"%s\" porque \"%s\"."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
-msgid "Invitation Rejected"
-msgstr "Convite rexeitado"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
-msgid "Failed to join chat"
-msgstr "Non se puido unir á conversa"
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
-msgid "Unknown room"
-msgstr "Sala descoñecida"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
-msgid "Maybe the room is full"
-msgstr "Quizais a sala está chea"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
-msgid "Not available"
-msgstr "Non dispoñible"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"Erro descoñecido. Pode que teña que desconectarse e agardar cinco minutos "
-"antes de poder unirse á sala da conversa"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Agora está conversando en %s."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
-msgid "Failed to join buddy in chat"
-msgstr "Non se puido unir o contacto á conversa"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
-msgid "Maybe they're not in a chat?"
-msgstr "Quizais non están nunha conversa?"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
-msgid "Fetching the room list failed."
-msgstr "Non se puido obter a lista de salas."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
-msgid "Voices"
-msgstr "Voces"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
-msgid "Webcams"
-msgstr "Cámaras web"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
-msgid "Unable to fetch room list."
-msgstr "Non se puido obter a lista de salas."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
-msgid "User Rooms"
-msgstr "Salas de usuarios"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -11448,7 +12856,7 @@
 
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
 msgid "Unable to establish file descriptor."
 msgstr "Non se puido establecer o descritor de ficheiro."
 
@@ -11469,13 +12877,15 @@
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr "Síntoo, os perfís con contido só para adultos non están admitidos aínda."
+msgstr ""
+"Síntoo, os perfís con contido só para adultos non están admitidos aínda."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 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 esta ligazón co seu navegador web:"
+msgstr ""
+"Se desexa ver este perfil, debería visitar esta ligazón co seu navegador web:"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
@@ -11521,7 +12931,9 @@
 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 nun formato aínda non admitido."
+msgstr ""
+"Síntoo, este perfil parece estar nun idioma ou nun formato aínda non "
+"admitido."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
@@ -11545,6 +12957,77 @@
 msgid "The user's profile is empty."
 msgstr "O perfil do usuario está baleiro."
 
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s declinou o seu convite de conferencia na sala \"%s\" porque \"%s\"."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
+msgid "Invitation Rejected"
+msgstr "Convite rexeitado"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr "Non se puido unir á conversa"
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr "Sala descoñecida"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr "Quizais a sala está chea"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr "Non dispoñible"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Erro descoñecido. Pode que teña que desconectarse e agardar cinco minutos "
+"antes de poder unirse á sala da conversa"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Agora está conversando en %s."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr "Non se puido unir o contacto á conversa"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr "Quizais non están nunha conversa?"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Fetching the room list failed."
+msgstr "Non se puido obter a lista de salas."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+msgid "Voices"
+msgstr "Voces"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr "Cámaras web"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr "Non se puido obter a lista de salas."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr "Salas de usuarios"
+
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Produciuse un problema ao conectarse co servidor YCHT."
@@ -11571,11 +13054,6 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Non se puido enviar á conversa %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "Usuario"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:791
 #: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
@@ -11620,16 +13098,20 @@
 #: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"instance &lt;instancia&gt;: Establecer a instancia que se debe empregar nesta "
-"clase"
+"instance &lt;instancia&gt;: Establecer a instancia que se debe empregar "
+"nesta clase"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instancia&gt;: Establecer a instancia que se debe empregar nesta clase"
+msgstr ""
+"inst &lt;instancia&gt;: Establecer a instancia que se debe empregar nesta "
+"clase"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "topic &lt;instancia&gt;: Establecee a instancia que se debe empregar nesta clase"
+msgstr ""
+"topic &lt;instancia&gt;: Establecee a instancia que se debe empregar nesta "
+"clase"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
@@ -11638,7 +13120,8 @@
 "conversa"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+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;"
@@ -11726,8 +13209,8 @@
 msgid "Exposure"
 msgstr "Exposición"
 
-#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1600
+#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
+#: ../libpurple/proxy.c:1617
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -11736,66 +13219,77 @@
 "Non se puido crear un conectador:\n"
 "%s"
 
-#: ../libpurple/proxy.c:658
+#: ../libpurple/proxy.c:659
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Non é posible analizar a resposta desde o proxy de HTTP: %s\n"
 
-#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
-#: ../libpurple/proxy.c:782
+#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
+#: ../libpurple/proxy.c:792
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Erro de conexión no proxy de HTTP %d"
 
-#: ../libpurple/proxy.c:778
+#: ../libpurple/proxy.c:788
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Acceso denegado: o servidor proxy non permite \"tunneling\" no porto %d."
-
-#: ../libpurple/proxy.c:995
+msgstr ""
+"Acceso denegado: o servidor proxy non permite \"tunneling\" no porto %d."
+
+#: ../libpurple/proxy.c:1012
 #, c-format
 msgid "Error resolving %s"
 msgstr "Erro ao solucionar %s"
 
-#: ../libpurple/proxy.c:1697
+#: ../libpurple/proxy.c:1714
 msgid "Could not resolve host name"
 msgstr "Non se puido resolver o nome do servidor"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1377
+#: ../libpurple/request.h:1378
 msgid "_Yes"
 msgstr "_Si"
 
-#: ../libpurple/request.h:1377
+#: ../libpurple/request.h:1378
 msgid "_No"
 msgstr "_Non"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1397
+#: ../libpurple/request.h:1398
 msgid "_Accept"
 msgstr "_Aceptar"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:47
+#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "Non estou aquí agora"
 
-#: ../libpurple/savedstatuses.c:534
+#: ../libpurple/savedstatuses.c:535
 msgid "saved statuses"
 msgstr "estados gardados"
 
-#: ../libpurple/server.c:233
+#: ../libpurple/server.c:234
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s chámase agora %s.\n"
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:302
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr ""
+
+#: ../libpurple/server.c:347
+#, c-format
+msgid "%s has requested your attention!"
+msgstr ""
+
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11804,77 +13298,110 @@
 "%s convidou a %s á sala de conversa %s:\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s convidou a %s á sala de conversa %s\n"
 
-#: ../libpurple/server.c:689
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "Aceptar o convite para conversar?"
 
-#: ../libpurple/status.c:152
+#: ../libpurple/sslconn.c:164
+#, fuzzy
+msgid "SSL Connection Failed"
+msgstr "Fallou a conexión"
+
+#: ../libpurple/sslconn.c:166
+msgid "SSL Handshake Failed"
+msgstr "Fallou na negociación SSL"
+
+#: ../libpurple/sslconn.c:168
+msgid "SSL peer presented an invalid certificate"
+msgstr ""
+
+#: ../libpurple/sslconn.c:171
+#, fuzzy
+msgid "Unknown SSL error"
+msgstr "Erro descoñecido"
+
+#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Quitar"
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "Non molestar"
 
-#: ../libpurple/status.c:158
+#: ../libpurple/status.c:159
 msgid "Extended away"
 msgstr "Ausencia estendida"
 
-#: ../libpurple/status.c:159
+#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "Móbil"
 
-#: ../libpurple/status.c:608
+#: ../libpurple/status.c:609
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s cambiou o estado de %s a %s"
 
-#: ../libpurple/status.c:618
+#: ../libpurple/status.c:612
+#, fuzzy, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s cambiou o estado de %s a %s"
+
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is now %s"
 msgstr "%s agora é %s"
 
-#: ../libpurple/status.c:623
+#: ../libpurple/status.c:625
+#, fuzzy, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s agora é %s"
+
+#: ../libpurple/status.c:631
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s xa non é %s"
 
-#: ../libpurple/status.c:1233
+#: ../libpurple/status.c:633
+#, fuzzy, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s xa non é %s"
+
+#: ../libpurple/status.c:1244
 #, c-format
 msgid "%s became idle"
 msgstr "%s agora está inactivo"
 
-#: ../libpurple/status.c:1250
+#: ../libpurple/status.c:1261
 #, c-format
 msgid "%s became unidle"
 msgstr "%s agora está activo"
 
-#: ../libpurple/status.c:1313
+#: ../libpurple/status.c:1324
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s agora está inactivo"
 
-#: ../libpurple/status.c:1315
+#: ../libpurple/status.c:1326
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s agora está activo"
 
-#: ../libpurple/util.c:717
+#: ../libpurple/util.c:701
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2702
+#: ../libpurple/util.c:2705
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erro ao ler %s"
 
-#: ../libpurple/util.c:2703
+#: ../libpurple/util.c:2706
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11883,84 +13410,86 @@
 "Atopouse un erro ao ler o seu %s. Non se cargou e o ficheiro antigo foi "
 "renomeado a %s~."
 
-#: ../libpurple/util.c:3203
+#: ../libpurple/util.c:3206
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:3206
+#: ../libpurple/util.c:3209
 msgid "Unknown."
 msgstr "Descoñecido."
 
-#: ../libpurple/util.c:3232
+#: ../libpurple/util.c:3235
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundo"
 
-#: ../libpurple/util.c:3244
+#: ../libpurple/util.c:3247
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d día"
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3255
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d hora"
 
-#: ../libpurple/util.c:3258
+#: ../libpurple/util.c:3261
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d hora"
 
-#: ../libpurple/util.c:3266
+#: ../libpurple/util.c:3269
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minuto"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3275
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minuto"
 
-#: ../libpurple/util.c:3532
+#: ../libpurple/util.c:3535
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Non se puido abrir %s: Demasiadas redireccións"
 
-#: ../libpurple/util.c:3569 ../libpurple/util.c:3864
+#: ../libpurple/util.c:3572 ../libpurple/util.c:3868
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Non se puido conectar a %s"
 
-#: ../libpurple/util.c:3692
+#: ../libpurple/util.c:3695
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
-msgstr "Non é posible asignar memoria suficiente para manter os contidos de %s. O servidor web talvez pode estar a intentar algo malintencionado."
-
-#: ../libpurple/util.c:3727
+msgstr ""
+"Non é posible asignar memoria suficiente para manter os contidos de %s. O "
+"servidor web talvez pode estar a intentar algo malintencionado."
+
+#: ../libpurple/util.c:3730
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Erro ao ler desde %s: %s"
 
-#: ../libpurple/util.c:3758
+#: ../libpurple/util.c:3761
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Error ao escribir a %s: %s"
 
-#: ../libpurple/util.c:3783
+#: ../libpurple/util.c:3786
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Non se pode conectar a %s: %s"
@@ -11986,37 +13515,37 @@
 msgstr "A orientación da bandexa."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Opcións de inicio de sesión"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "Pro_tocolo:"
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "_Nome de usuario:"
 
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "Alias _local:"
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "_Recordar contrasinal"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Opcións de usuario"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "Noti_ficacións de correo novo"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "Usar esta icona de contacto para esta conta:"
 
@@ -12050,7 +13579,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1208
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213
 msgid "Use Environmental Settings"
 msgstr "Usar a configuración do contorno"
 
@@ -12072,15 +13601,15 @@
 msgid "Proxy Options"
 msgstr "Opcións do proxy"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1241
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
 msgid "_Port:"
 msgstr "_Porto:"
 
@@ -12088,31 +13617,44 @@
 msgid "_Username:"
 msgstr "Nome de _usuario:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1278
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
 msgid "Pa_ssword:"
 msgstr "Co_ntrasinal:"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1195
+#, fuzzy
+msgid "Unable to save new account"
+msgstr "Imposible crear a conexión"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Engadir conta"
 
-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Básico"
 
-#: ../pidgin/gtkaccount.c:1508
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "_Avanzado"
 
-#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../pidgin/gtkaccount.c:2010
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../pidgin/gtkaccount.c:2210
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12127,235 +13669,301 @@
 msgstr ""
 "<span size='larger' weight='bold'>Benvida/o a %s!</span>\n"
 "\n"
-"Non ten ningunha conta de MI habilitada. Para comezar conéctese con %s premendo no "
-"botón <b>Engadir</b> e configure a súa conta primeiro. Se desexa que %s se conecte a "
-"varias contas de MI, prema de novo <b>Engadir</b> para configuralas\n"
-"\n"
-"Pode voltar outra vez a esta ventá para engadir, editar ou eliminar as contas de "
-"<b>Contas->Engadir/Editart</b> na ventá da lista de contactos"
-
-#: ../pidgin/gtkblist.c:760
+"Non ten ningunha conta de MI habilitada. Para comezar conéctese con %s "
+"premendo no botón <b>Engadir</b> e configure a súa conta primeiro. Se desexa "
+"que %s se conecte a varias contas de MI, prema de novo <b>Engadir</b> para "
+"configuralas\n"
+"\n"
+"Pode voltar outra vez a esta ventá para engadir, editar ou eliminar as "
+"contas de <b>Contas->Engadir/Editart</b> na ventá da lista de contactos"
+
+#: ../pidgin/gtkblist.c:524
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../pidgin/gtkblist.c:525
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:527
+#, fuzzy
+msgid "_Merge"
+msgstr "_Mensaxe:"
+
+#: ../pidgin/gtkblist.c:924
 msgid "Join a Chat"
 msgstr "Unirse a unha conversa"
 
-#: ../pidgin/gtkblist.c:781
+#: ../pidgin/gtkblist.c:945
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr "Introduza a información apropiada da conversa á que desexaría unirse.\n"
-
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:792 ../pidgin/gtkblist.c:5478
-#: ../pidgin/gtkblist.c:5844 ../pidgin/gtkpounce.c:540
-#: ../pidgin/gtkroomlist.c:395
+msgstr ""
+"Introduza a información apropiada da conversa á que desexaría unirse.\n"
+
+#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6188
+#: ../pidgin/gtkpounce.c:539 ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "Con_ta:"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkprivacy.c:602
-#: ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1245
 msgid "Un_block"
 msgstr "Des_bloquear"
 
-#: ../pidgin/gtkblist.c:1132
+#: ../pidgin/gtkblist.c:1288
+msgid "Move to"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1328
 msgid "Get _Info"
 msgstr "Obter _información"
 
-#: ../pidgin/gtkblist.c:1135 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "M_I"
 
-#: ../pidgin/gtkblist.c:1141
-msgid "_Send File"
+#: ../pidgin/gtkblist.c:1337
+#, fuzzy
+msgid "_Send File..."
 msgstr "E_nviar ficheiro"
 
-#: ../pidgin/gtkblist.c:1148
-msgid "Add Buddy _Pounce"
-msgstr "Engadir _aviso de contacto"
-
-#: ../pidgin/gtkblist.c:1153 ../pidgin/gtkblist.c:1157
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1344
+#, fuzzy
+msgid "Add Buddy _Pounce..."
+msgstr "Engadir aviso de contacto..."
+
+#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353
+#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491
 msgid "View _Log"
 msgstr "Ver _rexistro"
 
-#: ../pidgin/gtkblist.c:1170 ../pidgin/gtkblist.c:1179
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1359
+#, fuzzy
+msgid "Hide when offline"
+msgstr "Non pode mandar mensaxes se está desconectado"
+
+#: ../pidgin/gtkblist.c:1359
+#, fuzzy
+msgid "Show when offline"
+msgstr "Non pode mandar mensaxes se está desconectado"
+
+#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382
+#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1173 ../pidgin/gtkblist.c:1181
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: ../pidgin/gtkblist.c:1231
-msgid "Add a _Buddy"
-msgstr "Engadir un _contacto"
-
-#: ../pidgin/gtkblist.c:1234
-msgid "Add a C_hat"
-msgstr "Engadir unha _conversa"
-
-#: ../pidgin/gtkblist.c:1237
+#: ../pidgin/gtkblist.c:1434
+#, fuzzy
+msgid "Add _Buddy..."
+msgstr "Engadir contacto"
+
+#: ../pidgin/gtkblist.c:1437
+#, fuzzy
+msgid "Add C_hat..."
+msgstr "Engadir conversa"
+
+#: ../pidgin/gtkblist.c:1440
 msgid "_Delete Group"
 msgstr "_Borrar o grupo"
 
-#: ../pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1442
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1464
 msgid "Auto-Join"
 msgstr "Conectarse automaticamente"
 
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1322
+#: ../pidgin/gtkblist.c:1466
+#, fuzzy
+msgid "Persistent"
+msgstr "Persa"
+
+#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1532
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../pidgin/gtkblist.c:1572 ../pidgin/gtkblist.c:1584
-#: ../pidgin/gtkblist.c:4572 ../pidgin/gtkblist.c:4582
+#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
+#: ../pidgin/gtkblist.c:4885 ../pidgin/gtkblist.c:4898
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Silenciar sons"
 
-#: ../pidgin/gtkblist.c:2044 ../pidgin/gtkconv.c:4731
-#: ../pidgin/gtkpounce.c:429
-msgid "You are not currently signed on with an account that can add that buddy."
-msgstr "Actualmente non está conectado con ningunha conta que poida engadir a ese contacto."
+#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4903
+#: ../pidgin/gtkpounce.c:430
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+"Actualmente non está conectado con ningunha conta que poida engadir a ese "
+"contacto."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:3067
 msgid "/_Buddies"
 msgstr "/_Contactos"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contactos/_Mensaxe instantánea nova..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contactos/_Unirse a unha conversa..."
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:3070
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contactos/Obter _información do usuario..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:3071
 msgid "/Buddies/View User _Log..."
 msgstr "/Contactos/Ver _rexistro do usuario..."
 
-#: ../pidgin/gtkblist.c:2856
-msgid "/Buddies/Show _Offline Buddies"
+#: ../pidgin/gtkblist.c:3073
+#, fuzzy
+msgid "/Buddies/Show"
+msgstr "/_Contactos"
+
+#: ../pidgin/gtkblist.c:3074
+#, fuzzy
+msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Contactos/Mostrar contactos _desconectados"
 
-#: ../pidgin/gtkblist.c:2857
-msgid "/Buddies/Show _Empty Groups"
+#: ../pidgin/gtkblist.c:3075
+#, fuzzy
+msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Contactos/Mostrar grupos _baleiros"
 
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/Show Buddy _Details"
+#: ../pidgin/gtkblist.c:3076
+#, fuzzy
+msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Contactos/Mostrar detalles de _contactos"
 
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Show Idle _Times"
+#: ../pidgin/gtkblist.c:3077
+#, fuzzy
+msgid "/Buddies/Show/Idle _Times"
 msgstr "/Contactos/Mostrar _tempo de ausencia"
 
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:3078
+#, fuzzy
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Contactos/Mostrar grupos _baleiros"
+
+#: ../pidgin/gtkblist.c:3079
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Contactos/_Ordenar contactos"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:3081
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contactos/_Engadir un contacto..."
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:3082
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contactos/Engadir unha con_versa..."
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:3083
 msgid "/Buddies/Add _Group..."
 msgstr "/Contactos/Engadir un _grupo..."
 
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:3085
 msgid "/Buddies/_Quit"
 msgstr "/Contactos/_Saír"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3088
 msgid "/_Accounts"
 msgstr "/Con_tas"
 
-#: ../pidgin/gtkblist.c:2870 ../pidgin/gtkblist.c:6542
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Contas/Engadir\\/Editar"
+#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6889
+#, fuzzy
+msgid "/Accounts/Manage"
+msgstr "/Contas"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3092
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:3093
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Ferramentas/_Avisos de contacto"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:3094
+#, fuzzy
+msgid "/Tools/_Certificates"
+msgstr "/Ferramentas/Pr_eferencias"
+
+#: ../pidgin/gtkblist.c:3095
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/C_omplementos"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:3096
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_eferencias"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:3097
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:3099
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferencias de _ficheiros"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:3100
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/Lista de _salas"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:3101
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/_Rexistro do sistema"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3103
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Silenciar s_ons"
 
 #. Help
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3105
 msgid "/_Help"
 msgstr "/A_xuda"
 
-#: ../pidgin/gtkblist.c:2886
+#: ../pidgin/gtkblist.c:3106
 msgid "/Help/Online _Help"
 msgstr "/Axuda/A_xuda en liña"
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3107
 msgid "/Help/_Debug Window"
 msgstr "/Axuda/Ventá de _depuración"
 
-#: ../pidgin/gtkblist.c:2889 ../pidgin/gtkblist.c:2891
+#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
 msgid "/Help/_About"
 msgstr "/Axuda/_Acerca de"
 
-#: ../pidgin/gtkblist.c:2920
+#: ../pidgin/gtkblist.c:3140
 #, c-format
 msgid ""
 "\n"
@@ -12364,189 +13972,197 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3218
 msgid "Buddy Alias"
 msgstr "Alias de contacto"
 
-#: ../pidgin/gtkblist.c:3027
+#: ../pidgin/gtkblist.c:3247
 msgid "Logged In"
 msgstr "Xa está conectado"
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3293
 msgid "Last Seen"
 msgstr "Última vista"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3314
 msgid "Spooky"
 msgstr "Espeluznante"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3316
 msgid "Awesome"
 msgstr "Impresionante"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3318
 msgid "Rockin'"
 msgstr "Brillante"
 
-#: ../pidgin/gtkblist.c:3436
+#: ../pidgin/gtkblist.c:3657
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inactivo %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3438
+#: ../pidgin/gtkblist.c:3659
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3440
+#: ../pidgin/gtkblist.c:3661
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"
 
-#: ../pidgin/gtkblist.c:3585
+#: ../pidgin/gtkblist.c:3806
 msgid "/Buddies/New Instant Message..."
 msgstr "/Contacto/Mensaxe instantánea _nova..."
 
-#: ../pidgin/gtkblist.c:3586 ../pidgin/gtkblist.c:3619
+#: ../pidgin/gtkblist.c:3807 ../pidgin/gtkblist.c:3840
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contacto/Unirse a unha conversa..."
 
-#: ../pidgin/gtkblist.c:3587
+#: ../pidgin/gtkblist.c:3808
 msgid "/Buddies/Get User Info..."
 msgstr "/Contacto/Obter información do usuario..."
 
-#: ../pidgin/gtkblist.c:3588
+#: ../pidgin/gtkblist.c:3809
 msgid "/Buddies/Add Buddy..."
 msgstr "/Contacto/Engadir un contacto..."
 
-#: ../pidgin/gtkblist.c:3589 ../pidgin/gtkblist.c:3622
+#: ../pidgin/gtkblist.c:3810 ../pidgin/gtkblist.c:3843
 msgid "/Buddies/Add Chat..."
 msgstr "/Contacto/Engadir unha conversa..."
 
-#: ../pidgin/gtkblist.c:3590
+#: ../pidgin/gtkblist.c:3811
 msgid "/Buddies/Add Group..."
 msgstr "/Contacto/Engadir un grupo..."
 
-#: ../pidgin/gtkblist.c:3625
+#: ../pidgin/gtkblist.c:3846
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../pidgin/gtkblist.c:3628
+#: ../pidgin/gtkblist.c:3849
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:3725 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3944 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensaxes sen ler de %s\n"
 msgstr[1] "%d mensaxes sen ler de %s\n"
 
-#: ../pidgin/gtkblist.c:3805
+#: ../pidgin/gtkblist.c:4104
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:3807
-msgid "Alphabetically"
-msgstr "Alfabeticamente"
-
-#: ../pidgin/gtkblist.c:3808
+#: ../pidgin/gtkblist.c:4107
 msgid "By status"
 msgstr "Por estado"
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:4108
 msgid "By log size"
 msgstr "Por tamaño de rexistro"
 
-#: ../pidgin/gtkblist.c:4014 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4313 ../pidgin/gtkconn.c:180
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../pidgin/gtkblist.c:4024
-msgid "Re-enable Account"
-msgstr "Reactivar conta"
-
-#: ../pidgin/gtkblist.c:4050
+#: ../pidgin/gtkblist.c:4349
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s desconectado: %s</span>"
 
-#: ../pidgin/gtkblist.c:4202
+#: ../pidgin/gtkblist.c:4501
 msgid "<b>Username:</b>"
 msgstr "<b>Nome de usuario:</b>"
 
-#: ../pidgin/gtkblist.c:4209
+#: ../pidgin/gtkblist.c:4508
 msgid "<b>Password:</b>"
 msgstr "<b>Contrasinal:</b>"
 
-#: ../pidgin/gtkblist.c:4220
+#: ../pidgin/gtkblist.c:4519
 msgid "_Login"
 msgstr "_Iniciar a sesión"
 
-#: ../pidgin/gtkblist.c:4303
+#: ../pidgin/gtkblist.c:4602
 msgid "/Accounts"
 msgstr "/Contas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4317
-#, c-format
+#: ../pidgin/gtkblist.c:4616
+#, fuzzy, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Benvida/o a %s!</span>\n"
 "\n"
-"Non ten ningunha conta habilitada. Active as súas contas de MI desde  a ventá "
-"de <b>Contas</b> en <b>Contas->Engadir/Editar</b>. Unha vez actives as túas contas, "
-"poderá conectarse, establecer o seu estado e falar cos seus amigos."
+"Non ten ningunha conta habilitada. Active as súas contas de MI desde  a "
+"ventá de <b>Contas</b> en <b>Contas->Engadir/Editar</b>. Unha vez actives as "
+"túas contas, poderá conectarse, establecer o seu estado e falar cos seus "
+"amigos."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4566
-msgid "/Buddies/Show Offline Buddies"
+#: ../pidgin/gtkblist.c:4879
+#, fuzzy
+msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Contactos/Mostrar contactos desconectados"
 
-#: ../pidgin/gtkblist.c:4569
-msgid "/Buddies/Show Empty Groups"
+#: ../pidgin/gtkblist.c:4882
+#, fuzzy
+msgid "/Buddies/Show/Empty Groups"
 msgstr "/Contactos/Mostrar grupos baleiros"
 
-#: ../pidgin/gtkblist.c:4575
-msgid "/Buddies/Show Buddy Details"
+#: ../pidgin/gtkblist.c:4888
+#, fuzzy
+msgid "/Buddies/Show/Buddy Details"
 msgstr "/Contactos/Mostrar detalles de contactos"
 
-#: ../pidgin/gtkblist.c:4578
-msgid "/Buddies/Show Idle Times"
+#: ../pidgin/gtkblist.c:4891
+#, fuzzy
+msgid "/Buddies/Show/Idle Times"
 msgstr "/Contactos/Mostrar tempos de ausencia"
 
-#: ../pidgin/gtkblist.c:5455
+#: ../pidgin/gtkblist.c:4894
+#, fuzzy
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Contactos/Mostrar grupos baleiros"
+
+#: ../pidgin/gtkblist.c:5796
 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. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
 "Introduza o nome de usuario da persoa que quere engadir á lista. "
-"Opcionalmente, pode introducir un alias. O alias mostrarase en lugar do "
-"nome de usuario sempre que for posible.\n"
+"Opcionalmente, pode introducir un alias. O alias mostrarase en lugar do nome "
+"de usuario sempre que for posible.\n"
+
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:5819
+#, fuzzy
+msgid "A_ccount:"
+msgstr "Conta:"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5490
+#: ../pidgin/gtkblist.c:5831
 msgid "_Screen name:"
 msgstr "_Nome de usuario:"
 
-#: ../pidgin/gtkblist.c:5512 ../pidgin/gtkblist.c:5865
+#: ../pidgin/gtkblist.c:5853 ../pidgin/gtkblist.c:6209
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5777
+#: ../pidgin/gtkblist.c:6121
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo non está soportado nas salas de conversa."
 
-#: ../pidgin/gtkblist.c:5793
+#: ../pidgin/gtkblist.c:6137
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -12554,7 +14170,7 @@
 "Non está conectado con ningunha conta que teña capacidade de acceder a "
 "conversas."
 
-#: ../pidgin/gtkblist.c:5834
+#: ../pidgin/gtkblist.c:6178
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12562,43 +14178,57 @@
 "Introduza un alias e a información que crea apropiada da conversa que "
 "desexaría engadir á lista de contactos.\n"
 
-#: ../pidgin/gtkblist.c:5922
+#: ../pidgin/gtkblist.c:6237
+msgid "Autojoin when account becomes online."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6238
+msgid "Hide chat when the window is closed."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6264
 msgid "Please enter the name of the group to be added."
 msgstr "Introduza o nome do grupo que quere engadir."
 
-#: ../pidgin/gtkblist.c:6562
+#: ../pidgin/gtkblist.c:6909
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Contas/"
 
-#: ../pidgin/gtkblist.c:6586
+#: ../pidgin/gtkblist.c:6933
 msgid "_Edit Account"
 msgstr "_Editar a conta"
 
-#: ../pidgin/gtkblist.c:6599 ../pidgin/gtkconv.c:3037
+#: ../pidgin/gtkblist.c:6946 ../pidgin/gtkconv.c:3136
 msgid "No actions available"
 msgstr "Non hai accións dispoñibles"
 
-#: ../pidgin/gtkblist.c:6607
+#: ../pidgin/gtkblist.c:6954
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../pidgin/gtkblist.c:6619
+#: ../pidgin/gtkblist.c:6966
 msgid "Enable Account"
 msgstr "Activar a conta"
 
-#: ../pidgin/gtkblist.c:6625
+#: ../pidgin/gtkblist.c:6972
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Contas/Activar conta"
 
-#: ../pidgin/gtkblist.c:6674
+#: ../pidgin/gtkblist.c:7021
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../pidgin/gtkblist.c:6744
+#: ../pidgin/gtkblist.c:7091
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contactos/Ordenar contactos"
 
-#: ../pidgin/gtkconn.c:179
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:530
+#, fuzzy
+msgid "SSL Servers"
+msgstr "Servidor"
+
+#: ../pidgin/gtkconn.c:181
 #, c-format
 msgid ""
 "%s\n"
@@ -12608,27 +14238,29 @@
 msgstr ""
 "%s\n"
 "\n"
-"%s non tentará reconectar a conta até que vostede corrixa o erro e "
-"a volva activar."
-
-#: ../pidgin/gtkconv.c:488
+"%s non tentará reconectar a conta até que vostede corrixa o erro e a volva "
+"activar."
+
+#: ../pidgin/gtkconv.c:523
 msgid "Unknown command."
 msgstr "Comando descoñecido."
 
-#: ../pidgin/gtkconv.c:760 ../pidgin/gtkconv.c:786
+#: ../pidgin/gtkconv.c:795 ../pidgin/gtkconv.c:821
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ese contacto non utiliza o mesmo protocolo que esta conversa."
 
-#: ../pidgin/gtkconv.c:780
-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 convidar a ese contacto."
-
-#: ../pidgin/gtkconv.c:833
+#: ../pidgin/gtkconv.c:815
+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 convidar a ese contacto."
+
+#: ../pidgin/gtkconv.c:868
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar a un contacto á sala de conversa"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:863
+#: ../pidgin/gtkconv.c:898
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12636,200 +14268,188 @@
 "Introduza o nome de usuario que desexa convidar, xunto cunha mensaxe de "
 "convite opcional."
 
-#: ../pidgin/gtkconv.c:884
+#: ../pidgin/gtkconv.c:919
 msgid "_Buddy:"
 msgstr "_Contacto:"
 
-#: ../pidgin/gtkconv.c:904 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtkconv.c:930 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "_Mensaxe:"
 
-#: ../pidgin/gtkconv.c:961 ../pidgin/gtkconv.c:2544 ../pidgin/gtkdebug.c:218
-#: ../pidgin/gtkft.c:542
+#: ../pidgin/gtkconv.c:988 ../pidgin/gtkconv.c:2657 ../pidgin/gtkdebug.c:219
+#: ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "Non se puido abrir o ficheiro."
 
-#: ../pidgin/gtkconv.c:967
+#: ../pidgin/gtkconv.c:994
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversa con %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1003
+#: ../pidgin/gtkconv.c:1032
 msgid "Save Conversation"
 msgstr "Gardar conversa"
 
-#: ../pidgin/gtkconv.c:1152 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Buscar"
 
-#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1204 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Buscar:"
 
-#: ../pidgin/gtkconv.c:1361
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-"Iniciuose o rexistro. A partir de agora rexistraranse todas as mensaxes "
-"desta conversa."
-
-#: ../pidgin/gtkconv.c:1369
-msgid "Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"Detívose o rexistro. Non se rexistrarán mensaxes desta conversa de agora "
-"en adiante."
-
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1675
 msgid "Un-Ignore"
 msgstr "Non ignorar"
 
-#: ../pidgin/gtkconv.c:1620
+#: ../pidgin/gtkconv.c:1678
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../pidgin/gtkconv.c:1640
+#: ../pidgin/gtkconv.c:1698
 msgid "Get Away Message"
 msgstr "Mensaxe de ausencia"
 
-#: ../pidgin/gtkconv.c:1663
+#: ../pidgin/gtkconv.c:1721
 msgid "Last said"
 msgstr "Dito a última vez"
 
-#: ../pidgin/gtkconv.c:2552
+#: ../pidgin/gtkconv.c:2665
 msgid "Unable to save icon file to disk."
 msgstr "Non se puido gardar o ficheiro de iconas no disco."
 
-#: ../pidgin/gtkconv.c:2603
+#: ../pidgin/gtkconv.c:2716
 msgid "Save Icon"
 msgstr "Gardar icona"
 
-#: ../pidgin/gtkconv.c:2655
+#: ../pidgin/gtkconv.c:2768
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2660
+#: ../pidgin/gtkconv.c:2773
 msgid "Hide Icon"
 msgstr "Ocultar icona"
 
-#: ../pidgin/gtkconv.c:2663
+#: ../pidgin/gtkconv.c:2776
 msgid "Save Icon As..."
 msgstr "Gardar a icona como..."
 
-#: ../pidgin/gtkconv.c:2667
+#: ../pidgin/gtkconv.c:2780
 msgid "Set Custom Icon..."
 msgstr "Establecer iconas personalizadas..."
 
-#: ../pidgin/gtkconv.c:2680
+#: ../pidgin/gtkconv.c:2793
 msgid "Remove Custom Icon"
 msgstr "Eliminar as iconas personalizadas"
 
+#: ../pidgin/gtkconv.c:2924
+msgid "Show All"
+msgstr ""
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2943
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2945
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/_Mensaxe instantánea nova..."
 
-#: ../pidgin/gtkconv.c:2829
+#: ../pidgin/gtkconv.c:2950
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Buscar..."
 
-#: ../pidgin/gtkconv.c:2831
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Ver _rexistro"
 
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2953
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/_Gardar como..."
 
-#: ../pidgin/gtkconv.c:2834
+#: ../pidgin/gtkconv.c:2955
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/Limpar _historial"
 
-#: ../pidgin/gtkconv.c:2838
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar ficheiro..."
 
-#: ../pidgin/gtkconv.c:2839
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Engadir _aviso de contacto..."
 
-#: ../pidgin/gtkconv.c:2841
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Obter información"
 
-#: ../pidgin/gtkconv.c:2843
+#: ../pidgin/gtkconv.c:2964
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/Con_vidar..."
 
-#: ../pidgin/gtkconv.c:2845
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/M_ore"
 msgstr "/Conversa/Má_is"
 
-#: ../pidgin/gtkconv.c:2849
+#: ../pidgin/gtkconv.c:2970
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversa/A_lias..."
 
-#: ../pidgin/gtkconv.c:2851
+#: ../pidgin/gtkconv.c:2972
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloquear..."
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversa/_Desbloquear..."
 
-#: ../pidgin/gtkconv.c:2855
+#: ../pidgin/gtkconv.c:2976
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/Enga_dir..."
 
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2978
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/_Eliminar..."
 
-#: ../pidgin/gtkconv.c:2862
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversa/Inserir liga_zón..."
 
-#: ../pidgin/gtkconv.c:2864
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Inserir ima_xe..."
 
-#: ../pidgin/gtkconv.c:2870
+#: ../pidgin/gtkconv.c:2991
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Pechar"
 
 #. Options
-#: ../pidgin/gtkconv.c:2874
+#: ../pidgin/gtkconv.c:2995
 msgid "/_Options"
 msgstr "/_Opcións"
 
-#: ../pidgin/gtkconv.c:2875
+#: ../pidgin/gtkconv.c:2996
 msgid "/Options/Enable _Logging"
 msgstr "/Opcións/Activar _rexistro"
 
-#: ../pidgin/gtkconv.c:2876
+#: ../pidgin/gtkconv.c:2997
 msgid "/Options/Enable _Sounds"
 msgstr "/Opcións/Activar _sons"
 
-#: ../pidgin/gtkconv.c:2877
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Opcións/Mostrar _iconas dos contactos"
-
-#: ../pidgin/gtkconv.c:2879
+#: ../pidgin/gtkconv.c:2999
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opcións/Mostrar _barra de formato"
 
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:3000
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opcións/Mostrar _marcas de tempo"
 
-#: ../pidgin/gtkconv.c:3025
+#: ../pidgin/gtkconv.c:3124
 msgid "/Conversation/More"
 msgstr "/Conversa/Máis"
 
-#: ../pidgin/gtkconv.c:3081
+#: ../pidgin/gtkconv.c:3180
 msgid "/Options"
 msgstr "/Opcións"
 
@@ -12838,639 +14458,646 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3148
+#: ../pidgin/gtkconv.c:3215 ../pidgin/gtkconv.c:3247
 msgid "/Conversation"
 msgstr "/Conversa"
 
-#: ../pidgin/gtkconv.c:3156
+#: ../pidgin/gtkconv.c:3255
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver o rexistro"
 
-#: ../pidgin/gtkconv.c:3162
+#: ../pidgin/gtkconv.c:3261
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar o ficheiro..."
 
-#: ../pidgin/gtkconv.c:3166
+#: ../pidgin/gtkconv.c:3265
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Engadir un aviso de contacto..."
 
-#: ../pidgin/gtkconv.c:3172
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Obter información"
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3275
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convidar..."
 
-#: ../pidgin/gtkconv.c:3182
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Alias..."
 
-#: ../pidgin/gtkconv.c:3186
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3190
+#: ../pidgin/gtkconv.c:3289
 msgid "/Conversation/Unblock..."
 msgstr "/Conversa/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3194
+#: ../pidgin/gtkconv.c:3293
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Engadir..."
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3297
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Eliminar..."
 
-#: ../pidgin/gtkconv.c:3204
+#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversa/Inserir ligazón..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3307
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Inserir unha imaxe..."
 
-#: ../pidgin/gtkconv.c:3214
+#: ../pidgin/gtkconv.c:3313
 msgid "/Options/Enable Logging"
 msgstr "/Opcións/Activar rexistro"
 
-#: ../pidgin/gtkconv.c:3217
+#: ../pidgin/gtkconv.c:3316
 msgid "/Options/Enable Sounds"
 msgstr "/Opcións/Activar sons"
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3329
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opcións/Mostrar barra de formato"
 
-#: ../pidgin/gtkconv.c:3233
+#: ../pidgin/gtkconv.c:3332
 msgid "/Options/Show Timestamps"
 msgstr "/Opcións/Mostrar marcas de tempo"
 
-#: ../pidgin/gtkconv.c:3236
-msgid "/Options/Show Buddy Icon"
-msgstr "/Opcións/Mostrar iconas dos contactos"
-
-#: ../pidgin/gtkconv.c:3320 ../pidgin/gtkconv.c:3362
+#: ../pidgin/gtkconv.c:3409 ../pidgin/gtkconv.c:3451
 msgid "User is typing..."
 msgstr "O usuario está a escribir..."
 
-#: ../pidgin/gtkconv.c:3365
+#: ../pidgin/gtkconv.c:3454
 msgid "User has typed something and stopped"
 msgstr "O usuario escribiu algo e parou"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3548 ../pidgin/gtkconv.c:7812
-msgid "_Send To"
-msgstr "_Enviar a"
-
-#: ../pidgin/gtkconv.c:4261
+#: ../pidgin/gtkconv.c:3637 ../pidgin/gtkconv.c:8103
+#, fuzzy
+msgid "S_end To"
+msgstr "Enviar a"
+
+#: ../pidgin/gtkconv.c:4349
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4365
+#: ../pidgin/gtkconv.c:4453
 msgid "0 people in room"
 msgstr "0 persoas na sala"
 
-#: ../pidgin/gtkconv.c:5633 ../pidgin/gtkconv.c:5754
+#: ../pidgin/gtkconv.c:5823 ../pidgin/gtkconv.c:5944
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoa na sala"
 msgstr[1] "%d persoa na sala"
 
-#: ../pidgin/gtkconv.c:6357 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6550 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Escribindo"
 
-#: ../pidgin/gtkconv.c:6361
+#: ../pidgin/gtkconv.c:6554
 msgid "Stopped Typing"
 msgstr "Deixou de escribir"
 
-#: ../pidgin/gtkconv.c:6364
+#: ../pidgin/gtkconv.c:6557
 msgid "Nick Said"
 msgstr "Alias dixo"
 
-#: ../pidgin/gtkconv.c:6367 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6560 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Mensaxes sen ler"
 
-#: ../pidgin/gtkconv.c:6370
+#: ../pidgin/gtkconv.c:6563
 msgid "New Event"
 msgstr "Evento novo"
 
-#: ../pidgin/gtkconv.c:7362
+#: ../pidgin/gtkconv.c:7654
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Limpa todos os historiais de conversas."
 
-#: ../pidgin/gtkconv.c:7526
+#: ../pidgin/gtkconv.c:7817
 msgid "Confirm close"
 msgstr "Confirmar o peche"
 
-#: ../pidgin/gtkconv.c:7558
+#: ../pidgin/gtkconv.c:7849
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Hai mensaxes sen ler. Seguro que quere pechar a ventá?"
 
-#: ../pidgin/gtkconv.c:8144
+#: ../pidgin/gtkconv.c:8436
 msgid "Close other tabs"
 msgstr "Pechar outros separadores"
 
-#: ../pidgin/gtkconv.c:8150
+#: ../pidgin/gtkconv.c:8442
 msgid "Close all tabs"
 msgstr "Pechar todas os separadores"
 
-#: ../pidgin/gtkconv.c:8158
+#: ../pidgin/gtkconv.c:8450
 msgid "Detach this tab"
 msgstr "Separar este separador"
 
-#: ../pidgin/gtkconv.c:8164
+#: ../pidgin/gtkconv.c:8456
 msgid "Close this tab"
 msgstr "Pechar este separador"
 
-#: ../pidgin/gtkconv.c:8662
+#: ../pidgin/gtkconv.c:8951
 msgid "Close conversation"
 msgstr "Pechar a conversa"
 
-#: ../pidgin/gtkconv.c:9261
+#: ../pidgin/gtkconv.c:9553
 msgid "Last created window"
 msgstr "Última ventá creada"
 
-#: ../pidgin/gtkconv.c:9263
+#: ../pidgin/gtkconv.c:9555
 msgid "Separate IM and Chat windows"
 msgstr "Separar as ventás de MI e de conversa"
 
-#: ../pidgin/gtkconv.c:9265 ../pidgin/gtkprefs.c:1412
+#: ../pidgin/gtkconv.c:9557 ../pidgin/gtkprefs.c:1417
 msgid "New window"
 msgstr "Nova ventá"
 
-#: ../pidgin/gtkconv.c:9267
+#: ../pidgin/gtkconv.c:9559
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:9269
+#: ../pidgin/gtkconv.c:9561
 msgid "By account"
 msgstr "Por conta"
 
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Gardar rexistro de depuración"
 
-#: ../pidgin/gtkdebug.c:581
+#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Inverter"
 
-#: ../pidgin/gtkdebug.c:584
+#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Coincidencias resaltadas"
 
-#: ../pidgin/gtkdebug.c:651
+#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "_Só iconas"
 
-#: ../pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "_Só texto"
 
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "_Texto e iconas"
 
-#: ../pidgin/gtkdebug.c:774
+#: ../pidgin/gtkdebug.c:775
 msgid "Filter"
 msgstr "Filtro"
 
-#: ../pidgin/gtkdebug.c:793
+#: ../pidgin/gtkdebug.c:794
 msgid "Right click for more options."
 msgstr "Premer co botón dereito para máis opcións."
 
-#: ../pidgin/gtkdebug.c:823
+#: ../pidgin/gtkdebug.c:824
 msgid "Level "
 msgstr "Nivel"
 
-#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
+#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
 msgid "Select the debug filter level."
 msgstr "Seleccione o nivel do filtro de depuración."
 
-#: ../pidgin/gtkdebug.c:832
+#: ../pidgin/gtkdebug.c:833
 msgid "All"
 msgstr "Todos"
 
-#: ../pidgin/gtkdebug.c:833
+#: ../pidgin/gtkdebug.c:834
 msgid "Misc"
 msgstr "Diversos"
 
-#: ../pidgin/gtkdebug.c:835
-msgid "Warning"
-msgstr "Aviso"
-
 #: ../pidgin/gtkdebug.c:836
-msgid "Error "
-msgstr "Erro"
+msgid "Warning"
+msgstr "Aviso"
 
 #: ../pidgin/gtkdebug.c:837
+msgid "Error "
+msgstr "Erro"
+
+#: ../pidgin/gtkdebug.c:838
 msgid "Fatal Error"
 msgstr "Erro moi grave"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "desenvolvedor principal"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
-#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:77
-#: ../pidgin/gtkdialogs.c:78 ../pidgin/gtkdialogs.c:79
-#: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
-#: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
-#: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
-#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:89
-#: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:92
 msgid "developer"
 msgstr "desenvolvedor"
 
-#: ../pidgin/gtkdialogs.c:86
-msgid "support"
-msgstr "soporte"
-
 #: ../pidgin/gtkdialogs.c:87
+msgid "support"
+msgstr "soporte"
+
+#: ../pidgin/gtkdialogs.c:88
 msgid "support/QA"
 msgstr "soporte/QA"
 
-#: ../pidgin/gtkdialogs.c:104
+#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+msgid "developer & webmaster"
+msgstr "desenvolvedor e webmaster"
+
+#: ../pidgin/gtkdialogs.c:99
+msgid "Senior Contributor/QA"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
 msgstr "adaptación a win32"
 
-#: ../pidgin/gtkdialogs.c:105 ../pidgin/gtkdialogs.c:106
+#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "mantedor"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:111
 msgid "libfaim maintainer"
 msgstr "mantedor de libfaim"
 
-#: ../pidgin/gtkdialogs.c:108
-msgid "developer & webmaster"
-msgstr "desenvolvedor e webmaster"
-
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker e deseñador de controladores [lazy bum]"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:115
 msgid "XMPP developer"
 msgstr "Desenvolvedor XMPP"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "autor orixinal"
 
-#: ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:133
 msgid "Afrikaans"
 msgstr "Africano"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:134
 msgid "Arabic"
 msgstr "Árabe"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:131
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:135
+msgid "Belarusian Latin"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:224
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
 msgstr "Bengalí"
 
-#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:142
 msgid "Bosnian"
 msgstr "Bosnio"
 
-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:226
 msgid "Catalan"
 msgstr "Catalán"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
 msgstr "Valenciano"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:227
 msgid "Czech"
 msgstr "Checo"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr "Danés"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:228
 msgid "German"
 msgstr "Alemán"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
 msgid "Greek"
 msgstr "Grego"
 
-#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:156
 msgid "Australian English"
 msgstr "Inglés australiano"
 
-#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:157
 msgid "Canadian English"
 msgstr "Inglés canadense"
 
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:158
 msgid "British English"
 msgstr "Inglés británico"
 
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:159
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Spanish"
 msgstr "Español"
 
-#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:161
 msgid "Estonian"
 msgstr "Estonio"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
 msgstr "Euskera"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:166
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:229
-#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "French"
 msgstr "Francés"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
-#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:239
 msgid "Galician"
 msgstr "Galego"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati Language Team"
 msgstr "Equipo de idioma de Gujarati"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:240
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:174
 msgid "Hindi"
 msgstr "Hindú"
 
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:241
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:176
 msgid "Indonesian"
 msgstr "Indonesio"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:242
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244 ../pidgin/gtkdialogs.c:245
 msgid "Japanese"
 msgstr "Xaponés"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:246
 msgid "Georgian"
 msgstr "Xeorxiano"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:179
 msgid "Ubuntu Georgian Translators"
 msgstr "Tradutores xeorxianos de Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada Translation team"
 msgstr "Equipo de tradución ao Kannada"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:248
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
 msgstr "Curdo"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:250
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
-#: ../pidgin/gtkdialogs.c:244
-msgid "Macedonian"
-msgstr "Macedonio"
-
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:245
-msgid "Bokmål Norwegian"
-msgstr "Bokmål noruegués"
-
-#: ../pidgin/gtkdialogs.c:183
-msgid "Nepali"
-msgstr "Bengalí"
-
-#: ../pidgin/gtkdialogs.c:184
-msgid "Dutch, Flemish"
-msgstr "Holandés, Flamenco"
-
-#: ../pidgin/gtkdialogs.c:185
-msgid "Norwegian Nynorsk"
-msgstr "Nynorsk noruegués"
-
 #: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:246
-msgid "Polish"
-msgstr "Polaco"
+#: ../pidgin/gtkdialogs.c:251
+msgid "Macedonian"
+msgstr "Macedonio"
+
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:252
+msgid "Bokmål Norwegian"
+msgstr "Bokmål noruegués"
 
 #: ../pidgin/gtkdialogs.c:189
-msgid "Portuguese"
-msgstr "Portugués"
+msgid "Nepali"
+msgstr "Bengalí"
 
 #: ../pidgin/gtkdialogs.c:190
-msgid "Portuguese-Brazil"
-msgstr "Portugués brasileiro"
+msgid "Dutch, Flemish"
+msgstr "Holandés, Flamenco"
 
 #: ../pidgin/gtkdialogs.c:191
+msgid "Norwegian Nynorsk"
+msgstr "Nynorsk noruegués"
+
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:253
+msgid "Polish"
+msgstr "Polaco"
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "Portuguese"
+msgstr "Portugués"
+
+#: ../pidgin/gtkdialogs.c:196
+msgid "Portuguese-Brazil"
+msgstr "Portugués brasileiro"
+
+#: ../pidgin/gtkdialogs.c:197
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:198
 msgid "Romanian"
 msgstr "Romeno"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:247
-#: ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:256 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:259
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:203
 msgid "Albanian"
 msgstr "Albanés"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:253
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:261
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:207
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:208
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:209
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:262
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:211
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:211
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh e o equipo Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:263
 msgid "Simplified Chinese"
 msgstr "Chinés simplificado"
 
-#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:213 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
 msgid "Hong Kong Chinese"
 msgstr "Chinés de Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:211
-#: ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:264
 msgid "Traditional Chinese"
 msgstr "Chinés tradicional"
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:223
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../pidgin/gtkdialogs.c:342
+#: ../pidgin/gtkdialogs.c:351
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#: ../pidgin/gtkdialogs.c:380
-#, c-format
+#: ../pidgin/gtkdialogs.c:394
+#, fuzzy, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
-msgstr ""
-"%s é un cliente de mensaxería gráfico e modular baseado en libpurple e que é"
-"capaz de conectarse a AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, e QQ todos a un "
-"tempo.  Está escrito usando GTK+.<BR><BR>Vostede pode modificar e redistribuír o "
-"programa baixo os termos da GPL (versión 2 ou posterior).  Unha copia da GPL "
-"vai dentro do ficheiro 'COPYING' distribuído con %s.  Os dereitos de autor de %s son dos "
-"contribuíntes.  Vexa o ficheiro de 'COPYRIGHT' para a lista completa de "
-"contribuíntes.  Nós non damos ningún tipo de garantía sobre este programa.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:395
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
+msgstr ""
+"%s é un cliente de mensaxería gráfico e modular baseado en libpurple e que "
+"écapaz de conectarse a AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, e QQ todos a "
+"un tempo.  Está escrito usando GTK+.<BR><BR>Vostede pode modificar e "
+"redistribuír o programa baixo os termos da GPL (versión 2 ou posterior).  "
+"Unha copia da GPL vai dentro do ficheiro 'COPYING' distribuído con %s.  Os "
+"dereitos de autor de %s son dos contribuíntes.  Vexa o ficheiro de "
+"'COPYRIGHT' para a lista completa de contribuíntes.  Nós non damos ningún "
+"tipo de garantía sobre este programa.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:412
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:400
+#: ../pidgin/gtkdialogs.c:417
 msgid "Current Developers"
 msgstr "Desenvolvedores actuais"
 
-#: ../pidgin/gtkdialogs.c:415
+#: ../pidgin/gtkdialogs.c:432
 msgid "Crazy Patch Writers"
 msgstr "Tolos escritores de parches"
 
-#: ../pidgin/gtkdialogs.c:430
+#: ../pidgin/gtkdialogs.c:447
 msgid "Retired Developers"
 msgstr "Desenvolvedores retirados"
 
-#: ../pidgin/gtkdialogs.c:445
+#: ../pidgin/gtkdialogs.c:462
 msgid "Retired Crazy Patch Writers"
 msgstr "Desenvolvedores de parches tolos retirados"
 
-#: ../pidgin/gtkdialogs.c:460
+#: ../pidgin/gtkdialogs.c:477
 msgid "Artists"
 msgstr "Artistas"
 
-#: ../pidgin/gtkdialogs.c:475
+#: ../pidgin/gtkdialogs.c:492
 msgid "Current Translators"
 msgstr "Tradutores actuais"
 
-#: ../pidgin/gtkdialogs.c:495
+#: ../pidgin/gtkdialogs.c:512
 msgid "Past Translators"
 msgstr "Tradutores anteriores"
 
-#: ../pidgin/gtkdialogs.c:513
+#: ../pidgin/gtkdialogs.c:530
 msgid "Debugging Information"
 msgstr "Información de depuración"
 
-#: ../pidgin/gtkdialogs.c:882
+#: ../pidgin/gtkdialogs.c:900
 msgid "Get User Info"
 msgstr "Obter información do usuario"
 
-#: ../pidgin/gtkdialogs.c:884
+#: ../pidgin/gtkdialogs.c:902
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -13478,11 +15105,11 @@
 "Introduza o nome de usuario ou o alias da persoa da que quere ver "
 "información."
 
-#: ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:992
 msgid "View User Log"
 msgstr "Ver rexistro do usuario"
 
-#: ../pidgin/gtkdialogs.c:976
+#: ../pidgin/gtkdialogs.c:994
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -13490,32 +15117,32 @@
 "Introduza o nome de usuario ou o alias da persoa da que quere ver a "
 "información de rexistro."
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1014
 msgid "Alias Contact"
 msgstr "Alias para o contacto"
 
-#: ../pidgin/gtkdialogs.c:997
+#: ../pidgin/gtkdialogs.c:1015
 msgid "Enter an alias for this contact."
 msgstr "Introduza un alias para este contacto."
 
-#: ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1037
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduza un alias para %s."
 
-#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1039
 msgid "Alias Buddy"
 msgstr "Alias do contacto"
 
-#: ../pidgin/gtkdialogs.c:1042
+#: ../pidgin/gtkdialogs.c:1060
 msgid "Alias Chat"
 msgstr "Alias na conversa"
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1061
 msgid "Enter an alias for this chat."
 msgstr "Introduza un alias para esta conversa."
 
-#: ../pidgin/gtkdialogs.c:1082
+#: ../pidgin/gtkdialogs.c:1100
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13524,36 +15151,38 @@
 "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 %d contacto máis da lista de "
-"contactos. Quere continuar?"
+"Está a punto de eliminar o contacto que contén a %s e %d contacto máis da "
+"lista de contactos. Quere continuar?"
 msgstr[1] ""
-"Está a punto de eliminar o contacto que contén a %s e %d contacto máis da lista de "
-"contactos. Quere continuar?"
-
-#: ../pidgin/gtkdialogs.c:1090
+"Está a punto de eliminar o contacto que contén a %s e %d contacto máis da "
+"lista de contactos. Quere continuar?"
+
+#: ../pidgin/gtkdialogs.c:1108
 msgid "Remove Contact"
 msgstr "Eliminar o contacto"
 
-#: ../pidgin/gtkdialogs.c:1093
+#: ../pidgin/gtkdialogs.c:1111
 msgid "_Remove Contact"
 msgstr "_Eliminar o contacto"
 
-#: ../pidgin/gtkdialogs.c:1124
+#: ../pidgin/gtkdialogs.c:1142
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
-msgstr "Está a piques de combinar o grupo chamado %s dentro do grupo %s.Desexa continuar?"
-
-#: ../pidgin/gtkdialogs.c:1131
+msgstr ""
+"Está a piques de combinar o grupo chamado %s dentro do grupo %s.Desexa "
+"continuar?"
+
+#: ../pidgin/gtkdialogs.c:1149
 msgid "Merge Groups"
 msgstr "Combinar grupos"
 
-#: ../pidgin/gtkdialogs.c:1134
+#: ../pidgin/gtkdialogs.c:1152
 msgid "_Merge Groups"
 msgstr "_Combinar grupos"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1202
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13562,28 +15191,29 @@
 "Está a piques de borrar o grupo %s e todos os seus membros da lista de "
 "contactos. Quere continuar?"
 
-#: ../pidgin/gtkdialogs.c:1187
+#: ../pidgin/gtkdialogs.c:1205
 msgid "Remove Group"
 msgstr "Eliminar o grupo"
 
-#: ../pidgin/gtkdialogs.c:1190
+#: ../pidgin/gtkdialogs.c:1208
 msgid "_Remove Group"
 msgstr "_Eliminar o grupo"
 
-#: ../pidgin/gtkdialogs.c:1223
-#, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+#: ../pidgin/gtkdialogs.c:1241
+#, c-format
+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 lista de contactos. Quere continuar?"
 
-#: ../pidgin/gtkdialogs.c:1226
+#: ../pidgin/gtkdialogs.c:1244
 msgid "Remove Buddy"
 msgstr "Eliminar o contacto"
 
-#: ../pidgin/gtkdialogs.c:1229
+#: ../pidgin/gtkdialogs.c:1247
 msgid "_Remove Buddy"
 msgstr "_Eliminar o contacto"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1268
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13592,11 +15222,11 @@
 "Está a punto de eliminar a conversa %s da lista de contactos. Quere "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1271
 msgid "Remove Chat"
 msgstr "Eliminar a conversa"
 
-#: ../pidgin/gtkdialogs.c:1256
+#: ../pidgin/gtkdialogs.c:1274
 msgid "_Remove Chat"
 msgstr "_Eliminar a conversa"
 
@@ -13621,136 +15251,138 @@
 msgstr "Sen son"
 
 #: ../pidgin/gtkdocklet.c:535
-msgid "Blink on new message"
+#, fuzzy
+msgid "Blink on New Message"
 msgstr "Intermitencia para as novas mensaxes"
 
 #: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "Saír"
 
-#: ../pidgin/gtkft.c:153
+#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "Non iniciado"
 
-#: ../pidgin/gtkft.c:273
+#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Recibindo como:</b>"
 
-#: ../pidgin/gtkft.c:275
+#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Recibindo de:</b>"
 
-#: ../pidgin/gtkft.c:279
+#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>Enviando a:</b>"
 
-#: ../pidgin/gtkft.c:281
+#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>Enviando como:</b>"
 
-#: ../pidgin/gtkft.c:497
+#: ../pidgin/gtkft.c:498
 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."
-
-#: ../pidgin/gtkft.c:502
+msgstr ""
+"Non se configurou ningunha aplicación para abrir este tipo de ficheiro."
+
+#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "Produciuse un erro ao abrir o ficheiro."
 
-#: ../pidgin/gtkft.c:539
+#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Erro ao lanzar %s: %s"
 
-#: ../pidgin/gtkft.c:548
+#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "Erro ao executar %s"
 
-#: ../pidgin/gtkft.c:549
+#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "O proceso devolveu o código de erro %d"
 
-#: ../pidgin/gtkft.c:696
+#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Nome do ficheiro:"
 
-#: ../pidgin/gtkft.c:697
+#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "Ficheiro local:"
 
-#: ../pidgin/gtkft.c:699
-msgid "Speed:"
-msgstr "Velocidade:"
-
 #: ../pidgin/gtkft.c:700
+msgid "Speed:"
+msgstr "Velocidade:"
+
+#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "Tempo transcorrido:"
 
-#: ../pidgin/gtkft.c:701
+#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Tempo restante:"
 
-#: ../pidgin/gtkft.c:783
+#: ../pidgin/gtkft.c:784
 msgid "Close this window when all transfers _finish"
 msgstr "_Pechar esta ventá cando rematen todas as transferencias"
 
-#: ../pidgin/gtkft.c:793
+#: ../pidgin/gtkft.c:794
 msgid "C_lear finished transfers"
 msgstr "L_impar as transferencias rematadas"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:802
+#: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
 msgstr "_Detalles da transferencia de ficheiros"
 
 #. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pausar"
 
 #. Resume button
-#: ../pidgin/gtkft.c:842
+#: ../pidgin/gtkft.c:843
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../pidgin/gtkimhtml.c:815
+#: ../pidgin/gtkimhtml.c:816
 msgid "Paste as Plain _Text"
 msgstr "Pegar como _texto plano"
 
-#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1138
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "_Reset formatting"
 msgstr "_Reiniciar os formatos"
 
-#: ../pidgin/gtkimhtml.c:1372
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Hyperlink color"
 msgstr "Cor da ligazón"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1374
 msgid "Color to draw hyperlinks."
 msgstr "Cor para debuxar ligazóns."
 
-#: ../pidgin/gtkimhtml.c:1376
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Hyperlink prelight color"
 msgstr "Cor de ligazón pre-iluminada"
 
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1378
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Cor para debuxar ligazóns cando o rato estea enriba."
 
-#: ../pidgin/gtkimhtml.c:1597
+#: ../pidgin/gtkimhtml.c:1598
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar o enderezo de correo"
 
-#: ../pidgin/gtkimhtml.c:1609
+#: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
 msgstr "_Abrir a ligazón no navegador"
 
-#: ../pidgin/gtkimhtml.c:1619
+#: ../pidgin/gtkimhtml.c:1620
 msgid "_Copy Link Location"
 msgstr "_Copiar o destino da ligazón"
 
-#: ../pidgin/gtkimhtml.c:3365
+#: ../pidgin/gtkimhtml.c:3369
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13760,7 +15392,7 @@
 "\n"
 "PNG é o predeterminado."
 
-#: ../pidgin/gtkimhtml.c:3368
+#: ../pidgin/gtkimhtml.c:3372
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13770,7 +15402,7 @@
 "\n"
 "PNG é o predeterminado."
 
-#: ../pidgin/gtkimhtml.c:3397
+#: ../pidgin/gtkimhtml.c:3401
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13781,7 +15413,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3400
+#: ../pidgin/gtkimhtml.c:3404
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13792,35 +15424,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
+#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
 msgid "Save Image"
 msgstr "Gardar a imaxe"
 
-#: ../pidgin/gtkimhtml.c:3518
+#: ../pidgin/gtkimhtml.c:3522
 msgid "_Save Image..."
 msgstr "_Gardar a imaxe..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:163
 msgid "Select Font"
 msgstr "Seleccionar o tipo de letra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:242
 msgid "Select Text Color"
 msgstr "Seleccionar a cor do texto"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:321
 msgid "Select Background Color"
 msgstr "Seleccionar a cor do fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:410
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "_Description"
 msgstr "_Descrición"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13828,176 +15460,251 @@
 "Introduza o URL e a descrición da ligazón que quere inserir. A descrición é "
 "opcional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:425
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduza o URL da ligazón que quere inserir."
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Insert Link"
 msgstr "Inserir unha ligazón"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1207
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1260
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:514
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Non se puido almacenar a imaxe: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
 msgid "Insert Image"
 msgstr "Inserir imaxe"
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:761
 msgid "This theme has no available smileys."
 msgstr "Este tema non ten emoticonas dispoñibles."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:778
 msgid "Smile!"
 msgstr "Emoticona!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:820 ../pidgin/gtkimhtmltoolbar.c:1164
+#: ../pidgin/gtkimhtmltoolbar.c:843 ../pidgin/gtkimhtmltoolbar.c:1217
 msgid "_Font"
 msgstr "_Tipo de letra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1124
+#: ../pidgin/gtkimhtmltoolbar.c:1051
+#, fuzzy
+msgid "Group Items"
+msgstr "Grupo ID"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1051
+msgid "Ungroup Items"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Negra"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Cursiva"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1087 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Subliñado"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1088
+msgid "Strikethrough"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Increase Font Size"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1091
+msgid "Decrease Font Size"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+#, fuzzy
+msgid "Font Face"
+msgstr "_Estilo do tipo de letra"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+#, fuzzy
+msgid "Background Color"
+msgstr "Cor de _fondo"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1095
+#, fuzzy
+msgid "Foreground Color"
+msgstr "Cor de primeiro plano"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1097
+#, fuzzy
+msgid "Reset Formatting"
+msgstr "_Reiniciar os formatos"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+#, fuzzy
+msgid "Insert IM Image"
+msgstr "Inserir imaxe"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1101
+#, fuzzy
+msgid "Insert Smiley"
+msgstr "Inserir imaxe"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1177
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negra</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1125
+#: ../pidgin/gtkimhtmltoolbar.c:1178
 msgid "<i>_Italic</i>"
 msgstr "<i>_Cursiva</i> "
 
-#: ../pidgin/gtkimhtmltoolbar.c:1126
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<u>_Underline</u>"
 msgstr "<u>_Subliñado</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1127
+#: ../pidgin/gtkimhtmltoolbar.c:1180
+#, fuzzy
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span size='larger'>_Máis grande</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Máis grande</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1129
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1131
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>Máis _pequena</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1135
+#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "_Font face"
 msgstr "_Estilo do tipo de letra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1136
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "Foreground _color"
 msgstr "Cor de primeiro plano"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1137
+#: ../pidgin/gtkimhtmltoolbar.c:1191
 msgid "Bac_kground color"
 msgstr "Cor de _fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1215
-msgid "_Smiley"
-msgstr "_Emoticona"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1221
+#: ../pidgin/gtkimhtmltoolbar.c:1268
 msgid "_Image"
 msgstr "_Imaxe"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1227
+#: ../pidgin/gtkimhtmltoolbar.c:1274
 msgid "_Link"
 msgstr "_Ligazón"
 
-#: ../pidgin/gtklog.c:292
+#: ../pidgin/gtkimhtmltoolbar.c:1280
+msgid "_Horizontal rule"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1302
+#, fuzzy
+msgid "_Smile!"
+msgstr "Emoticona!"
+
+#: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
-"Está seguro de que quere borrar permanentemente o rexistro de conversas con "
-"%s que comezou o %s?"
-
-#: ../pidgin/gtklog.c:303
+"Está seguro de que quere borrar permanentemente o rexistro de conversas con %"
+"s que comezou o %s?"
+
+#: ../pidgin/gtklog.c:304
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr ""
-"Está seguro de que quere borrar permanentemente o rexistro de conversas en "
-"%s que comezou o %s?"
-
-#: ../pidgin/gtklog.c:308
+"Está seguro de que quere borrar permanentemente o rexistro de conversas en %"
+"s que comezou o %s?"
+
+#: ../pidgin/gtklog.c:309
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
-msgstr "Está seguro de que quere borrar permanentemente o rexistro do sistema en %s?"
-
-#: ../pidgin/gtklog.c:452
+msgstr ""
+"Está seguro de que quere borrar permanentemente o rexistro do sistema en %s?"
+
+#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversa en %s de %s</span>"
 
-#: ../pidgin/gtklog.c:455
+#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversa con %s en %s</span>"
 
-#: ../pidgin/gtklog.c:502
+#: ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:549
+#: ../pidgin/gtklog.c:550
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"Só se rexistrarán os eventos do sistema se nas preferencias está activada a opción "
-"\"Rexistrar todos os cambios de estado no rexistro do sistema\"."
-
-#: ../pidgin/gtklog.c:553
+"Só se rexistrarán os eventos do sistema se nas preferencias está activada a "
+"opción \"Rexistrar todos os cambios de estado no rexistro do sistema\"."
+
+#: ../pidgin/gtklog.c:554
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
-"Só se rexistrarán as mensaxes instantáneas se nas preferencias está activada a opción"
-"\"Rexistrar todas as mensaxes instantáneas\"."
-
-#: ../pidgin/gtklog.c:556
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"As conversas só se rexistrarán se nas preferencias está activada a opción \"Rexistrar todas as conversas"
-"\"."
-
-#: ../pidgin/gtklog.c:560
+"Só se rexistrarán as mensaxes instantáneas se nas preferencias está activada "
+"a opción\"Rexistrar todas as mensaxes instantáneas\"."
+
+#: ../pidgin/gtklog.c:557
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"As conversas só se rexistrarán se nas preferencias está activada a opción "
+"\"Rexistrar todas as conversas\"."
+
+#: ../pidgin/gtklog.c:561
 msgid "No logs were found"
 msgstr "Non se atoparon rexistros"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:575
+#: ../pidgin/gtklog.c:576
 msgid "_Browse logs folder"
 msgstr "_Explorar o cartafol dos rexistros"
 
-#: ../pidgin/gtklog.c:639
+#: ../pidgin/gtklog.c:640
 msgid "Total log size:"
 msgstr "Tamaño total do rexistro:"
 
-#: ../pidgin/gtklog.c:708
+#: ../pidgin/gtklog.c:709
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversas en %s"
 
-#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
+#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversas con %s"
 
-#: ../pidgin/gtklog.c:803
+#: ../pidgin/gtklog.c:804
 msgid "System Log"
 msgstr "Rexistro do sistema"
 
@@ -14007,7 +15714,7 @@
 msgstr "%s %s. Probe `%s -h' para máis información.\n"
 
 #: ../pidgin/gtkmain.c:388
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -14019,6 +15726,7 @@
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
+"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -14029,14 +15737,15 @@
 "  -h, --help          mostra esta axuda e sae\n"
 "  -m, --multiple      non asegurarse de que hai só unha instancia\n"
 "  -n, --nologin       non conectarse de forma automática\n"
-"  -l, --login[=NOME]  conectarse de forma automática( argumento opcional NOME especifica\n"
+"  -l, --login[=NOME]  conectarse de forma automática( argumento opcional "
+"NOME especifica\n"
 "                      a(s) conta(s) a empregar separadas por comas)\n"
 "  -v, --version       mostra a versión actual e sae\n"
 
-#: ../pidgin/gtkmain.c:512
-#, c-format
-msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+#: ../pidgin/gtkmain.c:516
+#, fuzzy, c-format
+msgid ""
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -14055,8 +15764,7 @@
 "%swiki/DeveloperPages\n"
 msgstr ""
 "O programa %s deixou de funcionar e tentou gardar un ficheiro (core).\n"
-"Isto é un erro no software que non foi debido ao "
-"seu uso\n"
+"Isto é un erro no software que non foi debido ao seu uso\n"
 "\n"
 "Se pode reproducir este erro, notifíqueo aos desenvolvedores\n"
 "informando dun erro en:\n"
@@ -14074,66 +15782,67 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
+#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:348
+#: ../pidgin/gtknotify.c:349
 msgid "Open All Messages"
 msgstr "Abrir todas as mensaxes"
 
-#: ../pidgin/gtknotify.c:401
+#: ../pidgin/gtknotify.c:402
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Ten correo!</span>"
 
-#: ../pidgin/gtknotify.c:521
+#: ../pidgin/gtknotify.c:537
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s ten %d mensaxe nova."
 msgstr[1] "%s ten %d mensaxe nova."
 
-#: ../pidgin/gtknotify.c:532
-#, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+#: ../pidgin/gtknotify.c:562
+#, fuzzy, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
 msgstr[0] "<b>Ten %d correo electrónico novo.</b>"
 msgstr[1] "<b>Ten %d correo electrónico novo.</b>"
 
-#: ../pidgin/gtknotify.c:972
+#: ../pidgin/gtknotify.c:989
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "O comando do navegador \"%s\" non é válido."
 
-#: ../pidgin/gtknotify.c:974 ../pidgin/gtknotify.c:986
-#: ../pidgin/gtknotify.c:999 ../pidgin/gtknotify.c:1127
+#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
+#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
 msgid "Unable to open URL"
 msgstr "Non se puido abrir o URL"
 
-#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:997
+#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Erro ao lanzar \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1128
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr ""
-"Elixiuse o navegador 'Manual', mais non se definiu ningún "
-"comando para executalo."
-
-#: ../pidgin/gtkplugin.c:264
+#: ../pidgin/gtknotify.c:1145
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+"Elixiuse o navegador 'Manual', mais non se definiu ningún comando para "
+"executalo."
+
+#: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
 msgstr "Desactivaranse os seguintes complementos."
 
-#: ../pidgin/gtkplugin.c:283
+#: ../pidgin/gtkplugin.c:284
 msgid "Multiple plugins will be unloaded."
 msgstr "Desactivaranse múltiples complementos."
 
-#: ../pidgin/gtkplugin.c:287
+#: ../pidgin/gtkplugin.c:288
 msgid "Unload Plugins"
 msgstr "Desactivar complementos"
 
-#: ../pidgin/gtkplugin.c:399
+#: ../pidgin/gtkplugin.c:400
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -14144,7 +15853,7 @@
 "<span weight=\"bold\">Sitio web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nome do ficheiro:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:409
+#: ../pidgin/gtkplugin.c:410
 #, c-format
 msgid ""
 "%s\n"
@@ -14155,378 +15864,382 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Erro:·%s\n"
 "Comprobe o sitio web do complemento para obter unha actualización.</span>"
 
-#: ../pidgin/gtkplugin.c:535
+#: ../pidgin/gtkplugin.c:536
 msgid "Configure Pl_ugin"
 msgstr "Configurar o _complemento"
 
-#: ../pidgin/gtkplugin.c:598
+#: ../pidgin/gtkplugin.c:599
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalles do complemento</b>"
 
-#: ../pidgin/gtkpounce.c:156
+#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:532
 msgid "Pounce on Whom"
 msgstr "A quen avisar"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:559
 msgid "_Buddy name:"
 msgstr "Nome do _contacto:"
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:593
 msgid "Si_gns on"
 msgstr "_Está conectado"
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:595
 msgid "Signs o_ff"
 msgstr "_Está desconectado"
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:597
 msgid "Goes a_way"
 msgstr "_Está ausente"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:599
 msgid "Ret_urns from away"
 msgstr "_Deixa de estar ausente"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:601
 msgid "Becomes _idle"
 msgstr "Está _inactivo"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:603
 msgid "Is no longer i_dle"
 msgstr "_Xa non está inactivo"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:605
 msgid "Starts _typing"
 msgstr "Comeza a _escribir"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:607
 msgid "P_auses while typing"
 msgstr "Fai unha p_ausa ao escribir"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:609
 msgid "Stops t_yping"
 msgstr "Deixa de escr_ibir"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:611
 msgid "Sends a _message"
 msgstr "Envia unha _mensaxe"
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:654
 msgid "Ope_n an IM window"
 msgstr "_Abrir unha ventá de MI"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:656
 msgid "_Pop up a notification"
 msgstr "_Notificación cunha ventá emerxente"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:658
 msgid "Send a _message"
 msgstr "Enviar unha _mensaxe"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:660
 msgid "E_xecute a command"
 msgstr "E_xecutar un comando"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:662
 msgid "P_lay a sound"
 msgstr "Re_producir un son"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:668
 msgid "Brows_e..."
 msgstr "Exp_lorar..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:670
 msgid "Br_owse..."
 msgstr "Expl_orar..."
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:671
 msgid "Pre_view"
 msgstr "Pre_visualizar"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:798
 msgid "P_ounce only when my status is not Available"
 msgstr "Só avisar cando _o meu estado é non dispoñible"
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:803
 msgid "_Recurring"
 msgstr "_Recorrente"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1246
 msgid "Pounce Target"
 msgstr "Sobre quen avisar"
 
-#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/gtkprefs.c:386
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../pidgin/gtkprefs.c:516
+#: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
 msgstr "Fallou o desempaquetado do tema de emoticonas."
 
-#: ../pidgin/gtkprefs.c:643
+#: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
 msgstr "Instalar tema"
 
-#: ../pidgin/gtkprefs.c:696
+#: ../pidgin/gtkprefs.c:697
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr ""
-"Seleccione da lista inferior o tema de emoticonas que desexa. Pode "
-"instalar temas novos arrastrándoos e soltándoos sobre esta lista de temas."
-
-#: ../pidgin/gtkprefs.c:731
+"Seleccione da lista inferior o tema de emoticonas que desexa. Pode instalar "
+"temas novos arrastrándoos e soltándoos sobre esta lista de temas."
+
+#: ../pidgin/gtkprefs.c:732
 msgid "Icon"
 msgstr "Icona"
 
-#: ../pidgin/gtkprefs.c:893
+#: ../pidgin/gtkprefs.c:894
 msgid "System Tray Icon"
 msgstr "Icona da área de notificación do sistema"
 
-#: ../pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:895
 msgid "_Show system tray icon:"
 msgstr "Mo_strar icona da área de notificación do sistema:"
 
-#: ../pidgin/gtkprefs.c:898
+#: ../pidgin/gtkprefs.c:899
 msgid "On unread messages"
 msgstr "Se hai mensaxes sen ler"
 
-#: ../pidgin/gtkprefs.c:903
+#: ../pidgin/gtkprefs.c:904
 msgid "Conversation Window Hiding"
 msgstr "Ocultar ventá de conversa"
 
-#: ../pidgin/gtkprefs.c:904
+#: ../pidgin/gtkprefs.c:905
 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar as novas conversas de MI:"
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1939
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
 msgid "When away"
 msgstr "Cando estea ausente"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:916
 msgid "Tabs"
 msgstr "Separadores"
 
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:918
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostrar MI e conversas en ventás con _separadores"
 
-#: ../pidgin/gtkprefs.c:931
+#: ../pidgin/gtkprefs.c:932
 msgid "Show close b_utton on tabs"
 msgstr "Mostrar botóns de _peche nos separadores"
 
-#: ../pidgin/gtkprefs.c:934
+#: ../pidgin/gtkprefs.c:935
 msgid "_Placement:"
 msgstr "_Localización:"
 
-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:937
 msgid "Top"
 msgstr "Enriba"
 
-#: ../pidgin/gtkprefs.c:937
+#: ../pidgin/gtkprefs.c:938
 msgid "Bottom"
 msgstr "Abaixo"
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:939
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:940
 msgid "Right"
 msgstr "Dereita"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:942
 msgid "Left Vertical"
 msgstr "Vertical esquerda"
 
-#: ../pidgin/gtkprefs.c:942
+#: ../pidgin/gtkprefs.c:943
 msgid "Right Vertical"
 msgstr "Vertical dereita"
 
-#: ../pidgin/gtkprefs.c:949
+#: ../pidgin/gtkprefs.c:950
 msgid "N_ew conversations:"
 msgstr "Conversas _novas:"
 
-#: ../pidgin/gtkprefs.c:994
+#: ../pidgin/gtkprefs.c:995
 msgid "Show _formatting on incoming messages"
 msgstr "Mostrar _formato nas mensaxes entrantes"
 
 #: ../pidgin/gtkprefs.c:997
+msgid "Close IMs immediately when the tab is closed"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1000
 msgid "Show _detailed information"
 msgstr "Mostrar información _detallada"
 
-#: ../pidgin/gtkprefs.c:999
+#: ../pidgin/gtkprefs.c:1002
 msgid "Enable buddy ic_on animation"
 msgstr "Activar animacións nas i_conas dos contactos"
 
-#: ../pidgin/gtkprefs.c:1006
+#: ../pidgin/gtkprefs.c:1009
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificarlles aos contactos cando se lles está escribindo"
 
-#: ../pidgin/gtkprefs.c:1009
+#: ../pidgin/gtkprefs.c:1012
 msgid "Highlight _misspelled words"
 msgstr "_Resaltar os erros de ortografía"
 
-#: ../pidgin/gtkprefs.c:1013
+#: ../pidgin/gtkprefs.c:1016
 msgid "Use smooth-scrolling"
 msgstr "Usar desprazamento suave"
 
-#: ../pidgin/gtkprefs.c:1016
+#: ../pidgin/gtkprefs.c:1019
 msgid "F_lash window when IMs are received"
 msgstr "Ventá escinti_lante ao se recibiren mensaxes"
 
-#: ../pidgin/gtkprefs.c:1018
+#: ../pidgin/gtkprefs.c:1021
 msgid "Minimi_ze new conversation windows"
 msgstr "Minimi_zar as novas ventás de conversa"
 
-#: ../pidgin/gtkprefs.c:1022
+#: ../pidgin/gtkprefs.c:1025
 msgid "Font"
 msgstr "Tipo de letra"
 
-#: ../pidgin/gtkprefs.c:1024
+#: ../pidgin/gtkprefs.c:1027
 msgid "Use document font from _theme"
 msgstr "Usar tipo de letra do documento do _tema"
 
-#: ../pidgin/gtkprefs.c:1026
+#: ../pidgin/gtkprefs.c:1029
 msgid "Use font from _theme"
 msgstr "Usar tipo de letra do _tema"
 
-#: ../pidgin/gtkprefs.c:1028
+#: ../pidgin/gtkprefs.c:1031
 msgid "Conversation _font:"
 msgstr "Tipo de _letra da conversa:"
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1045
 msgid "Default Formatting"
 msgstr "Formato predeterminado"
 
-#: ../pidgin/gtkprefs.c:1059
+#: ../pidgin/gtkprefs.c:1064
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
-"Isto é unha mostra de como aparecerá a súa mensaxe saínte cando use protocolos "
-"que soportan formatado."
-
-#: ../pidgin/gtkprefs.c:1125
+"Isto é unha mostra de como aparecerá a súa mensaxe saínte cando use "
+"protocolos que soportan formatado."
+
+#: ../pidgin/gtkprefs.c:1130
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkprefs.c:1142
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1141
+#: ../pidgin/gtkprefs.c:1146
 msgid "_Autodetect IP address"
 msgstr "_Autodetectar enderezo IP"
 
-#: ../pidgin/gtkprefs.c:1150
+#: ../pidgin/gtkprefs.c:1155
 msgid "Public _IP:"
 msgstr "_IP pública:"
 
-#: ../pidgin/gtkprefs.c:1179
+#: ../pidgin/gtkprefs.c:1184
 msgid "Ports"
 msgstr "Portos"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente o rango de portos en que se escoitará"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1190
 msgid "_Start port:"
 msgstr "Porto _inicial:"
 
-#: ../pidgin/gtkprefs.c:1192
+#: ../pidgin/gtkprefs.c:1197
 msgid "_End port:"
 msgstr "Porto _final:"
 
-#: ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkprefs.c:1205
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../pidgin/gtkprefs.c:1204
+#: ../pidgin/gtkprefs.c:1209
 msgid "No proxy"
 msgstr "Sen proxy"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1265
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1330
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1331
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1332
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1333
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1334
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1335
 msgid "GNOME Default"
 msgstr "Predeterminado de Gnome"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1336
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1337
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1338
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1339
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1343
+#: ../pidgin/gtkprefs.c:1348
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1396
+#: ../pidgin/gtkprefs.c:1401
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1405
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1413
 msgid "_Open link in:"
 msgstr "_Abrir ligazón en:"
 
-#: ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkprefs.c:1415
 msgid "Browser default"
 msgstr "Navegador predeterminado"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1416
 msgid "Existing window"
 msgstr "Ventá existente"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1418
 msgid "New tab"
 msgstr "Novo separador"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1432
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14535,63 +16248,63 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../pidgin/gtkprefs.c:1467
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log _format:"
 msgstr "_Formato de rexistro:"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1477
 msgid "Log all _instant messages"
 msgstr "Rexistrar todas as mensaxes _instantáneas"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all c_hats"
 msgstr "Rexistrar todas as _conversas"
 
-#: ../pidgin/gtkprefs.c:1476
+#: ../pidgin/gtkprefs.c:1481
 msgid "Log all _status changes to system log"
 msgstr "Rexistrar todas os cambios de e_stado no rexistro do sistema"
 
-#: ../pidgin/gtkprefs.c:1622
+#: ../pidgin/gtkprefs.c:1627
 msgid "Sound Selection"
 msgstr "Selección de son"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1637
 msgid "Quietest"
 msgstr "O máis silencioso"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1639
 msgid "Quieter"
 msgstr "Máis silencioso"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1641
 msgid "Quiet"
 msgstr "Silencioso"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1645
 msgid "Loud"
 msgstr "Ruidoso"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1647
 msgid "Louder"
 msgstr "Máis ruidoso"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1649
 msgid "Loudest"
 msgstr "O máis ruidoso"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1715
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../pidgin/gtkprefs.c:1710
+#: ../pidgin/gtkprefs.c:1717
 msgid "Console beep"
 msgstr "Bip da consola"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1724
 msgid "No sounds"
 msgstr "Sen sons"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1732
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14600,281 +16313,284 @@
 "C_omando para son:\n"
 "(%s para nome de ficheiro)"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1759
 msgid "Sounds when conversation has _focus"
 msgstr "Sons cando a conversa ten o _foco"
 
-#: ../pidgin/gtkprefs.c:1754
+#: ../pidgin/gtkprefs.c:1761
 msgid "Enable sounds:"
 msgstr "Activar os sons:"
 
-#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/gtkprefs.c:1772
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1845
+#: ../pidgin/gtkprefs.c:1852
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../pidgin/gtkprefs.c:1922
+#: ../pidgin/gtkprefs.c:1929
 msgid "_Report idle time:"
 msgstr "Mostrar o _tempo de inactividade:"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1934
 msgid "Based on keyboard or mouse use"
 msgstr "Baseado no uso do teclado ou do rato"
 
-#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkprefs.c:1943
 msgid "_Auto-reply:"
 msgstr "Resposta _automática:"
 
-#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/gtkprefs.c:1947
 msgid "When both away and idle"
 msgstr "Cando estea ausente e inactivo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1953
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-#: ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:1955
 msgid "Change status when _idle"
 msgstr "Cambiar o estado cando estea _inactivo"
 
-#: ../pidgin/gtkprefs.c:1952
+#: ../pidgin/gtkprefs.c:1959
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de cambiar a inactivo:"
 
-#: ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkprefs.c:1967
 msgid "Change _status to:"
 msgstr "Cambiar o e_stado a:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1988
 msgid "Status at Startup"
 msgstr "Estado para o inicio"
 
-#: ../pidgin/gtkprefs.c:1983
+#: ../pidgin/gtkprefs.c:1990
 msgid "Use status from last _exit at startup"
 msgstr "Empregar o estado da última _saída ao comezar"
 
-#: ../pidgin/gtkprefs.c:1989
+#: ../pidgin/gtkprefs.c:1996
 msgid "Status to a_pply at startup:"
 msgstr "Estado para _aplicar ao comezar:"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2034
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:2029
+#: ../pidgin/gtkprefs.c:2036
 msgid "Smiley Themes"
 msgstr "Temas das emoticonas"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2043
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:2040
+#: ../pidgin/gtkprefs.c:2047
 msgid "Status / Idle"
 msgstr "Estado / Inactivo"
 
-#: ../pidgin/gtkprivacy.c:79
+#: ../pidgin/gtkprivacy.c:80
 msgid "Allow all users to contact me"
 msgstr "Permitir que contacten comigo todos os usuarios"
 
-#: ../pidgin/gtkprivacy.c:80
+#: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users on my buddy list"
 msgstr "Permitirlles só aos usuarios na miña lista de contactos"
 
-#: ../pidgin/gtkprivacy.c:81
+#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users below"
 msgstr "Permitirlles só aos seguintes usuarios"
 
-#: ../pidgin/gtkprivacy.c:82
+#: ../pidgin/gtkprivacy.c:83
 msgid "Block all users"
 msgstr "Bloquear a todos os usuarios"
 
-#: ../pidgin/gtkprivacy.c:83
+#: ../pidgin/gtkprivacy.c:84
 msgid "Block only the users below"
 msgstr "Bloquear só aos seguintes usuarios"
 
-#: ../pidgin/gtkprivacy.c:369
+#: ../pidgin/gtkprivacy.c:370
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../pidgin/gtkprivacy.c:381
+#: ../pidgin/gtkprivacy.c:382
 msgid "Changes to privacy settings take effect immediately."
-msgstr "Os cambios na configuración de privacidade teñen efecto inmediatamente."
+msgstr ""
+"Os cambios na configuración de privacidade teñen efecto inmediatamente."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:393
+#: ../pidgin/gtkprivacy.c:394
 msgid "Set privacy for:"
 msgstr "Establecer privacidade para:"
 
-#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
 msgid "Permit User"
 msgstr "Permitir ao usuario"
 
-#: ../pidgin/gtkprivacy.c:557
+#: ../pidgin/gtkprivacy.c:558
 msgid "Type a user you permit to contact you."
 msgstr "Escriba un usuario ao que lle permita contactar con vostede."
 
-#: ../pidgin/gtkprivacy.c:558
+#: ../pidgin/gtkprivacy.c:559
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Introduza o nome de usuario ao que lle quere permitir que contacte con vostede."
-
-#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
+msgstr ""
+"Introduza o nome de usuario ao que lle quere permitir que contacte con "
+"vostede."
+
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "_Permitir"
 
-#: ../pidgin/gtkprivacy.c:567
+#: ../pidgin/gtkprivacy.c:568
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Permite a %s contactar con vostede?"
 
-#: ../pidgin/gtkprivacy.c:569
+#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Está seguro que quere permitir que %s contacte con vostede?"
 
-#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
 msgid "Block User"
 msgstr "Bloquear ao usuario"
 
-#: ../pidgin/gtkprivacy.c:599
+#: ../pidgin/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr "Escriba o usuario ao que desexa bloquear."
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr "Introduza o nome do usuario ao que desexa bloquear."
 
-#: ../pidgin/gtkprivacy.c:608
+#: ../pidgin/gtkprivacy.c:609
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquear a %s?"
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Está seguro de que desexa bloquear a %s?"
 
-#: ../pidgin/gtkrequest.c:271
+#: ../pidgin/gtkrequest.c:272
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1504
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Ese ficheiro xa existe"
 
-#: ../pidgin/gtkrequest.c:1505
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Quere sobrescribilo?"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Sobrescribir"
 
-#: ../pidgin/gtkrequest.c:1509
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Escoller un novo nome"
 
-#: ../pidgin/gtkrequest.c:1647 ../pidgin/gtkrequest.c:1661
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Seleccionar cartafol..."
 
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:374
+#: ../pidgin/gtkroomlist.c:375
 msgid "Room List"
 msgstr "Lista de salas"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:442
+#: ../pidgin/gtkroomlist.c:443
 msgid "_Get List"
 msgstr "_Obter a lista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:450
+#: ../pidgin/gtkroomlist.c:451
 msgid "_Add Chat"
 msgstr "_Engadir conversa"
 
-#: ../pidgin/gtksavedstatuses.c:336
+#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Está seguro de que desexa borrar os estados gardados seleccionados?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
 msgid "_Use"
 msgstr "_Usar"
 
-#: ../pidgin/gtksavedstatuses.c:779
+#: ../pidgin/gtksavedstatuses.c:780
 msgid "Title already in use.  You must choose a unique title."
 msgstr "O título xa está en uso. Debe escoller un título único."
 
-#: ../pidgin/gtksavedstatuses.c:969
+#: ../pidgin/gtksavedstatuses.c:970
 msgid "Different"
 msgstr "Diferente"
 
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1159
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
 msgid "_Status:"
 msgstr "E_stado:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1209
+#: ../pidgin/gtksavedstatuses.c:1210
 msgid "Use a _different status for some accounts"
 msgstr "Usar un estado _diferente para algunhas contas"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1273
+#: ../pidgin/gtksavedstatuses.c:1274
 msgid "Sa_ve & Use"
 msgstr "Ga_rdar e usar"
 
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1480
 #, c-format
 msgid "Status for %s"
 msgstr "Estado para %s"
 
-#: ../pidgin/gtkstatusbox.c:663
+#: ../pidgin/gtkstatusbox.c:664
 msgid "Waiting for network connection"
 msgstr "A agardar pola conexión á rede"
 
-#: ../pidgin/gtkutils.c:631
+#: ../pidgin/gtkutils.c:632
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1388 ../pidgin/gtkutils.c:1411
+#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "O seguinte erro ocorreu ao cargar %s: %s"
 
-#: ../pidgin/gtkutils.c:1391 ../pidgin/gtkutils.c:1413
+#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
 msgid "Failed to load image"
 msgstr "Fallou ao cargar a imaxe"
 
-#: ../pidgin/gtkutils.c:1487
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Non se pode enviar o cartafol %s."
 
-#: ../pidgin/gtkutils.c:1488
+#: ../pidgin/gtkutils.c:1499
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
-"%s non pode transferir un cartafol. Necesita enviar os ficheiros do "
-"cartafol de un en un."
-
-#: ../pidgin/gtkutils.c:1520 ../pidgin/gtkutils.c:1532
-#: ../pidgin/gtkutils.c:1539
+"%s non pode transferir un cartafol. Necesita enviar os ficheiros do cartafol "
+"de un en un."
+
+#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1550
 msgid "You have dragged an image"
 msgstr "Arrastrouse unha imaxe"
 
-#: ../pidgin/gtkutils.c:1521
+#: ../pidgin/gtkutils.c:1532
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14882,31 +16598,31 @@
 "Pode enviar esta imaxe como unha transferencia de ficheiro, inserila na "
 "mensaxe ou usala como unha icona de contacto para este usuario."
 
-#: ../pidgin/gtkutils.c:1527 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Set as buddy icon"
 msgstr "Establecer como icona de contacto"
 
-#: ../pidgin/gtkutils.c:1528 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
 msgid "Send image file"
 msgstr "Enviar un ficheiro de imaxe"
 
-#: ../pidgin/gtkutils.c:1529 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
 msgid "Insert in message"
 msgstr "Inserir na mensaxe"
 
-#: ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1544
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Desexa establecela como a icona de contacto para este usuario?"
 
-#: ../pidgin/gtkutils.c:1540
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"Pode enviar esta imaxe como unha transferencia ou usala como a icona de contacto "
-"para este usuario."
-
-#: ../pidgin/gtkutils.c:1541
+"Pode enviar esta imaxe como unha transferencia ou usala como a icona de "
+"contacto para este usuario."
+
+#: ../pidgin/gtkutils.c:1552
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14919,19 +16635,19 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1610
 msgid "Cannot send launcher"
 msgstr "Non se pode enviar o acceso directo"
 
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1610
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
-"Arrastrou un acceso directo do escritorio. O máis probable é que queira enviar o "
-"contido ao que apunta o acceso directo."
-
-#: ../pidgin/gtkutils.c:2334
+"Arrastrou un acceso directo do escritorio. O máis probable é que queira "
+"enviar o contido ao que apunta o acceso directo."
+
+#: ../pidgin/gtkutils.c:2345
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14942,28 +16658,33 @@
 "<b>Tamaño do ficheiro:</b> %s\n"
 "<b>Tamaño da imaxe:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2630
+#: ../pidgin/gtkutils.c:2641
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr "O ficheiro '%s' é demasiado grande para %s.  Probe cunha imaxe máis pequena.\n"
-
-#: ../pidgin/gtkutils.c:2632
+msgstr ""
+"O ficheiro '%s' é demasiado grande para %s.  Probe cunha imaxe máis "
+"pequena.\n"
+
+#: ../pidgin/gtkutils.c:2643
 msgid "Icon Error"
 msgstr "Erro de icona"
 
-#: ../pidgin/gtkutils.c:2633
+#: ../pidgin/gtkutils.c:2644
 msgid "Could not set icon"
 msgstr "Non se puido enviar a icona"
 
-#: ../pidgin/gtkutils.c:2733
+#: ../pidgin/gtkutils.c:2744
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Fallou ao abrir o ficheiro '%s': %s"
 
-#: ../pidgin/gtkutils.c:2782
-#, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr "Fallou ao cargar a imaxe '%s': descoñécese a razón,o máis probable é que sexa un arquivo de imaxe danado"
+#: ../pidgin/gtkutils.c:2793
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+"Fallou ao cargar a imaxe '%s': descoñécese a razón,o máis probable é que "
+"sexa un arquivo de imaxe danado"
 
 #: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
@@ -14973,27 +16694,27 @@
 msgid "Select color"
 msgstr "Seleccionar a cor"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "Pechar _os separadores"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "_Obter información"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "_Convidar"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_Abrir o correo"
 
@@ -15067,8 +16788,9 @@
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
 msgstr ""
-"O complemento de dispoñibilidade de contacto (cap) emprégase para mostrar a información estatística "
-"sobre os contactos nunha lista de contactos de usuarios."
+"O complemento de dispoñibilidade de contacto (cap) emprégase para mostrar a "
+"información estatística sobre os contactos nunha lista de contactos de "
+"usuarios."
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -15123,8 +16845,10 @@
 #. *< version
 #. *< summary
 #: ../pidgin/plugins/contact_priority.c:190
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Permite controlar os valores asociados aos diferentes estados dos contactos."
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+"Permite controlar os valores asociados aos diferentes estados dos contactos."
 
 #. *< description
 #: ../pidgin/plugins/contact_priority.c:192
@@ -15132,8 +16856,8 @@
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"Permite cambiar os puntos asignados aos estados inactivo/ausente/desconectado "
-"para os contactos nos cálculos de prioridades dos contactos."
+"Permite cambiar os puntos asignados aos estados inactivo/ausente/"
+"desconectado para os contactos nos cálculos de prioridades dos contactos."
 
 #: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
@@ -15163,23 +16887,11 @@
 msgid "Received Messages"
 msgstr "Mensaxes recibidas"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "Seleccionar a cor para %s"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Negra"
-
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Cursiva"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Subliñado"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Ignorar os formatos entrantes"
@@ -15206,8 +16918,8 @@
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
-"Nota: A preferencia para \"Novas conversas\" debe estar establecida a "
-"\"Por número de conversas\"."
+"Nota: A preferencia para \"Novas conversas\" debe estar establecida a \"Por "
+"número de conversas\"."
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
@@ -15302,22 +17014,24 @@
 #. Add the label.
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
-msgstr "Seleccione unha persoa da súa axenda de enderezos amosada abaixo ou engada unha nova persoa."
+msgstr ""
+"Seleccione unha persoa da súa axenda de enderezos amosada abaixo ou engada "
+"unha nova persoa."
 
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
 msgid "Group:"
 msgstr "Grupo:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
 msgid "New Person"
 msgstr "Nova persoa"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 msgid "Select Buddy"
 msgstr "Seleccionar contacto"
 
@@ -15392,44 +17106,35 @@
 msgid "Provides integration with Evolution."
 msgstr "Ofrece integración con Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
 msgstr "Introduza a información da persoa a continuación."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Introduza o nome de usuario do contacto e o tipo de conta máis abaixo."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
 msgstr "Tipo de conta:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
 msgstr "Información opcional:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
 msgstr "Nome:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
 msgstr "Apelidos:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 msgid "E-mail:"
 msgstr "Correo electrónico:"
 
-#: ../pidgin/plugins/gtkbuddynote.c:34
-#, c-format
-msgid ""
-"\n"
-"<b>Buddy Note</b>: %s"
-msgstr ""
-"\n"
-"<b>Nota do contacto</b>: %s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15451,7 +17156,16 @@
 "Probar para ver se todos os sinais da interface de usuario funcionan "
 "correctamente."
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/gtkbuddynote.c:36
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Nota do contacto</b>: %s"
+
+#: ../pidgin/plugins/history.c:192
 msgid "History"
 msgstr "Historial"
 
@@ -15484,8 +17198,7 @@
 #: ../pidgin/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 contactos que mostra se ten novo "
-"correo."
+"Engade unha pequena caixa á lista de contactos que mostra se ten novo correo."
 
 #: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
@@ -15499,11 +17212,11 @@
 msgid "Draw Markerline in "
 msgstr "Debuxar subliñado en"
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "Ventás de M_I"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "Ventás de C_onversa"
 
@@ -15519,32 +17232,32 @@
 msgid "Music messaging session confirmed."
 msgstr "Confirmouse a sesión de mensaxería musical."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Mensaxería musical"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "Produciuse un conflito ao executar o comando:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "Erro ao executar o Editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "Ocorreu o seguinte erro:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Configuración de Mensaxería musical"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "Ruta do editor de partituras"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "_Aplicar"
 
@@ -15556,12 +17269,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Complemento de mensaxaría musical para composición colaborativa."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -15571,74 +17284,74 @@
 "común en tempo real."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Notificación para"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Só se alguén di o seu nome de usuario"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "Ventás con_foco"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Métodos de notificación"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Prefixar a _cadea no título da ventá:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Inserir o _número de mensaxes novas no título da ventá"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Inserir a conta de mensaxes novas na característica _X"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Establecer pista \"_URXENTE\" do xestor de ventás"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "S_ubir a ventá de conversa"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Eliminación da notificación"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Eliminar cando a ventá da conversa ten o _foco"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Eliminar cando se prema na ventá da conversa"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Eliminar cando se _escriba na ventá da conversa"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Eliminar cando se envíe unha _mensaxe"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Eliminar ao cambiar de _separador de conversa"
 
@@ -15648,7 +17361,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Notificación de mensaxes"
 
@@ -15656,7 +17369,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Permite notificar de diversas formas sobre as mensaxes sen ler."
 
@@ -15707,44 +17420,36 @@
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separación horizontal de GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "Entrada de conversas"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "Historial de conversas"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Visor do rexistro"
-
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "Diálogo de solicitude"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "Diálogo de notificación"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "Seleccionar cor"
 
-#: ../pidgin/plugins/pidginrc.c:300
+#: ../pidgin/plugins/pidginrc.c:294
 msgid "Select Interface Font"
 msgstr "Seleccionar tipo de letra da interface"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "Seleccionar tipo de letra para %s"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "Tipo de letra da interface GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atallo de texto GTK+"
 
@@ -15768,36 +17473,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "Cores da interface"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Tamaño dos widget"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "Tipos de letra"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
 msgstr "Ferramentas de ficheiros Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:502
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Escribir configuración en %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "Reler ficheiros gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:538
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Control de temas GTK+ de Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Prové acceso ás configuracións de gtkrc usadas comunmente."
 
@@ -15814,8 +17519,9 @@
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"Permítelle enviar datos en bruto a protocolos baseados en texto (XMPP, MSN, IRC, TOC). Prema "
-"'Intro' na caixa de entrada para enviar. Observe a ventá de depuración."
+"Permítelle enviar datos en bruto a protocolos baseados en texto (XMPP, MSN, "
+"IRC, TOC). Prema 'Intro' na caixa de entrada para enviar. Observe a ventá de "
+"depuración."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
@@ -15823,8 +17529,8 @@
 "You are using %s version %s.  The current version is %s.  You can get it "
 "from <a href=\"%s\">%s</a><hr>"
 msgstr ""
-"Vostede usa %s versión %s.  A versión actual é a %s.  Pode obtela de"
-" <a href=\"%s\">%s</a><hr>"
+"Vostede usa %s versión %s.  A versión actual é a %s.  Pode obtela de <a href="
+"\"%s\">%s</a><hr>"
 
 #: ../pidgin/plugins/relnot.c:79
 #, c-format
@@ -16030,44 +17736,44 @@
 "Este complemento permitelle ao usuario personalizar os formatos de marca de "
 "tempo para as mensaxes de conversas e as mensaxes de rexistro."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Opacidade:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Ventás de conversa de MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "Transparencia das ventás de M_I"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "M_ostrar barra de desprazamento na ventá MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Eliminar a transparencia das ventás de MI ao ter o foco"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Sempre enriba"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Ventá da lista de contactos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "Transparencia da ventá de lista de _contactos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Eliminar transparencia da ventá da lista de contactos ao ter o foco"
 
@@ -16077,19 +17783,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Transparencia"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparencia variable para a lista de contactos e as conversas."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -16142,8 +17848,11 @@
 msgstr "Opcións específicas de Pidgin en Windows."
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr "Prové opcións específicas para Pidgin en Windows , como o ancoraxe da ventá de contactos."
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr ""
+"Prové opcións específicas para Pidgin en Windows , como o ancoraxe da ventá "
+"de contactos."
 
 #: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
@@ -16192,3 +17901,59 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento é útil para depurar servidores XMPP ou clientes."
 
+#~ msgid "Sort by status"
+#~ msgstr "Ordenar por estado"
+
+#~ msgid "Sort alphabetically"
+#~ msgstr "Ordenar alfabeticamente"
+
+#~ msgid "Sort by log size"
+#~ msgstr "Ordenar por tamaño de rexistro"
+
+#~ msgid "You have just sent a Nudge!"
+#~ msgstr "Acaba de enviar un cobadazo!"
+
+#~ msgid "Has you"
+#~ msgstr "Tenlle"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Complemento de protocolo MSN"
+
+#~ msgid "Would like to add him?"
+#~ msgstr "Quere engadilo?"
+
+#~ msgid "%s just sent you a Buzz!"
+#~ msgstr "%s acaba de darlle un cobadazo!"
+
+#~ msgid "You have just sent a Buzz!"
+#~ msgstr "Acaba de enviar un cobadazo!"
+
+#~ msgid "Add Buddy _Pounce"
+#~ msgstr "Engadir _aviso de contacto"
+
+#~ msgid "Add a _Buddy"
+#~ msgstr "Engadir un _contacto"
+
+#~ msgid "Add a C_hat"
+#~ msgstr "Engadir unha _conversa"
+
+#~ msgid "/Accounts/Add\\/Edit"
+#~ msgstr "/Contas/Engadir\\/Editar"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/Opcións/Mostrar _iconas dos contactos"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/Opcións/Mostrar iconas dos contactos"
+
+#~ msgid "_Send To"
+#~ msgstr "_Enviar a"
+
+#~ msgid "_Smiley"
+#~ msgstr "_Emoticona"
+
+#~ msgid "Conversation History"
+#~ msgstr "Historial de conversas"
+
+#~ msgid "Log Viewer"
+#~ msgstr "Visor do rexistro"