changeset 19342:24176a09220c

fixes #2639 committer: Luke Schierer <[e-mail]>

--- a/po/gl.po	Mon Aug 20 17:38:12 2007 +0000
+++ b/po/gl.po	Mon Aug 20 17:40:33 2007 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-01 03:21-0400\n"
-"PO-Revision-Date: 2007-08-02 14:19+0200\n"
+"POT-Creation-Date: 2007-08-20 03:22-0400\n"
+"PO-Revision-Date: 2007-08-20 13:55+0200\n"
 "Last-Translator: Frco. Javier Rial Rodríguez <[e-mail]>\n"
 "Language-Team: Galician <[e-mail]>\n"
 "MIME-Version: 1.0\n"
@@ -19,17 +19,17 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:70 ../finch/finch.c:298 ../finch/finch.c:327
-#: ../finch/finch.c:404
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:417
 msgid "Finch"
 msgstr "Pidgin"
 
-#: ../finch/finch.c:204
+#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Tente `%s -h' para máis información.\n"
 
-#: ../finch/finch.c:206
+#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -50,7 +50,7 @@
 "  -n, --nologin       non iniciar a sesión automaticamente\n"
 "  -v, --version       mostrar a versión actual e saír\n"
 
-#: ../finch/finch.c:325 ../pidgin/gtkmain.c:709
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -69,7 +69,8 @@
 #: ../libpurple/protocols/jabber/chat.c:688
 #: ../libpurple/protocols/jabber/jabber.c:1227
 #: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Erro"
@@ -99,7 +100,7 @@
 msgstr "(Probablemente olvidaches executar 'make install'.)"
 
 #: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4024
+#: ../pidgin/gtkblist.c:4023
 msgid "Modify Account"
 msgstr "Modificar a conta"
 
@@ -129,14 +130,14 @@
 #: ../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:2209 ../finch/gntplugin.c:378
+#: ../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/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
+#: ../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
@@ -148,19 +149,19 @@
 #: ../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:6083
+#: ../libpurple/protocols/oscar/oscar.c:6042
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:140
 #: ../libpurple/protocols/qq/group_join.c:365
 #: ../libpurple/protocols/qq/group_opt.c:144
 #: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../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
@@ -183,36 +184,37 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1002
-#: ../libpurple/protocols/yahoo/yahoo.c:3333
-#: ../libpurple/protocols/yahoo/yahoo.c:3344 ../pidgin/gtkaccount.c:1917
-#: ../pidgin/gtkaccount.c:2511 ../pidgin/gtkblist.c:5926
-#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:885
-#: ../pidgin/gtkdialogs.c:977 ../pidgin/gtkdialogs.c:997
-#: ../pidgin/gtkdialogs.c:1021 ../pidgin/gtkdialogs.c:1043
-#: ../pidgin/gtkdialogs.c:1091 ../pidgin/gtkdialogs.c:1132
-#: ../pidgin/gtkdialogs.c:1188 ../pidgin/gtkdialogs.c:1227
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkimhtmltoolbar.c:425
+#: ../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:1572
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Save button
 #. Save
 #: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:484 ../finch/gntstatus.c:594
-#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../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
 msgid "Save"
 msgstr "Gardar"
 
 #: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1909
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1566
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Está seguro de que quere borrar %s?"
@@ -226,11 +228,11 @@
 #: ../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:1571
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2115 ../finch/gntui.c:77
+#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2118 ../finch/gntui.c:81
 #: ../pidgin/gtkaccount.c:2334 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Contas"
@@ -243,13 +245,13 @@
 #: ../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:116
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/gg/gg.c:878 ../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/silc/chat.c:615
 #: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2510
-#: ../pidgin/gtkblist.c:5925 ../pidgin/gtkconv.c:1650
+#: ../pidgin/gtkblist.c:5924 ../pidgin/gtkconv.c:1654
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Engadir"
@@ -268,24 +270,24 @@
 msgid "Add buddy to your list?"
 msgstr "Quere engadir o contacto á súa lista?"
 
-#: ../finch/gntaccount.c:927 ../pidgin/gtkaccount.c:2561
+#: ../finch/gntaccount.c:933 ../pidgin/gtkaccount.c:2567
 #, 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:952 ../finch/gntaccount.c:955
-#: ../finch/gntaccount.c:982 ../pidgin/gtkaccount.c:2584
-#: ../pidgin/gtkaccount.c:2590
+#: ../finch/gntaccount.c:958 ../finch/gntaccount.c:961
+#: ../finch/gntaccount.c:988 ../pidgin/gtkaccount.c:2590
+#: ../pidgin/gtkaccount.c:2596
 msgid "Authorize buddy?"
 msgstr "Autorizar o contacto?"
 
-#: ../finch/gntaccount.c:959 ../finch/gntaccount.c:986
-#: ../pidgin/gtkaccount.c:2585 ../pidgin/gtkaccount.c:2591
+#: ../finch/gntaccount.c:965 ../finch/gntaccount.c:992
+#: ../pidgin/gtkaccount.c:2591 ../pidgin/gtkaccount.c:2597
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../finch/gntaccount.c:960 ../finch/gntaccount.c:987
-#: ../pidgin/gtkaccount.c:2586 ../pidgin/gtkaccount.c:2592
+#: ../finch/gntaccount.c:966 ../finch/gntaccount.c:993
+#: ../pidgin/gtkaccount.c:2592 ../pidgin/gtkaccount.c:2598
 msgid "Deny"
 msgstr "Rexeitar"
 
@@ -309,7 +311,7 @@
 msgid "Error adding buddy"
 msgstr "Erro ao engadir un contacto"
 
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2860
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2858
 #: ../pidgin/gtkaccount.c:1990 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Nome de usuario"
@@ -320,8 +322,8 @@
 #: ../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:996
-#: ../pidgin/gtkdialogs.c:1020 ../pidgin/gtkdialogs.c:1042
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:999
+#: ../pidgin/gtkdialogs.c:1023 ../pidgin/gtkdialogs.c:1045
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
@@ -330,10 +332,10 @@
 msgid "Group"
 msgstr "Grupo"
 
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1301
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
 #: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2983 ../pidgin/gtknotify.c:482
+#: ../pidgin/gtkblist.c:2986 ../pidgin/gtknotify.c:488
 #: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Conta"
@@ -347,7 +349,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3178 ../pidgin/gtkblist.c:5432
+#: ../libpurple/protocols/yahoo/yahoo.c:3243 ../pidgin/gtkblist.c:5431
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Engadir contacto"
@@ -375,7 +377,7 @@
 msgid "Auto-join"
 msgstr "Conectar automaticamente"
 
-#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5811
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5810
 msgid "Add Chat"
 msgstr "Engadir conversa"
 
@@ -397,7 +399,7 @@
 
 #: ../finch/gntblist.c:453 ../finch/gntblist.c:855
 #: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5922
+#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5921
 msgid "Add Group"
 msgstr "Engadir un grupo"
 
@@ -429,7 +431,7 @@
 msgid "Retrieving..."
 msgstr "Recuperando..."
 
-#: ../finch/gntblist.c:903 ../finch/gntconv.c:407
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:431
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -440,10 +442,10 @@
 msgstr "Engadir aviso de contacto"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:914 ../finch/gntconv.c:419
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:443
 #: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1598
+#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1602
 msgid "Send File"
 msgstr "Enviar o ficheiro"
 
@@ -487,15 +489,15 @@
 msgstr "Confirmar a eliminación"
 
 #: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1647 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkconv.c:1651 ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Eliminar"
 
 #. Buddy List
-#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2294 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:78 ../pidgin/gtkblist.c:4268
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2297 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4267
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Lista de contactos"
 
@@ -508,7 +510,7 @@
 msgstr "Cambiar etiqueta"
 
 #. General
-#: ../finch/gntblist.c:1296 ../libpurple/protocols/gg/gg.c:632
+#: ../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
@@ -526,29 +528,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:3007
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3010
 msgid "Nickname"
 msgstr "Alias"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1316 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:314
+#: ../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:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:2932
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3035
-#: ../pidgin/gtkblist.c:3444 ../pidgin/gtkprefs.c:1918
+#: ../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
 msgid "Idle"
 msgstr "Inactivo"
 
-#: ../finch/gntblist.c:1330
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr "No móbil"
 
-#: ../finch/gntblist.c:1411
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -557,12 +559,12 @@
 "Conectado: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:1420
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Conta: %s (%s)"
 
-#: ../finch/gntblist.c:1432
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -571,47 +573,47 @@
 "\n"
 "Visto por última vez: hai %s"
 
-#: ../finch/gntblist.c:1698 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Novo..."
 
-#: ../finch/gntblist.c:1705 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Gardado..."
 
-#: ../finch/gntblist.c:2083 ../finch/gntplugin.c:254 ../finch/gntui.c:82
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:86
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../finch/gntblist.c:2190 ../pidgin/gtkdialogs.c:728
-#: ../pidgin/gtkdialogs.c:866 ../pidgin/gtkdialogs.c:947
+#: ../finch/gntblist.c:2193 ../pidgin/gtkdialogs.c:731
+#: ../pidgin/gtkdialogs.c:869 ../pidgin/gtkdialogs.c:950
 msgid "_Name"
 msgstr "_Nome"
 
-#: ../finch/gntblist.c:2195 ../pidgin/gtkdialogs.c:733
-#: ../pidgin/gtkdialogs.c:871 ../pidgin/gtkdialogs.c:952
+#: ../finch/gntblist.c:2198 ../pidgin/gtkdialogs.c:736
+#: ../pidgin/gtkdialogs.c:874 ../pidgin/gtkdialogs.c:955
 msgid "_Account"
 msgstr "_Conta"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:741
+#: ../finch/gntblist.c:2206 ../pidgin/gtkdialogs.c:744
 msgid "New Instant Message"
 msgstr "Mensaxe instantánea nova"
 
-#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:743
+#: ../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:2208 ../finch/gntnotify.c:79 ../libpurple/account.c:983
+#: ../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:6082
+#: ../libpurple/protocols/oscar/oscar.c:6041
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -628,40 +630,40 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1001
-#: ../libpurple/protocols/yahoo/yahoo.c:3332
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:4023
-#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:884
-#: ../pidgin/gtkdialogs.c:976 ../pidgin/gtkrequest.c:269
+#: ../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
 msgid "OK"
 msgstr "Aceptar"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2228 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
+#: ../finch/gntblist.c:2231 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
 msgid "Options"
 msgstr "Opcións"
 
-#: ../finch/gntblist.c:2234
+#: ../finch/gntblist.c:2237
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2238
+#: ../finch/gntblist.c:2241
 msgid "Show empty groups"
 msgstr "Mostrar grupos baleiros"
 
-#: ../finch/gntblist.c:2244
+#: ../finch/gntblist.c:2247
 msgid "Show offline buddies"
 msgstr "Mostrar contactos desconectados"
 
-#: ../finch/gntblist.c:2250
+#: ../finch/gntblist.c:2253
 msgid "Sort by status"
 msgstr "Ordenar por estado"
 
-#: ../finch/gntblist.c:2254
+#: ../finch/gntblist.c:2257
 msgid "Sort alphabetically"
 msgstr "Ordenar alfabeticamente"
 
-#: ../finch/gntblist.c:2258
+#: ../finch/gntblist.c:2261
 msgid "Sort by log size"
 msgstr "Ordenar por tamaño de rexistro"
 
@@ -688,41 +690,41 @@
 "Pidgin non tentará reconectar a conta ata que vostede corrixa o erro "
 "e a volva activar."
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:118
 msgid "No such command."
 msgstr "Non existe o comando."
 
-#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:491
+#: ../finch/gntconv.c:122 ../pidgin/gtkconv.c:495
 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:126 ../pidgin/gtkconv.c:497
+#: ../finch/gntconv.c:127 ../pidgin/gtkconv.c:501
 msgid "Your command failed for an unknown reason."
 msgstr "O seu comando fallou por motivos descoñecidos."
 
-#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:504
+#: ../finch/gntconv.c:132 ../pidgin/gtkconv.c:508
 msgid "That command only works in chats, not IMs."
 msgstr "Ese comando só funciona en conversas, non en MI."
 
-#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:135 ../pidgin/gtkconv.c:511
 msgid "That command only works in IMs, not chats."
 msgstr "Ese comando só funciona en MI, non en conversas."
 
-#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:139 ../pidgin/gtkconv.c:516
 msgid "That command doesn't work on this protocol."
 msgstr "Ese comando non funciona neste protocolo."
 
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:225
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:248
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
+#: ../finch/gntconv.c:253 ../finch/gntconv.c:672
 #, c-format
 msgid ""
 "\n"
@@ -731,48 +733,48 @@
 "\n"
 "%s está a escribir..."
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:272
 msgid "You have left this chat."
 msgstr "Abandonou esta conversa."
 
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:366
 msgid "Send To"
 msgstr "Enviar a"
 
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:410
 msgid "Conversation"
 msgstr "Conversa"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:416
 msgid "Clear Scrollback"
 msgstr "Limpar o historial da conversa"
 
-#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:420 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Mostrar marcas de tempo"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:436
 msgid "Add Buddy Pounce..."
 msgstr "Engadir aviso de contacto..."
 
-#: ../finch/gntconv.c:613
+#: ../finch/gntconv.c:638
 msgid "<AUTO-REPLY> "
 msgstr "<RESPOSTA AUTOMÁTICA>"
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:760
 msgid "List of users:\n"
 msgstr "Lista de usuarios:\n"
 
-#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:334
+#: ../finch/gntconv.c:905 ../pidgin/gtkconv.c:338
 msgid "Supported debug options are:  version"
 msgstr "As opcións de depuración soportadas son:  version"
 
-#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:383
+#: ../finch/gntconv.c:940 ../pidgin/gtkconv.c:387
 msgid "No such command (in this context)."
 msgstr "Non existe o comando (neste contexto)."
 
-#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:386
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:390
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -780,7 +782,7 @@
 "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:976 ../pidgin/gtkconv.c:7291
+#: ../finch/gntconv.c:1001 ../pidgin/gtkconv.c:7350
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -788,13 +790,13 @@
 "say &lt;mensaxe&gt;:  Envía unha mensaxe como se non se estivese a utilizar"
 "un comando."
 
-#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7294
+#: ../finch/gntconv.c:1004 ../pidgin/gtkconv.c:7353
 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:982 ../pidgin/gtkconv.c:7297
+#: ../finch/gntconv.c:1007 ../pidgin/gtkconv.c:7356
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -802,43 +804,43 @@
 "debug&lt;opción&gt;:  Envía información de depuración sobre a conversa "
 "actual."
 
-#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7300
+#: ../finch/gntconv.c:1010 ../pidgin/gtkconv.c:7359
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Limpa o historial da conversa."
 
-#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7306
+#: ../finch/gntconv.c:1013 ../pidgin/gtkconv.c:7365
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Axuda sobre un comando específico."
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1016
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Amosa a lista de usuarios na conversa"
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1021
 msgid "plugins: Show the plugins window."
 msgstr "complementos: Mostra a ventá de complementos."
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1024
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostra a lista de contactos."
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1027
 msgid "accounts: Show the accounts window."
 msgstr "contas: Mostra a ventá de contas."
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1030
 msgid "debugwin: Show the debug window."
 msgstr "depuración: Mostra a ventá de depuración."
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1033
 msgid "prefs: Show the preference window."
 msgstr "preferencias: Mostra a ventá de preferencias."
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1036
 msgid "statuses: Show the savedstatuses window."
 msgstr "estados: Mostrar a ventá de estados gardardos."
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:84 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Ventá de depuración"
 
@@ -864,7 +866,7 @@
 msgstr "Transferencia de ficheiros - %d%% de %d ficheiros"
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:85
 #: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Transferencia de ficheiros"
@@ -891,7 +893,7 @@
 
 #. 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:318
+#: ../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
@@ -900,15 +902,15 @@
 #: ../libpurple/protocols/jabber/jabber.c:1212
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2672
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../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:3083 ../pidgin/gtkblist.c:3079
-#: ../pidgin/gtkblist.c:3092 ../pidgin/gtkblist.c:3094
+#: ../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
 msgid "Status"
 msgstr "Estado"
@@ -968,11 +970,11 @@
 msgid "You have mail!"
 msgstr "Ten un correo!"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "Remitente"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Asunto"
 
@@ -983,29 +985,29 @@
 msgstr[0] "%s (%s) ten %d mensaxe nova."
 msgstr[1] "%s (%s) ten %d mensaxe nova."
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "Correo novo"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:915
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:923
 #, c-format
 msgid "Info for %s"
 msgstr "Información sobre %s"
 
 #: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:916
+#: ../pidgin/gtknotify.c:924
 msgid "Buddy Information"
 msgstr "Información do contacto"
 
-#: ../finch/gntnotify.c:376
+#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1626 ../pidgin/gtkdebug.c:834
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1630 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Info"
 
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1587
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1591
 msgid "IM"
 msgstr "MI"
 
@@ -1072,7 +1074,7 @@
 #. 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:83 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2060
+#: ../finch/gntui.c:88 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2062
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -1185,7 +1187,7 @@
 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:79 ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:685 ../finch/gntui.c:83 ../pidgin/gtkpounce.c:1339
 msgid "Buddy Pounces"
 msgstr "Avisos de contacto"
 
@@ -1247,13 +1249,13 @@
 msgid "Based on keyboard use"
 msgstr "Baseado no uso do teclado"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1925
 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:1922 ../pidgin/gtkprefs.c:1936
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../pidgin/gtkprefs.c:1924 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nunca"
 
@@ -1302,12 +1304,12 @@
 msgstr "Cambiar o estado a"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2028
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversas"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1464 ../pidgin/gtkprefs.c:2039
 msgid "Logging"
 msgstr "Rexistro"
 
@@ -1315,16 +1317,167 @@
 msgid "Not implemented yet."
 msgstr "Funcionalidade non implementada."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1539
-#: ../pidgin/gtkrequest.c:1585
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "Gardar ficheiro..."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1540
-#: ../pidgin/gtkrequest.c:1586
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "Abrir ficheiro..."
 
+#: ../finch/gntsound.c:94 ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Conéctase un contacto"
+
+#: ../finch/gntsound.c:95 ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Desconéctase un contacto"
+
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Mensaxe recibida"
+
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Mensaxe recibida que comeza unha conversa"
+
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Mensaxe enviada"
+
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Alguén entra na conversa"
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Alguén deixa a conversa"
+
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "Participa na conversa"
+
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Conversan outros"
+
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:74
+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
+msgid "GStreamer Failure"
+msgstr "Fallo de GStreamer"
+
+#: ../finch/gntsound.c:358 ../pidgin/gtksound.c:311
+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
+msgid "(default)"
+msgstr "(por defecto)"
+
+#: ../finch/gntsound.c:719
+msgid "Select Sound File ..."
+msgstr "Elixir ficheiro de son ..."
+
+#: ../finch/gntsound.c:894
+msgid "Sound Preferences"
+msgstr "Preferencias de son"
+
+#: ../finch/gntsound.c:905
+msgid "Profiles"
+msgstr "Perfís"
+
+#: ../finch/gntsound.c:944 ../pidgin/gtkprefs.c:1712
+msgid "Automatic"
+msgstr "Automático"
+
+#: ../finch/gntsound.c:947
+msgid "Console Beep"
+msgstr "Bip da consola"
+
+#: ../finch/gntsound.c:948 ../pidgin/gtkprefs.c:1716
+msgid "Command"
+msgstr "Comando"
+
+#: ../finch/gntsound.c:949
+msgid "No Sound"
+msgstr "Sen son"
+
+#: ../finch/gntsound.c:951 ../pidgin/gtkprefs.c:1707
+msgid "Sound Method"
+msgstr "Método para reproducir sons"
+
+#: ../finch/gntsound.c:956
+msgid "Method: "
+msgstr "Método:"
+
+#: ../finch/gntsound.c:963
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"Comandos de son\n"
+"(%s para nome de ficheiro)"
+
+#. Sound options
+#: ../finch/gntsound.c:971 ../pidgin/gtkprefs.c:1751
+msgid "Sound Options"
+msgstr "Opcións de son"
+
+#: ../finch/gntsound.c:972
+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
+#: ../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
+msgid "Only when available"
+msgstr "Só cando estea dispoñible"
+
+#: ../finch/gntsound.c:982 ../pidgin/gtkprefs.c:1757
+msgid "Only when not available"
+msgstr "Só cando estea non dispoñible"
+
+#: ../finch/gntsound.c:989
+msgid "Volume(0-100):"
+msgstr "Volume(0-100):"
+
+#. Sound events
+#: ../finch/gntsound.c:1006 ../pidgin/gtkprefs.c:1793
+msgid "Sound Events"
+msgstr "Eventos de son"
+
+#: ../finch/gntsound.c:1008 ../pidgin/gtkprefs.c:1852
+msgid "Event"
+msgstr "Evento"
+
+#: ../finch/gntsound.c:1008
+msgid "File"
+msgstr "Ficheiro"
+
+#: ../finch/gntsound.c:1027 ../pidgin/gtkprefs.c:1871
+msgid "Test"
+msgstr "Probar"
+
+#: ../finch/gntsound.c:1030 ../pidgin/gtkprefs.c:1875
+msgid "Reset"
+msgstr "Reiniciar"
+
+#: ../finch/gntsound.c:1033 ../pidgin/gtkprefs.c:1879
+msgid "Choose..."
+msgstr "Escoller..."
+
 #: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
@@ -1351,9 +1504,9 @@
 msgstr "Tipo"
 
 #: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:247
-#: ../libpurple/protocols/bonjour/bonjour.c:254
-#: ../libpurple/protocols/bonjour/bonjour.c:320
+#: ../libpurple/protocols/bonjour/bonjour.c:249
+#: ../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
@@ -1368,12 +1521,12 @@
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5543
-#: ../libpurple/protocols/oscar/oscar.c:5761
-#: ../libpurple/protocols/oscar/oscar.c:5775
-#: ../libpurple/protocols/oscar/oscar.c:5791
-#: ../libpurple/protocols/oscar/oscar.c:5798
-#: ../libpurple/protocols/oscar/oscar.c:5805
+#: ../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
@@ -1381,8 +1534,8 @@
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3586
-#: ../libpurple/protocols/yahoo/yahoo.c:3592
+#: ../libpurple/protocols/yahoo/yahoo.c:3651
+#: ../libpurple/protocols/yahoo/yahoo.c:3657
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
@@ -1434,7 +1587,11 @@
 msgid "Save & Use"
 msgstr "Gardar e usar"
 
-#: ../finch/gntui.c:84
+#: ../finch/gntui.c:87 ../pidgin/gtkprefs.c:2030
+msgid "Sounds"
+msgstr "Sons"
+
+#: ../finch/gntui.c:89
 msgid "Statuses"
 msgstr "Estados"
 
@@ -1596,7 +1753,7 @@
 msgstr "Falta o complemento de protocolo para %s"
 
 #: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4020
+#: ../pidgin/gtkblist.c:4019
 msgid "Connection Error"
 msgstr "Erro de conexión"
 
@@ -1644,13 +1801,13 @@
 #: ../libpurple/protocols/jabber/buddy.c:1462
 #: ../libpurple/protocols/jabber/buddy.c:1479
 #: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
 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:5322 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../pidgin/gtkblist.c:5321 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Contactos"
@@ -2102,15 +2259,15 @@
 msgid "Old flat format"
 msgstr "Formato plano antigo"
 
-#: ../libpurple/log.c:837
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "O rexistro desta conversa fallou."
 
-#: ../libpurple/log.c:1280
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1364
+#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2119,7 +2276,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1366
+#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2128,16 +2285,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 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:1436 ../libpurple/log.c:1566
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, 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:1498
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA AUTOMÁTICA>: %s\n"
@@ -2228,13 +2385,13 @@
 
 #: ../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:1454
-#: ../libpurple/protocols/oscar/oscar.c:2247
-#: ../libpurple/protocols/oscar/oscar.c:2294
-#: ../libpurple/protocols/oscar/oscar.c:5875
-#: ../libpurple/protocols/oscar/oscar.c:5930
-#: ../libpurple/protocols/oscar/oscar.c:6156
-#: ../libpurple/protocols/oscar/oscar.c:6226 ../libpurple/request.h:1387
+#: ../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
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -2297,18 +2454,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
 msgid "Buddy Notes"
 msgstr "Anotacións de contactos"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
 msgid "Store notes on particular buddies."
 msgstr "Almacenar anotacións de contactos particulares."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74
 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."
 
@@ -2502,110 +2659,110 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:492
+#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1574
+#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "O usuario está desconectado."
 
-#: ../libpurple/plugins/log_reader.c:1580
+#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
 msgstr "Resposta automática enviada:"
 
-#: ../libpurple/plugins/log_reader.c:1590
 #: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s desconectouse."
 
-#: ../libpurple/plugins/log_reader.c:1607
+#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr "Unha ou máis mensaxes puideron non chegar ao destino."
 
-#: ../libpurple/plugins/log_reader.c:1617
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "Foi desconectado do servidor."
 
-#: ../libpurple/plugins/log_reader.c:1625
+#: ../libpurple/plugins/log_reader.c:1628
 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."
 
-#: ../libpurple/plugins/log_reader.c:1640
+#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Non se puido enviar a mensaxe porque excedeu a lonxitude máxima."
 
-#: ../libpurple/plugins/log_reader.c:1645
+#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "Non se puido enviar a mensaxe."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2344
-#: ../libpurple/plugins/log_reader.c:2467
+#: ../libpurple/plugins/log_reader.c:2349
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2357
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2362
+#: ../libpurple/plugins/log_reader.c:2477
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2369
-#: ../libpurple/plugins/log_reader.c:2476
+#: ../libpurple/plugins/log_reader.c:2374
+#: ../libpurple/plugins/log_reader.c:2481
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2383
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2388
+#: ../libpurple/plugins/log_reader.c:2486
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2395
-#: ../libpurple/plugins/log_reader.c:2485
+#: ../libpurple/plugins/log_reader.c:2400
+#: ../libpurple/plugins/log_reader.c:2490
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2407
-#: ../libpurple/plugins/log_reader.c:2489
+#: ../libpurple/plugins/log_reader.c:2412
+#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2449
+#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
 msgstr "Configuración de lectura de rexistro xeral"
 
-#: ../libpurple/plugins/log_reader.c:2453
+#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
 msgstr "Cálculos de tamaño rápido"
 
-#: ../libpurple/plugins/log_reader.c:2457
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
 msgstr "Usar nomes heurísticos"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2463
+#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
 msgstr "Directorio de rexistro"
 
@@ -2615,19 +2772,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2518
+#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "Lector de rexistro"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2522
+#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Incluír outros rexistros de clientes de MI no visor de rexistro."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2526
+#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2977,25 +3134,43 @@
 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?"
 
-#. 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/bonjour/bonjour.c:294
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4545
-#: ../libpurple/protocols/oscar/oscar.c:5621
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3488
-#: ../libpurple/protocols/yahoo/yahoo.c:3562 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932
-#: ../pidgin/gtkstatusbox.c:1056
-msgid "Away"
-msgstr "Ausente"
+#. 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
+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
+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/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+msgid "E-Mail"
+msgstr "Correo electrónico"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:623
+msgid "AIM Account"
+msgstr "Conta de AIM"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:356
+#: ../libpurple/protocols/bonjour/bonjour.c:626
+msgid "XMPP Account"
+msgstr "Conta de XMPP"
 
 #. *< type
 #. *< ui_requirement
@@ -3007,38 +3182,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:460
+#: ../libpurple/protocols/bonjour/bonjour.c:462
 msgid "Bonjour Protocol Plugin"
 msgstr "Complemento de protocolo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:477
-#: ../libpurple/protocols/bonjour/bonjour.c:526
+#: ../libpurple/protocols/bonjour/bonjour.c:505
+#: ../libpurple/protocols/bonjour/bonjour.c:512
+#: ../libpurple/protocols/bonjour/bonjour.c:561
 msgid "Purple Person"
 msgstr "Persoa Purple"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Nome do servidor"
 
-#. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:579
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
-msgid "First name"
-msgstr "Nome"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:582
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
-msgid "Last name"
-msgstr "Apelidos"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:585
+#: ../libpurple/protocols/bonjour/bonjour.c:620
 #: ../libpurple/protocols/gg/gg.c:472
 #: ../libpurple/protocols/jabber/jabber.c:818
 #: ../libpurple/protocols/silc/silc.c:770
@@ -3048,42 +3210,34 @@
 msgid "E-mail"
 msgstr "Correo electrónico"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:588
-msgid "AIM Account"
-msgstr "Conta de AIM"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:591
-msgid "XMPP Account"
-msgstr "Conta de XMPP"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:381
+#: ../libpurple/protocols/bonjour/jabber.c:383
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s pechou a conversa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:433
-#: ../libpurple/protocols/bonjour/jabber.c:656
-#: ../libpurple/protocols/bonjour/jabber.c:674
+#: ../libpurple/protocols/bonjour/jabber.c:435
+#: ../libpurple/protocols/bonjour/jabber.c:658
+#: ../libpurple/protocols/bonjour/jabber.c:676
 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:579
+#: ../libpurple/protocols/bonjour/jabber.c:581
 msgid "Cannot open socket"
 msgstr "Non se puido abrir o conectador"
 
-#: ../libpurple/protocols/bonjour/jabber.c:587
+#: ../libpurple/protocols/bonjour/jabber.c:589
 msgid "Error setting socket options"
 msgstr "Erro ao establecer as opcións do conectador"
 
-#: ../libpurple/protocols/bonjour/jabber.c:611
+#: ../libpurple/protocols/bonjour/jabber.c:613
 msgid "Could not bind socket to port"
 msgstr "Non se pode ligar o conectador ao porto"
 
-#: ../libpurple/protocols/bonjour/jabber.c:619
+#: ../libpurple/protocols/bonjour/jabber.c:621
 msgid "Could not listen on socket"
 msgstr "Non se pode escoitar o conectador"
 
@@ -3190,8 +3344,8 @@
 #: ../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:3798
-#: ../libpurple/protocols/oscar/oscar.c:3811
+#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Cidade"
@@ -3201,10 +3355,10 @@
 msgstr "Data de nacemento"
 
 #: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3741
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
+#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Sexo"
@@ -3214,16 +3368,16 @@
 msgstr "Home ou muller"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3741
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Home"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3741
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Muller"
 
@@ -3283,12 +3437,13 @@
 #: ../libpurple/protocols/gg/gg.c:1003
 #: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5593
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5552
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2934 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3079 ../pidgin/gtkblist.c:3420
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
+#: ../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
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -3297,21 +3452,42 @@
 #: ../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/yahoo/yahoo.c:2936 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:3001 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
 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/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/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
+msgid "Away"
+msgstr "Ausente"
+
 #: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2671
-#: ../libpurple/protocols/oscar/oscar.c:3708
+#: ../libpurple/protocols/oscar/oscar.c:2669
+#: ../libpurple/protocols/oscar/oscar.c:3667
 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:3719
+#: ../libpurple/protocols/oscar/oscar.c:3678
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3322,7 +3498,7 @@
 msgstr "Data de nacemento"
 
 #: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3920
+#: ../libpurple/protocols/oscar/oscar.c:3879
 msgid "Unable to display the search results."
 msgstr "Non se poden mostrar os resultados da busca."
 
@@ -3530,11 +3706,11 @@
 #: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1288
+#: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3724
 #: ../libpurple/protocols/simple/simple.c:1676
-#: ../libpurple/protocols/yahoo/yahoo.c:2779
+#: ../libpurple/protocols/yahoo/yahoo.c:2844
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Conectando"
@@ -3552,7 +3728,7 @@
 msgstr "Non se puido crear o conectador "
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/oscar/oscar.c:1284
+#: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Non se puido conectar ao servidor"
 
@@ -3607,8 +3783,8 @@
 #. 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:6660
-#: ../libpurple/protocols/qq/qq.c:753
+#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5728
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
@@ -3621,8 +3797,8 @@
 
 #. port to connect to
 #: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6663
-#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5733
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
@@ -3692,7 +3868,7 @@
 msgstr " <i>(identificado)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/oscar/oscar.c:3668
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -3972,7 +4148,7 @@
 msgstr "names [canle]:  Obter a lista dos usuarios que están na canle."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1832
+#: ../libpurple/protocols/jabber/jabber.c:1830
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo alias&gt;:  Cambia o seu alias."
 
@@ -4226,18 +4402,6 @@
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: ../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/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
-msgstr "Correo electrónico"
-
 #: ../libpurple/protocols/jabber/buddy.c:284
 #: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
@@ -4256,13 +4420,13 @@
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3758
+#: ../libpurple/protocols/oscar/oscar.c:3717
 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:3090
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3093
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Descrición"
@@ -4313,8 +4477,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3797
-#: ../libpurple/protocols/oscar/oscar.c:3810
+#: ../libpurple/protocols/oscar/oscar.c:3756
+#: ../libpurple/protocols/oscar/oscar.c:3769
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -4368,8 +4532,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1476
 #: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5797
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5756
 #: ../libpurple/protocols/sametime/sametime.c:3298
 msgid "Do Not Disturb"
 msgstr "Non molestar"
@@ -4380,7 +4544,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1625
 #: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/oscar/oscar.c:3679
 msgid "Last Name"
 msgstr "Apelidos"
 
@@ -4418,8 +4582,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3723
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3682
+#: ../libpurple/protocols/oscar/oscar.c:3691
 msgid "E-Mail Address"
 msgstr "Enderezo de correo electrónico"
 
@@ -4432,9 +4596,9 @@
 #: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../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
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
@@ -4458,7 +4622,7 @@
 msgstr "Buscar directorio"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5283
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #: ../libpurple/protocols/yahoo/yahoochat.c:962
 msgid "_Room:"
 msgstr "_Sala:"
@@ -4566,8 +4730,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:467
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2398
-#: ../libpurple/protocols/yahoo/yahoo.c:2430
+#: ../libpurple/protocols/yahoo/yahoo.c:2463
+#: ../libpurple/protocols/yahoo/yahoo.c:2495
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4615,8 +4779,8 @@
 msgstr "Xa está rexistrado"
 
 #: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3799
-#: ../libpurple/protocols/oscar/oscar.c:3812
+#: ../libpurple/protocols/oscar/oscar.c:3758
+#: ../libpurple/protocols/oscar/oscar.c:3771
 msgid "State"
 msgstr "Estado"
 
@@ -4669,8 +4833,8 @@
 #: ../libpurple/protocols/jabber/jabber.c:1502
 #: ../libpurple/protocols/jabber/jabber.c:1543
 #: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5591
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5550
 msgid "Not Authorized"
 msgstr "Non autorizado"
 
@@ -4731,7 +4895,7 @@
 msgstr "Introduza o novo contrasinal"
 
 #: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6377
+#: ../libpurple/protocols/oscar/oscar.c:6336
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
@@ -4739,7 +4903,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6347
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
@@ -4969,41 +5133,41 @@
 msgid "Unknown role: \"%s\""
 msgstr "Papel descoñecido: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/jabber.c:1735
 #, 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:1790
+#: ../libpurple/protocols/jabber/jabber.c:1788
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Non puido expulsar o usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1824
+#: ../libpurple/protocols/jabber/jabber.c:1822
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar unha sala de conversa."
 
-#: ../libpurple/protocols/jabber/jabber.c:1828
+#: ../libpurple/protocols/jabber/jabber.c:1826
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar unha sala de conversa."
 
-#: ../libpurple/protocols/jabber/jabber.c:1837
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Abandonar a sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1842
+#: ../libpurple/protocols/jabber/jabber.c:1840
 msgid "register:  Register with a chat room."
 msgstr "register: Rexistrarse nunha sala de conversa."
 
-#: ../libpurple/protocols/jabber/jabber.c:1848
+#: ../libpurple/protocols/jabber/jabber.c:1846
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novo asunto]:  Ver ou cambiar o asunto."
 
-#: ../libpurple/protocols/jabber/jabber.c:1854
+#: ../libpurple/protocols/jabber/jabber.c:1852
 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:1860
+#: ../libpurple/protocols/jabber/jabber.c:1858
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5011,7 +5175,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:1866
+#: ../libpurple/protocols/jabber/jabber.c:1864
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5019,19 +5183,19 @@
 "role &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Establecer "
 "o papel dun usuario na sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1872
+#: ../libpurple/protocols/jabber/jabber.c:1870
 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:1878
+#: ../libpurple/protocols/jabber/jabber.c:1876
 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:1884
+#: ../libpurple/protocols/jabber/jabber.c:1882
 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:1889
+#: ../libpurple/protocols/jabber/jabber.c:1887
 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 "
@@ -5115,35 +5279,35 @@
 msgid "XML Parse error"
 msgstr "Erro de tratamento XML"
 
-#: ../libpurple/protocols/jabber/presence.c:290
+#: ../libpurple/protocols/jabber/presence.c:292
 msgid "Unknown Error in presence"
 msgstr "Erro descoñecido en presenza"
 
-#: ../libpurple/protocols/jabber/presence.c:364
-#: ../libpurple/protocols/jabber/presence.c:365
+#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:367
 msgid "Create New Room"
 msgstr "Crear unha sala nova"
 
-#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:368
 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:372
+#: ../libpurple/protocols/jabber/presence.c:374
 msgid "_Configure Room"
 msgstr "_Configurar a sala"
 
-#: ../libpurple/protocols/jabber/presence.c:373
+#: ../libpurple/protocols/jabber/presence.c:375
 msgid "_Accept Defaults"
 msgstr "_Aceptar os valores predeterminados"
 
-#: ../libpurple/protocols/jabber/presence.c:415
+#: ../libpurple/protocols/jabber/presence.c:417
 #, c-format
 msgid "Error in chat %s"
 msgstr "Erro na conversa %s"
 
-#: ../libpurple/protocols/jabber/presence.c:419
+#: ../libpurple/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erro ao unirse á conversa %s"
@@ -5401,7 +5565,7 @@
 msgstr "Servidor moi ocupado"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1381
+#: ../libpurple/protocols/oscar/oscar.c:1378
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
@@ -5504,8 +5668,8 @@
 msgstr "Tenlle"
 
 #: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3596
+#: ../libpurple/protocols/yahoo/yahoo.c:2977
+#: ../libpurple/protocols/yahoo/yahoo.c:3661
 msgid "Be Right Back"
 msgstr "Volvo deseguida"
 
@@ -5516,20 +5680,20 @@
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2914
-#: ../libpurple/protocols/yahoo/yahoo.c:3599
+#: ../libpurple/protocols/yahoo/yahoo.c:2979
+#: ../libpurple/protocols/yahoo/yahoo.c:3664
 msgid "Busy"
 msgstr "Ocupado"
 
 #: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3611
+#: ../libpurple/protocols/yahoo/yahoo.c:2987
+#: ../libpurple/protocols/yahoo/yahoo.c:3676
 msgid "On the Phone"
 msgstr "Ao teléfono"
 
 #: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2926
-#: ../libpurple/protocols/yahoo/yahoo.c:3617
+#: ../libpurple/protocols/yahoo/yahoo.c:2991
+#: ../libpurple/protocols/yahoo/yahoo.c:3682
 msgid "Out to Lunch"
 msgstr "Saín xantar"
 
@@ -5589,9 +5753,9 @@
 msgstr "Xeral"
 
 #: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libpurple/protocols/oscar/oscar.c:3723
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:219
+#: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Idade"
@@ -5685,7 +5849,7 @@
 msgstr "Teléfono da casa 2"
 
 #: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3761
 msgid "Home Address"
 msgstr "Domicilio"
 
@@ -5721,7 +5885,7 @@
 msgstr "Posto de traballo"
 
 #: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3782
 msgid "Company"
 msgstr "Compañía"
 
@@ -5743,7 +5907,7 @@
 msgstr "Teléfono do traballo 2"
 
 #: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Work Address"
 msgstr "Enderezo do traballo"
 
@@ -6066,22 +6230,22 @@
 msgid "%s just sent you a Nudge!"
 msgstr "%s acáballe de dar un cobadazo!"
 
-#: ../libpurple/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:252
 #, 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:319
+#: ../libpurple/protocols/msn/userlist.c:321
 #, 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:641
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Imposible engadir \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "O nome especificado é incorrecto."
 
@@ -6441,8 +6605,8 @@
 msgstr "Porto do servidor"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2309
-#: ../libpurple/protocols/yahoo/yahoo.c:2476
+#: ../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
@@ -6450,8 +6614,8 @@
 msgstr "O servidor pechou a conexión."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2303
-#: ../libpurple/protocols/yahoo/yahoo.c:2470 ../libpurple/proxy.c:592
+#: ../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
 #, c-format
@@ -6500,7 +6664,7 @@
 msgstr "Complemento de protocolo ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4203
+#: ../libpurple/protocols/yahoo/yahoo.c:4279
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codificación"
@@ -6631,7 +6795,7 @@
 msgid "Not while on AOL"
 msgstr "Non mentres está en AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
+#: ../libpurple/protocols/oscar/oscar.c:347
 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 "
@@ -6642,7 +6806,7 @@
 "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:457
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6652,21 +6816,21 @@
 "unha codificación diferente ou que %s ten un cliente con erros.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2376
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2376
 #: ../pidgin/gtkutils.c:2406
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Icona de contacto"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Voz"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "MI Directa AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:647
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -6674,124 +6838,125 @@
 msgid "Chat"
 msgstr "Conversa"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:5999
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:5958
 msgid "Get File"
 msgstr "Recibir ficheiro"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Xogos"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Extensións"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "Enviar lista de contactos"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "Conexión directa ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "Antigo ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Cifraxe Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "Seguridade activada"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Vídeoconversa"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "Vídeo en directo"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Cámara"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5769
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5728
 msgid "Free For Chat"
 msgstr "Dispoñible para conversar"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5804
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5763
 msgid "Not Available"
 msgstr "Non dispoñible"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5790
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5749
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr "Visible na Web"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2930 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:736 ../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
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
+#: ../libpurple/protocols/oscar/oscar.c:738
 msgid "Online"
 msgstr "Conectado"
 
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1121
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3675
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1123
 msgid "IP Address"
 msgstr "Enderezo IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2863
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Warning Level"
 msgstr "Nivel de aviso"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "Comentario de contacto"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6800,7 +6965,7 @@
 "Non se puido conectar ao servidor de autenticación:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6809,20 +6974,20 @@
 "Non se puido conectar ao servidor BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "Enviouse o nome de usuario"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "Conexión establecida, cookie enviada"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "Rematando a conexión"
 
-#: ../libpurple/protocols/oscar/oscar.c:1261
+#: ../libpurple/protocols/oscar/oscar.c:1258
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6833,29 +6998,29 @@
 "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:1346
-#: ../libpurple/protocols/yahoo/yahoo.c:1948
+#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 msgid "Invalid screen name."
 msgstr "Nome de usuario incorrecto."
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1969
+#: ../libpurple/protocols/yahoo/yahoo.c:2031
 msgid "Incorrect password."
 msgstr "Contrasinal incorrecto."
 
-#: ../libpurple/protocols/oscar/oscar.c:1358
+#: ../libpurple/protocols/oscar/oscar.c:1355
 msgid "Your account is currently suspended."
 msgstr "A conta está deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1362
+#: ../libpurple/protocols/oscar/oscar.c:1359
 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:1367
-#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1375
 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."
@@ -6863,44 +7028,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:1372
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, 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:1411
+#: ../libpurple/protocols/oscar/oscar.c:1408
 msgid "Could Not Connect"
 msgstr "Non se puido conectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1415
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Received authorization"
 msgstr "Recibiuse a autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:1437
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "A clave SecurID que se introduciu non é válida."
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "Introduza o SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:1448
 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:1453
-#: ../libpurple/protocols/oscar/oscar.c:2246
-#: ../libpurple/protocols/oscar/oscar.c:2293
-#: ../libpurple/protocols/oscar/oscar.c:5874
-#: ../libpurple/protocols/oscar/oscar.c:6155 ../libpurple/request.h:1387
+#: ../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
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1492
-#: ../libpurple/protocols/oscar/oscar.c:1535
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6909,53 +7074,53 @@
 "Talvez sexa desconectado en breve. Pode querer usar TOC ata que se resolva "
 "isto. Comprobe %s para as novidades."
 
-#: ../libpurple/protocols/oscar/oscar.c:1495
-#: ../libpurple/protocols/oscar/oscar.c:1538
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 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:1623
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, 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:1626
+#: ../libpurple/protocols/oscar/oscar.c:1623
 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:1655
+#: ../libpurple/protocols/oscar/oscar.c:1652
 msgid "Password sent"
 msgstr "Contrasinal enviado"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1708
 msgid "Unable to initialize connection"
 msgstr "Non é posible comezar a conexión"
 
-#: ../libpurple/protocols/oscar/oscar.c:2216
+#: ../libpurple/protocols/oscar/oscar.c:2212
 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:2244
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "Mensaxe de solicitude de autorización:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2245
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr "Por favor, autoríceme!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2285
-#: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:2419
-#: ../libpurple/protocols/oscar/oscar.c:5252
-#: ../libpurple/protocols/yahoo/yahoo.c:1000
+#: ../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
 msgid "No reason given."
 msgstr "Non se indicou unha razón."
 
-#: ../libpurple/protocols/oscar/oscar.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr "Mensaxe de autorización rexeitada:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6966,17 +7131,17 @@
 "seguinte razón:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2420
+#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr "Autorización ICQ rexeitada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2427
+#: ../libpurple/protocols/oscar/oscar.c:2425
 #, 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:2435
+#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6989,7 +7154,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2443
+#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7002,7 +7167,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2451
+#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7015,59 +7180,59 @@
 "A mensaxe é:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2470
 #, 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:2478
+#: ../libpurple/protocols/oscar/oscar.c:2476
 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:2483 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Engadir"
 
-#: ../libpurple/protocols/oscar/oscar.c:2484
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2568
+#: ../libpurple/protocols/oscar/oscar.c:2566
 #, 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:2577
+#: ../libpurple/protocols/oscar/oscar.c:2575
 #, 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:2586
+#: ../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."
 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:2595
+#: ../libpurple/protocols/oscar/oscar.c:2593
 #, 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:2604
+#: ../libpurple/protocols/oscar/oscar.c:2602
 #, 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:2613
+#: ../libpurple/protocols/oscar/oscar.c:2611
 #, 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."
@@ -7075,55 +7240,55 @@
 msgstr[1] "Perdeuse %hu mensaxe de %s por motivos descoñecidos."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2768
+#: ../libpurple/protocols/oscar/oscar.c:2766
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Non se puido enviar a mensaxe: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2768
-#: ../libpurple/protocols/oscar/oscar.c:2773
-#: ../libpurple/protocols/oscar/oscar.c:2837
+#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2771
+#: ../libpurple/protocols/oscar/oscar.c:2835
 msgid "Unknown reason."
 msgstr "Razón descoñecida."
 
-#: ../libpurple/protocols/oscar/oscar.c:2771
+#: ../libpurple/protocols/oscar/oscar.c:2769
 #: ../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:2837
+#: ../libpurple/protocols/oscar/oscar.c:2835
 #, c-format
 msgid "User information not available: %s"
 msgstr "Información de usuario non dispoñible: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2868
+#: ../libpurple/protocols/oscar/oscar.c:2866
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2873
+#: ../libpurple/protocols/oscar/oscar.c:2871
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Membro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2878
+#: ../libpurple/protocols/oscar/oscar.c:2876
 msgid "Capabilities"
 msgstr "Capacidades"
 
-#: ../libpurple/protocols/oscar/oscar.c:2908
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Available Message"
 msgstr "Mensaxe dispoñible"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2934
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3016
+#: ../libpurple/protocols/oscar/oscar.c:3014
 msgid "Your AIM connection may be lost."
 msgstr "Pode que se perdese a conexión AIM."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3204
+#: ../libpurple/protocols/oscar/oscar.c:3202
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7131,7 +7296,7 @@
 "[Non se puido mostrar unha mensaxe deste usuario porque contén caracteres "
 "incorrectos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3407
+#: ../libpurple/protocols/oscar/oscar.c:3366
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7140,82 +7305,82 @@
 "na taxa de envío de mensaxes. Agarde 10 segundos e volva a "
 "intentalo."
 
-#: ../libpurple/protocols/oscar/oscar.c:3490
+#: ../libpurple/protocols/oscar/oscar.c:3449
 #: ../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:3738
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../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:3768
+#: ../libpurple/protocols/oscar/oscar.c:3727
 msgid "Personal Web Page"
 msgstr "Sitio web persoal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/oscar/oscar.c:3751
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: ../libpurple/protocols/oscar/oscar.c:3800
-#: ../libpurple/protocols/oscar/oscar.c:3813
+#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3772
 msgid "Zip Code"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3824
+#: ../libpurple/protocols/oscar/oscar.c:3783
 msgid "Division"
 msgstr "Sección"
 
-#: ../libpurple/protocols/oscar/oscar.c:3825
+#: ../libpurple/protocols/oscar/oscar.c:3784
 msgid "Position"
 msgstr "Cargo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3827
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Web Page"
 msgstr "Páxina web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3789
 msgid "Work Information"
 msgstr "Información do traballo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3886
+#: ../libpurple/protocols/oscar/oscar.c:3845
 msgid "Pop-Up Message"
 msgstr "Mensaxe emerxente"
 
-#: ../libpurple/protocols/oscar/oscar.c:3926
+#: ../libpurple/protocols/oscar/oscar.c:3885
 #, 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:3931
+#: ../libpurple/protocols/oscar/oscar.c:3890
 msgid "Screen name"
 msgstr "Nome de usuario"
 
-#: ../libpurple/protocols/oscar/oscar.c:3957
+#: ../libpurple/protocols/oscar/oscar.c:3916
 #, 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:3978
+#: ../libpurple/protocols/oscar/oscar.c:3937
 #, 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:3980
+#: ../libpurple/protocols/oscar/oscar.c:3939
 msgid "Account Confirmation Requested"
 msgstr "Confirmación de conta solicitada"
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:3970
 msgid "Error Changing Account Info"
 msgstr "Erro ao cambiar a información da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:3973
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7224,12 +7389,12 @@
 "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:4017
+#: ../libpurple/protocols/oscar/oscar.c:3976
 #, 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:4020
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7238,7 +7403,7 @@
 "Erro 0x%04x: Non se pode dar formato ao nome de usuario porque o nome "
 "solicitado é demasiado longo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:3982
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7247,7 +7412,7 @@
 "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:4026
+#: ../libpurple/protocols/oscar/oscar.c:3985
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7256,7 +7421,7 @@
 "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:4029
+#: ../libpurple/protocols/oscar/oscar.c:3988
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7265,31 +7430,31 @@
 "Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque o enderezo "
 "dado é incorrecto."
 
-#: ../libpurple/protocols/oscar/oscar.c:4032
+#: ../libpurple/protocols/oscar/oscar.c:3991
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro descoñecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4042
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, 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:4044
+#: ../libpurple/protocols/oscar/oscar.c:4003
 msgid "Account Info"
 msgstr "Información da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4216
+#: ../libpurple/protocols/oscar/oscar.c:4175
 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:4487
+#: ../libpurple/protocols/oscar/oscar.c:4446
 msgid "Unable to set AIM profile."
 msgstr "Non se puido establecer o perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4488
+#: ../libpurple/protocols/oscar/oscar.c:4447
 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 "
@@ -7299,7 +7464,7 @@
 "inicio de sesión se completase. O perfil non se establecerá, inténteo novamente cando xa "
 "estea conectado completamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4502
+#: ../libpurple/protocols/oscar/oscar.c:4461
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7311,14 +7476,14 @@
 "Excedeuse a lonxitude máxima de %d byte do perfil de usuario.  Eliminouse o "
 "excedente."
 msgstr[1] ""
-"Excedeuse a lonxitude máxima de %d bytes do perfil de usuario.  Eliminouse o "
+"Excedeuse a lonxitude máxima de %d byte do perfil de usuario.  Eliminouse o "
 "excedente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4507
+#: ../libpurple/protocols/oscar/oscar.c:4466
 msgid "Profile too long."
 msgstr "Perfil demasiado longo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4552
+#: ../libpurple/protocols/oscar/oscar.c:4511
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7330,14 +7495,14 @@
 "Excedeuse a lonxitude máxima de %d byte da mensaxe de ausencia.  Eliminouse o "
 "excedente."
 msgstr[1] ""
-"Excedeuse a lonxitude máxima de %d bytes da mensaxe de ausencia.  Eliminouse o "
+"Excedeuse a lonxitude máxima de %d byte da mensaxe de ausencia.  Eliminouse o "
 "excedente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:4516
 msgid "Away message too long."
 msgstr "Mensaxe de ausencia demasiado longa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4626
+#: ../libpurple/protocols/oscar/oscar.c:4585
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7348,17 +7513,17 @@
 "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:4628
-#: ../libpurple/protocols/oscar/oscar.c:5061
-#: ../libpurple/protocols/oscar/oscar.c:5076
+#: ../libpurple/protocols/oscar/oscar.c:4587
+#: ../libpurple/protocols/oscar/oscar.c:5020
+#: ../libpurple/protocols/oscar/oscar.c:5035
 msgid "Unable To Add"
 msgstr "Non se puido engadir"
 
-#: ../libpurple/protocols/oscar/oscar.c:4737
+#: ../libpurple/protocols/oscar/oscar.c:4696
 msgid "Unable To Retrieve Buddy List"
 msgstr "Non se puido obter a lista de contactos"
 
-#: ../libpurple/protocols/oscar/oscar.c:4738
+#: ../libpurple/protocols/oscar/oscar.c:4697
 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."
@@ -7366,15 +7531,15 @@
 "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:4920
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:5130
-#: ../libpurple/protocols/oscar/oscar.c:5131
-#: ../libpurple/protocols/oscar/oscar.c:5136
+#: ../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
 msgid "Orphans"
 msgstr "Orfos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5059
+#: ../libpurple/protocols/oscar/oscar.c:5018
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7383,17 +7548,17 @@
 "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:5059
-#: ../libpurple/protocols/oscar/oscar.c:5074
+#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5033
 msgid "(no name)"
 msgstr "(sen nome)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5032
 #, 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:5167
+#: ../libpurple/protocols/oscar/oscar.c:5126
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7402,24 +7567,24 @@
 "O usuario %s deulle permiso para engadilo nas súas listas de contactos. Desexa "
 "engadilos a eles?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5175
+#: ../libpurple/protocols/oscar/oscar.c:5134
 msgid "Authorization Given"
 msgstr "Autorización concedida"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5248
+#: ../libpurple/protocols/oscar/oscar.c:5207
 #, 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:5249
+#: ../libpurple/protocols/oscar/oscar.c:5208
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5252
+#: ../libpurple/protocols/oscar/oscar.c:5211
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7430,51 +7595,51 @@
 "seguinte razón:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5253
+#: ../libpurple/protocols/oscar/oscar.c:5212
 msgid "Authorization Denied"
 msgstr "Autorización denegada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5289
+#: ../libpurple/protocols/oscar/oscar.c:5248
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "Int_ercambio:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5329
+#: ../libpurple/protocols/oscar/oscar.c:5288
 msgid "Invalid chat name specified."
 msgstr "Especificouse un nome de conversa incorrecto."
 
-#: ../libpurple/protocols/oscar/oscar.c:5398
+#: ../libpurple/protocols/oscar/oscar.c:5357
 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:5558
-#: ../libpurple/protocols/oscar/oscar.c:5563
+#: ../libpurple/protocols/oscar/oscar.c:5517
+#: ../libpurple/protocols/oscar/oscar.c:5522
 msgid "Away Message"
 msgstr "Mensaxe de ausencia"
 
-#: ../libpurple/protocols/oscar/oscar.c:5563
+#: ../libpurple/protocols/oscar/oscar.c:5522
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obtendo)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:5722
 msgid "iTunes Music Store Link"
 msgstr "LIgazón a tenda de música iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5871
+#: ../libpurple/protocols/oscar/oscar.c:5830
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de contacto para %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5872
+#: ../libpurple/protocols/oscar/oscar.c:5831
 msgid "Buddy Comment:"
 msgstr "Comentario de contacto:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/oscar.c:5878
 #, 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:5923
+#: ../libpurple/protocols/oscar/oscar.c:5882
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7482,66 +7647,66 @@
 "Como isto revela o seu enderezo IP, pode ser considerado como un risco de "
 "privacidade. Quere continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5929
+#: ../libpurple/protocols/oscar/oscar.c:5888
 #: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:5964
+#: ../libpurple/protocols/oscar/oscar.c:5923
 msgid "Get AIM Info"
 msgstr "Obter informaciónde AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5970
+#: ../libpurple/protocols/oscar/oscar.c:5929
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de contacto"
 
-#: ../libpurple/protocols/oscar/oscar.c:5978
+#: ../libpurple/protocols/oscar/oscar.c:5937
 msgid "Get Status Msg"
 msgstr "Obter mensaxe de estado"
 
-#: ../libpurple/protocols/oscar/oscar.c:5991
+#: ../libpurple/protocols/oscar/oscar.c:5950
 msgid "Direct IM"
 msgstr "MI directa"
 
-#: ../libpurple/protocols/oscar/oscar.c:6013
+#: ../libpurple/protocols/oscar/oscar.c:5972
 msgid "Re-request Authorization"
 msgstr "Solicitar unha autorización outra vez"
 
-#: ../libpurple/protocols/oscar/oscar.c:6072
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Require authorization"
 msgstr "Pedir unha autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:6075
+#: ../libpurple/protocols/oscar/oscar.c:6034
 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:6080
+#: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "ICQ Privacy Options"
 msgstr "Opcións de privacidade ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6099
+#: ../libpurple/protocols/oscar/oscar.c:6058
 msgid "The new formatting is invalid."
 msgstr "O novo formato é incorrecto."
 
-#: ../libpurple/protocols/oscar/oscar.c:6100
+#: ../libpurple/protocols/oscar/oscar.c:6059
 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:6153
+#: ../libpurple/protocols/oscar/oscar.c:6112
 msgid "Change Address To:"
 msgstr "Cambiar o enderezo a:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6199
+#: ../libpurple/protocols/oscar/oscar.c:6158
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>vostede non está agardando autorización</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6202
+#: ../libpurple/protocols/oscar/oscar.c:6161
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Agardando a autorización dos seguintes contactos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6203
+#: ../libpurple/protocols/oscar/oscar.c:6162
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7549,73 +7714,73 @@
 "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:6220
+#: ../libpurple/protocols/oscar/oscar.c:6179
 msgid "Find Buddy by E-Mail"
 msgstr "Buscar un contacto polo correo electrónico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6221
+#: ../libpurple/protocols/oscar/oscar.c:6180
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar un contacto polo enderezo de correo electrónico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6222
+#: ../libpurple/protocols/oscar/oscar.c:6181
 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:6225
+#: ../libpurple/protocols/oscar/oscar.c:6184
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/oscar/oscar.c:6342
 msgid "Set User Info (URL)..."
 msgstr "Editar a información de usuario (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6353
 msgid "Change Password (URL)"
 msgstr "Modificar contrasinal (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6398
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar o reenvío de MI (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6408
+#: ../libpurple/protocols/oscar/oscar.c:6367
 msgid "Set Privacy Options..."
 msgstr "Editar opcións de privacidade..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6415
+#: ../libpurple/protocols/oscar/oscar.c:6374
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar o enderezo rexistrado actualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6423
+#: ../libpurple/protocols/oscar/oscar.c:6382
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Cambiar o enderezo de correo actualmente rexistrado..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6389
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar contactos pendentes de autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:6436
+#: ../libpurple/protocols/oscar/oscar.c:6395
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Buscar un contacto polo enderezo de correo electrónico..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6400
 msgid "Search for Buddy by Information"
 msgstr "Localizar un contacto pola súa información"
 
-#: ../libpurple/protocols/oscar/oscar.c:6509
+#: ../libpurple/protocols/oscar/oscar.c:6468
 msgid "Use recent buddies group"
 msgstr "Usar un grupo de contactos recente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6512
+#: ../libpurple/protocols/oscar/oscar.c:6471
 msgid "Show how long you have been idle"
 msgstr "Mostrar o tempo que estivo inactivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6667
+#: ../libpurple/protocols/oscar/oscar.c:6626
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7835,7 +8000,6 @@
 msgstr "Rexeitou a solicitude de %d"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "Introduza a súa razón:"
 
@@ -7852,35 +8016,37 @@
 #: ../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:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
+#: ../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 fails"
-msgstr "Engadir contacto con solicitude de autorización fallida"
-
-#: ../libpurple/protocols/qq/buddy_opt.c:308
+msgid "Add buddy with auth request failed"
+msgstr "Engadir contacto con fallo na solicitude de autorización"
+
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "Eliminou con éxito un contacto"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:336
-msgid "You have successfully removed yourself from a buddy"
-msgstr "Eliminouse a vostede mesmo con éxito dun contacto"
-
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+msgid "You have successfully removed yourself from your friend's buddy list"
+msgstr "Eliminóuselle con éxito da lista de contactos do seu amigo."
+
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "O usuario %d precisa unha autenticación"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Introduza a solicitude aquí"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:405
+#: ../libpurple/protocols/qq/buddy_opt.c:407
 #: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Quere ser o meu amigo?"
@@ -7888,22 +8054,22 @@
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:408
 #: ../libpurple/protocols/qq/group_join.c:138
 #: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:416
-#, c-format
-msgid "You have added %d in buddy list"
-msgstr "Engadiu %d á lista de amigos"
-
-#: ../libpurple/protocols/qq/buddy_opt.c:513
+#: ../libpurple/protocols/qq/buddy_opt.c:418
+#, c-format
+msgid "You have added %d to buddy list"
+msgstr "Engadiu a %d á súa lista de contactos."
+
+#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "Erro de QQid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:514
+#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "QQid non válido"
 
@@ -7932,7 +8098,7 @@
 msgstr "QQ Qun"
 
 #: ../libpurple/protocols/qq/group.c:120
-msgid "Please input external group ID"
+msgid "Please enter external group ID"
 msgstr "Introduza o ID do grupo externo"
 
 #: ../libpurple/protocols/qq/group.c:121
@@ -7941,12 +8107,12 @@
 
 #: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
-msgid "User %d applied to join group %d"
-msgstr "O usuario %d solicita unirse ao grupo %d"
+msgid "User %d requested to join group %d"
+msgstr "O usuario %d pediu unirse ao grupo %d"
 
 #: ../libpurple/protocols/qq/group_im.c:127
 #: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:195
+#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "Razón: %s"
@@ -7966,37 +8132,37 @@
 
 #: ../libpurple/protocols/qq/group_im.c:141
 #: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "Aprobar"
 
 #: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
-msgid "You request to join group %d has been rejected by admin %d"
-msgstr "A súa solicitude para se unir ao grupo%d foi rexeitada polo administrador %d"
+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"
 
 #: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
-msgid "You request to join group %d has been approved by admin %d"
-msgstr "A súa solicitude para se unir ao grupo %d foi aprobada polo administrador %d"
+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"
 
 #: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
-msgid "You [%d] has exit group \"%d\""
-msgstr "Ti [%d] acabas de saír do grupo \"%d\""
+msgid "You [%d] have left group \"%d\""
+msgstr "Vostede [%d] abandoou o grupo \"%d\""
 
 #: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
-msgid "You [%d] has been added by group \"%d\""
-msgstr "Vostede [%d] foi engadido ao grupo\"%d\""
+msgid "You [%d] have been added to group \"%d\""
+msgstr "Vostede [%d] uniuse ao grupo \"%d\""
 
 #: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Este grupo foi engadido á súa lista de contactos"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-msgid "I am not member"
+msgid "I am not a member"
 msgstr "Non son un membro"
 
 #: ../libpurple/protocols/qq/group_internal.c:44
@@ -8020,24 +8186,24 @@
 msgstr "Este grupo non permite que se unan outros membros"
 
 #: ../libpurple/protocols/qq/group_join.c:233
-msgid "You have successfully exited the group"
-msgstr "Saíu con éxito do grupo"
+msgid "You have successfully left the group"
+msgstr "Abandoou o grupo con éxito"
 
 #: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "Autenticación de grupo QQ"
 
 #: ../libpurple/protocols/qq/group_join.c:258
-msgid "Your authorization operation has been accepted by the QQ server"
-msgstr "A súa operación de autorización foi aceptada polo servidor QQ"
+msgid "Your authorization request has been accepted by the QQ server"
+msgstr "A súa solicitude de autorización foi aceptada polo servidor QQ"
 
 #: ../libpurple/protocols/qq/group_join.c:329
-msgid "You inputted a group id outside the acceptable range"
-msgstr "Introduciu un id de grupo fóra dun intervalo aceptado"
+msgid "You entered a group ID outside the acceptable range"
+msgstr "Introduciu un ID de grupo fora do rango de aceptación"
 
 #: ../libpurple/protocols/qq/group_join.c:360
-msgid "Are you sure to exit this Qun?"
-msgstr "Está seguro de que quere saír deste Qun?"
+msgid "Are you sure you want to leave this Qun?"
+msgstr "Está seguro que quera abandoar este Qun?"
 
 #: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
@@ -8047,10 +8213,6 @@
 "Nota: se vostede é o creador, \n"
 "esta operación eliminará finalmente este Qun."
 
-#: ../libpurple/protocols/qq/group_join.c:367
-msgid "Go ahead"
-msgstr "Seguir"
-
 #: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
@@ -8060,18 +8222,22 @@
 msgid "Group Operation Error"
 msgstr "Erro de operación do grupo"
 
-#. we wanna see window
+#. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:88
-msgid "Do you wanna approve the request?"
-msgstr "Quere aprobar a solicitude?"
+#: ../libpurple/protocols/qq/sys_msg.c:87
+msgid "Do you want to approve the request?"
+msgstr "Quere aprobar esta petición?"
+
+#: ../libpurple/protocols/qq/group_opt.c:137
+msgid "Enter your reason:"
+msgstr "Introduza a súa razón:"
 
 #: ../libpurple/protocols/qq/group_opt.c:235
-msgid "You have successfully modify Qun member"
+msgid "You have successfully modified Qun member"
 msgstr "Modificou con éxito o membro de Qun"
 
 #: ../libpurple/protocols/qq/group_opt.c:305
-msgid "You have successfully modify Qun information"
+msgid "You have successfully modified Qun information"
 msgstr "Modificou con éxito a información de Qun"
 
 #: ../libpurple/protocols/qq/group_opt.c:392
@@ -8091,20 +8257,16 @@
 msgstr "Mensaxe do sistema"
 
 #: ../libpurple/protocols/qq/im.c:576
-msgid "Server ACK"
-msgstr "Servidor ACK"
-
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "Non se puido enviar MI."
 
 #: ../libpurple/protocols/qq/keep_alive.c:87
-msgid "Keep alive error, seems connection lost!"
-msgstr "Produciuse un erro, semella que se perdeu a conexión!"
+msgid "Keep alive error"
+msgstr "Produciuse un erro"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Request login token error!"
-msgstr "Erro na solicitude de inicio de sesión!"
+msgid "Error requesting login token"
+msgstr "Erro na solicitude de inicio de sesión"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
@@ -8123,96 +8285,83 @@
 msgid "Unknown-%d"
 msgstr "Descoñecido-%d"
 
-#: ../libpurple/protocols/qq/qq.c:209
-#, c-format
-msgid "%s Address"
-msgstr "%s Enderezo"
-
-#: ../libpurple/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:211
+msgid "TCP Address"
+msgstr "Enderezo TCP"
+
+#: ../libpurple/protocols/qq/qq.c:213
+msgid "UDP Address"
+msgstr "Enderezo UDP"
+
+#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "Nivel"
 
-#: ../libpurple/protocols/qq/qq.c:278
-msgid "QQ: Available"
-msgstr "QQ: Dispoñible"
-
-#: ../libpurple/protocols/qq/qq.c:282
-msgid "QQ: Away"
-msgstr "QQ: Ausente"
-
-#: ../libpurple/protocols/qq/qq.c:286
-msgid "QQ: Invisible"
-msgstr "QQ: invisible"
-
-#: ../libpurple/protocols/qq/qq.c:290
-msgid "QQ: Offline"
-msgstr "QQ: Desconectado"
-
-#: ../libpurple/protocols/qq/qq.c:371
+#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "Nome non válido"
 
-#: ../libpurple/protocols/qq/qq.c:437
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Actualmente conectado</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Última actualización</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:442
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Modo de conexión:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>IP do servidor:</b> %s:%d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>A miña IP pública:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:449
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Hora de inicio de sesión:</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Última IP de inicio de sesión</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Última hora de inicio de sesión</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "Información de inicio de sesión"
 
-#: ../libpurple/protocols/qq/qq.c:531
-msgid "Modify My Information"
-msgstr "Modificar a miña información"
-
-#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:533
+msgid "Set My Information"
+msgstr "Establecer a miña información"
+
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Modificar o contrasinal"
 
-#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
 msgstr "Mostrar información de inicio de sesión"
 
-#: ../libpurple/protocols/qq/qq.c:558
-msgid "Exit this QQ Qun"
+#: ../libpurple/protocols/qq/qq.c:560
+msgid "Leave this QQ Qun"
 msgstr "Saír desta QQ Qun"
 
-#: ../libpurple/protocols/qq/qq.c:582
+#: ../libpurple/protocols/qq/qq.c:584
 msgid "Block this buddy"
 msgstr "Bloquear a este contacto"
 
@@ -8226,22 +8375,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "Protocolo QQ\tComplemento"
 
-#: ../libpurple/protocols/qq/qq.c:750
+#: ../libpurple/protocols/qq/qq.c:752
 msgid "Connect using TCP"
 msgstr "Conectar usando TCP"
 
-#: ../libpurple/protocols/qq/qq_proxy.c:497
-msgid "Socket send error"
-msgstr "Erro de envio do conectador"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:500
-msgid "Connection refused"
-msgstr "Conexión rexeitada"
-
 #: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
 msgstr "Erro do conectador"
@@ -8274,53 +8415,52 @@
 msgid "Login failed, no reply"
 msgstr "Fallou o inicio de sesión , non responder"
 
-#: ../libpurple/protocols/qq/sys_msg.c:112
-msgid "Do you wanna add this buddy?"
-msgstr "Desexa engadir este contacto?"
+#: ../libpurple/protocols/qq/sys_msg.c:110
+msgid "Do you want to add this buddy?"
+msgstr "Quere engadir este contacto?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
+#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr "Foi engadido por %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
+#: ../libpurple/protocols/qq/sys_msg.c:169
 msgid "Would like to add him?"
 msgstr "Quere engadilo?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:178
-#, c-format
-msgid "%s has added you [%s]"
-msgstr "%s engadiulle [%s]"
-
-#: ../libpurple/protocols/qq/sys_msg.c:194
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#, c-format
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "%s engadiuno [%s] á súa lista de contactos"
+
+#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "O usuario %s rexeitou a súa solicitude"
 
-#: ../libpurple/protocols/qq/sys_msg.c:214
-#, c-format
-msgid "User %s has approved your request"
+#: ../libpurple/protocols/qq/sys_msg.c:212
+#, c-format
+msgid "User %s approved your request"
 msgstr "O usuario %s aprobou a súa solicitude"
 
-#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
-#, c-format
-msgid "%s wanna add you [%s] as friends"
-msgstr "%s quere engadirlle [%s] como amigo"
-
-#: ../libpurple/protocols/qq/sys_msg.c:242
+#: ../libpurple/protocols/qq/sys_msg.c:238
+#, c-format
+msgid "%s wants to add you [%s] as a friend"
+msgstr "%s quere engadilo [%s] como amigo"
+
+#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
+#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr " %s non está na súa lista de contactos"
 
-#: ../libpurple/protocols/qq/sys_msg.c:266
+#: ../libpurple/protocols/qq/sys_msg.c:263
 msgid "Would you like to add him?"
 msgstr "Quere engadilo?"
 
@@ -8514,7 +8654,7 @@
 msgid "Send TEST Announcement"
 msgstr "Enviar anuncio de PROBA"
 
-#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4302
+#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4329
 msgid "Topic:"
 msgstr "Asunto:"
 
@@ -8539,7 +8679,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Non se especificou un servidor de comunidade Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4025
+#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4024
 msgid "Connect"
 msgstr "Conectar"
 
@@ -8718,7 +8858,7 @@
 "enviarlles mensaxes cos botóns de acción que se amosan abaixo."
 
 #. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:718
+#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:726
 msgid "Search Results"
 msgstr "Resultados da busca"
 
@@ -9992,7 +10132,7 @@
 msgstr "O seu estado de ánimo actual"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1638
 msgid "Normal"
 msgstr "Normal"
 
@@ -10388,7 +10528,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:2029
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2031
 msgid "Network"
 msgstr "Rede"
 
@@ -10867,8 +11007,8 @@
 msgid "Password Change Successful"
 msgstr "O contrasinal modificouse con éxito"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5531
-#: ../pidgin/gtkblist.c:5884
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5530
+#: ../pidgin/gtkblist.c:5883
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -10936,28 +11076,28 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "A súa mensaxe Yahoo! non se enviou."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:893
+#: ../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:940
+#: ../libpurple/protocols/yahoo/yahoo.c:942
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaxe do sistema Yahoo! para %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:999
+#: ../libpurple/protocols/yahoo/yahoo.c:1013
 msgid "Authorization denied message:"
 msgstr "Mensaxe de autorización rexeitada:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1080
+#: ../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:1083
+#: ../libpurple/protocols/yahoo/yahoo.c:1145
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10966,11 +11106,11 @@
 "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:1086
+#: ../libpurple/protocols/yahoo/yahoo.c:1148
 msgid "Add buddy rejected"
 msgstr "Rexeitouse engadir o contacto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1837
+#: ../libpurple/protocols/yahoo/yahoo.c:1899
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10981,11 +11121,11 @@
 "Probablemente non será capaz de conectarse con Yahoo.  "
 "Comprobe se hai actualizacións de %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1840
+#: ../libpurple/protocols/yahoo/yahoo.c:1902
 msgid "Failed Yahoo! Authentication"
 msgstr "Fallou a autenticación en Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1906
+#: ../libpurple/protocols/yahoo/yahoo.c:1968
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10994,52 +11134,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:1909
+#: ../libpurple/protocols/yahoo/yahoo.c:1971
 msgid "Ignore buddy?"
 msgstr "Ignorar o contacto?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1972
+#: ../libpurple/protocols/yahoo/yahoo.c:2034
 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:1975
+#: ../libpurple/protocols/yahoo/yahoo.c:2037
 #, 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:2029
+#: ../libpurple/protocols/yahoo/yahoo.c:2091
 #, 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:2032
+#: ../libpurple/protocols/yahoo/yahoo.c:2094
 msgid "Could not add buddy to server list"
 msgstr "Non se puido engadir o contacto á lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2151
+#: ../libpurple/protocols/yahoo/yahoo.c:2213
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2491
+#: ../libpurple/protocols/yahoo/yahoo.c:2556
 msgid "Received unexpected HTTP response from server."
 msgstr "Recibiuse unha resposta HTTP inesperada do servidor."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2515
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
-#: ../libpurple/protocols/yahoo/yahoo.c:2804
-#: ../libpurple/protocols/yahoo/yahoo.c:2814
+#: ../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/ycht.c:585
 msgid "Connection problem"
 msgstr "Problema de conexión"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2541
+#: ../libpurple/protocols/yahoo/yahoo.c:2606
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11048,7 +11188,7 @@
 "Perdeuse a conexión con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2566
+#: ../libpurple/protocols/yahoo/yahoo.c:2631
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11057,111 +11197,111 @@
 "Non se puido establecer unha conexión con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2916
-#: ../libpurple/protocols/yahoo/yahoo.c:3602
+#: ../libpurple/protocols/yahoo/yahoo.c:2981
+#: ../libpurple/protocols/yahoo/yahoo.c:3667
 msgid "Not at Home"
 msgstr "Fóra da casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2918
-#: ../libpurple/protocols/yahoo/yahoo.c:3605
+#: ../libpurple/protocols/yahoo/yahoo.c:2983
+#: ../libpurple/protocols/yahoo/yahoo.c:3670
 msgid "Not at Desk"
 msgstr "Lonxe do escritorio"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2920
-#: ../libpurple/protocols/yahoo/yahoo.c:3608
+#: ../libpurple/protocols/yahoo/yahoo.c:2985
+#: ../libpurple/protocols/yahoo/yahoo.c:3673
 msgid "Not in Office"
 msgstr "Fóra da oficina"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2924
-#: ../libpurple/protocols/yahoo/yahoo.c:3614
+#: ../libpurple/protocols/yahoo/yahoo.c:2989
+#: ../libpurple/protocols/yahoo/yahoo.c:3679
 msgid "On Vacation"
 msgstr "De vacacións"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2928
-#: ../libpurple/protocols/yahoo/yahoo.c:3620
+#: ../libpurple/protocols/yahoo/yahoo.c:2993
+#: ../libpurple/protocols/yahoo/yahoo.c:3685
 msgid "Stepped Out"
 msgstr "Abandonou"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3021
-#: ../libpurple/protocols/yahoo/yahoo.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3086
+#: ../libpurple/protocols/yahoo/yahoo.c:3116
 msgid "Not on server list"
 msgstr "Non incluído na lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3068
-#: ../libpurple/protocols/yahoo/yahoo.c:3126
+#: ../libpurple/protocols/yahoo/yahoo.c:3133
+#: ../libpurple/protocols/yahoo/yahoo.c:3191
 msgid "Appear Online"
 msgstr "Aparecer conectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3071
-#: ../libpurple/protocols/yahoo/yahoo.c:3147
+#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3212
 msgid "Appear Permanently Offline"
 msgstr "Aparecer permanentemente desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3154
 msgid "Presence"
 msgstr "Presenza"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3132
+#: ../libpurple/protocols/yahoo/yahoo.c:3197
 msgid "Appear Offline"
 msgstr "Aparecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3141
+#: ../libpurple/protocols/yahoo/yahoo.c:3206
 msgid "Don't Appear Permanently Offline"
 msgstr "Non aparecer sempre desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3189
+#: ../libpurple/protocols/yahoo/yahoo.c:3254
 msgid "Join in Chat"
 msgstr "Unirse a unha conversa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3195
+#: ../libpurple/protocols/yahoo/yahoo.c:3260
 msgid "Initiate Conference"
 msgstr "Iniciar unha conferencia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3223
+#: ../libpurple/protocols/yahoo/yahoo.c:3288
 msgid "Presence Settings"
 msgstr "Configuración da presenza"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3229
+#: ../libpurple/protocols/yahoo/yahoo.c:3294
 msgid "Start Doodling"
 msgstr "Comezar Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3330
+#: ../libpurple/protocols/yahoo/yahoo.c:3395
 msgid "Activate which ID?"
 msgstr "Que ID activar?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3341
+#: ../libpurple/protocols/yahoo/yahoo.c:3406
 msgid "Join who in chat?"
 msgstr "A quen quere unir á conversa?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3353
+#: ../libpurple/protocols/yahoo/yahoo.c:3418
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3357
+#: ../libpurple/protocols/yahoo/yahoo.c:3422
 msgid "Join User in Chat..."
 msgstr "Unir a un usuario á conversa..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3362
+#: ../libpurple/protocols/yahoo/yahoo.c:3427
 msgid "Open Inbox"
 msgstr "Abrir a caixa de entrada"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3871
+#: ../libpurple/protocols/yahoo/yahoo.c:3947
 msgid "You have just sent a Buzz!"
 msgstr "Acaba de enviar un cobadazo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3930
+#: ../libpurple/protocols/yahoo/yahoo.c:4006
 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:3935
+#: ../libpurple/protocols/yahoo/yahoo.c:4011
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Mostrar as canles da rede Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3939
+#: ../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:3943
+#: ../libpurple/protocols/yahoo/yahoo.c:4019
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitarlle ao usuario o comezo dunha sesión Doodle"
 
@@ -11175,56 +11315,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4151
-#: ../libpurple/protocols/yahoo/yahoo.c:4153
+#: ../libpurple/protocols/yahoo/yahoo.c:4227
+#: ../libpurple/protocols/yahoo/yahoo.c:4229
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4176
+#: ../libpurple/protocols/yahoo/yahoo.c:4252
 msgid "Yahoo Japan"
 msgstr "Yahoo Xapón"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4179
+#: ../libpurple/protocols/yahoo/yahoo.c:4255
 msgid "Pager server"
 msgstr "Servidor do buscapersoas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4182
+#: ../libpurple/protocols/yahoo/yahoo.c:4258
 msgid "Japan Pager server"
 msgstr "Servidor de buscapersoas xaponés"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4185
+#: ../libpurple/protocols/yahoo/yahoo.c:4261
 msgid "Pager port"
 msgstr "Porto do buscapersoas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4188
+#: ../libpurple/protocols/yahoo/yahoo.c:4264
 msgid "File transfer server"
 msgstr "Servidor de transferencia de ficheiros"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4191
+#: ../libpurple/protocols/yahoo/yahoo.c:4267
 msgid "Japan file transfer server"
 msgstr "Servidor de transferencia de ficheiros xaponés"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4194
+#: ../libpurple/protocols/yahoo/yahoo.c:4270
 msgid "File transfer port"
 msgstr "Porto de transferencia de ficheiros"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4197
+#: ../libpurple/protocols/yahoo/yahoo.c:4273
 msgid "Chat room locale"
 msgstr "Localización da sala de conversa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4200
+#: ../libpurple/protocols/yahoo/yahoo.c:4276
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar os convites a salas de conferencias ou de conversa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4208
+#: ../libpurple/protocols/yahoo/yahoo.c:4284
 msgid "Chat room list URL"
 msgstr "Url de lista de salas da conversa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4211
+#: ../libpurple/protocols/yahoo/yahoo.c:4287
 msgid "Yahoo Chat server"
 msgstr "Servidor de conversa de Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4214
+#: ../libpurple/protocols/yahoo/yahoo.c:4290
 msgid "Yahoo Chat port"
 msgstr "Porto de conversa de Yahoo"
 
@@ -11313,7 +11453,7 @@
 msgstr "Non se puido establecer o descritor de ficheiro."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Erro de escritura"
 
@@ -11677,7 +11817,7 @@
 msgid "Unset"
 msgstr "Quitar"
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "Non molestar"
 
@@ -11729,12 +11869,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2692
+#: ../libpurple/util.c:2702
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erro ao ler %s"
 
-#: ../libpurple/util.c:2693
+#: ../libpurple/util.c:2703
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11743,84 +11883,84 @@
 "Atopouse un erro ao ler o seu %s. Non se cargou e o ficheiro antigo foi "
 "renomeado a %s~."
 
-#: ../libpurple/util.c:3193
+#: ../libpurple/util.c:3203
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:3196
+#: ../libpurple/util.c:3206
 msgid "Unknown."
 msgstr "Descoñecido."
 
-#: ../libpurple/util.c:3222
+#: ../libpurple/util.c:3232
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundo"
 
-#: ../libpurple/util.c:3234
+#: ../libpurple/util.c:3244
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d día"
 
-#: ../libpurple/util.c:3242
+#: ../libpurple/util.c:3252
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d hora"
 
-#: ../libpurple/util.c:3248
+#: ../libpurple/util.c:3258
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d hora"
 
-#: ../libpurple/util.c:3256
+#: ../libpurple/util.c:3266
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minuto"
 
-#: ../libpurple/util.c:3262
+#: ../libpurple/util.c:3272
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minuto"
 
-#: ../libpurple/util.c:3522
+#: ../libpurple/util.c:3532
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Non se puido abrir %s: Demasiadas redireccións"
 
-#: ../libpurple/util.c:3559 ../libpurple/util.c:3854
+#: ../libpurple/util.c:3569 ../libpurple/util.c:3864
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Non se puido conectar a %s"
 
-#: ../libpurple/util.c:3682
+#: ../libpurple/util.c:3692
 #, 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:3717
+#: ../libpurple/util.c:3727
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Erro ao ler desde %s: %s"
 
-#: ../libpurple/util.c:3748
+#: ../libpurple/util.c:3758
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Error ao escribir a %s: %s"
 
-#: ../libpurple/util.c:3773
+#: ../libpurple/util.c:3783
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Non se pode conectar a %s: %s"
@@ -11910,7 +12050,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1208
 msgid "Use Environmental Settings"
 msgstr "Usar a configuración do contorno"
 
@@ -11932,15 +12072,15 @@
 msgid "Proxy Options"
 msgstr "Opcións do proxy"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1202
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1223
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1241
 msgid "_Port:"
 msgstr "_Porto:"
 
@@ -11948,7 +12088,7 @@
 msgid "_Username:"
 msgstr "Nome de _usuario:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1278
 msgid "Pa_ssword:"
 msgstr "Co_ntrasinal:"
 
@@ -12005,8 +12145,8 @@
 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:5479
-#: ../pidgin/gtkblist.c:5845 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:792 ../pidgin/gtkblist.c:5478
+#: ../pidgin/gtkblist.c:5844 ../pidgin/gtkpounce.c:540
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "Con_ta:"
@@ -12086,136 +12226,136 @@
 msgstr "_Expandir"
 
 #: ../pidgin/gtkblist.c:1572 ../pidgin/gtkblist.c:1584
-#: ../pidgin/gtkblist.c:4573 ../pidgin/gtkblist.c:4583
+#: ../pidgin/gtkblist.c:4572 ../pidgin/gtkblist.c:4582
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Silenciar sons"
 
-#: ../pidgin/gtkblist.c:2044 ../pidgin/gtkconv.c:4686
+#: ../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."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2847
+#: ../pidgin/gtkblist.c:2850
 msgid "/_Buddies"
 msgstr "/_Contactos"
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2851
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contactos/_Mensaxe instantánea nova..."
 
-#: ../pidgin/gtkblist.c:2849
+#: ../pidgin/gtkblist.c:2852
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contactos/_Unirse a unha conversa..."
 
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contactos/Obter _información do usuario..."
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/View User _Log..."
 msgstr "/Contactos/Ver _rexistro do usuario..."
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2856
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Contactos/Mostrar contactos _desconectados"
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2857
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Contactos/Mostrar grupos _baleiros"
 
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:2858
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Contactos/Mostrar detalles de _contactos"
 
-#: ../pidgin/gtkblist.c:2856
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Contactos/Mostrar _tempo de ausencia"
-
-#: ../pidgin/gtkblist.c:2857
-msgid "/Buddies/_Sort Buddies"
-msgstr "/Contactos/_Ordenar contactos"
-
 #: ../pidgin/gtkblist.c:2859
+msgid "/Buddies/Show Idle _Times"
+msgstr "/Contactos/Mostrar _tempo de ausencia"
+
+#: ../pidgin/gtkblist.c:2860
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Contactos/_Ordenar contactos"
+
+#: ../pidgin/gtkblist.c:2862
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contactos/_Engadir un contacto..."
 
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2863
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contactos/Engadir unha con_versa..."
 
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2864
 msgid "/Buddies/Add _Group..."
 msgstr "/Contactos/Engadir un _grupo..."
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2866
 msgid "/Buddies/_Quit"
 msgstr "/Contactos/_Saír"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2869
 msgid "/_Accounts"
 msgstr "/Con_tas"
 
-#: ../pidgin/gtkblist.c:2867 ../pidgin/gtkblist.c:6543
+#: ../pidgin/gtkblist.c:2870 ../pidgin/gtkblist.c:6542
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Contas/Engadir\\/Editar"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:2873
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../pidgin/gtkblist.c:2871
-msgid "/Tools/Buddy _Pounces"
-msgstr "/Ferramentas/_Avisos de contacto"
-
-#: ../pidgin/gtkblist.c:2872
-msgid "/Tools/Plu_gins"
-msgstr "/Ferramentas/C_omplementos"
-
-#: ../pidgin/gtkblist.c:2873
-msgid "/Tools/Pr_eferences"
-msgstr "/Ferramentas/Pr_eferencias"
-
 #: ../pidgin/gtkblist.c:2874
-msgid "/Tools/Pr_ivacy"
-msgstr "/Ferramentas/Pr_ivacidade"
+msgid "/Tools/Buddy _Pounces"
+msgstr "/Ferramentas/_Avisos de contacto"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Tools/Plu_gins"
+msgstr "/Ferramentas/C_omplementos"
 
 #: ../pidgin/gtkblist.c:2876
-msgid "/Tools/_File Transfers"
-msgstr "/Ferramentas/Transferencias de _ficheiros"
+msgid "/Tools/Pr_eferences"
+msgstr "/Ferramentas/Pr_eferencias"
 
 #: ../pidgin/gtkblist.c:2877
+msgid "/Tools/Pr_ivacy"
+msgstr "/Ferramentas/Pr_ivacidade"
+
+#: ../pidgin/gtkblist.c:2879
+msgid "/Tools/_File Transfers"
+msgstr "/Ferramentas/Transferencias de _ficheiros"
+
+#: ../pidgin/gtkblist.c:2880
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/Lista de _salas"
 
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:2881
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/_Rexistro do sistema"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2883
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Silenciar s_ons"
 
 #. Help
-#: ../pidgin/gtkblist.c:2882
+#: ../pidgin/gtkblist.c:2885
 msgid "/_Help"
 msgstr "/A_xuda"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2886
 msgid "/Help/Online _Help"
 msgstr "/Axuda/A_xuda en liña"
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:2887
 msgid "/Help/_Debug Window"
 msgstr "/Axuda/Ventá de _depuración"
 
-#: ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:2888
+#: ../pidgin/gtkblist.c:2889 ../pidgin/gtkblist.c:2891
 msgid "/Help/_About"
 msgstr "/Axuda/_Acerca de"
 
-#: ../pidgin/gtkblist.c:2917
+#: ../pidgin/gtkblist.c:2920
 #, c-format
 msgid ""
 "\n"
@@ -12224,132 +12364,132 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: ../pidgin/gtkblist.c:2995
+#: ../pidgin/gtkblist.c:2998
 msgid "Buddy Alias"
 msgstr "Alias de contacto"
 
-#: ../pidgin/gtkblist.c:3024
+#: ../pidgin/gtkblist.c:3027
 msgid "Logged In"
 msgstr "Xa está conectado"
 
-#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3073
 msgid "Last Seen"
 msgstr "Última vista"
 
-#: ../pidgin/gtkblist.c:3090
+#: ../pidgin/gtkblist.c:3093
 msgid "Spooky"
 msgstr "Espeluznante"
 
-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:3095
 msgid "Awesome"
 msgstr "Impresionante"
 
-#: ../pidgin/gtkblist.c:3094
+#: ../pidgin/gtkblist.c:3097
 msgid "Rockin'"
 msgstr "Brillante"
 
-#: ../pidgin/gtkblist.c:3437
+#: ../pidgin/gtkblist.c:3436
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inactivo %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3439
+#: ../pidgin/gtkblist.c:3438
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3441
+#: ../pidgin/gtkblist.c:3440
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"
 
-#: ../pidgin/gtkblist.c:3586
+#: ../pidgin/gtkblist.c:3585
 msgid "/Buddies/New Instant Message..."
 msgstr "/Contacto/Mensaxe instantánea _nova..."
 
-#: ../pidgin/gtkblist.c:3587 ../pidgin/gtkblist.c:3620
+#: ../pidgin/gtkblist.c:3586 ../pidgin/gtkblist.c:3619
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contacto/Unirse a unha conversa..."
 
-#: ../pidgin/gtkblist.c:3588
+#: ../pidgin/gtkblist.c:3587
 msgid "/Buddies/Get User Info..."
 msgstr "/Contacto/Obter información do usuario..."
 
-#: ../pidgin/gtkblist.c:3589
+#: ../pidgin/gtkblist.c:3588
 msgid "/Buddies/Add Buddy..."
 msgstr "/Contacto/Engadir un contacto..."
 
-#: ../pidgin/gtkblist.c:3590 ../pidgin/gtkblist.c:3623
+#: ../pidgin/gtkblist.c:3589 ../pidgin/gtkblist.c:3622
 msgid "/Buddies/Add Chat..."
 msgstr "/Contacto/Engadir unha conversa..."
 
-#: ../pidgin/gtkblist.c:3591
+#: ../pidgin/gtkblist.c:3590
 msgid "/Buddies/Add Group..."
 msgstr "/Contacto/Engadir un grupo..."
 
-#: ../pidgin/gtkblist.c:3626
+#: ../pidgin/gtkblist.c:3625
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../pidgin/gtkblist.c:3629
+#: ../pidgin/gtkblist.c:3628
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:3726 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3725 ../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:3806
+#: ../pidgin/gtkblist.c:3805
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:3808
+#: ../pidgin/gtkblist.c:3807
 msgid "Alphabetically"
 msgstr "Alfabeticamente"
 
+#: ../pidgin/gtkblist.c:3808
+msgid "By status"
+msgstr "Por estado"
+
 #: ../pidgin/gtkblist.c:3809
-msgid "By status"
-msgstr "Por estado"
-
-#: ../pidgin/gtkblist.c:3810
 msgid "By log size"
 msgstr "Por tamaño de rexistro"
 
-#: ../pidgin/gtkblist.c:4015 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4014 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../pidgin/gtkblist.c:4025
+#: ../pidgin/gtkblist.c:4024
 msgid "Re-enable Account"
 msgstr "Reactivar conta"
 
-#: ../pidgin/gtkblist.c:4051
+#: ../pidgin/gtkblist.c:4050
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s desconectado: %s</span>"
 
-#: ../pidgin/gtkblist.c:4203
+#: ../pidgin/gtkblist.c:4202
 msgid "<b>Username:</b>"
 msgstr "<b>Nome de usuario:</b>"
 
-#: ../pidgin/gtkblist.c:4210
+#: ../pidgin/gtkblist.c:4209
 msgid "<b>Password:</b>"
 msgstr "<b>Contrasinal:</b>"
 
-#: ../pidgin/gtkblist.c:4221
+#: ../pidgin/gtkblist.c:4220
 msgid "_Login"
 msgstr "_Iniciar a sesión"
 
-#: ../pidgin/gtkblist.c:4304
+#: ../pidgin/gtkblist.c:4303
 msgid "/Accounts"
 msgstr "/Contas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4318
+#: ../pidgin/gtkblist.c:4317
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12367,23 +12507,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4567
+#: ../pidgin/gtkblist.c:4566
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Contactos/Mostrar contactos desconectados"
 
-#: ../pidgin/gtkblist.c:4570
+#: ../pidgin/gtkblist.c:4569
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Contactos/Mostrar grupos baleiros"
 
-#: ../pidgin/gtkblist.c:4576
+#: ../pidgin/gtkblist.c:4575
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Contactos/Mostrar detalles de contactos"
 
-#: ../pidgin/gtkblist.c:4579
+#: ../pidgin/gtkblist.c:4578
 msgid "/Buddies/Show Idle Times"
 msgstr "/Contactos/Mostrar tempos de ausencia"
 
-#: ../pidgin/gtkblist.c:5456
+#: ../pidgin/gtkblist.c:5455
 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. "
@@ -12394,19 +12534,19 @@
 "nome de usuario sempre que for posible.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5491
+#: ../pidgin/gtkblist.c:5490
 msgid "_Screen name:"
 msgstr "_Nome de usuario:"
 
-#: ../pidgin/gtkblist.c:5513 ../pidgin/gtkblist.c:5866
+#: ../pidgin/gtkblist.c:5512 ../pidgin/gtkblist.c:5865
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5778
+#: ../pidgin/gtkblist.c:5777
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo non está soportado nas salas de conversa."
 
-#: ../pidgin/gtkblist.c:5794
+#: ../pidgin/gtkblist.c:5793
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -12414,7 +12554,7 @@
 "Non está conectado con ningunha conta que teña capacidade de acceder a "
 "conversas."
 
-#: ../pidgin/gtkblist.c:5835
+#: ../pidgin/gtkblist.c:5834
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12422,39 +12562,39 @@
 "Introduza un alias e a información que crea apropiada da conversa que "
 "desexaría engadir á lista de contactos.\n"
 
-#: ../pidgin/gtkblist.c:5923
+#: ../pidgin/gtkblist.c:5922
 msgid "Please enter the name of the group to be added."
 msgstr "Introduza o nome do grupo que quere engadir."
 
-#: ../pidgin/gtkblist.c:6563
+#: ../pidgin/gtkblist.c:6562
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Contas/"
 
-#: ../pidgin/gtkblist.c:6587
+#: ../pidgin/gtkblist.c:6586
 msgid "_Edit Account"
 msgstr "_Editar a conta"
 
-#: ../pidgin/gtkblist.c:6600 ../pidgin/gtkconv.c:3011
+#: ../pidgin/gtkblist.c:6599 ../pidgin/gtkconv.c:3037
 msgid "No actions available"
 msgstr "Non hai accións dispoñibles"
 
-#: ../pidgin/gtkblist.c:6608
+#: ../pidgin/gtkblist.c:6607
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../pidgin/gtkblist.c:6620
+#: ../pidgin/gtkblist.c:6619
 msgid "Enable Account"
 msgstr "Activar a conta"
 
-#: ../pidgin/gtkblist.c:6626
+#: ../pidgin/gtkblist.c:6625
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Contas/Activar conta"
 
-#: ../pidgin/gtkblist.c:6675
+#: ../pidgin/gtkblist.c:6674
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../pidgin/gtkblist.c:6745
+#: ../pidgin/gtkblist.c:6744
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contactos/Ordenar contactos"
 
@@ -12471,24 +12611,24 @@
 "%s non tentará reconectar a conta até que vostede corrixa o erro e "
 "a volva activar."
 
-#: ../pidgin/gtkconv.c:484
+#: ../pidgin/gtkconv.c:488
 msgid "Unknown command."
 msgstr "Comando descoñecido."
 
-#: ../pidgin/gtkconv.c:756 ../pidgin/gtkconv.c:782
+#: ../pidgin/gtkconv.c:760 ../pidgin/gtkconv.c:786
 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:776
+#: ../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:829
+#: ../pidgin/gtkconv.c:833
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar a un contacto á sala de conversa"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:859
+#: ../pidgin/gtkconv.c:863
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12496,200 +12636,200 @@
 "Introduza o nome de usuario que desexa convidar, xunto cunha mensaxe de "
 "convite opcional."
 
-#: ../pidgin/gtkconv.c:880
+#: ../pidgin/gtkconv.c:884
 msgid "_Buddy:"
 msgstr "_Contacto:"
 
-#: ../pidgin/gtkconv.c:900 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtkconv.c:904 ../pidgin/gtksavedstatuses.c:1193
 #: ../pidgin/gtksavedstatuses.c:1525
 msgid "_Message:"
 msgstr "_Mensaxe:"
 
-#: ../pidgin/gtkconv.c:957 ../pidgin/gtkconv.c:2518 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:961 ../pidgin/gtkconv.c:2544 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Non se puido abrir o ficheiro."
 
-#: ../pidgin/gtkconv.c:963
+#: ../pidgin/gtkconv.c:967
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversa con %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:999
+#: ../pidgin/gtkconv.c:1003
 msgid "Save Conversation"
 msgstr "Gardar conversa"
 
-#: ../pidgin/gtkconv.c:1148 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1152 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Buscar"
 
-#: ../pidgin/gtkconv.c:1174 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Buscar:"
 
-#: ../pidgin/gtkconv.c:1357
+#: ../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:1365
+#: ../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:1613
+#: ../pidgin/gtkconv.c:1617
 msgid "Un-Ignore"
 msgstr "Non ignorar"
 
-#: ../pidgin/gtkconv.c:1616
+#: ../pidgin/gtkconv.c:1620
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../pidgin/gtkconv.c:1636
+#: ../pidgin/gtkconv.c:1640
 msgid "Get Away Message"
 msgstr "Mensaxe de ausencia"
 
-#: ../pidgin/gtkconv.c:1659
+#: ../pidgin/gtkconv.c:1663
 msgid "Last said"
 msgstr "Dito a última vez"
 
-#: ../pidgin/gtkconv.c:2526
+#: ../pidgin/gtkconv.c:2552
 msgid "Unable to save icon file to disk."
 msgstr "Non se puido gardar o ficheiro de iconas no disco."
 
-#: ../pidgin/gtkconv.c:2577
+#: ../pidgin/gtkconv.c:2603
 msgid "Save Icon"
 msgstr "Gardar icona"
 
-#: ../pidgin/gtkconv.c:2629
+#: ../pidgin/gtkconv.c:2655
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2634
+#: ../pidgin/gtkconv.c:2660
 msgid "Hide Icon"
 msgstr "Ocultar icona"
 
-#: ../pidgin/gtkconv.c:2637
+#: ../pidgin/gtkconv.c:2663
 msgid "Save Icon As..."
 msgstr "Gardar a icona como..."
 
-#: ../pidgin/gtkconv.c:2641
+#: ../pidgin/gtkconv.c:2667
 msgid "Set Custom Icon..."
 msgstr "Establecer iconas personalizadas..."
 
-#: ../pidgin/gtkconv.c:2654
+#: ../pidgin/gtkconv.c:2680
 msgid "Remove Custom Icon"
 msgstr "Eliminar as iconas personalizadas"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2822
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2824
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/_Mensaxe instantánea nova..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2829
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Buscar..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2831
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Ver _rexistro"
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2832
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/_Gardar como..."
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2834
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/Limpar _historial"
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2838
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar ficheiro..."
 
-#: ../pidgin/gtkconv.c:2813
+#: ../pidgin/gtkconv.c:2839
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Engadir _aviso de contacto..."
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2841
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Obter información"
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2843
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/Con_vidar..."
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2845
 msgid "/Conversation/M_ore"
 msgstr "/Conversa/Má_is"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2849
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversa/A_lias..."
 
-#: ../pidgin/gtkconv.c:2825
+#: ../pidgin/gtkconv.c:2851
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloquear..."
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2853
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversa/_Desbloquear..."
 
-#: ../pidgin/gtkconv.c:2829
+#: ../pidgin/gtkconv.c:2855
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/Enga_dir..."
 
-#: ../pidgin/gtkconv.c:2831
+#: ../pidgin/gtkconv.c:2857
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/_Eliminar..."
 
-#: ../pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2862
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversa/Inserir liga_zón..."
 
-#: ../pidgin/gtkconv.c:2838
+#: ../pidgin/gtkconv.c:2864
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Inserir ima_xe..."
 
-#: ../pidgin/gtkconv.c:2844
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Pechar"
 
 #. Options
-#: ../pidgin/gtkconv.c:2848
+#: ../pidgin/gtkconv.c:2874
 msgid "/_Options"
 msgstr "/_Opcións"
 
-#: ../pidgin/gtkconv.c:2849
+#: ../pidgin/gtkconv.c:2875
 msgid "/Options/Enable _Logging"
 msgstr "/Opcións/Activar _rexistro"
 
-#: ../pidgin/gtkconv.c:2850
+#: ../pidgin/gtkconv.c:2876
 msgid "/Options/Enable _Sounds"
 msgstr "/Opcións/Activar _sons"
 
-#: ../pidgin/gtkconv.c:2851
+#: ../pidgin/gtkconv.c:2877
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Opcións/Mostrar _iconas dos contactos"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2879
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opcións/Mostrar _barra de formato"
 
-#: ../pidgin/gtkconv.c:2854
+#: ../pidgin/gtkconv.c:2880
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opcións/Mostrar _marcas de tempo"
 
-#: ../pidgin/gtkconv.c:2999
+#: ../pidgin/gtkconv.c:3025
 msgid "/Conversation/More"
 msgstr "/Conversa/Máis"
 
-#: ../pidgin/gtkconv.c:3055
+#: ../pidgin/gtkconv.c:3081
 msgid "/Options"
 msgstr "/Opcións"
 
@@ -12698,176 +12838,176 @@
 #. 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:3090 ../pidgin/gtkconv.c:3122
+#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3148
 msgid "/Conversation"
 msgstr "/Conversa"
 
-#: ../pidgin/gtkconv.c:3130
+#: ../pidgin/gtkconv.c:3156
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver o rexistro"
 
-#: ../pidgin/gtkconv.c:3136
+#: ../pidgin/gtkconv.c:3162
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar o ficheiro..."
 
-#: ../pidgin/gtkconv.c:3140
+#: ../pidgin/gtkconv.c:3166
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Engadir un aviso de contacto..."
 
-#: ../pidgin/gtkconv.c:3146
+#: ../pidgin/gtkconv.c:3172
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Obter información"
 
-#: ../pidgin/gtkconv.c:3150
+#: ../pidgin/gtkconv.c:3176
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convidar..."
 
-#: ../pidgin/gtkconv.c:3156
+#: ../pidgin/gtkconv.c:3182
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Alias..."
 
-#: ../pidgin/gtkconv.c:3160
+#: ../pidgin/gtkconv.c:3186
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3164
+#: ../pidgin/gtkconv.c:3190
 msgid "/Conversation/Unblock..."
 msgstr "/Conversa/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3168
+#: ../pidgin/gtkconv.c:3194
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Engadir..."
 
-#: ../pidgin/gtkconv.c:3172
+#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Eliminar..."
 
-#: ../pidgin/gtkconv.c:3178
+#: ../pidgin/gtkconv.c:3204
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversa/Inserir ligazón..."
 
-#: ../pidgin/gtkconv.c:3182
+#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Inserir unha imaxe..."
 
-#: ../pidgin/gtkconv.c:3188
+#: ../pidgin/gtkconv.c:3214
 msgid "/Options/Enable Logging"
 msgstr "/Opcións/Activar rexistro"
 
-#: ../pidgin/gtkconv.c:3191
+#: ../pidgin/gtkconv.c:3217
 msgid "/Options/Enable Sounds"
 msgstr "/Opcións/Activar sons"
 
-#: ../pidgin/gtkconv.c:3204
+#: ../pidgin/gtkconv.c:3230
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opcións/Mostrar barra de formato"
 
-#: ../pidgin/gtkconv.c:3207
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Show Timestamps"
 msgstr "/Opcións/Mostrar marcas de tempo"
 
-#: ../pidgin/gtkconv.c:3210
+#: ../pidgin/gtkconv.c:3236
 msgid "/Options/Show Buddy Icon"
 msgstr "/Opcións/Mostrar iconas dos contactos"
 
-#: ../pidgin/gtkconv.c:3294 ../pidgin/gtkconv.c:3336
+#: ../pidgin/gtkconv.c:3320 ../pidgin/gtkconv.c:3362
 msgid "User is typing..."
 msgstr "O usuario está a escribir..."
 
-#: ../pidgin/gtkconv.c:3339
+#: ../pidgin/gtkconv.c:3365
 msgid "User has typed something and stopped"
 msgstr "O usuario escribiu algo e parou"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3520 ../pidgin/gtkconv.c:7732
+#: ../pidgin/gtkconv.c:3548 ../pidgin/gtkconv.c:7812
 msgid "_Send To"
 msgstr "_Enviar a"
 
-#: ../pidgin/gtkconv.c:4234
+#: ../pidgin/gtkconv.c:4261
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4338
+#: ../pidgin/gtkconv.c:4365
 msgid "0 people in room"
 msgstr "0 persoas na sala"
 
-#: ../pidgin/gtkconv.c:5585 ../pidgin/gtkconv.c:5706
+#: ../pidgin/gtkconv.c:5633 ../pidgin/gtkconv.c:5754
 #, 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:6305 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6357 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Escribindo"
 
-#: ../pidgin/gtkconv.c:6311
+#: ../pidgin/gtkconv.c:6361
 msgid "Stopped Typing"
 msgstr "Deixou de escribir"
 
-#: ../pidgin/gtkconv.c:6316
+#: ../pidgin/gtkconv.c:6364
 msgid "Nick Said"
 msgstr "Alias dixo"
 
-#: ../pidgin/gtkconv.c:6321 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6367 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Mensaxes sen ler"
 
-#: ../pidgin/gtkconv.c:6326
+#: ../pidgin/gtkconv.c:6370
 msgid "New Event"
 msgstr "Evento novo"
 
-#: ../pidgin/gtkconv.c:7303
+#: ../pidgin/gtkconv.c:7362
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Limpa todos os historiais de conversas."
 
-#: ../pidgin/gtkconv.c:7467
+#: ../pidgin/gtkconv.c:7526
 msgid "Confirm close"
 msgstr "Confirmar o peche"
 
-#: ../pidgin/gtkconv.c:7499
+#: ../pidgin/gtkconv.c:7558
 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:8059
+#: ../pidgin/gtkconv.c:8144
 msgid "Close other tabs"
 msgstr "Pechar outros separadores"
 
-#: ../pidgin/gtkconv.c:8065
+#: ../pidgin/gtkconv.c:8150
 msgid "Close all tabs"
 msgstr "Pechar todas os separadores"
 
-#: ../pidgin/gtkconv.c:8073
+#: ../pidgin/gtkconv.c:8158
 msgid "Detach this tab"
 msgstr "Separar este separador"
 
-#: ../pidgin/gtkconv.c:8079
+#: ../pidgin/gtkconv.c:8164
 msgid "Close this tab"
 msgstr "Pechar este separador"
 
-#: ../pidgin/gtkconv.c:8560
+#: ../pidgin/gtkconv.c:8662
 msgid "Close conversation"
 msgstr "Pechar a conversa"
 
-#: ../pidgin/gtkconv.c:9092
+#: ../pidgin/gtkconv.c:9261
 msgid "Last created window"
 msgstr "Última ventá creada"
 
-#: ../pidgin/gtkconv.c:9094
+#: ../pidgin/gtkconv.c:9263
 msgid "Separate IM and Chat windows"
 msgstr "Separar as ventás de MI e de conversa"
 
-#: ../pidgin/gtkconv.c:9096 ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkconv.c:9265 ../pidgin/gtkprefs.c:1412
 msgid "New window"
 msgstr "Nova ventá"
 
-#: ../pidgin/gtkconv.c:9098
+#: ../pidgin/gtkconv.c:9267
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:9100
+#: ../pidgin/gtkconv.c:9269
 msgid "By account"
 msgstr "Por conta"
 
@@ -13059,121 +13199,122 @@
 msgid "Spanish"
 msgstr "Español"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:155
+msgid "Estonian"
+msgstr "Estonio"
+
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
 msgid "Euskera(Basque)"
 msgstr "Euskera"
 
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:227
 #: ../pidgin/gtkdialogs.c:228
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:229
 #: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
 #: ../pidgin/gtkdialogs.c:232
 msgid "French"
 msgstr "Francés"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:233
 msgid "Galician"
 msgstr "Galego"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:166
 msgid "Gujarati Language Team"
 msgstr "Equipo de idioma de Gujarati"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:234
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../pidgin/gtkdialogs.c:167
-msgid "Hindi"
-msgstr "Hindú"
-
 #: ../pidgin/gtkdialogs.c:168
-msgid "Hungarian"
-msgstr "Húngaro"
+msgid "Hindi"
+msgstr "Hindú"
 
 #: ../pidgin/gtkdialogs.c:169
+msgid "Hungarian"
+msgstr "Húngaro"
+
+#: ../pidgin/gtkdialogs.c:170
 msgid "Indonesian"
 msgstr "Indonesio"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:235
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237 ../pidgin/gtkdialogs.c:238
 msgid "Japanese"
 msgstr "Xaponés"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:239
 msgid "Georgian"
 msgstr "Xeorxiano"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:173
 msgid "Ubuntu Georgian Translators"
 msgstr "Tradutores xeorxianos de Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:174
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:174
 msgid "Kannada Translation team"
 msgstr "Equipo de tradución ao Kannada"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:176
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kurdish"
 msgstr "Curdo"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:244
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:245
 msgid "Bokmål Norwegian"
 msgstr "Bokmål noruegués"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183
 msgid "Nepali"
 msgstr "Bengalí"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:184
 msgid "Dutch, Flemish"
 msgstr "Holandés, Flamenco"
 
-#: ../pidgin/gtkdialogs.c:184
-msgid "Norwegian"
-msgstr "Noruegués"
-
 #: ../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:244
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:246
 msgid "Polish"
 msgstr "Polaco"
 
@@ -13193,18 +13334,18 @@
 msgid "Romanian"
 msgstr "Romeno"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:245
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:248
 msgid "Russian"
 msgstr "Ruso"
 
 #: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:251
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:252
 msgid "Slovenian"
 msgstr "Esloveno"
 
@@ -13216,7 +13357,8 @@
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:254
 msgid "Swedish"
 msgstr "Sueco"
 
@@ -13232,7 +13374,7 @@
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:255
 msgid "Turkish"
 msgstr "Turco"
 
@@ -13244,7 +13386,7 @@
 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:253
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:256
 msgid "Simplified Chinese"
 msgstr "Chinés simplificado"
 
@@ -13254,7 +13396,7 @@
 msgstr "Chinés de Hong Kong"
 
 #: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:211
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:257
 msgid "Traditional Chinese"
 msgstr "Chinés tradicional"
 
@@ -13262,12 +13404,12 @@
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../pidgin/gtkdialogs.c:339
+#: ../pidgin/gtkdialogs.c:342
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:380
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -13288,47 +13430,47 @@
 "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:392
+#: ../pidgin/gtkdialogs.c:395
 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:397
+#: ../pidgin/gtkdialogs.c:400
 msgid "Current Developers"
 msgstr "Desenvolvedores actuais"
 
-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:415
 msgid "Crazy Patch Writers"
 msgstr "Tolos escritores de parches"
 
-#: ../pidgin/gtkdialogs.c:427
+#: ../pidgin/gtkdialogs.c:430
 msgid "Retired Developers"
 msgstr "Desenvolvedores retirados"
 
-#: ../pidgin/gtkdialogs.c:442
+#: ../pidgin/gtkdialogs.c:445
 msgid "Retired Crazy Patch Writers"
 msgstr "Desenvolvedores de parches tolos retirados"
 
-#: ../pidgin/gtkdialogs.c:457
+#: ../pidgin/gtkdialogs.c:460
 msgid "Artists"
 msgstr "Artistas"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:475
 msgid "Current Translators"
 msgstr "Tradutores actuais"
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:495
 msgid "Past Translators"
 msgstr "Tradutores anteriores"
 
-#: ../pidgin/gtkdialogs.c:510
+#: ../pidgin/gtkdialogs.c:513
 msgid "Debugging Information"
 msgstr "Información de depuración"
 
-#: ../pidgin/gtkdialogs.c:879
+#: ../pidgin/gtkdialogs.c:882
 msgid "Get User Info"
 msgstr "Obter información do usuario"
 
-#: ../pidgin/gtkdialogs.c:881
+#: ../pidgin/gtkdialogs.c:884
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -13336,11 +13478,11 @@
 "Introduza o nome de usuario ou o alias da persoa da que quere ver "
 "información."
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:974
 msgid "View User Log"
 msgstr "Ver rexistro do usuario"
 
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:976
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -13348,32 +13490,32 @@
 "Introduza o nome de usuario ou o alias da persoa da que quere ver a "
 "información de rexistro."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Contact"
 msgstr "Alias para o contacto"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:997
 msgid "Enter an alias for this contact."
 msgstr "Introduza un alias para este contacto."
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1019
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduza un alias para %s."
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1021
 msgid "Alias Buddy"
 msgstr "Alias do contacto"
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1042
 msgid "Alias Chat"
 msgstr "Alias na conversa"
 
-#: ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1043
 msgid "Enter an alias for this chat."
 msgstr "Introduza un alias para esta conversa."
 
-#: ../pidgin/gtkdialogs.c:1079
+#: ../pidgin/gtkdialogs.c:1082
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13388,30 +13530,30 @@
 "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:1087
+#: ../pidgin/gtkdialogs.c:1090
 msgid "Remove Contact"
 msgstr "Eliminar o contacto"
 
-#: ../pidgin/gtkdialogs.c:1090
+#: ../pidgin/gtkdialogs.c:1093
 msgid "_Remove Contact"
 msgstr "_Eliminar o contacto"
 
-#: ../pidgin/gtkdialogs.c:1121
+#: ../pidgin/gtkdialogs.c:1124
 #, 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:1128
+#: ../pidgin/gtkdialogs.c:1131
 msgid "Merge Groups"
 msgstr "Combinar grupos"
 
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1134
 msgid "_Merge Groups"
 msgstr "_Combinar grupos"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1184
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13420,28 +13562,28 @@
 "Está a piques de borrar o grupo %s e todos os seus membros da lista de "
 "contactos. Quere continuar?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1187
 msgid "Remove Group"
 msgstr "Eliminar o grupo"
 
-#: ../pidgin/gtkdialogs.c:1187
+#: ../pidgin/gtkdialogs.c:1190
 msgid "_Remove Group"
 msgstr "_Eliminar o grupo"
 
-#: ../pidgin/gtkdialogs.c:1220
+#: ../pidgin/gtkdialogs.c:1223
 #, 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:1223
+#: ../pidgin/gtkdialogs.c:1226
 msgid "Remove Buddy"
 msgstr "Eliminar o contacto"
 
-#: ../pidgin/gtkdialogs.c:1226
+#: ../pidgin/gtkdialogs.c:1229
 msgid "_Remove Buddy"
 msgstr "_Eliminar o contacto"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1250
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13450,11 +13592,11 @@
 "Está a punto de eliminar a conversa %s da lista de contactos. Quere "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1253
 msgid "Remove Chat"
 msgstr "Eliminar a conversa"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1256
 msgid "_Remove Chat"
 msgstr "_Eliminar a conversa"
 
@@ -13572,43 +13714,43 @@
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../pidgin/gtkimhtml.c:814
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Pegar como _texto plano"
 
-#: ../pidgin/gtkimhtml.c:831
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1138
 msgid "_Reset formatting"
 msgstr "_Reiniciar os formatos"
 
-#: ../pidgin/gtkimhtml.c:1371
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "Cor da ligazón"
 
-#: ../pidgin/gtkimhtml.c:1372
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "Cor para debuxar ligazóns."
 
-#: ../pidgin/gtkimhtml.c:1375
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
 msgstr "Cor de ligazón pre-iluminada"
 
-#: ../pidgin/gtkimhtml.c:1376
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Cor para debuxar ligazóns cando o rato estea enriba."
 
-#: ../pidgin/gtkimhtml.c:1596
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar o enderezo de correo"
 
-#: ../pidgin/gtkimhtml.c:1608
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "_Abrir a ligazón no navegador"
 
-#: ../pidgin/gtkimhtml.c:1618
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "_Copiar o destino da ligazón"
 
-#: ../pidgin/gtkimhtml.c:3363
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13618,7 +13760,7 @@
 "\n"
 "PNG é o predeterminado."
 
-#: ../pidgin/gtkimhtml.c:3366
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13628,7 +13770,7 @@
 "\n"
 "PNG é o predeterminado."
 
-#: ../pidgin/gtkimhtml.c:3395
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13639,7 +13781,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3398
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13650,11 +13792,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3476 ../pidgin/gtkimhtml.c:3488
+#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "Gardar a imaxe"
 
-#: ../pidgin/gtkimhtml.c:3516
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "_Gardar a imaxe..."
 
@@ -13694,7 +13836,7 @@
 msgid "Insert Link"
 msgstr "Inserir unha ligazón"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1157
+#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1207
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -13716,59 +13858,58 @@
 msgid "Smile!"
 msgstr "Emoticona!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1066
-msgid "_Bold"
-msgstr "_Negra"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1067
-msgid "_Italic"
-msgstr "_Cursiva"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1068
-msgid "_Underline"
-msgstr "_Subraiado"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1069
-msgid "_Larger"
-msgstr "_Grande"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1071
+#: ../pidgin/gtkimhtmltoolbar.c:820 ../pidgin/gtkimhtmltoolbar.c:1164
+msgid "_Font"
+msgstr "_Tipo de letra"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1124
+msgid "<b>_Bold</b>"
+msgstr "<b>_Negra</b>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1125
+msgid "<i>_Italic</i>"
+msgstr "<i>_Cursiva</i> "
+
+#: ../pidgin/gtkimhtmltoolbar.c:1126
+msgid "<u>_Underline</u>"
+msgstr "<u>_Subliñado</u>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1127
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>_Máis grande</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1129
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1073
-msgid "_Smaller"
-msgstr "_Pequena"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1074
+#: ../pidgin/gtkimhtmltoolbar.c:1131
+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
 msgid "_Font face"
 msgstr "_Estilo do tipo de letra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1075
-msgid "_Foreground color"
-msgstr "_Cor de primeiro plano"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1076
-msgid "_Background color"
-msgstr "_Cor de fondo"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1102
-msgid "_Font"
-msgstr "_Tipo de letra"
+#: ../pidgin/gtkimhtmltoolbar.c:1136
+msgid "Foreground _color"
+msgstr "Cor de primeiro plano"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1137
-msgid "_Reset font"
-msgstr "_Reiniciar tipo de letra"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1164
+msgid "Bac_kground color"
+msgstr "Cor de _fondo"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Smiley"
 msgstr "_Emoticona"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1170
+#: ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "_Image"
 msgstr "_Imaxe"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1176
+#: ../pidgin/gtkimhtmltoolbar.c:1227
 msgid "_Link"
 msgstr "_Ligazón"
 
@@ -13933,48 +14074,48 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:698 ../pidgin/pidgin.h:50
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:343
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Abrir todas as mensaxes"
 
-#: ../pidgin/gtknotify.c:395
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Ten correo!</span>"
 
-#: ../pidgin/gtknotify.c:515
+#: ../pidgin/gtknotify.c:521
 #, 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:526
+#: ../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>"
 msgstr[0] "<b>Ten %d correo electrónico novo.</b>"
 msgstr[1] "<b>Ten %d correo electrónico novo.</b>"
 
-#: ../pidgin/gtknotify.c:964
+#: ../pidgin/gtknotify.c:972
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "O comando do navegador \"%s\" non é válido."
 
-#: ../pidgin/gtknotify.c:966 ../pidgin/gtknotify.c:978
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1119
+#: ../pidgin/gtknotify.c:974 ../pidgin/gtknotify.c:986
+#: ../pidgin/gtknotify.c:999 ../pidgin/gtknotify.c:1127
 msgid "Unable to open URL"
 msgstr "Non se puido abrir o URL"
 
-#: ../pidgin/gtknotify.c:976 ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:997
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Erro ao lanzar \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1120
+#: ../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 "
@@ -14120,7 +14261,7 @@
 msgstr "Sobre quen avisar"
 
 #: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Por defecto"
 
@@ -14152,13 +14293,6 @@
 msgid "_Show system tray icon:"
 msgstr "Mo_strar icona da área de notificación do sistema:"
 
-#: ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1756
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
-msgid "Always"
-msgstr "Sempre"
-
 #: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Se hai mensaxes sen ler"
@@ -14171,7 +14305,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar as novas conversas de MI:"
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1939
 msgid "When away"
 msgstr "Cando estea ausente"
 
@@ -14272,7 +14406,7 @@
 msgid "Default Formatting"
 msgstr "Formato predeterminado"
 
-#: ../pidgin/gtkprefs.c:1057
+#: ../pidgin/gtkprefs.c:1059
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -14280,119 +14414,119 @@
 "Isto é unha mostra de como aparecerá a súa mensaxe saínte cando use protocolos "
 "que soportan formatado."
 
-#: ../pidgin/gtkprefs.c:1123
+#: ../pidgin/gtkprefs.c:1125
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1135
+#: ../pidgin/gtkprefs.c:1137
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1139
+#: ../pidgin/gtkprefs.c:1141
 msgid "_Autodetect IP address"
 msgstr "_Autodetectar enderezo IP"
 
-#: ../pidgin/gtkprefs.c:1148
+#: ../pidgin/gtkprefs.c:1150
 msgid "Public _IP:"
 msgstr "_IP pública:"
 
-#: ../pidgin/gtkprefs.c:1177
+#: ../pidgin/gtkprefs.c:1179
 msgid "Ports"
 msgstr "Portos"
 
-#: ../pidgin/gtkprefs.c:1180
+#: ../pidgin/gtkprefs.c:1182
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente o rango de portos en que se escoitará"
 
-#: ../pidgin/gtkprefs.c:1183
+#: ../pidgin/gtkprefs.c:1185
 msgid "_Start port:"
 msgstr "Porto _inicial:"
 
-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1192
 msgid "_End port:"
 msgstr "Porto _final:"
 
-#: ../pidgin/gtkprefs.c:1198
+#: ../pidgin/gtkprefs.c:1200
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkprefs.c:1204
 msgid "No proxy"
 msgstr "Sen proxy"
 
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1260
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: ../pidgin/gtkprefs.c:1323
+#: ../pidgin/gtkprefs.c:1325
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1324
-msgid "Opera"
-msgstr "Opera"
-
-#: ../pidgin/gtkprefs.c:1325
-msgid "Netscape"
-msgstr "Netscape"
-
 #: ../pidgin/gtkprefs.c:1326
-msgid "Mozilla"
-msgstr "Mozilla"
+msgid "Opera"
+msgstr "Opera"
 
 #: ../pidgin/gtkprefs.c:1327
-msgid "Konqueror"
-msgstr "Konqueror"
+msgid "Netscape"
+msgstr "Netscape"
 
 #: ../pidgin/gtkprefs.c:1328
-msgid "GNOME Default"
-msgstr "Predeterminado de Gnome"
+msgid "Mozilla"
+msgstr "Mozilla"
 
 #: ../pidgin/gtkprefs.c:1329
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../pidgin/gtkprefs.c:1330
+msgid "GNOME Default"
+msgstr "Predeterminado de Gnome"
+
+#: ../pidgin/gtkprefs.c:1331
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1343
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1394
+#: ../pidgin/gtkprefs.c:1396
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#: ../pidgin/gtkprefs.c:1398
+#: ../pidgin/gtkprefs.c:1400
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1406
+#: ../pidgin/gtkprefs.c:1408
 msgid "_Open link in:"
 msgstr "_Abrir ligazón en:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1410
 msgid "Browser default"
 msgstr "Navegador predeterminado"
 
-#: ../pidgin/gtkprefs.c:1409
+#: ../pidgin/gtkprefs.c:1411
 msgid "Existing window"
 msgstr "Ventá existente"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "New tab"
 msgstr "Novo separador"
 
-#: ../pidgin/gtkprefs.c:1425
+#: ../pidgin/gtkprefs.c:1427
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14401,80 +14535,63 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../pidgin/gtkprefs.c:1465
+#: ../pidgin/gtkprefs.c:1467
 msgid "Log _format:"
 msgstr "_Formato de rexistro:"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log all _instant messages"
 msgstr "Rexistrar todas as mensaxes _instantáneas"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all c_hats"
 msgstr "Rexistrar todas as _conversas"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all _status changes to system log"
 msgstr "Rexistrar todas os cambios de e_stado no rexistro do sistema"
 
-#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671
-#: ../pidgin/gtkprefs.c:1865
-msgid "(default)"
-msgstr "(por defecto)"
-
-#: ../pidgin/gtkprefs.c:1620
+#: ../pidgin/gtkprefs.c:1622
 msgid "Sound Selection"
 msgstr "Selección de son"
 
-#: ../pidgin/gtkprefs.c:1630
+#: ../pidgin/gtkprefs.c:1632
 msgid "Quietest"
 msgstr "O máis silencioso"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quieter"
 msgstr "Máis silencioso"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quiet"
 msgstr "Silencioso"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1640
 msgid "Loud"
 msgstr "Ruidoso"
 
-#: ../pidgin/gtkprefs.c:1640
-msgid "Louder"
-msgstr "Máis ruidoso"
-
 #: ../pidgin/gtkprefs.c:1642
+msgid "Louder"
+msgstr "Máis ruidoso"
+
+#: ../pidgin/gtkprefs.c:1644
 msgid "Loudest"
 msgstr "O máis ruidoso"
 
-#: ../pidgin/gtkprefs.c:1705
-msgid "Sound Method"
-msgstr "Método para reproducir sons"
-
-#: ../pidgin/gtkprefs.c:1706
+#: ../pidgin/gtkprefs.c:1708
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1710
 msgid "Console beep"
 msgstr "Bip da consola"
 
-#: ../pidgin/gtkprefs.c:1710
-msgid "Automatic"
-msgstr "Automático"
-
-#: ../pidgin/gtkprefs.c:1714
-msgid "Command"
-msgstr "Comando"
-
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1717
 msgid "No sounds"
 msgstr "Sen sons"
 
-#: ../pidgin/gtkprefs.c:1723
+#: ../pidgin/gtkprefs.c:1725
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14483,117 +14600,81 @@
 "C_omando para son:\n"
 "(%s para nome de ficheiro)"
 
-#: ../pidgin/gtkprefs.c:1749
-msgid "Sound Options"
-msgstr "Opcións de son"
-
-#: ../pidgin/gtkprefs.c:1750
+#: ../pidgin/gtkprefs.c:1752
 msgid "Sounds when conversation has _focus"
 msgstr "Sons cando a conversa ten o _foco"
 
-#: ../pidgin/gtkprefs.c:1752
-msgid "Enable sounds:"
-msgstr "Activar os sons:"
-
 #: ../pidgin/gtkprefs.c:1754
-msgid "Only when available"
-msgstr "Só cando estea dispoñible"
-
-#: ../pidgin/gtkprefs.c:1755
-msgid "Only when not available"
-msgstr "Só cando estea non dispoñible"
-
-#: ../pidgin/gtkprefs.c:1763
+msgid "Enable sounds:"
+msgstr "Activar os sons:"
+
+#: ../pidgin/gtkprefs.c:1765
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1791
-msgid "Sound Events"
-msgstr "Eventos de son"
-
-#: ../pidgin/gtkprefs.c:1843
+#: ../pidgin/gtkprefs.c:1845
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../pidgin/gtkprefs.c:1850
-msgid "Event"
-msgstr "Evento"
-
-#: ../pidgin/gtkprefs.c:1869
-msgid "Test"
-msgstr "Probar"
-
-#: ../pidgin/gtkprefs.c:1873
-msgid "Reset"
-msgstr "Reiniciar"
-
-#: ../pidgin/gtkprefs.c:1877
-msgid "Choose..."
-msgstr "Escoller..."
-
-#: ../pidgin/gtkprefs.c:1920
+#: ../pidgin/gtkprefs.c:1922
 msgid "_Report idle time:"
 msgstr "Mostrar o _tempo de inactividade:"
 
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1927
 msgid "Based on keyboard or mouse use"
 msgstr "Baseado no uso do teclado ou do rato"
 
-#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:1936
 msgid "_Auto-reply:"
 msgstr "Resposta _automática:"
 
-#: ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkprefs.c:1940
 msgid "When both away and idle"
 msgstr "Cando estea ausente e inactivo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:1946
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1948
 msgid "Change status when _idle"
 msgstr "Cambiar o estado cando estea _inactivo"
 
-#: ../pidgin/gtkprefs.c:1950
+#: ../pidgin/gtkprefs.c:1952
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de cambiar a inactivo:"
 
-#: ../pidgin/gtkprefs.c:1958
+#: ../pidgin/gtkprefs.c:1960
 msgid "Change _status to:"
 msgstr "Cambiar o e_stado a:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1979
+#: ../pidgin/gtkprefs.c:1981
 msgid "Status at Startup"
 msgstr "Estado para o inicio"
 
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1983
 msgid "Use status from last _exit at startup"
 msgstr "Empregar o estado da última _saída ao comezar"
 
-#: ../pidgin/gtkprefs.c:1987
+#: ../pidgin/gtkprefs.c:1989
 msgid "Status to a_pply at startup:"
 msgstr "Estado para _aplicar ao comezar:"
 
-#: ../pidgin/gtkprefs.c:2025
+#: ../pidgin/gtkprefs.c:2027
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2029
 msgid "Smiley Themes"
 msgstr "Temas das emoticonas"
 
-#: ../pidgin/gtkprefs.c:2028
-msgid "Sounds"
-msgstr "Sons"
-
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2036
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:2038
+#: ../pidgin/gtkprefs.c:2040
 msgid "Status / Idle"
 msgstr "Estado / Inactivo"
 
@@ -14682,23 +14763,23 @@
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1491
+#: ../pidgin/gtkrequest.c:1504
 msgid "That file already exists"
 msgstr "Ese ficheiro xa existe"
 
-#: ../pidgin/gtkrequest.c:1492
+#: ../pidgin/gtkrequest.c:1505
 msgid "Would you like to overwrite it?"
 msgstr "Quere sobrescribilo?"
 
-#: ../pidgin/gtkrequest.c:1495
+#: ../pidgin/gtkrequest.c:1508
 msgid "Overwrite"
 msgstr "Sobrescribir"
 
-#: ../pidgin/gtkrequest.c:1496
+#: ../pidgin/gtkrequest.c:1509
 msgid "Choose New Name"
 msgstr "Escoller un novo nome"
 
-#: ../pidgin/gtkrequest.c:1634 ../pidgin/gtkrequest.c:1648
+#: ../pidgin/gtkrequest.c:1647 ../pidgin/gtkrequest.c:1661
 msgid "Select Folder..."
 msgstr "Seleccionar cartafol..."
 
@@ -14757,54 +14838,6 @@
 msgid "Status for %s"
 msgstr "Estado para %s"
 
-#: ../pidgin/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Conéctase un contacto"
-
-#: ../pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Desconéctase un contacto"
-
-#: ../pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "Mensaxe recibida"
-
-#: ../pidgin/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Mensaxe recibida que comeza unha conversa"
-
-#: ../pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "Mensaxe enviada"
-
-#: ../pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Alguén entra na conversa"
-
-#: ../pidgin/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Alguén deixa a conversa"
-
-#: ../pidgin/gtksound.c:70
-msgid "You talk in chat"
-msgstr "Participa na conversa"
-
-#: ../pidgin/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Conversan outros"
-
-#: ../pidgin/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "Alguén menciona o seu nome na conversa"
-
-#: ../pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "Fallo de GStreamer"
-
-#: ../pidgin/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "O GStreamer errou ao iniciar."
-
 #: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "A agardar pola conexión á rede"
@@ -14964,7 +14997,7 @@
 msgid "_Open Mail"
 msgstr "_Abrir o correo"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Emitocanas de Pidgin"
 
@@ -15388,6 +15421,15 @@
 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
@@ -15989,43 +16031,43 @@
 "tempo para as mensaxes de conversas e as mensaxes de rexistro."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640
 msgid "Opacity:"
 msgstr "Opacidade:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557
 msgid "IM Conversation Windows"
 msgstr "Ventás de conversa de MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
 msgid "_IM window transparency"
 msgstr "Transparencia das ventás de M_I"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
 msgid "_Show slider bar in IM window"
 msgstr "M_ostrar barra de desprazamento na ventá MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
 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:578
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
 msgid "Always on top"
 msgstr "Sempre enriba"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614
 msgid "Buddy List Window"
 msgstr "Ventá da lista de contactos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
 msgid "_Buddy List window transparency"
 msgstr "Transparencia da ventá de lista de _contactos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Eliminar transparencia da ventá da lista de contactos ao ter o foco"
 
@@ -16035,19 +16077,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
 msgid "Transparency"
 msgstr "Transparencia"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
 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:689
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -16059,47 +16101,47 @@
 "\n"
 "* Nota: este complemento require Win2000 ou outro máis novo."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime Version"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Inicio"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Iniciar %s ao comezo de Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "Lista de contactos a_ncorable"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Manter a ventá da lista de contactos por enriba:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Só cando está ancorado"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Ventá escintilante cando se reciben mensaxes nas conversas"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Opcións de Pidgin en Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opcións específicas de Pidgin en Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../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."