diff po/gl.po @ 15596:8e3734ea23ba

commit these updated translations here also
author Luke Schierer <lschiere@pidgin.im>
date Fri, 09 Feb 2007 13:43:36 +0000
parents b7ae1464365c
children
line wrap: on
line diff
--- a/po/gl.po	Fri Feb 09 13:42:33 2007 +0000
+++ b/po/gl.po	Fri Feb 09 13:43:36 2007 +0000
@@ -3,42 +3,46 @@
 # Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2005, 2006.
+# Mancomun.org <softwarelibre@cesga.es>, 2007.
+# Mancomun.org <mancomun@mancomun.org>, 2007.
+# Ignacio Casal Quinteiro <icq@cvs.gnome.org>, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-05 00:10+0100\n"
-"PO-Revision-Date: 2006-11-05 15:47+0100\n"
-"Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
+"POT-Creation-Date: 2007-01-15 11:50+0100\n"
+"PO-Revision-Date: 2007-01-15 12:04+0100\n"
+"Last-Translator: Ignacio Casal Quinteiro <icq@cvs.gnome.org>\n"
 "Language-Team: Galego <trasno@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: KBabel 1.11.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
+"X-Poedit-Bookmarks: 1821,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: ../gaim.desktop.in.h:1
 msgid "Gaim Internet Messenger"
-msgstr "Gaim - Mensaxería en Internet"
+msgstr "Gaim - Mensaxería na Internet"
 
 #: ../gaim.desktop.in.h:2
 msgid "Internet Messenger"
-msgstr "Mensaxería en Internet"
+msgstr "Mensaxería na Internet"
 
 #: ../gaim.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Envía mensaxes instantáneas a través de múltiples protocolos"
 
-#: ../console/gntaccount.c:119 ../console/gntblist.c:277
-#: ../console/gntblist.c:395 ../console/gntblist.c:408
-#: ../console/gntplugin.c:169 ../console/gntplugin.c:214
+#: ../console/gntaccount.c:119 ../console/gntblist.c:272
+#: ../console/gntblist.c:390 ../console/gntblist.c:403
+#: ../console/gntplugin.c:154 ../console/gntplugin.c:199
 #: ../console/gntstatus.c:291 ../console/gntstatus.c:299
-#: ../libgaim/protocols/jabber/buddy.c:1363
-#: ../libgaim/protocols/jabber/chat.c:677
-#: ../libgaim/protocols/jabber/chat.c:688
-#: ../libgaim/protocols/jabber/jabber.c:1188
-#: ../libgaim/protocols/qq/group_join.c:322
-#: ../libgaim/protocols/silc/ops.c:1449
+#: ../libgaim/protocols/jabber/buddy.c:1399
+#: ../libgaim/protocols/jabber/chat.c:679
+#: ../libgaim/protocols/jabber/chat.c:690
+#: ../libgaim/protocols/jabber/jabber.c:1208
+#: ../libgaim/protocols/qq/group_join.c:324
+#: ../libgaim/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "Erro"
 
@@ -48,121 +52,112 @@
 
 #: ../console/gntaccount.c:120
 msgid "Screenname of an account must be non-empty."
-msgstr "O alcume dunha conta non debe estar baleiro."
-
-#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:558
+msgstr "O alcume da conta non pode estar baleiro."
+
+#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:567
 msgid "New mail notifications"
 msgstr "Notificacións de correo novo"
 
-#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:487
+#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:496
 msgid "Remember password"
 msgstr "Recordar contrasinal"
 
-#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1400 ../gtk/gtkblist.c:3797
+#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1430 ../gtk/gtkblist.c:3867
 msgid "Modify Account"
 msgstr "Modificar conta"
 
 #: ../console/gntaccount.c:474
 msgid "New Account"
-msgstr "Conta nova"
-
-#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:399 ../gtk/gtkft.c:695
+msgstr "Nova conta"
+
+#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:407 ../gtk/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:404 ../gtk/gtkblist.c:4942
+#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:412 ../gtk/gtkblist.c:5219
 #: ../gtk/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Nome de usuario:"
 
-#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:478
+#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:487
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4963 ../gtk/gtkblist.c:5328
+#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5240 ../gtk/gtkblist.c:5603
 msgid "Alias:"
 msgstr "Alcume:"
 
 #. Cancel
 #: ../console/gntaccount.c:554 ../console/gntaccount.c:615
-#: ../console/gntaccount.c:834 ../console/gntblist.c:318
-#: ../console/gntblist.c:385 ../console/gntblist.c:418
-#: ../console/gntblist.c:747 ../console/gntblist.c:916
-#: ../console/gntblist.c:1007 ../console/gntblist.c:1920
+#: ../console/gntaccount.c:834 ../console/gntblist.c:313
+#: ../console/gntblist.c:380 ../console/gntblist.c:413
+#: ../console/gntblist.c:737 ../console/gntblist.c:906
+#: ../console/gntblist.c:997 ../console/gntblist.c:2021
 #: ../console/gntprefs.c:224 ../console/gntstatus.c:139
-#: ../console/gntstatus.c:471 ../console/gntstatus.c:596
-#: ../gtk/gtkaccount.c:1833 ../gtk/gtkaccount.c:2307 ../gtk/gtkblist.c:5384
-#: ../gtk/gtkdialogs.c:681 ../gtk/gtkdialogs.c:818 ../gtk/gtkdialogs.c:909
-#: ../gtk/gtkdialogs.c:928 ../gtk/gtkdialogs.c:950 ../gtk/gtkdialogs.c:970
-#: ../gtk/gtkdialogs.c:1014 ../gtk/gtkdialogs.c:1052 ../gtk/gtkdialogs.c:1106
-#: ../gtk/gtkdialogs.c:1143 ../gtk/gtkdialogs.c:1168
-#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:296
-#: ../gtk/gtkpounce.c:1088 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
+#: ../console/gntstatus.c:472 ../console/gntstatus.c:597
+#: ../gtk/gtkaccount.c:1866 ../gtk/gtkaccount.c:2433 ../gtk/gtkblist.c:5659
+#: ../gtk/gtkdialogs.c:685 ../gtk/gtkdialogs.c:822 ../gtk/gtkdialogs.c:913
+#: ../gtk/gtkdialogs.c:932 ../gtk/gtkdialogs.c:954 ../gtk/gtkdialogs.c:974
+#: ../gtk/gtkdialogs.c:1018 ../gtk/gtkdialogs.c:1056 ../gtk/gtkdialogs.c:1110
+#: ../gtk/gtkdialogs.c:1147 ../gtk/gtkdialogs.c:1172
+#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:286
+#: ../gtk/gtkpounce.c:1098 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
 #: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
-#: ../gtk/gtksavedstatuses.c:296 ../libgaim/account.c:964
-#: ../libgaim/account.c:1135 ../libgaim/account.c:1169
-#: ../libgaim/conversation.c:1164 ../libgaim/protocols/gg/gg.c:498
-#: ../libgaim/protocols/gg/gg.c:656 ../libgaim/protocols/gg/gg.c:792
-#: ../libgaim/protocols/gg/gg.c:871 ../libgaim/protocols/jabber/buddy.c:588
-#: ../libgaim/protocols/jabber/buddy.c:1725
-#: ../libgaim/protocols/jabber/buddy.c:1759
-#: ../libgaim/protocols/jabber/chat.c:780
-#: ../libgaim/protocols/jabber/jabber.c:850
-#: ../libgaim/protocols/jabber/jabber.c:1343
-#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:251
-#: ../libgaim/protocols/msn/msn.c:266 ../libgaim/protocols/msn/msn.c:281
-#: ../libgaim/protocols/msn/msn.c:296 ../libgaim/protocols/msn/msn.c:313
-#: ../libgaim/protocols/oscar/oscar.c:1388
-#: ../libgaim/protocols/oscar/oscar.c:2152
-#: ../libgaim/protocols/oscar/oscar.c:2191
-#: ../libgaim/protocols/oscar/oscar.c:2239
-#: ../libgaim/protocols/oscar/oscar.c:5733
-#: ../libgaim/protocols/oscar/oscar.c:5785
-#: ../libgaim/protocols/oscar/oscar.c:5937
-#: ../libgaim/protocols/oscar/oscar.c:5962
-#: ../libgaim/protocols/oscar/oscar.c:6018
-#: ../libgaim/protocols/oscar/oscar.c:6087
-#: ../libgaim/protocols/oscar/peer.c:991
-#: ../libgaim/protocols/qq/buddy_info.c:480
-#: ../libgaim/protocols/qq/buddy_opt.c:210
-#: ../libgaim/protocols/qq/buddy_opt.c:400 ../libgaim/protocols/qq/group.c:122
-#: ../libgaim/protocols/qq/group_join.c:136
-#: ../libgaim/protocols/qq/group_join.c:357
-#: ../libgaim/protocols/qq/group_opt.c:140
-#: ../libgaim/protocols/qq/group_opt.c:390 ../libgaim/protocols/qq/qq.c:459
-#: ../libgaim/protocols/qq/sendqueue.c:201
-#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
-#: ../libgaim/protocols/qq/sys_msg.c:245
-#: ../libgaim/protocols/sametime/sametime.c:3361
-#: ../libgaim/protocols/sametime/sametime.c:3446
-#: ../libgaim/protocols/sametime/sametime.c:3616
-#: ../libgaim/protocols/sametime/sametime.c:5311
+#: ../gtk/gtksavedstatuses.c:296 ../libgaim/account.c:961
+#: ../libgaim/account.c:1149 ../libgaim/account.c:1183
+#: ../libgaim/conversation.c:1164 ../libgaim/plugins/buddynote.c:51
+#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
+#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
+#: ../libgaim/protocols/jabber/buddy.c:588
+#: ../libgaim/protocols/jabber/buddy.c:1761
+#: ../libgaim/protocols/jabber/buddy.c:1795
+#: ../libgaim/protocols/jabber/chat.c:788
+#: ../libgaim/protocols/jabber/jabber.c:859
+#: ../libgaim/protocols/jabber/jabber.c:1363
+#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:249
+#: ../libgaim/protocols/msn/msn.c:264 ../libgaim/protocols/msn/msn.c:279
+#: ../libgaim/protocols/msn/msn.c:294 ../libgaim/protocols/msn/msn.c:311
+#: ../libgaim/protocols/oscar/oscar.c:6043
+#: ../libgaim/protocols/oscar/peer.c:1021
+#: ../libgaim/protocols/qq/buddy_info.c:484
+#: ../libgaim/protocols/qq/buddy_opt.c:212
+#: ../libgaim/protocols/qq/buddy_opt.c:402 ../libgaim/protocols/qq/group.c:124
+#: ../libgaim/protocols/qq/group_join.c:138
+#: ../libgaim/protocols/qq/group_join.c:359
+#: ../libgaim/protocols/qq/group_opt.c:142
+#: ../libgaim/protocols/qq/group_opt.c:392
+#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159
+#: ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:3401
+#: ../libgaim/protocols/sametime/sametime.c:3486
+#: ../libgaim/protocols/sametime/sametime.c:3656
 #: ../libgaim/protocols/sametime/sametime.c:5400
-#: ../libgaim/protocols/sametime/sametime.c:5524
+#: ../libgaim/protocols/sametime/sametime.c:5489
+#: ../libgaim/protocols/sametime/sametime.c:5613
 #: ../libgaim/protocols/silc/buddy.c:467
 #: ../libgaim/protocols/silc/buddy.c:1078
 #: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
-#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1910
+#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1912
 #: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
-#: ../libgaim/protocols/yahoo/yahoo.c:3214
-#: ../libgaim/protocols/yahoo/yahoo.c:3223 ../libgaim/request.h:1344
-#: ../libgaim/request.h:1354
+#: ../libgaim/protocols/yahoo/yahoo.c:961
+#: ../libgaim/protocols/yahoo/yahoo.c:3208
+#: ../libgaim/protocols/yahoo/yahoo.c:3217
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Save
 #: ../console/gntaccount.c:558 ../console/gntprefs.c:224
-#: ../console/gntstatus.c:474 ../console/gntstatus.c:584 ../gtk/gtkdebug.c:762
-#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1168
-#: ../libgaim/protocols/jabber/buddy.c:587
+#: ../console/gntstatus.c:475 ../console/gntstatus.c:585 ../gtk/gtkdebug.c:762
+#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1182
+#: ../libgaim/plugins/buddynote.c:50 ../libgaim/protocols/jabber/buddy.c:587
 msgid "Save"
 msgstr "Gardar"
 
-#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1827
+#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1860
 #: ../gtk/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "Está seguro de que quere borrar %s?"
+msgstr "Estás seguro de que queres borrar %s?"
 
 #. Close any other opened delete window
 #: ../console/gntaccount.c:614
@@ -171,29 +166,29 @@
 
 #: ../console/gntaccount.c:615 ../console/gntaccount.c:681
 #: ../console/gntstatus.c:139 ../console/gntstatus.c:201
-#: ../gtk/gtkaccount.c:1832 ../gtk/gtkpounce.c:1087 ../gtk/gtkrequest.c:273
+#: ../gtk/gtkaccount.c:1865 ../gtk/gtkpounce.c:1097 ../gtk/gtkrequest.c:273
 #: ../gtk/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../console/gntaccount.c:644 ../console/gntblist.c:1841
-#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2139 ../gtk/gtkdocklet.c:530
+#: ../console/gntaccount.c:644 ../console/gntblist.c:1927
+#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2259 ../gtk/gtkdocklet.c:543
 msgid "Accounts"
 msgstr "Contas"
 
 #: ../console/gntaccount.c:650
+#, fuzzy
 msgid "You can enable/disable accounts from the following list."
-msgstr "Pode activar/desactivar contas da seguinte lista."
+msgstr "Agardando a autorización dos seguintes contactos"
 
 #: ../console/gntaccount.c:673 ../console/gntaccount.c:833
-#: ../console/gntblist.c:318 ../console/gntblist.c:385
-#: ../console/gntblist.c:418 ../console/gntnotify.c:306
-#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2306 ../gtk/gtkblist.c:5383
+#: ../console/gntblist.c:313 ../console/gntblist.c:380
+#: ../console/gntblist.c:413 ../console/gntnotify.c:309
+#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2432 ../gtk/gtkblist.c:5658
 #: ../gtk/gtkconv.c:1634 ../gtk/gtkrequest.c:274
-#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2430
-#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
-#: ../libgaim/protocols/qq/sys_msg.c:245
-#: ../libgaim/protocols/sametime/sametime.c:5399
+#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/qq/sys_msg.c:104
+#: ../libgaim/protocols/qq/sys_msg.c:159 ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:5488
 #: ../libgaim/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "Engadir"
@@ -202,234 +197,255 @@
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2255
+#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2379
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s fixo a %s seu amigo/a%s%s"
-
-#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2304
+msgstr "%s%s%s%s fixo a %s seu contacto %s%s"
+
+#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2431
 msgid "Add buddy to your list?"
-msgstr "Engadir o amigo a súa lista?"
-
-#: ../console/gntblist.c:269
+msgstr "Engadir o contacto á súa listaxe?"
+
+#: ../console/gntblist.c:264
 msgid "You must provide a screename for the buddy."
-msgstr "Debe dar un nome de usuario para o amigo."
-
-#: ../console/gntblist.c:271
+msgstr ""
+
+#: ../console/gntblist.c:266
 msgid "You must provide a group."
-msgstr "Debe indicar un grupo."
-
-#: ../console/gntblist.c:273
+msgstr ""
+
+#: ../console/gntblist.c:268
 msgid "You must select an account."
-msgstr "Debe especificar unha conta."
-
-#: ../console/gntblist.c:277
+msgstr "Debe seleccionar unha conta."
+
+#: ../console/gntblist.c:272
 msgid "Error adding buddy"
-msgstr "Erro engadindo o amigo"
-
-#: ../console/gntblist.c:302 ../gtk/gtkaccount.c:1896
-#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2804
+msgstr "Erro ao engadir un amigo"
+
+#: ../console/gntblist.c:297 ../gtk/gtkaccount.c:1941
+#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2849
 msgid "Screen Name"
 msgstr "Nome de usuario"
 
-#: ../console/gntblist.c:305 ../console/gntblist.c:377 ../gtk/gtkdialogs.c:927
-#: ../gtk/gtkdialogs.c:949 ../gtk/gtkdialogs.c:969 ../gtk/gtkrequest.c:277
-#: ../libgaim/protocols/silc/chat.c:587
+#: ../console/gntblist.c:300 ../console/gntblist.c:372 ../gtk/gtkdialogs.c:931
+#: ../gtk/gtkdialogs.c:953 ../gtk/gtkdialogs.c:973 ../gtk/gtkrequest.c:277
+#: ../libgaim/protocols/msn/msn.c:1362 ../libgaim/protocols/silc/chat.c:587
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:680
+#: ../libgaim/protocols/zephyr/zephyr.c:789
+#: ../libgaim/protocols/zephyr/zephyr.c:1207
 msgid "Alias"
 msgstr "Alcume"
 
-#: ../console/gntblist.c:308 ../console/gntblist.c:380
+#: ../console/gntblist.c:303 ../console/gntblist.c:375
 msgid "Group"
 msgstr "Grupo"
 
-#: ../console/gntblist.c:311 ../console/gntblist.c:368
-#: ../console/gntnotify.c:155 ../console/gntstatus.c:562
-#: ../gtk/gtknotify.c:402 ../gtk/gtkpounce.c:1255
-#: ../gtk/plugins/gevolution/gevolution.c:451 ../libgaim/plugins/idle.c:153
-#: ../libgaim/plugins/idle.c:189
+#: ../console/gntblist.c:306 ../console/gntblist.c:363
+#: ../console/gntblist.c:1166 ../console/gntnotify.c:155
+#: ../console/gntstatus.c:563 ../gtk/gtkblist.c:2710 ../gtk/gtknotify.c:467
+#: ../gtk/gtkpounce.c:1265 ../gtk/plugins/gevolution/gevolution.c:444
+#: ../libgaim/plugins/idle.c:153 ../libgaim/plugins/idle.c:189
 msgid "Account"
 msgstr "Conta"
 
-#: ../console/gntblist.c:317 ../console/gntblist.c:794 ../gtk/gtkblist.c:4896
+#: ../console/gntblist.c:312 ../console/gntblist.c:784 ../gtk/gtkblist.c:5173
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
 #: ../libgaim/protocols/silc/buddy.c:736
 #: ../libgaim/protocols/silc/buddy.c:1030
 #: ../libgaim/protocols/silc/buddy.c:1075
 #: ../libgaim/protocols/silc/buddy.c:1174
-#: ../libgaim/protocols/yahoo/yahoo.c:3128
+#: ../libgaim/protocols/yahoo/yahoo.c:3122
 msgid "Add Buddy"
-msgstr "Engadir amigo"
-
-#: ../console/gntblist.c:317
+msgstr "Engadir contacto"
+
+#: ../console/gntblist.c:312
 msgid "Please enter buddy information."
 msgstr "Introduza a información do amigo."
 
-#: ../console/gntblist.c:340 ../libgaim/blist.c:1195
+#: ../console/gntblist.c:335 ../libgaim/blist.c:1195
 msgid "Chats"
-msgstr "Chats"
+msgstr "Conversas"
 
 #. Extract their Name and put it in
-#. Contact Info
-#. Personal
-#. Business
-#: ../console/gntblist.c:374 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
+#: ../console/gntblist.c:369 ../gtk/gtkplugin.c:579 ../gtk/gtkroomlist.c:621
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
 #: ../gtk/plugins/gevolution/assoc-buddy.c:123
-#: ../libgaim/protocols/jabber/jabber.c:781
-#: ../libgaim/protocols/msn/msn.c:1533 ../libgaim/protocols/msn/msn.c:1586
-#: ../libgaim/protocols/msn/msn.c:1608 ../libgaim/protocols/qq/buddy_info.c:42
+#: ../libgaim/protocols/jabber/jabber.c:790
+#: ../libgaim/protocols/msn/msn.c:1535 ../libgaim/protocols/msn/msn.c:1600
+#: ../libgaim/protocols/msn/msn.c:1627 ../libgaim/protocols/qq/buddy_info.c:44
 msgid "Name"
 msgstr "Nome"
 
-#: ../console/gntblist.c:383 ../console/gntblist.c:796 ../gtk/gtkblist.c:5274
+#: ../console/gntblist.c:378 ../console/gntblist.c:786 ../gtk/gtkblist.c:5549
 msgid "Add Chat"
-msgstr "Engadir Chat"
-
-#: ../console/gntblist.c:384
+msgstr "Engadir conversa"
+
+#: ../console/gntblist.c:379
 msgid "You can edit more information from the context menu later."
-msgstr "Pode editar máis información máis adiante através do menú contextual."
-
-#: ../console/gntblist.c:395 ../console/gntblist.c:408
+msgstr ""
+
+#: ../console/gntblist.c:390 ../console/gntblist.c:403
 msgid "Error adding group"
-msgstr "Erro engadindo o grupo"
-
-#: ../console/gntblist.c:396
+msgstr "Erro ao engadir o grupo"
+
+#: ../console/gntblist.c:391
+#, fuzzy
 msgid "You must give a name for the group to add."
-msgstr "Debe dar un nome para o grupo a engadir."
-
-#: ../console/gntblist.c:409
+msgstr "Introduza o nome do grupo para engadir."
+
+#: ../console/gntblist.c:404
+#, fuzzy
 msgid "A group with the name already exists."
-msgstr "Xa existe un grupo con ese nome."
-
-#: ../console/gntblist.c:416 ../console/gntblist.c:798 ../gtk/gtkblist.c:5380
-#: ../libgaim/protocols/sametime/sametime.c:5310
-#: ../libgaim/protocols/sametime/sametime.c:5397
+msgstr "Xa existe un cartafol con ese nome"
+
+#: ../console/gntblist.c:411 ../console/gntblist.c:788 ../gtk/gtkblist.c:5655
+#: ../libgaim/protocols/sametime/sametime.c:5399
+#: ../libgaim/protocols/sametime/sametime.c:5486
 msgid "Add Group"
 msgstr "Engadir grupo"
 
-#: ../console/gntblist.c:416
+#: ../console/gntblist.c:411
+#, fuzzy
 msgid "Enter the name of the group"
-msgstr "Introduza o nome do grupo"
-
-#: ../console/gntblist.c:746
+msgstr "Introduza o nome do grupo para engadir."
+
+#: ../console/gntblist.c:736
 msgid "Edit Chat"
-msgstr "Editar Chat"
-
-#: ../console/gntblist.c:746
+msgstr "Editar conversa"
+
+#: ../console/gntblist.c:736
 msgid "Please Update the necessary fields."
-msgstr "Actualice os campos necesarios."
-
-#: ../console/gntblist.c:747 ../console/gntstatus.c:196
+msgstr ""
+
+#: ../console/gntblist.c:737 ../console/gntstatus.c:196
 msgid "Edit"
 msgstr "Editar"
 
-#: ../console/gntblist.c:761
+#: ../console/gntblist.c:751
+#, fuzzy
 msgid "Auto-join"
 msgstr "Conectarse automaticamente"
 
-#: ../console/gntblist.c:770
+#: ../console/gntblist.c:760
 msgid "Edit Settings"
 msgstr "Editar configuración"
 
-#: ../console/gntblist.c:816 ../libgaim/protocols/silc/chat.c:878
+#: ../console/gntblist.c:806 ../libgaim/protocols/silc/chat.c:878
 msgid "Get Info"
 msgstr "Obter información"
 
-#: ../console/gntblist.c:821
+#: ../console/gntblist.c:811
 msgid "Add Buddy Pounce"
 msgstr "Engadir aviso de amigo"
 
-#: ../console/gntblist.c:828 ../gtk/gtkconv.c:1582
-#: ../libgaim/protocols/oscar/oscar.c:615
+#: ../console/gntblist.c:818 ../gtk/gtkconv.c:1582
+#: ../libgaim/protocols/oscar/oscar.c:633
 msgid "Send File"
-msgstr "Enviar ficheiro"
-
-#: ../console/gntblist.c:832
+msgstr "Enviar o ficheiro"
+
+#: ../console/gntblist.c:822
 msgid "View Log"
 msgstr "Ver rexistro"
 
-#: ../console/gntblist.c:912
+#: ../console/gntblist.c:902
 #, c-format
 msgid "Please enter the new name for %s"
-msgstr "Por favor, introduza o seu novo nome para %s"
-
-#: ../console/gntblist.c:914 ../console/gntblist.c:915
-#: ../console/gntblist.c:1084
+msgstr "Por favor, introduza o novo nome para %s"
+
+#: ../console/gntblist.c:904 ../console/gntblist.c:905
+#: ../console/gntblist.c:1116
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../console/gntblist.c:914
+#: ../console/gntblist.c:904
 msgid "Enter empty string to reset the name."
-msgstr "Introduza unha cadea en branco para reiniciar o nome."
-
-#: ../console/gntblist.c:987
+msgstr ""
+
+#: ../console/gntblist.c:977
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "Se elimina este contacto tamén eliminará tódolos amigos no contacto"
-
-#: ../console/gntblist.c:995
+msgstr ""
+
+#: ../console/gntblist.c:985
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "Se elimina este grupo tamén eliminará a tódolos amigos no grupo"
-
-#: ../console/gntblist.c:1000
+msgstr ""
+
+#: ../console/gntblist.c:990
 #, c-format
 msgid "Are you sure you want to remove %s?"
-msgstr "Está seguro de que quere borrar %s?"
+msgstr "Estás seguro de que queres borrar %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../console/gntblist.c:1003
+#: ../console/gntblist.c:993
+#, fuzzy
 msgid "Confirm Remove"
-msgstr "Confirmar borrado"
-
-#: ../console/gntblist.c:1006 ../console/gntblist.c:1086
-#: ../gtk/gtkblist.c:1039 ../gtk/gtkconv.c:1631 ../gtk/gtkrequest.c:275
+msgstr "Confirmar peche"
+
+#: ../console/gntblist.c:996 ../console/gntblist.c:1118 ../gtk/gtkblist.c:1106
+#: ../gtk/gtkconv.c:1631 ../gtk/gtkrequest.c:275 ../gtk/gtkstatusbox.c:248
 msgid "Remove"
 msgstr "Eliminar"
 
 #. Buddy List
-#: ../console/gntblist.c:1061 ../console/gntblist.c:1987
-#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:3914
+#: ../console/gntblist.c:1093 ../console/gntblist.c:2088
+#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:4083
 #: ../gtk/plugins/win32/winprefs/winprefs.c:327
 msgid "Buddy List"
-msgstr "Lista de amigos"
-
-#: ../console/gntblist.c:1090
+msgstr "Listaxe de contactos"
+
+#: ../console/gntblist.c:1123
 #, fuzzy
 msgid "Place tagged"
 msgstr "Lugares nos que viviu"
 
-#: ../console/gntblist.c:1093
-msgid "Tag"
-msgstr "Etiqueta"
-
-#: ../console/gntblist.c:1120 ../console/gntblist.c:1221
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Conta: %s (%s)"
-
-#: ../console/gntblist.c:1145
-#, c-format
-msgid ""
-"\n"
-"Idle: %s"
-msgstr ""
-"\n"
-"Inactivo: %s"
-
-#: ../console/gntblist.c:1200
-#, c-format
-msgid "Nickname: %s\n"
-msgstr "Alcume: %s\n"
-
-#: ../console/gntblist.c:1212
+#: ../console/gntblist.c:1128
+msgid "Toggle Tag"
+msgstr ""
+
+#. General
+#: ../console/gntblist.c:1161 ../gtk/gtkblist.c:2734
+#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1035
+#: ../libgaim/protocols/gg/gg.c:1110 ../libgaim/protocols/gg/gg.c:2203
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:814
+#: ../libgaim/protocols/jabber/buddy.c:1562
+#: ../libgaim/protocols/jabber/buddy.c:1744
+#: ../libgaim/protocols/jabber/jabber.c:800
+#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
+#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1042
+msgid "Nickname"
+msgstr "Alcume"
+
+#. Idle stuff
+#: ../console/gntblist.c:1181 ../gtk/gtkblist.c:2754 ../gtk/gtkblist.c:3307
+#: ../gtk/gtkprefs.c:1807 ../libgaim/protocols/bonjour/bonjour.c:333
+#: ../libgaim/protocols/jabber/buddy.c:645
+#: ../libgaim/protocols/jabber/buddy.c:683 ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/msn/state.c:32
+#: ../libgaim/protocols/novell/novell.c:2860
+#: ../libgaim/protocols/oscar/oscar.c:2873
+#: ../libgaim/protocols/yahoo/yahoo.c:2876
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:686
+msgid "Idle"
+msgstr "Inactivo"
+
+#: ../console/gntblist.c:1270
 #, c-format
 msgid ""
 "Online: %d\n"
 "Total: %d"
 msgstr ""
-"En liña: %d\n"
+"Conectado: %d\n"
 "Total: %d"
 
-#: ../console/gntblist.c:1233
+#: ../console/gntblist.c:1279
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Conta: %s (%s)"
+
+#: ../console/gntblist.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -438,91 +454,81 @@
 "\n"
 "Visto por última vez: fai %s"
 
-#: ../console/gntblist.c:1456 ../gtk/gtkdocklet.c:478
-#: ../gtk/gtkstatusbox.c:984
+#: ../console/gntblist.c:1540 ../gtk/gtkdocklet.c:491
+#: ../gtk/gtkstatusbox.c:1000
 msgid "New..."
 msgstr "Novo..."
 
-#: ../console/gntblist.c:1463 ../gtk/gtkdocklet.c:479
-#: ../gtk/gtkstatusbox.c:985
+#: ../console/gntblist.c:1547 ../gtk/gtkdocklet.c:492
+#: ../gtk/gtkstatusbox.c:1001
 msgid "Saved..."
 msgstr "Gardado..."
 
-#: ../console/gntblist.c:1809 ../console/gntplugin.c:231 ../console/gntui.c:73
-#: ../gtk/gtkdocklet.c:531 ../gtk/gtkplugin.c:538
+#: ../console/gntblist.c:1895 ../console/gntplugin.c:216 ../console/gntui.c:73
+#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:528
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../console/gntblist.c:1901 ../gtk/gtkdialogs.c:662 ../gtk/gtkdialogs.c:799
-#: ../gtk/gtkdialogs.c:879
+#: ../console/gntblist.c:2002 ../gtk/gtkdialogs.c:666 ../gtk/gtkdialogs.c:803
+#: ../gtk/gtkdialogs.c:883
 msgid "_Name"
 msgstr "_Nome"
 
-#: ../console/gntblist.c:1906 ../gtk/gtkdialogs.c:667 ../gtk/gtkdialogs.c:804
-#: ../gtk/gtkdialogs.c:884
+#: ../console/gntblist.c:2007 ../gtk/gtkdialogs.c:671 ../gtk/gtkdialogs.c:808
+#: ../gtk/gtkdialogs.c:888
 msgid "_Account"
 msgstr "_Conta"
 
-#: ../console/gntblist.c:1914 ../gtk/gtkdialogs.c:675
+#: ../console/gntblist.c:2015 ../gtk/gtkdialogs.c:679
 msgid "New Instant Message"
 msgstr "Mensaxe instantánea nova"
 
-#: ../console/gntblist.c:1916 ../gtk/gtkdialogs.c:677
+#: ../console/gntblist.c:2017 ../gtk/gtkdialogs.c:681
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Introduza o nome de usuario ou alias da persoa coa que quere comunicarse."
 
-#. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
-#.
-#: ../console/gntblist.c:1919 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3796
-#: ../gtk/gtkdialogs.c:680 ../gtk/gtkdialogs.c:817 ../gtk/gtkdialogs.c:908
-#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:963 ../libgaim/account.c:1134
+#: ../console/gntblist.c:2020 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3866
+#: ../gtk/gtkdialogs.c:684 ../gtk/gtkdialogs.c:821 ../gtk/gtkdialogs.c:912
+#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:960 ../libgaim/account.c:1148
 #: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
-#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1342
-#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
-#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
-#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1387
-#: ../libgaim/protocols/oscar/oscar.c:2151
-#: ../libgaim/protocols/oscar/oscar.c:2238
-#: ../libgaim/protocols/oscar/oscar.c:5732
-#: ../libgaim/protocols/oscar/oscar.c:5936
-#: ../libgaim/protocols/oscar/oscar.c:5961
-#: ../libgaim/protocols/oscar/oscar.c:6017
+#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1362
+#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:248
+#: ../libgaim/protocols/msn/msn.c:263 ../libgaim/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:293 ../libgaim/protocols/oscar/oscar.c:6042
 #: ../libgaim/protocols/silc/buddy.c:466
 #: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
 #: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
-#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1909
-#: ../libgaim/protocols/silc/silc.c:749
-#: ../libgaim/protocols/yahoo/yahoo.c:3213
-#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
+#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1911
+#: ../libgaim/protocols/silc/silc.c:749 ../libgaim/protocols/yahoo/yahoo.c:960
+#: ../libgaim/protocols/yahoo/yahoo.c:3207
+#: ../libgaim/protocols/yahoo/yahoo.c:3216
 msgid "OK"
 msgstr "Aceptar"
 
 #. Create the "Options" frame.
-#: ../console/gntblist.c:1938 ../gtk/gtkpounce.c:766
+#: ../console/gntblist.c:2039 ../gtk/gtkpounce.c:776
 msgid "Options"
 msgstr "Opcións"
 
-#: ../console/gntblist.c:1944
+#: ../console/gntblist.c:2045
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../console/gntblist.c:1948
-#, fuzzy
+#: ../console/gntblist.c:2049
 msgid "Toggle offline buddies"
-msgstr "/Amigos/Amosar amigos desconectados"
-
-#: ../console/gntblist.c:1952
+msgstr ""
+
+#: ../console/gntblist.c:2053
 msgid "Sort by status"
 msgstr "Arranxar por estado"
 
-#: ../console/gntblist.c:1956
+#: ../console/gntblist.c:2057
 msgid "Sort alphabetically"
 msgstr "Arranxar alfabeticamente"
 
-#: ../console/gntblist.c:1960
+#: ../console/gntblist.c:2061
 msgid "Sort by log size"
-msgstr "Arranxar polo tamaño de rexistro"
+msgstr "Arranxar por tamaño de rexistro"
 
 #: ../console/gntconn.c:36
 #, c-format
@@ -535,137 +541,149 @@
 msgstr "%s desconectado."
 
 #: ../console/gntconn.c:40
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s was disconnected due to the following error:\n"
 "%s"
 msgstr ""
-"%s foi desconectado debido ao seguinte erro:\n"
+"O usuario %s quere engadir a %s á súa listaxe de contactos polo seguinte "
+"motivo:\n"
 "%s"
 
-#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3794 ../libgaim/account.c:991
+#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3864 ../libgaim/account.c:988
 #: ../libgaim/connection.c:107
 msgid "Connection Error"
 msgstr "Erro de conexión"
 
-#: ../console/gntconv.c:71
+#: ../console/gntconv.c:102
 msgid "No such command."
 msgstr "Non existe o comando."
 
-#: ../console/gntconv.c:75 ../gtk/gtkconv.c:493
+#: ../console/gntconv.c:106 ../gtk/gtkconv.c:493
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "Erro de sintase: Escribiu suficientes argumentos para ese comando."
-
-#: ../console/gntconv.c:80 ../gtk/gtkconv.c:498
+msgstr "Erro de sintaxe: escribiu demasiados argumentos para ese comando."
+
+#: ../console/gntconv.c:111 ../gtk/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
-msgstr "Seu comando fallou por motivos descoñecidos."
-
-#: ../console/gntconv.c:85 ../gtk/gtkconv.c:504
+msgstr "O seu comando fallou por motivos descoñecidos."
+
+#: ../console/gntconv.c:116 ../gtk/gtkconv.c:504
 msgid "That command only works in chats, not IMs."
-msgstr "Ese comando só funciona en chats, non en MIs."
-
-#: ../console/gntconv.c:88 ../gtk/gtkconv.c:507
+msgstr "Ese comando só funciona en conversas, non en MI."
+
+#: ../console/gntconv.c:119 ../gtk/gtkconv.c:507
 msgid "That command only works in IMs, not chats."
-msgstr "Ese comando só funciona en MIs, non en chats."
-
-#: ../console/gntconv.c:92 ../gtk/gtkconv.c:511
+msgstr "Ese comando só funciona en MI, non en conversas."
+
+#: ../console/gntconv.c:123 ../gtk/gtkconv.c:511
 msgid "That command doesn't work on this protocol."
 msgstr "Ese comando só funciona neste protocolo."
 
-#: ../console/gntconv.c:99
+#: ../console/gntconv.c:130
 msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "Ordes non soportadas. NON se enviou a mensaxe."
-
-#: ../console/gntconv.c:198
+msgstr ""
+
+#: ../console/gntconv.c:232
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../console/gntconv.c:219
+#: ../console/gntconv.c:255
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../console/gntconv.c:349
+#: ../console/gntconv.c:260 ../console/gntconv.c:432
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s está escribindo..."
+
+#: ../console/gntconv.c:399
 msgid "<AUTO-REPLY> "
 msgstr "<RESPOSTA AUTOMÁTICA>"
 
 #. Print the list of users in the room
-#: ../console/gntconv.c:443
+#: ../console/gntconv.c:501
 msgid "List of users:\n"
 msgstr "Lista de usuarios:\n"
 
-#: ../console/gntconv.c:567 ../gtk/gtkconv.c:386
+#: ../console/gntconv.c:625 ../gtk/gtkconv.c:386
 msgid "Supported debug options are:  version"
 msgstr "As opcións de depuración soportadas son:  version"
 
-#: ../console/gntconv.c:602 ../gtk/gtkconv.c:422
+#: ../console/gntconv.c:660 ../gtk/gtkconv.c:422
 msgid "No such command (in this context)."
 msgstr "Non existe o comando (neste contexto)."
 
-#: ../console/gntconv.c:605 ../gtk/gtkconv.c:425
+#: ../console/gntconv.c:663 ../gtk/gtkconv.c:425
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
 "Usar \"/help &lt;comando&gt;\" para obter axuda dun comando específico.\n"
-"Os seguintes comandos está dispoñibles neste contexto:\n"
-
-#: ../console/gntconv.c:644 ../gtk/gtkconv.c:6732
+"Os seguintes comandos están dispoñibles neste contexto:\n"
+
+#: ../console/gntconv.c:702 ../gtk/gtkconv.c:6788
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
-"say &lt;mensaxe&gt;:  Enviar unha mensaxe como se non se estivera utilizando "
+"say &lt;mensaxe&gt;:  Envía unha mensaxe como se non se estivera utilizando "
 "un comando."
 
-#: ../console/gntconv.c:647 ../gtk/gtkconv.c:6735
+#: ../console/gntconv.c:705 ../gtk/gtkconv.c:6791
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;acción&gt;:  Enviar unha acción estilo IRC a un amigo ou a un chat."
-
-#: ../console/gntconv.c:650 ../gtk/gtkconv.c:6738
+msgstr ""
+"me &lt;acción&gt;:  Envía unha acción estilo IRC a un contacto ou a unha "
+"conversa."
+
+#: ../console/gntconv.c:708 ../gtk/gtkconv.c:6794
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
-"debug &lt;opción&gt;:  Enviar información de depuración sobre a conversación "
+"debug &lt;opción&gt;:  Envía información de depuración sobre a conversa "
 "actual."
 
-#: ../console/gntconv.c:653 ../gtk/gtkconv.c:6741
+#: ../console/gntconv.c:711 ../gtk/gtkconv.c:6797
 msgid "clear: Clears the conversation scrollback."
-msgstr "limpar: Limpa a conversación desprazada."
-
-#: ../console/gntconv.c:656 ../gtk/gtkconv.c:6744
+msgstr "clear: Limpa o historial da conversa."
+
+#: ../console/gntconv.c:714 ../gtk/gtkconv.c:6800
 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;comando&gt;:  Recibir axuda dun comando específico."
-
-#: ../console/gntconv.c:661
+msgstr "help &lt;comando&gt;:  Axuda sobre un comando específico."
+
+#: ../console/gntconv.c:719
 msgid "plugins: Show the plugins window."
-msgstr "plugins: Amosar a fiestra de complementos."
-
-#: ../console/gntconv.c:664
+msgstr "plugins: Amosar a ventá de complementos."
+
+#: ../console/gntconv.c:722
 msgid "buddylist: Show the buddylist."
-msgstr "buddylist: Amosar lista de amigos."
-
-#: ../console/gntconv.c:667
+msgstr "buddylist: Amosar a lista de amigos."
+
+#: ../console/gntconv.c:725
 msgid "accounts: Show the accounts window."
-msgstr "accounts: Amosar fiestra de contas."
-
-#: ../console/gntconv.c:670
+msgstr "accounts: Amosar a ventá de contas."
+
+#: ../console/gntconv.c:728
 msgid "debugwin: Show the debug window."
-msgstr "debugwin: Amosar a fiestra de depuración."
-
-#: ../console/gntconv.c:673
+msgstr "debugwin: Amosar a ventá de depuración."
+
+#: ../console/gntconv.c:731
 msgid "prefs: Show the preference window."
-msgstr "prefs: Amosar a fiestra de preferencias."
-
-#: ../console/gntconv.c:676
+msgstr "prefs: Amosar a ventá de preferencias."
+
+#: ../console/gntconv.c:734
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses: Amosar a fiestra de estados gardados."
+msgstr "statuses: Amosar a ventá de estados gardardos."
 
 #: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
 msgid "Debug Window"
-msgstr "Fiestra de depuración"
+msgstr "Ventá de depuración"
 
 #. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
 #. * it's necessary to make the width of the debug window resizable ... like I said,
@@ -683,13 +701,13 @@
 msgid "Timestamps"
 msgstr "Marcas de tempo"
 
-#: ../console/gntgaim.c:166
+#: ../console/gntgaim.c:227
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Tente `%s -h' para máis información.\n"
 
-#: ../console/gntgaim.c:168
-#, c-format
+#: ../console/gntgaim.c:229
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -700,86 +718,87 @@
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-"%s\n"
+"Gaim %s\n"
 "Uso: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    usa DIR para ficheiros de configuración\n"
 "  -d, --debug         imprimir mensaxes de depuración a stdout\n"
 "  -h, --help          amosar esta axuda e saír\n"
 "  -n, --nologin       non conectarse automaticamente\n"
+"  -l, --login[=NOME]  conectarse automaticamente (como argumento especial "
+"espcificar o NOME\n"
+"                      da conta(s) a suar, separado por comas)\n"
 "  -v, --version       amosar a versión actual e saír\n"
 
 #: ../console/gntnotify.c:146
 msgid "Emails"
-msgstr "Emails"
+msgstr "Correos e."
 
 #: ../console/gntnotify.c:152 ../console/gntnotify.c:206
 msgid "You have mail!"
 msgstr "Ten un correo!"
 
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:414
-#: ../libgaim/protocols/jabber/jabber.c:1138
+#: ../console/gntnotify.c:155 ../libgaim/protocols/jabber/jabber.c:1153
 msgid "From"
 msgstr "De"
 
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:423
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:481
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../console/gntnotify.c:163 ../console/gntplugin.c:193
-#: ../console/gntplugin.c:274 ../console/gntstatus.c:206
-#: ../gtk/gtkrequest.c:272 ../libgaim/protocols/msn/msn.c:357
-#: ../libgaim/protocols/silc/util.c:377
+#: ../console/gntnotify.c:163 ../console/gntplugin.c:178
+#: ../console/gntplugin.c:259 ../console/gntstatus.c:206
+#: ../gtk/gtkaccount.c:2406 ../gtk/gtkrequest.c:272
+#: ../libgaim/protocols/msn/msn.c:355 ../libgaim/protocols/silc/util.c:377
 msgid "Close"
 msgstr "Pechar"
 
 #: ../console/gntnotify.c:182
-#, c-format
+#, fuzzy, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
-msgstr[0] "%s (%s) ten %d mensaxe nova."
-msgstr[1] "%s (%s) ten %d mensaxes novas."
-
-#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:332
+msgstr[0] "%s ten %d mensaxe nova."
+msgstr[1] "%s ten %d mensaxes novas."
+
+#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:322
 msgid "New Mail"
 msgstr "Correo novo"
 
-#: ../console/gntnotify.c:229 ../gtk/gtknotify.c:849
-#: ../libgaim/protocols/oscar/oscar.c:2611
+#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:856
 #, c-format
 msgid "Info for %s"
 msgstr "Información sobre %s"
 
-#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:850
+#: ../console/gntnotify.c:232 ../gtk/gtknotify.c:858
 #: ../libgaim/protocols/toc/toc.c:476
 msgid "Buddy Information"
-msgstr "Información de amigos"
-
-#: ../console/gntnotify.c:303
+msgstr "Información do contacto"
+
+#: ../console/gntnotify.c:306
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1610 ../gtk/gtkdebug.c:862
+#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1610 ../gtk/gtkdebug.c:862
 msgid "Info"
 msgstr "Info"
 
-#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1571
+#: ../console/gntnotify.c:315 ../gtk/gtkconv.c:1571
 msgid "IM"
 msgstr "MI"
 
-#: ../console/gntnotify.c:315
+#: ../console/gntnotify.c:318
 msgid "Join"
 msgstr "Unirse"
 
-#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3445
+#: ../console/gntnotify.c:321 ../libgaim/protocols/sametime/sametime.c:3485
 msgid "Invite"
-msgstr "Invitar"
-
-#: ../console/gntnotify.c:321
+msgstr "Convidar"
+
+#: ../console/gntnotify.c:324
 msgid "(none)"
 msgstr "(ningún)"
 
-#: ../console/gntplugin.c:117
+#: ../console/gntplugin.c:102
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -796,29 +815,30 @@
 "Sitio web: %s\n"
 "Nome de ficheiro: %s\n"
 
-#: ../console/gntplugin.c:170
+#: ../console/gntplugin.c:155
 msgid "Plugin need to be loaded before you can configure it."
-msgstr "Debe cargar o complemento antes de poder configuralo."
-
-#: ../console/gntplugin.c:208
+msgstr ""
+
+#: ../console/gntplugin.c:193
 msgid "..."
 msgstr "..."
 
-#: ../console/gntplugin.c:209
+#: ../console/gntplugin.c:194
 msgid "Still need to do something about this."
-msgstr "Aínda hai que facer algo sobre isto."
-
-#: ../console/gntplugin.c:215
+msgstr ""
+
+#: ../console/gntplugin.c:200
 msgid "No configuration options for this plugin."
-msgstr "Non hai opcións de configuración para este complemento."
-
-#: ../console/gntplugin.c:236
+msgstr ""
+
+#: ../console/gntplugin.c:221
+#, fuzzy
 msgid "You can (un)load plugins from the following list."
-msgstr "Pode activar/desactivar complementos da seguinte lista."
-
-#: ../console/gntplugin.c:279
+msgstr "Agardando a autorización dos seguintes contactos"
+
+#: ../console/gntplugin.c:264
 msgid "Configure Plugin"
-msgstr "Configurar complemento"
+msgstr "Configurar o complemento"
 
 #: ../console/gntprefs.c:122
 msgid "Show Idle Time"
@@ -826,15 +846,16 @@
 
 #: ../console/gntprefs.c:123
 msgid "Show Offline Buddies"
-msgstr "Amosar amigos desconectados"
+msgstr "Amosar contactos desconectados"
 
 #: ../console/gntprefs.c:129
 msgid "Show Timestamps"
 msgstr "Amosar marcas de tempo"
 
 #: ../console/gntprefs.c:130
+#, fuzzy
 msgid "Notify buddies when you are typing"
-msgstr "Notificar aos amigos cando lles está escribindo"
+msgstr "_Notificarlle aos contactos cando se lles está escribindo"
 
 #: ../console/gntprefs.c:136
 msgid "Log format"
@@ -842,39 +863,40 @@
 
 #: ../console/gntprefs.c:137
 msgid "Log IMs"
-msgstr "Rexistro de MIs"
+msgstr ""
 
 #: ../console/gntprefs.c:138
 msgid "Log chats"
-msgstr "Rexistrar chats"
+msgstr "Rexistrar as conversas"
 
 #: ../console/gntprefs.c:139
+#, fuzzy
 msgid "Log status change events"
-msgstr "Rexistrar os eventos de cambios de estado"
+msgstr "Rexistrar todas as mudanzas de e_stado no rexistro do sistema"
 
 #. Conversations
-#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1913
+#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1915
 #: ../gtk/plugins/win32/winprefs/winprefs.c:341
 msgid "Conversations"
-msgstr "Conversacións"
-
-#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1349 ../gtk/gtkprefs.c:1924
+msgstr "Conversas"
+
+#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1355 ../gtk/gtkprefs.c:1926
 msgid "Logging"
 msgstr "Rexistro"
 
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:532
-#: ../gtk/gtkprefs.c:1949
+#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545
+#: ../gtk/gtkprefs.c:1951
 msgid "Preferences"
 msgstr "Preferencias"
 
 #: ../console/gntrequest.c:495
 msgid "Not implemented yet."
-msgstr "Funcionalidade non implementada todavía."
+msgstr "Funcionalidade non implementada."
 
 #: ../console/gntstatus.c:135
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "Está seguro de que quere borrar \"%s\"?"
+msgstr "Estás seguro de que queres borrar \"%s\"?"
 
 #: ../console/gntstatus.c:138
 msgid "Delete Status"
@@ -884,9 +906,9 @@
 msgid "Saved Statuses"
 msgstr "Estados gardados"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:525
-#: ../gtk/gtksavedstatuses.c:433 ../libgaim/protocols/jabber/buddy.c:283
-#: ../libgaim/protocols/jabber/buddy.c:917
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:526
+#: ../gtk/gtksavedstatuses.c:433 ../libgaim/protocols/jabber/buddy.c:286
+#: ../libgaim/protocols/jabber/buddy.c:931
 #: ../libgaim/protocols/novell/novell.c:1484
 msgid "Title"
 msgstr "Título"
@@ -895,45 +917,45 @@
 msgid "Type"
 msgstr "Tipo"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:550
-#: ../console/gntstatus.c:562 ../gtk/gtksavedstatuses.c:459
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:551
+#: ../console/gntstatus.c:563 ../gtk/gtksavedstatuses.c:459
 #: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
 #: ../libgaim/protocols/bonjour/bonjour.c:263
-#: ../libgaim/protocols/gg/gg.c:1592 ../libgaim/protocols/gg/gg.c:1602
-#: ../libgaim/protocols/gg/gg.c:1608 ../libgaim/protocols/gg/gg.c:1617
-#: ../libgaim/protocols/gg/gg.c:1622 ../libgaim/protocols/irc/irc.c:244
-#: ../libgaim/protocols/jabber/jabber.c:1205
-#: ../libgaim/protocols/jabber/jabber.c:1215
+#: ../libgaim/protocols/bonjour/bonjour.c:339
+#: ../libgaim/protocols/gg/gg.c:1062 ../libgaim/protocols/gg/gg.c:1587
+#: ../libgaim/protocols/gg/gg.c:1605 ../libgaim/protocols/gg/gg.c:1615
+#: ../libgaim/protocols/gg/gg.c:1621 ../libgaim/protocols/gg/gg.c:1630
+#: ../libgaim/protocols/gg/gg.c:1635 ../libgaim/protocols/irc/irc.c:244
 #: ../libgaim/protocols/jabber/jabber.c:1225
 #: ../libgaim/protocols/jabber/jabber.c:1235
 #: ../libgaim/protocols/jabber/jabber.c:1245
-#: ../libgaim/protocols/jabber/jabber.c:1257
-#: ../libgaim/protocols/novell/novell.c:2876
+#: ../libgaim/protocols/jabber/jabber.c:1255
+#: ../libgaim/protocols/jabber/jabber.c:1265
+#: ../libgaim/protocols/jabber/jabber.c:1277
+#: ../libgaim/protocols/novell/novell.c:2873
+#: ../libgaim/protocols/novell/novell.c:2976
 #: ../libgaim/protocols/novell/novell.c:2982
 #: ../libgaim/protocols/novell/novell.c:2988
-#: ../libgaim/protocols/novell/novell.c:2994
-#: ../libgaim/protocols/oscar/oscar.c:5396
-#: ../libgaim/protocols/oscar/oscar.c:5411
-#: ../libgaim/protocols/oscar/oscar.c:5416
-#: ../libgaim/protocols/oscar/oscar.c:5624
-#: ../libgaim/protocols/oscar/oscar.c:5636
-#: ../libgaim/protocols/oscar/oscar.c:5649
-#: ../libgaim/protocols/oscar/oscar.c:5656
-#: ../libgaim/protocols/oscar/oscar.c:5663
-#: ../libgaim/protocols/sametime/sametime.c:3259
-#: ../libgaim/protocols/sametime/sametime.c:3265
-#: ../libgaim/protocols/sametime/sametime.c:3271
-#: ../libgaim/protocols/sametime/sametime.c:3350
+#: ../libgaim/protocols/oscar/oscar.c:5501
+#: ../libgaim/protocols/oscar/oscar.c:5729
+#: ../libgaim/protocols/oscar/oscar.c:5741
+#: ../libgaim/protocols/oscar/oscar.c:5754
+#: ../libgaim/protocols/oscar/oscar.c:5761
+#: ../libgaim/protocols/oscar/oscar.c:5768
+#: ../libgaim/protocols/sametime/sametime.c:3299
+#: ../libgaim/protocols/sametime/sametime.c:3305
+#: ../libgaim/protocols/sametime/sametime.c:3311
+#: ../libgaim/protocols/sametime/sametime.c:3390
 #: ../libgaim/protocols/silc/buddy.c:1544
 #: ../libgaim/protocols/simple/simple.c:246
+#: ../libgaim/protocols/yahoo/yahoo.c:3450
 #: ../libgaim/protocols/yahoo/yahoo.c:3456
-#: ../libgaim/protocols/yahoo/yahoo.c:3462
-#: ../libgaim/protocols/zephyr/zephyr.c:2333
+#: ../libgaim/protocols/zephyr/zephyr.c:2337
 msgid "Message"
 msgstr "Mensaxe"
 
 #. Use
-#: ../console/gntstatus.c:186 ../console/gntstatus.c:579
+#: ../console/gntstatus.c:186 ../console/gntstatus.c:580
 msgid "Use"
 msgstr "Usar"
 
@@ -943,132 +965,145 @@
 
 #: ../console/gntstatus.c:292
 msgid "Please enter a non-empty title for the status."
-msgstr "Introduza o título non baleiro para o estado."
+msgstr ""
 
 #: ../console/gntstatus.c:299
 msgid "Duplicate title"
 msgstr "Título duplicado"
 
 #: ../console/gntstatus.c:300
+#, fuzzy
 msgid "Please enter a different title for the status."
-msgstr "Introduza un título distinto para o estado."
-
-#: ../console/gntstatus.c:439
+msgstr "Usar un estado _diferente para algunhas contas"
+
+#: ../console/gntstatus.c:440
+#, fuzzy
 msgid "Substatus"
-msgstr "Subestado"
+msgstr "Estado"
 
 #. Set up stuff for the account box
-#: ../console/gntstatus.c:442 ../gtk/gtkblist.c:4990 ../gtk/gtkblist.c:5308
+#: ../console/gntstatus.c:443 ../gtk/gtkblist.c:5267 ../gtk/gtkblist.c:5583
 msgid "Account:"
 msgstr "Conta:"
 
-#: ../console/gntstatus.c:450 ../gtk/gtkft.c:698
+#: ../console/gntstatus.c:451 ../gtk/gtkft.c:698
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../console/gntstatus.c:465
+#: ../console/gntstatus.c:466
 msgid "Message:"
 msgstr "Mensaxe:"
 
-#: ../console/gntstatus.c:514
+#: ../console/gntstatus.c:515
 msgid "Edit Status"
 msgstr "Editar estado"
 
-#: ../console/gntstatus.c:533 ../console/gntstatus.c:562
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../console/gntstatus.c:534 ../console/gntstatus.c:563
+#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:2811 ../gtk/gtkblist.c:2813
 #: ../gtk/gtksavedstatuses.c:912 ../gtk/gtksavedstatuses.c:1059
-#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1575
-#: ../libgaim/protocols/gg/gg.c:1579 ../libgaim/protocols/jabber/buddy.c:623
-#: ../libgaim/protocols/jabber/buddy.c:630
-#: ../libgaim/protocols/jabber/buddy.c:658
-#: ../libgaim/protocols/jabber/jabber.c:1176
-#: ../libgaim/protocols/msn/msn.c:546
-#: ../libgaim/protocols/novell/novell.c:2875
-#: ../libgaim/protocols/novell/novell.c:2879
-#: ../libgaim/protocols/oscar/oscar.c:759
-#: ../libgaim/protocols/oscar/oscar.c:765
-#: ../libgaim/protocols/oscar/oscar.c:768
-#: ../libgaim/protocols/yahoo/yahoo.c:3032
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1584
+#: ../libgaim/protocols/gg/gg.c:1592 ../libgaim/protocols/jabber/buddy.c:637
+#: ../libgaim/protocols/jabber/buddy.c:641
+#: ../libgaim/protocols/jabber/buddy.c:674
+#: ../libgaim/protocols/jabber/jabber.c:1193
+#: ../libgaim/protocols/msn/msn.c:547
+#: ../libgaim/protocols/novell/novell.c:2870
+#: ../libgaim/protocols/oscar/oscar.c:800
+#: ../libgaim/protocols/oscar/oscar.c:805
+#: ../libgaim/protocols/oscar/oscar.c:807
+#: ../libgaim/protocols/oscar/oscar.c:2655
+#: ../libgaim/protocols/sametime/sametime.c:3276
+#: ../libgaim/protocols/sametime/sametime.c:4161
+#: ../libgaim/protocols/yahoo/yahoo.c:3027
 msgid "Status"
 msgstr "Estado"
 
-#: ../console/gntstatus.c:556
+#: ../console/gntstatus.c:557
+#, fuzzy
 msgid "Use different status for following accounts"
-msgstr "Usar un estado diferente para as seguintes contas"
+msgstr "Usar un estado _diferente para algunhas contas"
 
 #. Save & Use
-#: ../console/gntstatus.c:590
+#: ../console/gntstatus.c:591
+#, fuzzy
 msgid "Save & Use"
-msgstr "Gardar e usar"
+msgstr "Ga_rdar e usar"
 
 #: ../console/gntui.c:75
+#, fuzzy
 msgid "Statuses"
-msgstr "Estados"
+msgstr "Estado"
 
 #: ../console/plugins/gntgf.c:209
-#, c-format
+#, fuzzy, c-format
 msgid "%s just signed on"
-msgstr "%s acábase de conectar"
+msgstr "%s conectouse."
 
 #: ../console/plugins/gntgf.c:216
-#, c-format
+#, fuzzy, c-format
 msgid "%s just signed off"
-msgstr "%s acábase de desconectar."
+msgstr "%s desconectouse."
 
 #: ../console/plugins/gntgf.c:224
-#, c-format
+#, fuzzy, c-format
 msgid "%s sent you a message"
-msgstr "%s envioulle unha mensaxe."
+msgstr "%s envioulle unha mensaxe. (%s)"
 
 #: ../console/plugins/gntgf.c:243
 #, c-format
 msgid "%s said your nick in %s"
-msgstr "%s dixo o seu alcume en %s"
+msgstr ""
 
 #: ../console/plugins/gntgf.c:245
-#, c-format
+#, fuzzy, c-format
 msgid "%s sent a message in %s"
-msgstr "%s envioulle unha mensaxe en %s"
+msgstr "%s envioulle unha mensaxe. (%s)"
 
 #: ../console/plugins/gntgf.c:283
+#, fuzzy
 msgid "Buddy signs on/off"
-msgstr "Conectouse/Desconectouse un amigo"
+msgstr "_Conéctase/Desconéctase un contacto"
 
 #: ../console/plugins/gntgf.c:284
 msgid "You receive an IM"
-msgstr "Recibiu unha MI"
+msgstr ""
 
 #: ../console/plugins/gntgf.c:285
+#, fuzzy
 msgid "Someone speaks in a chat"
-msgstr "Alguén fala no chat"
+msgstr "Alguén menciona o seu nome na conversa"
 
 #: ../console/plugins/gntgf.c:286
+#, fuzzy
 msgid "Someone says your name in a chat"
-msgstr "Alguén menciona o seu nome no chat"
+msgstr "Alguén menciona o seu nome na conversa"
 
 #: ../console/plugins/gntgf.c:314
 msgid "Notify with a toaster when"
-msgstr "Notificar cun 'toaster' cando"
+msgstr ""
 
 #: ../console/plugins/gntgf.c:329
 msgid "Beep too!"
-msgstr "Bip tamén!"
+msgstr ""
 
 #: ../console/plugins/gntgf.c:335
 msgid "Set URGENT for the terminal window."
-msgstr "Establecer a fiestra de terminal coma URXENTE."
+msgstr ""
 
 #: ../console/plugins/gntgf.c:355
 msgid "GntGf"
-msgstr "GntGf"
+msgstr ""
 
 #: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
 msgid "Toaster plugin for Gaim-Text."
-msgstr "Complemento 'toaster' para Gaim-Text."
+msgstr ""
 
 #: ../console/plugins/gnthistory.c:116 ../gtk/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<b>Conversación con %s en %s:</b><br>"
+msgstr "<b>Conversa con %s en %s:</b><br>"
 
 #: ../console/plugins/gnthistory.c:138 ../gtk/plugins/history.c:147
 msgid "History Plugin Requires Logging"
@@ -1083,24 +1118,25 @@
 msgstr ""
 "Pode activar o rexistro en Ferramentas -> Preferencias -> Rexistro.\n"
 "\n"
-"A activación do rexistro nas mensaxes instantáneas e/ou chats activará o "
-"historial para os mesmos tipos de conversación."
+"A activación do rexistro nas mensaxes instantáneas e/ou conversas activará o "
+"historial para os mesmos tipos de conversa."
 
 #: ../console/plugins/gnthistory.c:179
+#, fuzzy
 msgid "GntHistory"
-msgstr "HistorialGnt"
+msgstr "Historial"
 
 #: ../console/plugins/gnthistory.c:181 ../gtk/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
-msgstr "Mostra as conversacións rexistradas previamente nas novas conversacións."
+msgstr "Amosa as conversas rexistradas previamente nas novas conversas."
 
 #: ../console/plugins/gnthistory.c:182 ../gtk/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
-"Cando se abre unha nova conversación este complemento introduce a última "
-"conversación na conversación actual."
+"Cando se abre unha nova conversa este complemento introduce a última "
+"conversa na actual."
 
 #: ../console/plugins/lastlog.c:69
 msgid "Lastlog"
@@ -1111,13 +1147,12 @@
 msgstr ""
 
 #: ../console/plugins/lastlog.c:121
-#, fuzzy
 msgid "GntLastlog"
-msgstr "Historial"
+msgstr ""
 
 #: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124
 msgid "Lastlog plugin for gaim-text."
-msgstr "Complemento 'Lastlog' para gaim-text."
+msgstr ""
 
 #: ../gtk/eggtrayicon.c:129
 msgid "Orientation"
@@ -1132,16 +1167,16 @@
 msgstr "_Alcume"
 
 #. join button
-#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1120 ../gtk/gtkroomlist.c:285
-#: ../gtk/gtkroomlist.c:442
+#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1186 ../gtk/gtkroomlist.c:306
+#: ../gtk/gtkroomlist.c:463
 msgid "_Join"
 msgstr "_Unirse"
 
 #: ../gtk/gaimstock.c:139
 msgid "Close _tabs"
-msgstr "Pechar _solapas"
-
-#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1004
+msgstr "Pechar _pestanas"
+
+#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1069
 msgid "I_M"
 msgstr "_MI"
 
@@ -1151,7 +1186,7 @@
 
 #: ../gtk/gaimstock.c:142
 msgid "_Invite"
-msgstr "_Invitar"
+msgstr "_Convidar"
 
 #: ../gtk/gaimstock.c:143
 msgid "_Modify"
@@ -1159,7 +1194,7 @@
 
 #: ../gtk/gaimstock.c:144
 msgid "_Open Mail"
-msgstr "A_brir correo"
+msgstr "A_brir o correo"
 
 #. Pause button
 #: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
@@ -1167,318 +1202,364 @@
 msgstr "_Pausar"
 
 #. Build the login options frame.
-#: ../gtk/gtkaccount.c:382
+#: ../gtk/gtkaccount.c:390
 msgid "Login Options"
 msgstr "Opcións de conexión"
 
-#: ../gtk/gtkaccount.c:483
+#: ../gtk/gtkaccount.c:492
+#, fuzzy
 msgid "Local alias:"
-msgstr "Alcume local:"
+msgstr "Ficheiro local:"
 
 #. Build the user options frame.
-#: ../gtk/gtkaccount.c:545
+#: ../gtk/gtkaccount.c:554
 msgid "User Options"
 msgstr "Opcións de usuario"
 
 #. Buddy icon
-#: ../gtk/gtkaccount.c:563
+#: ../gtk/gtkaccount.c:572
 msgid "Use this buddy icon for this account:"
-msgstr "Usar esta icona de amigo para esta conta:"
+msgstr ""
 
 #. Build the protocol options frame.
-#: ../gtk/gtkaccount.c:671
+#: ../gtk/gtkaccount.c:684
 #, c-format
 msgid "%s Options"
 msgstr "Opcións de %s"
 
-#: ../gtk/gtkaccount.c:867
+#: ../gtk/gtkaccount.c:881
+#, fuzzy
+msgid "Use GNOME Proxy Settings"
+msgstr "Usar configuración global do proxy"
+
+#: ../gtk/gtkaccount.c:882
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuración global do proxy"
 
-#: ../gtk/gtkaccount.c:873
+#: ../gtk/gtkaccount.c:888
 msgid "No Proxy"
 msgstr "Sen proxy"
 
-#: ../gtk/gtkaccount.c:879
+#: ../gtk/gtkaccount.c:894
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../gtk/gtkaccount.c:885
+#: ../gtk/gtkaccount.c:900
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../gtk/gtkaccount.c:891
+#: ../gtk/gtkaccount.c:906
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../gtk/gtkaccount.c:897 ../gtk/gtkprefs.c:1095
+#: ../gtk/gtkaccount.c:912 ../gtk/gtkprefs.c:1100
 msgid "Use Environmental Settings"
-msgstr "Usar configuración do entorno"
+msgstr "Usar configuración do contorno"
 
 #. This is an easter egg.
 #. It means one of two things, both intended as humourus:
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../gtk/gtkaccount.c:936
+#: ../gtk/gtkaccount.c:951
 msgid "If you look real closely"
-msgstr "Se miras de cerca"
+msgstr "Se miras de preto"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../gtk/gtkaccount.c:939
+#: ../gtk/gtkaccount.c:954
 msgid "you can see the butterflies mating"
 msgstr "podes ver as volvoretas apareándose"
 
-#: ../gtk/gtkaccount.c:960
+#: ../gtk/gtkaccount.c:975
 msgid "Proxy Options"
 msgstr "Opcións do proxy"
 
-#: ../gtk/gtkaccount.c:974 ../gtk/gtkprefs.c:1089
+#: ../gtk/gtkaccount.c:989 ../gtk/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../gtk/gtkaccount.c:983 ../gtk/gtkprefs.c:1110
+#: ../gtk/gtkaccount.c:998 ../gtk/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: ../gtk/gtkaccount.c:987 ../gtk/gtkprefs.c:1128
+#: ../gtk/gtkaccount.c:1002 ../gtk/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../gtk/gtkaccount.c:995
+#: ../gtk/gtkaccount.c:1010
 msgid "_Username:"
 msgstr "Nome de _usuario:"
 
-#: ../gtk/gtkaccount.c:1001 ../gtk/gtkprefs.c:1165
+#: ../gtk/gtkaccount.c:1017 ../gtk/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "Co_ntrasinal:"
 
-#: ../gtk/gtkaccount.c:1398
+#: ../gtk/gtkaccount.c:1428
 msgid "Add Account"
 msgstr "Engadir conta"
 
-#: ../gtk/gtkaccount.c:1422
+#: ../gtk/gtkaccount.c:1452
 msgid "_Basic"
 msgstr "_Básico"
 
-#: ../gtk/gtkaccount.c:1433
+#: ../gtk/gtkaccount.c:1463
 msgid "_Advanced"
 msgstr "_Avanzado"
 
 #. Register button
-#: ../gtk/gtkaccount.c:1448 ../libgaim/protocols/jabber/jabber.c:849
+#: ../gtk/gtkaccount.c:1478 ../libgaim/protocols/jabber/jabber.c:858
 msgid "Register"
 msgstr "Rexistrar"
 
-#: ../gtk/gtkaccount.c:1919 ../gtk/gtkplugin.c:576
+#: ../gtk/gtkaccount.c:1933 ../gtk/gtkplugin.c:566
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../gtk/gtkaccount.c:1927
+#: ../gtk/gtkaccount.c:1961
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../gtk/gtkblist.c:705
+#: ../gtk/gtkaccount.c:2133
+msgid ""
+"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with Gaim press the "
+"<b>Add</b> button below and configure your first account. If you want Gaim "
+"to connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
+msgstr ""
+
+#: ../gtk/gtkaccount.c:2483
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "O usuario %s quere engadir a %s á listaxe de contactos %s%s."
+
+#: ../gtk/gtkaccount.c:2506 ../gtk/gtkaccount.c:2512
+#, fuzzy
+msgid "Authorize buddy?"
+msgstr "Autorizar"
+
+#: ../gtk/gtkaccount.c:2507 ../gtk/gtkaccount.c:2513
+msgid "Authorize"
+msgstr "Autorizar"
+
+#: ../gtk/gtkaccount.c:2508 ../gtk/gtkaccount.c:2514
+msgid "Deny"
+msgstr "Rexeitar"
+
+#: ../gtk/gtkblist.c:709
 msgid "Join a Chat"
-msgstr "Unirse a un Chat"
-
-#: ../gtk/gtkblist.c:726
+msgstr "Unirse a unha conversa"
+
+#: ../gtk/gtkblist.c:730
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr "Introduza a información apropiada do chat ao que desexaría unirse.\n"
-
-#: ../gtk/gtkblist.c:737 ../gtk/gtkpounce.c:523 ../gtk/gtkroomlist.c:378
+msgstr "Introduza a información apropiada da conversa á que desexaría unirse.\n"
+
+#: ../gtk/gtkblist.c:741 ../gtk/gtkpounce.c:529 ../gtk/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "Con_ta:"
 
-#: ../gtk/gtkblist.c:1001
+#: ../gtk/gtkblist.c:1015 ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
+msgid "_Block"
+msgstr "_Bloquear"
+
+#: ../gtk/gtkblist.c:1015
+#, fuzzy
+msgid "Un_block"
+msgstr "Desbloquear"
+
+#: ../gtk/gtkblist.c:1066
 msgid "Get _Info"
 msgstr "Obter _información:"
 
-#: ../gtk/gtkblist.c:1010
+#: ../gtk/gtkblist.c:1075
 msgid "_Send File"
 msgstr "E_nviar ficheiro"
 
-#: ../gtk/gtkblist.c:1017
+#: ../gtk/gtkblist.c:1082
 msgid "Add Buddy _Pounce"
-msgstr "Engadir _aviso de amigo"
-
-#: ../gtk/gtkblist.c:1021 ../gtk/gtkblist.c:1025 ../gtk/gtkblist.c:1124
-#: ../gtk/gtkblist.c:1147
+msgstr "Engadir _aviso de contacto"
+
+#: ../gtk/gtkblist.c:1086 ../gtk/gtkblist.c:1090 ../gtk/gtkblist.c:1190
+#: ../gtk/gtkblist.c:1213
 msgid "View _Log"
 msgstr "Ver _rexistro"
 
-#: ../gtk/gtkblist.c:1036
+#: ../gtk/gtkblist.c:1103
 msgid "Alias..."
 msgstr "Alcume..."
 
-#: ../gtk/gtkblist.c:1045 ../gtk/gtkblist.c:1132 ../gtk/gtkblist.c:1153
+#: ../gtk/gtkblist.c:1112 ../gtk/gtkblist.c:1198 ../gtk/gtkblist.c:1219
 msgid "_Alias..."
 msgstr "_Alcume..."
 
-#: ../gtk/gtkblist.c:1047 ../gtk/gtkblist.c:1134 ../gtk/gtkblist.c:1155
+#: ../gtk/gtkblist.c:1114 ../gtk/gtkblist.c:1200 ../gtk/gtkblist.c:1221
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: ../gtk/gtkblist.c:1095
+#: ../gtk/gtkblist.c:1161
 msgid "Add a _Buddy"
-msgstr "Engadir un a_migo"
-
-#: ../gtk/gtkblist.c:1097
+msgstr "Engadir un _contacto"
+
+#: ../gtk/gtkblist.c:1163
 msgid "Add a C_hat"
-msgstr "Engadir un C_hat"
-
-#: ../gtk/gtkblist.c:1100
+msgstr "Engadir unha _conversa"
+
+#: ../gtk/gtkblist.c:1166
 msgid "_Delete Group"
-msgstr "_Borrar grupo"
-
-#: ../gtk/gtkblist.c:1102
+msgstr "_Borrar o grupo"
+
+#: ../gtk/gtkblist.c:1168
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../gtk/gtkblist.c:1122
+#: ../gtk/gtkblist.c:1188
 msgid "Auto-Join"
 msgstr "Conectarse automaticamente"
 
-#: ../gtk/gtkblist.c:1160 ../gtk/gtkblist.c:1183
+#: ../gtk/gtkblist.c:1226 ../gtk/gtkblist.c:1249
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../gtk/gtkblist.c:1188
+#: ../gtk/gtkblist.c:1254
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../gtk/gtkblist.c:1434 ../gtk/gtkblist.c:1446 ../gtk/gtkblist.c:4115
-#: ../gtk/gtkblist.c:4125
+#: ../gtk/gtkblist.c:1500 ../gtk/gtkblist.c:1512 ../gtk/gtkblist.c:4364
+#: ../gtk/gtkblist.c:4374
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Silenciar sons"
 
-#: ../gtk/gtkblist.c:1906 ../gtk/gtkconv.c:4345 ../gtk/gtkpounce.c:422
+#: ../gtk/gtkblist.c:1972 ../gtk/gtkconv.c:4394 ../gtk/gtkpounce.c:421
 msgid "You are not currently signed on with an account that can add that buddy."
-msgstr "Non está conectado con ningunha conta que poida engadir a ese amigo."
+msgstr "Non está conectado con ningunha conta que poida engadir a ese contacto."
 
 #. Buddies menu
-#: ../gtk/gtkblist.c:2500
+#: ../gtk/gtkblist.c:2567
 msgid "/_Buddies"
-msgstr "/_Amigos"
-
-#: ../gtk/gtkblist.c:2501
+msgstr "/_Contactos"
+
+#: ../gtk/gtkblist.c:2568
 msgid "/Buddies/New Instant _Message..."
-msgstr "/Amigos/_Mensaxe instantánea nova..."
-
-#: ../gtk/gtkblist.c:2502
+msgstr "/Contactos/_Mensaxe instantánea nova..."
+
+#: ../gtk/gtkblist.c:2569
 msgid "/Buddies/Join a _Chat..."
-msgstr "/Amigos/Unirse a un _Chat..."
-
-#: ../gtk/gtkblist.c:2503
+msgstr "/Contactos/Unirse a unha _conversa..."
+
+#: ../gtk/gtkblist.c:2570
 msgid "/Buddies/Get User _Info..."
-msgstr "/Amigos/Obter _información do usuario..."
-
-#: ../gtk/gtkblist.c:2504
+msgstr "/Contactos/Obter _información do usuario..."
+
+#: ../gtk/gtkblist.c:2571
 msgid "/Buddies/View User _Log..."
-msgstr "/Amigos/Ver _rexistro do usuario..."
-
-#: ../gtk/gtkblist.c:2506
+msgstr "/Contactos/Ver _rexistro do usuario..."
+
+#: ../gtk/gtkblist.c:2573
 msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Amigos/Amosar amigos _desconectados"
-
-#: ../gtk/gtkblist.c:2507
+msgstr "/Contactos/Amosar contactos _desconectados"
+
+#: ../gtk/gtkblist.c:2574
 msgid "/Buddies/Show _Empty Groups"
-msgstr "/Amigos/Amosar grupos _baleiros"
-
-#: ../gtk/gtkblist.c:2508
+msgstr "/Contactos/Amosar grupos _baleiros"
+
+#: ../gtk/gtkblist.c:2575
 msgid "/Buddies/Show Buddy _Details"
-msgstr "/Amigos/Amosar _detalles de amigos"
-
-#: ../gtk/gtkblist.c:2509
+msgstr "/Contactos/Amosar _detalles de contactos"
+
+#: ../gtk/gtkblist.c:2576
 msgid "/Buddies/Show Idle _Times"
-msgstr "/Amigos/Amosar _tempo de ausencia"
-
-#: ../gtk/gtkblist.c:2510
+msgstr "/Contactos/Amosar _tempo de ausencia"
+
+#: ../gtk/gtkblist.c:2577
 msgid "/Buddies/_Sort Buddies"
-msgstr "/Amigos/A_rranxar amigos"
-
-#: ../gtk/gtkblist.c:2512
+msgstr "/Contactos/Ordenar contactos"
+
+#: ../gtk/gtkblist.c:2579
 msgid "/Buddies/_Add Buddy..."
-msgstr "/Amigos/_Engadir un amigo..."
-
-#: ../gtk/gtkblist.c:2513
+msgstr "/Contactos/_Engadir un contacto..."
+
+#: ../gtk/gtkblist.c:2580
 msgid "/Buddies/Add C_hat..."
-msgstr "/Amigos/Engadir un _Chat..."
-
-#: ../gtk/gtkblist.c:2514
+msgstr "/Contactos/Engadir unha _conversa..."
+
+#: ../gtk/gtkblist.c:2581
 msgid "/Buddies/Add _Group..."
-msgstr "/Amigos/Engadir un _grupo..."
-
-#: ../gtk/gtkblist.c:2516
+msgstr "/Contactos/Engadir un _grupo..."
+
+#: ../gtk/gtkblist.c:2583
 msgid "/Buddies/_Quit"
-msgstr "/Amigos/_Saír"
+msgstr "/Contactos/_Saír"
 
 #. Accounts menu
-#: ../gtk/gtkblist.c:2519
+#: ../gtk/gtkblist.c:2586
 msgid "/_Accounts"
 msgstr "/_Contas"
 
-#: ../gtk/gtkblist.c:2520 ../gtk/gtkblist.c:5967
+#: ../gtk/gtkblist.c:2587 ../gtk/gtkblist.c:6265
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Contas/Engadir\\/Editar"
 
 #. Tools
-#: ../gtk/gtkblist.c:2523
+#: ../gtk/gtkblist.c:2590
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../gtk/gtkblist.c:2524
+#: ../gtk/gtkblist.c:2591
 msgid "/Tools/Buddy _Pounces"
-msgstr "/Ferramentas/_Avisos de amigo"
-
-#: ../gtk/gtkblist.c:2525
+msgstr "/Ferramentas/_Avisos de contacto"
+
+#: ../gtk/gtkblist.c:2592
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/C_omplementos"
 
-#: ../gtk/gtkblist.c:2526
+#: ../gtk/gtkblist.c:2593
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_eferencias"
 
-#: ../gtk/gtkblist.c:2527
+#: ../gtk/gtkblist.c:2594
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: ../gtk/gtkblist.c:2529
+#: ../gtk/gtkblist.c:2596
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferencias de _ficheiros"
 
-#: ../gtk/gtkblist.c:2530
+#: ../gtk/gtkblist.c:2597
 msgid "/Tools/R_oom List"
-msgstr "/Ferramentas/Lista de _salas"
-
-#: ../gtk/gtkblist.c:2531
+msgstr "/Ferramentas/Listaxe de _salas"
+
+#: ../gtk/gtkblist.c:2598
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/_Rexistro do sistema"
 
-#: ../gtk/gtkblist.c:2533
+#: ../gtk/gtkblist.c:2600
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Silenciar _sons"
 
 #. Help
-#: ../gtk/gtkblist.c:2536
+#: ../gtk/gtkblist.c:2603
 msgid "/_Help"
 msgstr "/A_xuda"
 
-#: ../gtk/gtkblist.c:2537
+#: ../gtk/gtkblist.c:2604
 msgid "/Help/Online _Help"
 msgstr "/Axuda/A_xuda en liña"
 
-#: ../gtk/gtkblist.c:2538
+#: ../gtk/gtkblist.c:2605
 msgid "/Help/_Debug Window"
-msgstr "/Axuda/Fiestra de _depuración"
-
-#: ../gtk/gtkblist.c:2539
+msgstr "/Axuda/Ventá de _depuración"
+
+#: ../gtk/gtkblist.c:2606
 msgid "/Help/_About"
 msgstr "/Axuda/_Acerca de"
 
-#: ../gtk/gtkblist.c:2571 ../gtk/gtkblist.c:2640
+#: ../gtk/gtkblist.c:2638
 #, c-format
 msgid ""
 "\n"
@@ -1487,306 +1568,289 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: ../gtk/gtkblist.c:2652
-#, c-format
-msgid ""
-"\n"
-"<b>Buddy Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Alcume de amigo:</b> %s"
-
-#: ../gtk/gtkblist.c:2664
-#, c-format
-msgid ""
-"\n"
-"<b>Nickname:</b> %s"
-msgstr ""
-"\n"
-"<b>Alcume:</b> %s"
-
-#: ../gtk/gtkblist.c:2673
-#, c-format
-msgid ""
-"\n"
-"<b>Logged In:</b> %s"
-msgstr ""
-"\n"
-"<b>Conectado:</b> %s"
-
-#: ../gtk/gtkblist.c:2684
-#, c-format
-msgid ""
-"\n"
-"<b>Idle:</b> %s"
-msgstr ""
-"\n"
-"<b>Inactivo:</b> %s"
-
-#: ../gtk/gtkblist.c:2719
-#, c-format
-msgid ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-msgstr ""
-"\n"
-"<b>Visto por última vez</b> fai %s"
-
-#: ../gtk/gtkblist.c:2728
-msgid ""
-"\n"
-"<b>Status:</b> Offline"
-msgstr ""
-"\n"
-"<b>Estado:</b> Desconectado"
-
-#: ../gtk/gtkblist.c:2739
-msgid ""
-"\n"
-"<b>Description:</b> Spooky"
-msgstr ""
-"\n"
-"<b>Descrición:</b> Terrorífica"
-
-#: ../gtk/gtkblist.c:2741
-msgid ""
-"\n"
-"<b>Status:</b> Awesome"
-msgstr ""
-"\n"
-"<b>Estado</b>: Xenial"
+#: ../gtk/gtkblist.c:2722
+#, fuzzy
+msgid "Buddy Alias"
+msgstr "Listaxe de contactos"
 
 #: ../gtk/gtkblist.c:2743
-msgid ""
-"\n"
-"<b>Status:</b> Rockin'"
-msgstr ""
-"\n"
-"<b>Estado</b>: Rock & roll"
-
-#: ../gtk/gtkblist.c:3210 ../gtk/gtkdocklet.c:458 ../gtk/gtkstatusbox.c:974
-#: ../libgaim/protocols/gg/gg.c:993 ../libgaim/protocols/jabber/buddy.c:1365
-#: ../libgaim/protocols/novell/novell.c:2865
-#: ../libgaim/protocols/oscar/oscar.c:769
-#: ../libgaim/protocols/oscar/oscar.c:5446
-#: ../libgaim/protocols/yahoo/yahoo.c:2883 ../libgaim/status.c:154
+#, fuzzy
+msgid "Logged In"
+msgstr "Xa está conectado"
+
+#: ../gtk/gtkblist.c:2789
+#, fuzzy
+msgid "Last Seen"
+msgstr "Apelidos"
+
+#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:3286 ../gtk/gtkdocklet.c:471
+#: ../gtk/gtkstatusbox.c:990 ../libgaim/protocols/gg/gg.c:993
+#: ../libgaim/protocols/jabber/buddy.c:1401
+#: ../libgaim/protocols/novell/novell.c:2863
+#: ../libgaim/protocols/oscar/oscar.c:807
+#: ../libgaim/protocols/oscar/oscar.c:5551 ../libgaim/protocols/qq/qq.c:170
+#: ../libgaim/protocols/qq/qq.c:177 ../libgaim/protocols/yahoo/yahoo.c:2878
+#: ../libgaim/status.c:154
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../gtk/gtkblist.c:3226
+#: ../gtk/gtkblist.c:2809 ../gtk/gtkprefs.c:680
+#: ../libgaim/protocols/jabber/buddy.c:289
+#: ../libgaim/protocols/jabber/buddy.c:937
+#: ../libgaim/protocols/jabber/chat.c:777
+msgid "Description"
+msgstr "Descrición"
+
+#: ../gtk/gtkblist.c:2809
+msgid "Spooky"
+msgstr ""
+
+#: ../gtk/gtkblist.c:2811
+msgid "Awesome"
+msgstr ""
+
+#: ../gtk/gtkblist.c:2813
+msgid "Rockin'"
+msgstr ""
+
+#: ../gtk/gtkblist.c:3302
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"
 
-#: ../gtk/gtkblist.c:3228
+#: ../gtk/gtkblist.c:3304
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"
 
-#. Idle stuff
-#: ../gtk/gtkblist.c:3231 ../gtk/gtkprefs.c:1805
-#: ../libgaim/protocols/bonjour/bonjour.c:333
-#: ../libgaim/protocols/jabber/buddy.c:635
-#: ../libgaim/protocols/jabber/buddy.c:668 ../libgaim/protocols/msn/msn.c:548
-#: ../libgaim/protocols/msn/state.c:32
-#: ../libgaim/protocols/novell/novell.c:2862
-#: ../libgaim/protocols/oscar/oscar.c:2825
-#: ../libgaim/protocols/yahoo/yahoo.c:2881
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
-msgid "Idle"
-msgstr "Inactivo"
-
-#: ../gtk/gtkblist.c:3359
+#: ../gtk/gtkblist.c:3435
 msgid "/Buddies/New Instant Message..."
-msgstr "/Amigos/Mensaxe instantánea _nova..."
-
-#: ../gtk/gtkblist.c:3360 ../gtk/gtkblist.c:3393
+msgstr "/Contacto/Mensaxe instantánea _nova..."
+
+#: ../gtk/gtkblist.c:3436 ../gtk/gtkblist.c:3469
 msgid "/Buddies/Join a Chat..."
-msgstr "/Amigos/Unirse a un Chat..."
-
-#: ../gtk/gtkblist.c:3361
+msgstr "/Contacto/Unirse a unha conversa..."
+
+#: ../gtk/gtkblist.c:3437
 msgid "/Buddies/Get User Info..."
-msgstr "/Amigos/Obter información do usuario..."
-
-#: ../gtk/gtkblist.c:3362
+msgstr "/Contacto/Obter información do usuario..."
+
+#: ../gtk/gtkblist.c:3438
 msgid "/Buddies/Add Buddy..."
-msgstr "/Amigos/Engadir un amigo..."
-
-#: ../gtk/gtkblist.c:3363 ../gtk/gtkblist.c:3396
+msgstr "/Contacto/Engadir un contacto..."
+
+#: ../gtk/gtkblist.c:3439 ../gtk/gtkblist.c:3472
 msgid "/Buddies/Add Chat..."
-msgstr "/Amigos/Engadir un Chat..."
-
-#: ../gtk/gtkblist.c:3364
+msgstr "/Contacto/Engadir unha conversa..."
+
+#: ../gtk/gtkblist.c:3440
 msgid "/Buddies/Add Group..."
-msgstr "/Amigos/Engadir un grupo..."
-
-#: ../gtk/gtkblist.c:3399
+msgstr "/Contacto/Engadir un grupo..."
+
+#: ../gtk/gtkblist.c:3475
 msgid "/Tools/Buddy Pounces"
-msgstr "/Ferramentas/Avisos de amigo"
-
-#: ../gtk/gtkblist.c:3402
+msgstr "/Ferramentas/Avisos de contacto"
+
+#: ../gtk/gtkblist.c:3478
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../gtk/gtkblist.c:3405
+#: ../gtk/gtkblist.c:3481
 msgid "/Tools/Room List"
-msgstr "/Ferramentas/Lista de salas"
-
-#: ../gtk/gtkblist.c:3501 ../gtk/gtkdocklet.c:149
+msgstr "/Ferramentas/Listaxe de salas"
+
+#: ../gtk/gtkblist.c:3578 ../gtk/gtkdocklet.c:152
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensaxe sen ler de %s\n"
 msgstr[1] "%d mensaxes sen ler de %s\n"
 
-#: ../gtk/gtkblist.c:3577
+#: ../gtk/gtkblist.c:3654
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../gtk/gtkblist.c:3579
+#: ../gtk/gtkblist.c:3656
 msgid "Alphabetically"
 msgstr "Alfabeticamente"
 
-#: ../gtk/gtkblist.c:3580
+#: ../gtk/gtkblist.c:3657
 msgid "By status"
 msgstr "Por estado"
 
-#: ../gtk/gtkblist.c:3581
+#: ../gtk/gtkblist.c:3658
 msgid "By log size"
 msgstr "Por tamaño de rexistro"
 
-#: ../gtk/gtkblist.c:3789 ../gtk/gtkconn.c:178
+#: ../gtk/gtkblist.c:3859 ../gtk/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../gtk/gtkblist.c:3798 ../libgaim/protocols/sametime/sametime.c:3615
+#: ../gtk/gtkblist.c:3868 ../libgaim/protocols/sametime/sametime.c:3655
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../gtk/gtkblist.c:3798
+#: ../gtk/gtkblist.c:3868
 msgid "Re-enable Account"
-msgstr "Re-activar conta"
-
-#: ../gtk/gtkblist.c:3819
+msgstr "Reactivar conta"
+
+#: ../gtk/gtkblist.c:3889
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s desconectado: %s</span>"
 
-#: ../gtk/gtkblist.c:3948
+#: ../gtk/gtkblist.c:4019
+#, fuzzy
+msgid "<b>Username:</b>"
+msgstr "Nome de _usuario:"
+
+#: ../gtk/gtkblist.c:4026
+#, fuzzy
+msgid "<b>Password:</b>"
+msgstr "Contrasinal:"
+
+#: ../gtk/gtkblist.c:4037
+#, fuzzy
+msgid "_Login"
+msgstr "Rexistro"
+
+#: ../gtk/gtkblist.c:4117
 msgid "/Accounts"
 msgstr "/Contas"
 
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../gtk/gtkblist.c:4131
+msgid ""
+"<span weight='bold' size='larger'>Welcome to Gaim!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
+msgstr ""
+
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../gtk/gtkblist.c:4109
+#: ../gtk/gtkblist.c:4358
 msgid "/Buddies/Show Offline Buddies"
-msgstr "/Amigos/Amosar amigos desconectados"
-
-#: ../gtk/gtkblist.c:4112
+msgstr "/Contactos/Amosar contactos desconectados"
+
+#: ../gtk/gtkblist.c:4361
 msgid "/Buddies/Show Empty Groups"
-msgstr "/Amigos/Amosar grupos baleiros"
-
-#: ../gtk/gtkblist.c:4118
+msgstr "/Contactos/Amosar grupos baleiros"
+
+#: ../gtk/gtkblist.c:4367
 msgid "/Buddies/Show Buddy Details"
-msgstr "/Amigos/Amosar detalles de amigos"
-
-#: ../gtk/gtkblist.c:4121
+msgstr "/Contactos/Amosar detalles de contactos"
+
+#: ../gtk/gtkblist.c:4370
 msgid "/Buddies/Show Idle Times"
-msgstr "/Amigos/Amosar tempos de ausencia"
-
-#: ../gtk/gtkblist.c:4786 ../gtk/plugins/gevolution/gevolution.c:97
+msgstr "/Contactos/Amosar tempos de ausencia"
+
+#: ../gtk/gtkblist.c:5063 ../gtk/plugins/gevolution/gevolution.c:97
 #: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
 #: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
-#: ../libgaim/protocols/jabber/roster.c:67
+#: ../libgaim/protocols/jabber/roster.c:68
 msgid "Buddies"
-msgstr "Amigos"
-
-#: ../gtk/gtkblist.c:4920
+msgstr "Contactos"
+
+#: ../gtk/gtkblist.c:5197
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
-"Introduza o nome de usuario da persoa que vostede quere engadir á lista. "
-"Pode, opcionalmente, introducir un alias ou alcume. O alcume mostrarase en "
-"lugar do nome de usuario sempre que sexa posible.\n"
-
-#: ../gtk/gtkblist.c:4980 ../gtk/gtkblist.c:5343
+"Introduza o nome de usuario da persoa que vostede quere engadir á listaxe. "
+"Pode, opcionalmente, introducir un alcume. O alcume amosarase en lugar do "
+"nome de usuario sempre que sexa posible.\n"
+
+#: ../gtk/gtkblist.c:5257 ../gtk/gtkblist.c:5618
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
 #: ../gtk/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "Grupo:"
 
-#: ../gtk/gtkblist.c:5241
+#: ../gtk/gtkblist.c:5516
 msgid "This protocol does not support chat rooms."
-msgstr "Este protocolo non está soportado nas salas de chats."
-
-#: ../gtk/gtkblist.c:5257
+msgstr "Este protocolo non está soportado nas salas de conversa."
+
+#: ../gtk/gtkblist.c:5532
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr "Non está conectado con ningunha conta que teña capacidade de acceder a chats."
-
-#: ../gtk/gtkblist.c:5298
+msgstr ""
+"Non está conectado con ningunha conta que teña capacidade de acceder a "
+"conversas."
+
+#: ../gtk/gtkblist.c:5573
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
-"Introduza un alcume, e a información que crea apropiada do chat que "
-"desexaría engadir na lista de amigos.\n"
-
-#: ../gtk/gtkblist.c:5381
+"Introduza un alcume e a información que crea apropiada da conversa que "
+"desexaría engadir na listaxe de contactos.\n"
+
+#: ../gtk/gtkblist.c:5656
 msgid "Please enter the name of the group to be added."
-msgstr "Introduza o nome do grupo a engadir."
-
-#: ../gtk/gtkblist.c:6007
+msgstr "Introduza o nome do grupo para engadir."
+
+#: ../gtk/gtkblist.c:6285
+#, fuzzy
+msgid "<GaimMain>/Accounts/"
+msgstr "/Contas"
+
+#: ../gtk/gtkblist.c:6310
 msgid "_Edit Account"
-msgstr "_Editar conta"
-
-#: ../gtk/gtkblist.c:6040 ../gtk/gtkblist.c:6046 ../gtk/gtkconv.c:2839
+msgstr "_Editar a conta"
+
+#: ../gtk/gtkblist.c:6343 ../gtk/gtkblist.c:6349 ../gtk/gtkconv.c:2838
 msgid "No actions available"
 msgstr "Non hai accións dispoñibles"
 
-#: ../gtk/gtkblist.c:6054
+#: ../gtk/gtkblist.c:6357
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../gtk/gtkblist.c:6066
+#: ../gtk/gtkblist.c:6369
 msgid "Enable Account"
-msgstr "Activar conta"
-
-#: ../gtk/gtkblist.c:6119
+msgstr "Activar a conta"
+
+#: ../gtk/gtkblist.c:6375
+msgid "<GaimMain>/Accounts/Enable Account"
+msgstr ""
+
+#: ../gtk/gtkblist.c:6424
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../gtk/gtkblist.c:6205
+#: ../gtk/gtkblist.c:6494
 msgid "/Buddies/Sort Buddies"
-msgstr "/Amigos/Arranxar amigos"
+msgstr "/Contactos/Ordenar contactos"
 
 #: ../gtk/gtkconn.c:179
-#, c-format
-msgid ""
-"%s was disconnected due to an error: %s\n"
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
 msgstr ""
-"Desconectouse %s debido a un erro: %s\n"
-"Gaim non tentará reconectarse a esta conta ata que corrixa o erro e reactive "
-"a conta."
+" Desconectouse %s debido a un erro: %s\n"
+"Gaim non tentará reconectarse a esta conta ata que corrixa o erro e a "
+"reactive."
 
 #: ../gtk/gtkconv.c:746 ../gtk/gtkconv.c:772
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "Ese amigo non utiliza o mesmo protocolo que este chat."
+msgstr "Ese contacto non utiliza o mesmo protocolo que esta conversa."
 
 #: ../gtk/gtkconv.c:766
 msgid "You are not currently signed on with an account that can invite that buddy."
-msgstr "Non está conectado con ningunha conta coa que poida invitar a ese amigo."
+msgstr "Non está conectado con ningunha conta coa que poida convidar a ese contacto."
 
 #: ../gtk/gtkconv.c:819
 msgid "Invite Buddy Into Chat Room"
-msgstr "Invitar a un amigo á sala de Chat"
+msgstr "Convidar a un contacto á sala de conversa"
 
 #. Put our happy label in it.
 #: ../gtk/gtkconv.c:849
@@ -1794,12 +1858,12 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
-"Introduza o nome de usuario ao que desexa invitar, xunto cunha mensaxe de "
-"invitación opcional."
+"Introduza o nome de usuario ao que desexa convidar, xunto cunha mensaxe de "
+"convite opcional."
 
 #: ../gtk/gtkconv.c:870
 msgid "_Buddy:"
-msgstr "_Amigo:"
+msgstr "_Contacto:"
 
 #: ../gtk/gtkconv.c:890 ../gtk/gtksavedstatuses.c:1111
 #: ../gtk/gtksavedstatuses.c:1447
@@ -1814,11 +1878,11 @@
 #: ../gtk/gtkconv.c:953
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Conversacións con %s</h1>\n"
+msgstr "<h1>Conversa con %s</h1>\n"
 
 #: ../gtk/gtkconv.c:977
 msgid "Save Conversation"
-msgstr "Gardar conversación"
+msgstr "Gardar conversa"
 
 #: ../gtk/gtkconv.c:1124 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
 msgid "Find"
@@ -1826,18 +1890,18 @@
 
 #: ../gtk/gtkconv.c:1150 ../gtk/gtkdebug.c:194
 msgid "_Search for:"
-msgstr "Termo a _buscar:"
+msgstr "_Buscar:"
 
 #: ../gtk/gtkconv.c:1321
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Iniciuose o rexistro. A partir de agora rexistraranse todas as mensaxes "
-"desta conversación."
+"desta conversa."
 
 #: ../gtk/gtkconv.c:1329
 msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
-"Deteuse o rexistro. Non se rexistrarán mensaxes desta conversación de agora "
+"Detívose o rexistro. Non se rexistrarán mensaxes desta conversa de agora "
 "endiante."
 
 #: ../gtk/gtkconv.c:1597
@@ -1858,305 +1922,307 @@
 
 #: ../gtk/gtkconv.c:2408
 msgid "Unable to save icon file to disk."
-msgstr "Non se puido gardar o ficheiro de iconas ao disco."
-
-#: ../gtk/gtkconv.c:2479
+msgstr "Non se puido gardar o ficheiro de iconas no disco."
+
+#: ../gtk/gtkconv.c:2478
 msgid "Save Icon"
 msgstr "Gardar icona"
 
-#: ../gtk/gtkconv.c:2528
+#: ../gtk/gtkconv.c:2527
 msgid "Animate"
 msgstr "Animar"
 
-#: ../gtk/gtkconv.c:2533
+#: ../gtk/gtkconv.c:2532
 msgid "Hide Icon"
 msgstr "Agochar icona"
 
-#: ../gtk/gtkconv.c:2536
+#: ../gtk/gtkconv.c:2535
 msgid "Save Icon As..."
 msgstr "Gardar icona como..."
 
-#: ../gtk/gtkconv.c:2540
+#: ../gtk/gtkconv.c:2539
+#, fuzzy
 msgid "Set Custom Icon..."
-msgstr "Establecer icona personalizada..."
-
-#: ../gtk/gtkconv.c:2547
+msgstr "Establecer a información de usuario..."
+
+#: ../gtk/gtkconv.c:2546
+#, fuzzy
 msgid "Remove Custom Icon"
-msgstr "Eliminar icona personalizada"
+msgstr "Eliminar o contacto"
 
 #. Conversation menu
-#: ../gtk/gtkconv.c:2688
+#: ../gtk/gtkconv.c:2687
 msgid "/_Conversation"
-msgstr "/_Conversación"
-
-#: ../gtk/gtkconv.c:2690
+msgstr "/_Conversa"
+
+#: ../gtk/gtkconv.c:2689
 msgid "/Conversation/New Instant _Message..."
-msgstr "/Conversación/_Mensaxe instantánea nova..."
-
-#: ../gtk/gtkconv.c:2695
+msgstr "/Conversa/_Mensaxe instantánea nova..."
+
+#: ../gtk/gtkconv.c:2694
 msgid "/Conversation/_Find..."
-msgstr "/Conversación/_Buscar..."
+msgstr "/Conversa/_Buscar..."
+
+#: ../gtk/gtkconv.c:2696
+msgid "/Conversation/View _Log"
+msgstr "/Conversa/Ver _rexistro"
 
 #: ../gtk/gtkconv.c:2697
-msgid "/Conversation/View _Log"
-msgstr "/Conversación/Ver _rexistro"
-
-#: ../gtk/gtkconv.c:2698
 msgid "/Conversation/_Save As..."
-msgstr "/Conversación/_Gardar como..."
-
-#: ../gtk/gtkconv.c:2700
+msgstr "/Conversa/_Gardar como..."
+
+#: ../gtk/gtkconv.c:2699
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Conversación/_Limpar deslizante"
+msgstr "/Conversa/_Limpar historial"
+
+#: ../gtk/gtkconv.c:2703
+msgid "/Conversation/Se_nd File..."
+msgstr "/Conversa/E_nviar ficheiro..."
 
 #: ../gtk/gtkconv.c:2704
-msgid "/Conversation/Se_nd File..."
-msgstr "/Conversación/E_nviar ficheiro..."
-
-#: ../gtk/gtkconv.c:2705
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Conversación/Engadir _aviso de amigo..."
-
-#: ../gtk/gtkconv.c:2707
+msgstr "/Conversa/Engadir _aviso de contacto..."
+
+#: ../gtk/gtkconv.c:2706
 msgid "/Conversation/_Get Info"
-msgstr "/Conversación/_Obter información"
-
-#: ../gtk/gtkconv.c:2709
+msgstr "/Conversa/_Obter información"
+
+#: ../gtk/gtkconv.c:2708
 msgid "/Conversation/In_vite..."
-msgstr "/Conversación/In_vitar..."
-
-#: ../gtk/gtkconv.c:2711
+msgstr "/Conversa/Con_vidar..."
+
+#: ../gtk/gtkconv.c:2710
 msgid "/Conversation/M_ore"
-msgstr "/Conversación/_Máis"
-
-#: ../gtk/gtkconv.c:2715
+msgstr "/Conversa/_Máis"
+
+#: ../gtk/gtkconv.c:2714
 msgid "/Conversation/Al_ias..."
-msgstr "/Conversación/Alc_ume..."
-
-#: ../gtk/gtkconv.c:2717
+msgstr "/Conversa/Alc_ume..."
+
+#: ../gtk/gtkconv.c:2716
 msgid "/Conversation/_Block..."
-msgstr "/Conversación/_Bloquear..."
-
-#: ../gtk/gtkconv.c:2719
+msgstr "/Conversa/_Bloquear..."
+
+#: ../gtk/gtkconv.c:2718
 msgid "/Conversation/_Add..."
-msgstr "/Conversación/_Engadir..."
-
-#: ../gtk/gtkconv.c:2721
+msgstr "/Conversa/_Engadir..."
+
+#: ../gtk/gtkconv.c:2720
 msgid "/Conversation/_Remove..."
-msgstr "/Conversación/El_iminar..."
-
-#: ../gtk/gtkconv.c:2726
+msgstr "/Conversa/El_iminar..."
+
+#: ../gtk/gtkconv.c:2725
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Conversación/Inserir li_gazón..."
-
-#: ../gtk/gtkconv.c:2728
+msgstr "/Conversa/Inserir li_gazón..."
+
+#: ../gtk/gtkconv.c:2727
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Conversación/Inserir ima_xe..."
-
-#: ../gtk/gtkconv.c:2733
+msgstr "/Conversa/Inserir ima_xe..."
+
+#: ../gtk/gtkconv.c:2732
 msgid "/Conversation/_Close"
-msgstr "/Conversación/_Pechar"
+msgstr "/Conversa/_Pechar"
 
 #. Options
-#: ../gtk/gtkconv.c:2737
+#: ../gtk/gtkconv.c:2736
 msgid "/_Options"
 msgstr "/_Opcións"
 
+#: ../gtk/gtkconv.c:2737
+msgid "/Options/Enable _Logging"
+msgstr "/Opcións/Activar _rexistro"
+
 #: ../gtk/gtkconv.c:2738
-msgid "/Options/Enable _Logging"
-msgstr "/Opcións/Activar _rexistro"
-
-#: ../gtk/gtkconv.c:2739
 msgid "/Options/Enable _Sounds"
 msgstr "/Opcións/Activar _sons"
 
-#: ../gtk/gtkconv.c:2740
+#: ../gtk/gtkconv.c:2739
 msgid "/Options/Show Buddy _Icon"
-msgstr "/Opcións/Amosar _iconas dos amigos"
-
-#: ../gtk/gtkconv.c:2742
+msgstr "/Opcións/Amosar _iconas dos contactos"
+
+#: ../gtk/gtkconv.c:2741
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opcións/Amosar _barra de formato"
 
-#: ../gtk/gtkconv.c:2743
+#: ../gtk/gtkconv.c:2742
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opcións/Amosar _marcas de tempo"
 
-#: ../gtk/gtkconv.c:2818
+#: ../gtk/gtkconv.c:2817
 msgid "/Conversation/More"
-msgstr "/Conversación/Máis"
+msgstr "/Conversa/Máis"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../gtk/gtkconv.c:2863 ../gtk/gtkconv.c:2895
+#: ../gtk/gtkconv.c:2862 ../gtk/gtkconv.c:2894
 msgid "/Conversation"
-msgstr "/Conversación"
-
-#: ../gtk/gtkconv.c:2903
+msgstr "/Conversa"
+
+#: ../gtk/gtkconv.c:2902
 msgid "/Conversation/View Log"
-msgstr "/Conversación/Ver rexistro"
-
-#: ../gtk/gtkconv.c:2909
+msgstr "/Conversa/Ver o rexistro"
+
+#: ../gtk/gtkconv.c:2908
 msgid "/Conversation/Send File..."
-msgstr "/Conversación/Enviar ficheiro..."
-
-#: ../gtk/gtkconv.c:2913
+msgstr "/Conversa/Enviar o ficheiro..."
+
+#: ../gtk/gtkconv.c:2912
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Conversación/Engadir aviso de amigo..."
-
-#: ../gtk/gtkconv.c:2919
+msgstr "/Conversa/Engadir un aviso de contacto..."
+
+#: ../gtk/gtkconv.c:2918
 msgid "/Conversation/Get Info"
-msgstr "/Conversación/Obter información"
-
-#: ../gtk/gtkconv.c:2923
+msgstr "/Conversa/Obter información"
+
+#: ../gtk/gtkconv.c:2922
 msgid "/Conversation/Invite..."
-msgstr "/Conversación/Invitar..."
-
-#: ../gtk/gtkconv.c:2929
+msgstr "/Conversa/Convidar..."
+
+#: ../gtk/gtkconv.c:2928
 msgid "/Conversation/Alias..."
-msgstr "/Conversación/Alcume..."
-
-#: ../gtk/gtkconv.c:2933
+msgstr "/Conversa/Alcume..."
+
+#: ../gtk/gtkconv.c:2932
 msgid "/Conversation/Block..."
-msgstr "/Conversación/Bloquear..."
-
-#: ../gtk/gtkconv.c:2937
+msgstr "/Conversa/Bloquear..."
+
+#: ../gtk/gtkconv.c:2936
 msgid "/Conversation/Add..."
-msgstr "/Conversación/Engadir..."
-
-#: ../gtk/gtkconv.c:2941
+msgstr "/Conversa/Engadir..."
+
+#: ../gtk/gtkconv.c:2940
 msgid "/Conversation/Remove..."
-msgstr "/Conversación/Eliminar..."
-
-#: ../gtk/gtkconv.c:2947
+msgstr "/Conversa/Eliminar..."
+
+#: ../gtk/gtkconv.c:2946
 msgid "/Conversation/Insert Link..."
-msgstr "/Conversación/Inserir ligazón..."
-
-#: ../gtk/gtkconv.c:2951
+msgstr "/Conversa/Inserir ligazón..."
+
+#: ../gtk/gtkconv.c:2950
 msgid "/Conversation/Insert Image..."
-msgstr "/Conversación/Inserir imaxe..."
-
-#: ../gtk/gtkconv.c:2957
+msgstr "/Conversa/Inserir unha imaxe..."
+
+#: ../gtk/gtkconv.c:2956
 msgid "/Options/Enable Logging"
 msgstr "/Opcións/Activar rexistro"
 
-#: ../gtk/gtkconv.c:2960
+#: ../gtk/gtkconv.c:2959
 msgid "/Options/Enable Sounds"
 msgstr "/Opcións/Activar sons"
 
-#: ../gtk/gtkconv.c:2973
+#: ../gtk/gtkconv.c:2972
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opcións/Amosar barra de formato"
 
-#: ../gtk/gtkconv.c:2976
+#: ../gtk/gtkconv.c:2975
 msgid "/Options/Show Timestamps"
 msgstr "/Opcións/Amosar marcas de tempo"
 
-#: ../gtk/gtkconv.c:2979
+#: ../gtk/gtkconv.c:2978
 msgid "/Options/Show Buddy Icon"
-msgstr "/Opcións/Amosar iconas dos amigos"
-
-#: ../gtk/gtkconv.c:3055
+msgstr "/Opcións/Amosar iconas dos contactos"
+
+#: ../gtk/gtkconv.c:3054
 msgid "User is typing..."
 msgstr "O usuario está escribindo..."
 
-#: ../gtk/gtkconv.c:3058
+#: ../gtk/gtkconv.c:3057
 msgid "User has typed something and stopped"
 msgstr "O usuario escribiu algo e parou"
 
 #. Build the Send To menu
-#: ../gtk/gtkconv.c:3241
+#: ../gtk/gtkconv.c:3240
 msgid "_Send To"
 msgstr "_Enviar a"
 
-#: ../gtk/gtkconv.c:3943
+#: ../gtk/gtkconv.c:3947
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../gtk/gtkconv.c:3997 ../libgaim/protocols/sametime/sametime.c:3557
+#: ../gtk/gtkconv.c:4042 ../libgaim/protocols/sametime/sametime.c:3597
 msgid "Topic:"
-msgstr "Tópico:"
+msgstr "Asunto:"
 
 #. Setup the label telling how many people are in the room.
-#: ../gtk/gtkconv.c:4049
+#: ../gtk/gtkconv.c:4094
 msgid "0 people in room"
-msgstr "0 persoas na conversación"
-
-#: ../gtk/gtkconv.c:5096 ../gtk/gtkconv.c:5217
+msgstr "0 persoas na conversa"
+
+#: ../gtk/gtkconv.c:5145 ../gtk/gtkconv.c:5266
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
-msgstr[0] "%d persoa na conversación"
-msgstr[1] "%d persoas na conversación"
-
-#: ../gtk/gtkconv.c:5770 ../gtk/gtkstatusbox.c:541
+msgstr[0] "%d persoa na conversa"
+msgstr[1] "%d persoas na sala"
+
+#: ../gtk/gtkconv.c:5819 ../gtk/gtkstatusbox.c:567
 msgid "Typing"
 msgstr "Escribindo"
 
-#: ../gtk/gtkconv.c:5776
+#: ../gtk/gtkconv.c:5825
 msgid "Stopped Typing"
-msgstr "Deixa de escribir"
-
-#: ../gtk/gtkconv.c:5781
+msgstr "Deixou de escribir"
+
+#: ../gtk/gtkconv.c:5830
 msgid "Nick Said"
 msgstr "Alcume"
 
-#: ../gtk/gtkconv.c:5786 ../gtk/gtkdocklet.c:500
+#: ../gtk/gtkconv.c:5835 ../gtk/gtkdocklet.c:513
 msgid "Unread Messages"
 msgstr "Mensaxes sen ler"
 
-#: ../gtk/gtkconv.c:5791
+#: ../gtk/gtkconv.c:5840
 msgid "New Event"
 msgstr "Evento novo"
 
-#: ../gtk/gtkconv.c:6905
+#: ../gtk/gtkconv.c:6961
 msgid "Confirm close"
 msgstr "Confirmar peche"
 
-#: ../gtk/gtkconv.c:6937
+#: ../gtk/gtkconv.c:6993
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Ten mensaxes sen ler. Está seguro que quere pechar a fiestra?"
-
-#: ../gtk/gtkconv.c:7472
+msgstr "Hai mensaxes sen ler. Seguro que queres pechar a ventá?"
+
+#: ../gtk/gtkconv.c:7528
 msgid "Close other tabs"
-msgstr "Pechar outras solapas"
-
-#: ../gtk/gtkconv.c:7478
+msgstr "Pechar outras pestanas"
+
+#: ../gtk/gtkconv.c:7534
 msgid "Close all tabs"
-msgstr "Pechar todas as solapas"
-
-#: ../gtk/gtkconv.c:7486
+msgstr "Pechar todas as pestanas"
+
+#: ../gtk/gtkconv.c:7542
 msgid "Detach this tab"
-msgstr "Desacoplar esta solapa"
-
-#: ../gtk/gtkconv.c:7492
+msgstr "Desacoplar esta pestana"
+
+#: ../gtk/gtkconv.c:7548
 msgid "Close this tab"
-msgstr "Pechar esta solapa"
-
-#: ../gtk/gtkconv.c:7760
+msgstr "Pechar esta pestana"
+
+#: ../gtk/gtkconv.c:7819
 msgid "Close conversation"
-msgstr "Pechar conversación"
-
-#: ../gtk/gtkconv.c:8224
+msgstr "Pechar conversa"
+
+#: ../gtk/gtkconv.c:8283
 msgid "Last created window"
-msgstr "Última fiestra creada"
-
-#: ../gtk/gtkconv.c:8226
+msgstr "Última ventá creada"
+
+#: ../gtk/gtkconv.c:8285
 msgid "Separate IM and Chat windows"
-msgstr "Separar fiestras de MIs e Chats"
-
-#: ../gtk/gtkconv.c:8228 ../gtk/gtkprefs.c:1297
+msgstr "Separar ventás de MI e conversas"
+
+#: ../gtk/gtkconv.c:8287 ../gtk/gtkprefs.c:1303
 msgid "New window"
-msgstr "Nova fiestra"
-
-#: ../gtk/gtkconv.c:8230
+msgstr "Nova ventá"
+
+#: ../gtk/gtkconv.c:8289
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../gtk/gtkconv.c:8232
+#: ../gtk/gtkconv.c:8291
 msgid "By account"
 msgstr "Por conta"
 
@@ -2174,15 +2240,15 @@
 
 #: ../gtk/gtkdebug.c:664
 msgid "_Icon Only"
-msgstr "Só _icona"
+msgstr ""
 
 #: ../gtk/gtkdebug.c:665
 msgid "_Text Only"
-msgstr "Só _texto"
+msgstr ""
 
 #: ../gtk/gtkdebug.c:666
 msgid "_Both Icon & Text"
-msgstr "_Tanto iconas como texto"
+msgstr ""
 
 #: ../gtk/gtkdebug.c:802
 msgid "Filter"
@@ -2194,41 +2260,46 @@
 
 #: ../gtk/gtkdebug.c:851
 msgid "Level "
-msgstr "Nivel "
+msgstr ""
 
 #: ../gtk/gtkdebug.c:852 ../gtk/gtkdebug.c:858
 msgid "Select the debug filter level."
-msgstr "Seleccione o nivel de filtrado de depuración"
+msgstr ""
 
 #: ../gtk/gtkdebug.c:860
+#, fuzzy
 msgid "All"
-msgstr "Todo"
+msgstr "Permitir"
 
 #: ../gtk/gtkdebug.c:861
+#, fuzzy
 msgid "Misc"
-msgstr "Misceláneo"
+msgstr "Música"
 
 #: ../gtk/gtkdebug.c:863
+#, fuzzy
 msgid "Warning"
-msgstr "Aviso"
+msgstr "Nivel de aviso"
 
 #: ../gtk/gtkdebug.c:864
+#, fuzzy
 msgid "Error "
-msgstr "Erro "
+msgstr "Erro"
 
 #: ../gtk/gtkdebug.c:865
+#, fuzzy
 msgid "Fatal Error"
-msgstr "Erro fatal"
-
-#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:109
+msgstr "Erro de fluxo"
+
+#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:110
 msgid "lead developer"
 msgstr "desenvolvedor principal"
 
 #: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
 #: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:73
 #: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
-#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:80
-#: ../gtk/gtkdialogs.c:81 ../gtk/gtkdialogs.c:82
+#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:81
+#: ../gtk/gtkdialogs.c:82 ../gtk/gtkdialogs.c:83
 msgid "developer"
 msgstr "desenvolvedor"
 
@@ -2240,353 +2311,366 @@
 msgid "support"
 msgstr "soporte"
 
-#: ../gtk/gtkdialogs.c:101
+#: ../gtk/gtkdialogs.c:80
+#, fuzzy
+msgid "support/QA"
+msgstr "soporte"
+
+#: ../gtk/gtkdialogs.c:102
 msgid "win32 port"
 msgstr "adaptación a win32"
 
-#: ../gtk/gtkdialogs.c:102 ../gtk/gtkdialogs.c:103
+#: ../gtk/gtkdialogs.c:103 ../gtk/gtkdialogs.c:104
 msgid "maintainer"
 msgstr "mantedor"
 
-#: ../gtk/gtkdialogs.c:104
+#: ../gtk/gtkdialogs.c:105
 msgid "libfaim maintainer"
 msgstr "mantedor de libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../gtk/gtkdialogs.c:106
+#: ../gtk/gtkdialogs.c:107
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker e deseñador de controladores [lazy bum]"
 
-#: ../gtk/gtkdialogs.c:107
+#: ../gtk/gtkdialogs.c:108
 msgid "Jabber developer"
 msgstr "desenvolvedor de Jabber"
 
-#: ../gtk/gtkdialogs.c:108
+#: ../gtk/gtkdialogs.c:109
 msgid "original author"
 msgstr "autor orixinal"
 
-#: ../gtk/gtkdialogs.c:115
+#: ../gtk/gtkdialogs.c:116
+#, fuzzy
 msgid "Arabic"
-msgstr "Árabe"
-
-#: ../gtk/gtkdialogs.c:116 ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:186
+msgstr "Amhárico"
+
+#: ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:190
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:119
+#: ../gtk/gtkdialogs.c:119 ../gtk/gtkdialogs.c:120
 msgid "Bengali"
 msgstr "Bengalí"
 
-#: ../gtk/gtkdialogs.c:120
+#: ../gtk/gtkdialogs.c:121
 msgid "Bosnian"
-msgstr "Bosnia"
-
-#: ../gtk/gtkdialogs.c:121 ../gtk/gtkdialogs.c:187 ../gtk/gtkdialogs.c:188
+msgstr "Bosnio"
+
+#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:191 ../gtk/gtkdialogs.c:192
 msgid "Catalan"
 msgstr "Catalán"
 
-#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:123
+#: ../gtk/gtkdialogs.c:123 ../gtk/gtkdialogs.c:124
 msgid "Valencian-Catalan"
 msgstr "Valenciano"
 
-#: ../gtk/gtkdialogs.c:124 ../gtk/gtkdialogs.c:189
+#: ../gtk/gtkdialogs.c:125 ../gtk/gtkdialogs.c:193
 msgid "Czech"
 msgstr "Checo"
 
-#: ../gtk/gtkdialogs.c:125
+#: ../gtk/gtkdialogs.c:126
 msgid "Danish"
 msgstr "Danés"
 
-#: ../gtk/gtkdialogs.c:126 ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:190
+#: ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:194
 msgid "German"
 msgstr "Alemán"
 
-#: ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:129
+#: ../gtk/gtkdialogs.c:129 ../gtk/gtkdialogs.c:130 ../gtk/gtkdialogs.c:131
+msgid "Dzongkha"
+msgstr ""
+
+#: ../gtk/gtkdialogs.c:132 ../gtk/gtkdialogs.c:133
 msgid "Greek"
 msgstr "Grego"
 
-#: ../gtk/gtkdialogs.c:130
+#: ../gtk/gtkdialogs.c:134
 msgid "Australian English"
 msgstr "Inglés australiano"
 
-#: ../gtk/gtkdialogs.c:131
+#: ../gtk/gtkdialogs.c:135
 msgid "Canadian English"
-msgstr "Inglés canadiense"
-
-#: ../gtk/gtkdialogs.c:132
+msgstr "Inglés canadense"
+
+#: ../gtk/gtkdialogs.c:136
 msgid "British English"
 msgstr "Inglés británico"
 
-#: ../gtk/gtkdialogs.c:133
+#: ../gtk/gtkdialogs.c:137
 msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../gtk/gtkdialogs.c:134 ../gtk/gtkdialogs.c:191 ../gtk/gtkdialogs.c:192
-#: ../gtk/gtkdialogs.c:193 ../gtk/gtkdialogs.c:194
+msgstr ""
+
+#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
+#: ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
 msgid "Spanish"
 msgstr "Español"
 
-#: ../gtk/gtkdialogs.c:135 ../gtk/gtkdialogs.c:136
+#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:140
 msgid "Euskera(Basque)"
-msgstr "Euskera"
-
-#: ../gtk/gtkdialogs.c:137 ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:139
+msgstr "Éuscaro"
+
+#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:143
 msgid "Persian"
-msgstr "Perso"
-
-#: ../gtk/gtkdialogs.c:140 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
+msgstr "Persa"
+
+#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:199 ../gtk/gtkdialogs.c:200
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
-#: ../gtk/gtkdialogs.c:199 ../gtk/gtkdialogs.c:200
+#: ../gtk/gtkdialogs.c:145 ../gtk/gtkdialogs.c:201 ../gtk/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:203 ../gtk/gtkdialogs.c:204
 msgid "French"
 msgstr "Francés"
 
-#: ../gtk/gtkdialogs.c:142
+#: ../gtk/gtkdialogs.c:146
 msgid "Galician"
 msgstr "Galego"
 
-#: ../gtk/gtkdialogs.c:143 ../gtk/gtkdialogs.c:144
+#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:148
 msgid "Gujarati"
-msgstr "Guxarati"
-
-#: ../gtk/gtkdialogs.c:145 ../gtk/gtkdialogs.c:201
+msgstr ""
+
+#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:205
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../gtk/gtkdialogs.c:146
+#: ../gtk/gtkdialogs.c:150
 msgid "Hindi"
 msgstr "Hindú"
 
-#: ../gtk/gtkdialogs.c:147
+#: ../gtk/gtkdialogs.c:151
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../gtk/gtkdialogs.c:148 ../gtk/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:206
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:203 ../gtk/gtkdialogs.c:204
-#: ../gtk/gtkdialogs.c:205
+#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:207 ../gtk/gtkdialogs.c:208
+#: ../gtk/gtkdialogs.c:209
 msgid "Japanese"
 msgstr "Xaponés"
 
-#: ../gtk/gtkdialogs.c:150 ../gtk/gtkdialogs.c:206
+#: ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:210
 msgid "Georgian"
 msgstr "Xeorxiano"
 
-#: ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:207
+#: ../gtk/gtkdialogs.c:155 ../gtk/gtkdialogs.c:211
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:154
+#: ../gtk/gtkdialogs.c:156 ../gtk/gtkdialogs.c:157 ../gtk/gtkdialogs.c:158
 msgid "Kurdish"
 msgstr "Curdo"
 
-#: ../gtk/gtkdialogs.c:155 ../gtk/gtkdialogs.c:208 ../gtk/gtkdialogs.c:209
+#: ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:212 ../gtk/gtkdialogs.c:213
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../gtk/gtkdialogs.c:156
+#: ../gtk/gtkdialogs.c:160
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../gtk/gtkdialogs.c:157
+#: ../gtk/gtkdialogs.c:161
+#, fuzzy
 msgid "Nepali"
-msgstr "Nepalí"
-
-#: ../gtk/gtkdialogs.c:158
+msgstr "Bengalí"
+
+#: ../gtk/gtkdialogs.c:162
 msgid "Dutch, Flemish"
 msgstr "Holandés, Flamenco"
 
-#: ../gtk/gtkdialogs.c:159
+#: ../gtk/gtkdialogs.c:163
 msgid "Norwegian"
-msgstr "Noruego"
-
-#: ../gtk/gtkdialogs.c:160 ../gtk/gtkdialogs.c:161 ../gtk/gtkdialogs.c:210
+msgstr "Noruegués"
+
+#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:214
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../gtk/gtkdialogs.c:162
+#: ../gtk/gtkdialogs.c:166
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../gtk/gtkdialogs.c:163
+#: ../gtk/gtkdialogs.c:167
 msgid "Portuguese-Brazil"
 msgstr "Portugués brasileiro"
 
-#: ../gtk/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:168
 msgid "Romanian"
-msgstr "Rumano"
-
-#: ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:211 ../gtk/gtkdialogs.c:212
+msgstr "Romeno"
+
+#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:215 ../gtk/gtkdialogs.c:216
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../gtk/gtkdialogs.c:166 ../gtk/gtkdialogs.c:167
+#: ../gtk/gtkdialogs.c:170 ../gtk/gtkdialogs.c:171
 msgid "Serbian"
-msgstr "Servio"
-
-#: ../gtk/gtkdialogs.c:168 ../gtk/gtkdialogs.c:213
+msgstr "Serbio"
+
+#: ../gtk/gtkdialogs.c:172 ../gtk/gtkdialogs.c:217
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../gtk/gtkdialogs.c:169
+#: ../gtk/gtkdialogs.c:173 ../gtk/gtkdialogs.c:218
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../gtk/gtkdialogs.c:170
+#: ../gtk/gtkdialogs.c:174
+#, fuzzy
 msgid "Albanian"
-msgstr "Albano"
-
-#: ../gtk/gtkdialogs.c:171 ../gtk/gtkdialogs.c:214
+msgstr "Romeno"
+
+#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:219
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../gtk/gtkdialogs.c:172
+#: ../gtk/gtkdialogs.c:176
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../gtk/gtkdialogs.c:173
+#: ../gtk/gtkdialogs.c:177
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../gtk/gtkdialogs.c:174
+#: ../gtk/gtkdialogs.c:178
 msgid "Thai"
 msgstr "Thai"
 
-#: ../gtk/gtkdialogs.c:175
+#: ../gtk/gtkdialogs.c:179
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../gtk/gtkdialogs.c:176
+#: ../gtk/gtkdialogs.c:180
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../gtk/gtkdialogs.c:176
+#: ../gtk/gtkdialogs.c:180
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh eo equipo Gnome-Vi"
 
-#: ../gtk/gtkdialogs.c:177 ../gtk/gtkdialogs.c:215
+#: ../gtk/gtkdialogs.c:181 ../gtk/gtkdialogs.c:220
 msgid "Simplified Chinese"
 msgstr "Chinés simplificado"
 
-#: ../gtk/gtkdialogs.c:178 ../gtk/gtkdialogs.c:179 ../gtk/gtkdialogs.c:216
+#: ../gtk/gtkdialogs.c:182 ../gtk/gtkdialogs.c:183 ../gtk/gtkdialogs.c:221
 msgid "Traditional Chinese"
 msgstr "Chinés tradicional"
 
-#: ../gtk/gtkdialogs.c:185
+#: ../gtk/gtkdialogs.c:189
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../gtk/gtkdialogs.c:297
+#: ../gtk/gtkdialogs.c:301
 msgid "About Gaim"
-msgstr "Acerca de Gaim"
-
-#: ../gtk/gtkdialogs.c:331
+msgstr "Acerca do Gaim"
+
+#: ../gtk/gtkdialogs.c:335
+#, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLENovell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with Gaim.  Gaim is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
+"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+."
+"<BR><BR>You may modify and redistribute the program under the terms of the "
+"GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' "
+"file distributed with Gaim.  Gaim is copyrighted by its contributors.  See "
+"the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
 "warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim é un cliente modular de mensaxería instantánea, capaz de utilizar AIM, "
-"MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLENovell GroupWise, Lotus Sametime, "
+"MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, "
 "Napster, Zephyr, e Gadu-Gadu ao mesmo tempo. Está escrito usando Gtk+."
-"<BR><BR> Pode modificar eredistribuir este programa baixo os termos da GPL "
-"(versión 2 ou posterior). Inclúeseunha copia da licencia GPL no ficheiro "
-"'COPYING' que se distribúe con Gaim. As persoasque contribuiron a Gaim teñen "
-"os dereitos de copia. Consulte o ficheiro 'COPYRIGHT' se desexaconsultar a "
-"lista completa de persoas que contribuíron. Este programa distribúese "
-"senningunha garantía.<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:346
+"<BR><BR> Pode modificar e redistribuír este programa baixo os termos da GPL "
+"(versión 2 ou posterior). Inclúese unha copia da licencia GPL no ficheiro "
+"'COPYING' que se distribúe co Gaim. As persoas que contribuíron no Gaim "
+"teñen os dereitos de copia. Consulte o ficheiro 'COPYRIGHT' se desexa "
+"consultar a listaxe completa de persoas que contribuíron. Este programa "
+"distribúese sen ningunha garantía.<BR><BR>"
+
+#: ../gtk/gtkdialogs.c:350
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim en irc.freenode.net<BR><BR>"
 
-#: ../gtk/gtkdialogs.c:349
+#: ../gtk/gtkdialogs.c:353
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim en irc.freenode.net<BR><BR>"
 
-#: ../gtk/gtkdialogs.c:355
+#: ../gtk/gtkdialogs.c:359
 msgid "Current Developers"
 msgstr "Desenvolvedores actuais"
 
-#: ../gtk/gtkdialogs.c:370
+#: ../gtk/gtkdialogs.c:374
 msgid "Crazy Patch Writers"
 msgstr "Tolos escritores de parches"
 
-#: ../gtk/gtkdialogs.c:385
+#: ../gtk/gtkdialogs.c:389
 msgid "Retired Developers"
 msgstr "Desenvolvedores retirados"
 
-#: ../gtk/gtkdialogs.c:400
+#: ../gtk/gtkdialogs.c:404
 msgid "Current Translators"
 msgstr "Tradutores actuais"
 
-#: ../gtk/gtkdialogs.c:420
+#: ../gtk/gtkdialogs.c:424
 msgid "Past Translators"
 msgstr "Tradutores anteriores"
 
-#: ../gtk/gtkdialogs.c:438
+#: ../gtk/gtkdialogs.c:442
 msgid "Debugging Information"
 msgstr "Información de depuración"
 
-#: ../gtk/gtkdialogs.c:812
+#: ../gtk/gtkdialogs.c:816
 msgid "Get User Info"
 msgstr "Obter información do usuario"
 
-#: ../gtk/gtkdialogs.c:814
+#: ../gtk/gtkdialogs.c:818
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
-"Introduza o nome de usuario ou alcume da persoa da cal quere ver a "
+"Introduza o nome de usuario ou o alcume da persoa da que quere ver "
 "información."
 
-#: ../gtk/gtkdialogs.c:903
+#: ../gtk/gtkdialogs.c:907
 msgid "View User Log"
-msgstr "Ver rexistro de usuario"
-
-#: ../gtk/gtkdialogs.c:905
+msgstr "Ver rexistro do usuario"
+
+#: ../gtk/gtkdialogs.c:909
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr ""
-"Introduza o nome de usuario ou alcume da persoa da cal quere ver a "
+"Introduza o nome de usuario ou o alcume da persoa da que quere ver a "
 "información de rexistro."
 
-#: ../gtk/gtkdialogs.c:924
+#: ../gtk/gtkdialogs.c:928
 msgid "Alias Contact"
-msgstr "Alcume para contacto"
-
-#: ../gtk/gtkdialogs.c:925
+msgstr "Alcume para o contacto"
+
+#: ../gtk/gtkdialogs.c:929
 msgid "Enter an alias for this contact."
-msgstr "Introduza un alcume para este contacto"
-
-#: ../gtk/gtkdialogs.c:945
+msgstr "Introduza un alcume para este contacto."
+
+#: ../gtk/gtkdialogs.c:949
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduza un alcume para %s."
 
-#: ../gtk/gtkdialogs.c:947
+#: ../gtk/gtkdialogs.c:951
 msgid "Alias Buddy"
-msgstr "Alcume de amigo"
-
-#: ../gtk/gtkdialogs.c:966
+msgstr "Alcume do contacto"
+
+#: ../gtk/gtkdialogs.c:970
 msgid "Alias Chat"
-msgstr "Alcume no Chat"
-
-#: ../gtk/gtkdialogs.c:967
+msgstr "Alcume na conversa"
+
+#: ../gtk/gtkdialogs.c:971
 msgid "Enter an alias for this chat."
-msgstr "Introduza un alcume para este chat."
-
-#: ../gtk/gtkdialogs.c:1004
+msgstr "Introduza un alcume para esta conversa."
+
+#: ../gtk/gtkdialogs.c:1008
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -2595,133 +2679,139 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"Está a punto de eliminar o contacto que contén a %s e outro %d amigo da "
-"súalista de amigos. Quere continuar?"
+"Está a punto de eliminar o contacto que contén a %s e outro %d da listaxe de "
+"contactos. Quere continuar?"
 msgstr[1] ""
-"Está a punto de eliminar o contacto que contén a %s e outros %d amigos da "
-"súalista de amigos. Quere continuar?"
-
-#: ../gtk/gtkdialogs.c:1012
+"Estás a punto de eliminar o contacto que contén a %s e outros %d da súa "
+"listaxe de contactos. Queres continuar?"
+
+#: ../gtk/gtkdialogs.c:1016
 msgid "Remove Contact"
-msgstr "Eliminar contacto"
-
-#: ../gtk/gtkdialogs.c:1013
+msgstr "Eliminar o contacto"
+
+#: ../gtk/gtkdialogs.c:1017
 msgid "_Remove Contact"
-msgstr "_Eliminar contacto"
-
-#: ../gtk/gtkdialogs.c:1043
-#, c-format
+msgstr "_Eliminar o contacto"
+
+#: ../gtk/gtkdialogs.c:1047
+#, fuzzy, 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 punto de fusionar o grupo chamado %s co grupo chamado %s. Desexa continuar?"
-
-#: ../gtk/gtkdialogs.c:1050
+msgstr ""
+"Está a punto de borrar o grupo %s xunto con todos os membros da listaxe de "
+"contactos. Quere continuar?"
+
+#: ../gtk/gtkdialogs.c:1054
+#, fuzzy
 msgid "Merge Groups"
-msgstr "Fusionar grupos"
-
-#: ../gtk/gtkdialogs.c:1051
+msgstr "Eliminar o grupo"
+
+#: ../gtk/gtkdialogs.c:1055
+#, fuzzy
 msgid "_Merge Groups"
-msgstr "_Fusionar grupos"
-
-#: ../gtk/gtkdialogs.c:1101
+msgstr "_Borrar o grupo"
+
+#: ../gtk/gtkdialogs.c:1105
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
-"Está a punto de borrar o grupo %s xunto con todos seus membros da lista de "
-"amigos. Desexa continuar?"
-
-#: ../gtk/gtkdialogs.c:1104
+"Está a punto de borrar o grupo %s xunto con todos os membros da listaxe de "
+"contactos. Quere continuar?"
+
+#: ../gtk/gtkdialogs.c:1108
 msgid "Remove Group"
-msgstr "Eliminar grupo"
-
-#: ../gtk/gtkdialogs.c:1105
+msgstr "Eliminar o grupo"
+
+#: ../gtk/gtkdialogs.c:1109
 msgid "_Remove Group"
-msgstr "_Eliminar grupo"
-
-#: ../gtk/gtkdialogs.c:1138
+msgstr "_Eliminar o grupo"
+
+#: ../gtk/gtkdialogs.c:1142
 #, 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 súa lista de amigos. Quere continuar?"
-
-#: ../gtk/gtkdialogs.c:1141
+msgstr "Está a punto de eliminar a %s da listaxe de contactos. Quere continuar?"
+
+#: ../gtk/gtkdialogs.c:1145
 msgid "Remove Buddy"
-msgstr "Eliminar amigo"
-
-#: ../gtk/gtkdialogs.c:1142
+msgstr "Eliminar o contacto"
+
+#: ../gtk/gtkdialogs.c:1146
 msgid "_Remove Buddy"
-msgstr "_Eliminar amigo"
-
-#: ../gtk/gtkdialogs.c:1163
+msgstr "_Eliminar o contacto"
+
+#: ../gtk/gtkdialogs.c:1167
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
-msgstr "Está a punto de eliminar o chat %s da súa lista de amigos. Quere continuar?"
-
-#: ../gtk/gtkdialogs.c:1166
+msgstr ""
+"Está a punto de eliminar a conversa %s da listaxe de contactos. Quere "
+"continuar?"
+
+#: ../gtk/gtkdialogs.c:1170
 msgid "Remove Chat"
-msgstr "Eliminar Chat"
-
-#: ../gtk/gtkdialogs.c:1167
+msgstr "Eliminar a conversa"
+
+#: ../gtk/gtkdialogs.c:1171
 msgid "_Remove Chat"
-msgstr "_Eliminar Chat"
-
-#: ../gtk/gtkdocklet.c:146
+msgstr "_Eliminar a conversa"
+
+#: ../gtk/gtkdocklet.c:149
 msgid "Right-click for more unread messages...\n"
-msgstr "Premer co botón dereito para máis mensaxes sen ler...\n"
-
-#: ../gtk/gtkdocklet.c:443
+msgstr "Premer co botón dereito para ver máis mensaxes sen ler...\n"
+
+#: ../gtk/gtkdocklet.c:456
 msgid "Change Status"
-msgstr "Cambiar estado"
-
-#: ../gtk/gtkdocklet.c:446 ../gtk/gtkstatusbox.c:971
-#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1367
+msgstr "Mudar o estado"
+
+#: ../gtk/gtkdocklet.c:459 ../gtk/gtkstatusbox.c:987
+#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1403
 #: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
 #: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
-#: ../libgaim/protocols/novell/novell.c:2853
-#: ../libgaim/protocols/yahoo/yahoo.c:2885 ../libgaim/status.c:155
+#: ../libgaim/protocols/novell/novell.c:2851
+#: ../libgaim/protocols/yahoo/yahoo.c:2880 ../libgaim/status.c:155
 msgid "Available"
 msgstr "Dispoñible"
 
 #. Away stuff
 #. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../gtk/gtkdocklet.c:450 ../gtk/gtkprefs.c:1819 ../gtk/gtkstatusbox.c:972
+#: ../gtk/gtkdocklet.c:463 ../gtk/gtkprefs.c:1821 ../gtk/gtkstatusbox.c:988
 #: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:524
-#: ../libgaim/protocols/irc/msgs.c:223
-#: ../libgaim/protocols/jabber/buddy.c:1371
-#: ../libgaim/protocols/novell/novell.c:2856
-#: ../libgaim/protocols/oscar/oscar.c:694
-#: ../libgaim/protocols/oscar/oscar.c:4407
-#: ../libgaim/protocols/oscar/oscar.c:5474
+#: ../libgaim/protocols/irc/msgs.c:226
+#: ../libgaim/protocols/jabber/buddy.c:1407
+#: ../libgaim/protocols/novell/novell.c:2854
+#: ../libgaim/protocols/oscar/oscar.c:712
+#: ../libgaim/protocols/oscar/oscar.c:4498
+#: ../libgaim/protocols/oscar/oscar.c:5579 ../libgaim/protocols/qq/qq.c:180
 #: ../libgaim/protocols/silc/buddy.c:1469
-#: ../libgaim/protocols/yahoo/yahoo.c:3359
-#: ../libgaim/protocols/yahoo/yahoo.c:3432 ../libgaim/status.c:158
+#: ../libgaim/protocols/yahoo/yahoo.c:3353
+#: ../libgaim/protocols/yahoo/yahoo.c:3426 ../libgaim/status.c:158
 msgid "Away"
 msgstr "Ausente"
 
-#: ../gtk/gtkdocklet.c:454 ../gtk/gtkstatusbox.c:973
-#: ../libgaim/protocols/oscar/oscar.c:698
-#: ../libgaim/protocols/yahoo/yahoo.c:2879 ../libgaim/status.c:157
+#: ../gtk/gtkdocklet.c:467 ../gtk/gtkstatusbox.c:989
+#: ../libgaim/protocols/oscar/oscar.c:716 ../libgaim/protocols/qq/qq.c:183
+#: ../libgaim/protocols/yahoo/yahoo.c:2874 ../libgaim/status.c:157
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../gtk/gtkdocklet.c:495
+#: ../gtk/gtkdocklet.c:508
 msgid "Show Buddy List"
-msgstr "Amosar lista de amigos"
-
-#: ../gtk/gtkdocklet.c:521
+msgstr "Amosar a listaxe de contactos"
+
+#: ../gtk/gtkdocklet.c:534
 msgid "New Message..."
 msgstr "Nova mensaxe..."
 
-#: ../gtk/gtkdocklet.c:536
+#: ../gtk/gtkdocklet.c:549
 msgid "Mute Sounds"
 msgstr "Sen son"
 
-#: ../gtk/gtkdocklet.c:543
+#: ../gtk/gtkdocklet.c:556
 #, fuzzy
 msgid "Blink on new message"
 msgstr "Mensaxe descoñecida"
@@ -2729,7 +2819,7 @@
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: ../gtk/gtkdocklet.c:554
+#: ../gtk/gtkdocklet.c:567
 msgid "Quit"
 msgstr "Saír"
 
@@ -2742,19 +2832,19 @@
 msgid "Not started"
 msgstr "Non iniciado"
 
-#: ../gtk/gtkft.c:159 ../libgaim/account.c:1662
-#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:630
-#: ../libgaim/protocols/jabber/buddy.c:1361
-#: ../libgaim/protocols/jabber/buddy.c:1378
-#: ../libgaim/protocols/novell/novell.c:2868
+#: ../gtk/gtkft.c:159 ../libgaim/account.c:1714
+#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:641
+#: ../libgaim/protocols/jabber/buddy.c:1397
+#: ../libgaim/protocols/jabber/buddy.c:1414
+#: ../libgaim/protocols/novell/novell.c:2866 ../libgaim/protocols/qq/qq.c:230
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1119
+#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1118
 msgid "Finished"
 msgstr "Rematado"
 
-#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1059
+#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1056
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -2763,9 +2853,9 @@
 msgstr "Agardando o comezo da transferencia"
 
 #: ../gtk/gtkft.c:228
-#, c-format
+#, fuzzy, c-format
 msgid "File Transfers - %d%% of %d files"
-msgstr "Transferencia de ficheiro - %d%% de %d ficheiros"
+msgstr "A transferencia de ficheiro a %s fallou."
 
 #: ../gtk/gtkft.c:233 ../gtk/gtkft.c:763
 msgid "File Transfers"
@@ -2803,7 +2893,7 @@
 #: ../gtk/gtkft.c:548
 #, c-format
 msgid "Error running %s"
-msgstr "Erro executando %s"
+msgstr "Erro ao executar %s"
 
 #: ../gtk/gtkft.c:549
 #, c-format
@@ -2828,7 +2918,7 @@
 
 #: ../gtk/gtkft.c:696
 msgid "Filename:"
-msgstr "Nome de ficheiro:"
+msgstr "Nome do ficheiro:"
 
 #: ../gtk/gtkft.c:697
 msgid "Local File:"
@@ -2840,7 +2930,7 @@
 
 #: ../gtk/gtkft.c:700
 msgid "Time Elapsed:"
-msgstr "Tempo transcurrido:"
+msgstr "Tempo transcorrido:"
 
 #: ../gtk/gtkft.c:701
 msgid "Time Remaining:"
@@ -2848,11 +2938,11 @@
 
 #: ../gtk/gtkft.c:786
 msgid "Close this window when all transfers _finish"
-msgstr "_Pechar esta fiestra cando rematen todas as transferencias"
+msgstr "_Pechar esta ventá cando rematen todas as transferencias"
 
 #: ../gtk/gtkft.c:796
 msgid "C_lear finished transfers"
-msgstr "_Limpar transferencias rematadas"
+msgstr "_Limpar as transferencias rematadas"
 
 #. "Download Details" arrow
 #: ../gtk/gtkft.c:805
@@ -2864,47 +2954,47 @@
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../gtk/gtkft.c:1061
+#: ../gtk/gtkft.c:1058
 msgid "Failed"
 msgstr "Fallou"
 
-#: ../gtk/gtkimhtml.c:814
+#: ../gtk/gtkimhtml.c:793
 msgid "Paste as Plain _Text"
 msgstr "Pegar como _texto plano"
 
-#: ../gtk/gtkimhtml.c:826
+#: ../gtk/gtkimhtml.c:810
 msgid "_Reset formatting"
-msgstr "_Reiniciar formatos"
-
-#: ../gtk/gtkimhtml.c:1318
+msgstr "_Reiniciar os formatos"
+
+#: ../gtk/gtkimhtml.c:1297
 msgid "Hyperlink color"
-msgstr "Cor de ligazón"
-
-#: ../gtk/gtkimhtml.c:1319
+msgstr "Cor da ligazón"
+
+#: ../gtk/gtkimhtml.c:1298
 msgid "Color to draw hyperlinks."
 msgstr "Cor para debuxar ligazóns."
 
-#: ../gtk/gtkimhtml.c:1322
+#: ../gtk/gtkimhtml.c:1301
 msgid "Hyperlink prelight color"
-msgstr "Cor de ligazón pre-iluminado"
-
-#: ../gtk/gtkimhtml.c:1323
+msgstr "Cor de ligazón pre-iluminada"
+
+#: ../gtk/gtkimhtml.c:1302
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Cor para debuxar ligazóns cando o rato esté enriba."
 
-#: ../gtk/gtkimhtml.c:1544
+#: ../gtk/gtkimhtml.c:1519
 msgid "_Copy E-Mail Address"
-msgstr "_Copiar enderezo E-Mail"
-
-#: ../gtk/gtkimhtml.c:1556
+msgstr "_Copiar o enderezo de correo"
+
+#: ../gtk/gtkimhtml.c:1531
 msgid "_Open Link in Browser"
-msgstr "_Abrir ligazón en navegador"
-
-#: ../gtk/gtkimhtml.c:1566
+msgstr "_Abrir a ligazón no navegador"
+
+#: ../gtk/gtkimhtml.c:1541
 msgid "_Copy Link Location"
-msgstr "_Copiar destino da ligazón"
-
-#: ../gtk/gtkimhtml.c:3298
+msgstr "_Copiar o destino da ligazón"
+
+#: ../gtk/gtkimhtml.c:3292
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -2914,7 +3004,7 @@
 "\n"
 "Por defecto PNG."
 
-#: ../gtk/gtkimhtml.c:3301
+#: ../gtk/gtkimhtml.c:3295
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -2924,39 +3014,39 @@
 "\n"
 "Por defecto PNG."
 
-#: ../gtk/gtkimhtml.c:3314
+#: ../gtk/gtkimhtml.c:3308
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span size='larger' weight='bold'>Erro gardando a imaxe</span>\n"
+"<span size='larger' weight='bold'>Erro ao gardar a imaxe</span>\n"
 "\n"
 "%s"
 
-#: ../gtk/gtkimhtml.c:3317
+#: ../gtk/gtkimhtml.c:3311
 #, c-format
 msgid ""
 "Error saving image\n"
 "\n"
 "%s"
 msgstr ""
-"Erro gardando a imaxe\n"
+"Erro ao gardar a imaxe\n"
 "\n"
 "%s"
 
-#: ../gtk/gtkimhtml.c:3397 ../gtk/gtkimhtml.c:3409
+#: ../gtk/gtkimhtml.c:3391 ../gtk/gtkimhtml.c:3403
 msgid "Save Image"
-msgstr "Gardar imaxe"
-
-#: ../gtk/gtkimhtml.c:3437
+msgstr "Gardar a imaxe"
+
+#: ../gtk/gtkimhtml.c:3431
 msgid "_Save Image..."
-msgstr "_Gardar imaxe..."
+msgstr "_Gardar a imaxe..."
 
 #: ../gtk/gtkimhtmltoolbar.c:147
 msgid "Select Font"
-msgstr "Seleccionar fonte"
+msgstr "Seleccionar a fonte"
 
 #: ../gtk/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
@@ -2979,16 +3069,16 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
-"Introduza a URL e a descrición do ligazón que quere inserir. A descrición é "
+"Introduza a URL e a descrición da ligazón que quere inserir. A descrición é "
 "opcional."
 
 #: ../gtk/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
-msgstr "Introduza a URL do ligazón que quere inserir."
+msgstr "Introduza a URL da ligazón que quere inserir."
 
 #: ../gtk/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
-msgstr "Inserir ligazón"
+msgstr "Inserir unha ligazón"
 
 #: ../gtk/gtkimhtmltoolbar.c:418
 msgid "_Insert"
@@ -3005,24 +3095,24 @@
 
 #: ../gtk/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
-msgstr "Este tema non ten emoticóns dispoñibles."
+msgstr "Este tema non ten emoticonas dispoñibles."
 
 #. show everything
 #: ../gtk/gtkimhtmltoolbar.c:735
 msgid "Smile!"
-msgstr "Sorisa"
-
-#: ../gtk/gtkimhtmltoolbar.c:922
+msgstr "Emoticona"
+
+#: ../gtk/gtkimhtmltoolbar.c:922 ../gtk/plugins/convcolors.c:278
 msgid "Bold"
-msgstr "Grosa"
-
-#: ../gtk/gtkimhtmltoolbar.c:933
+msgstr "Negra"
+
+#: ../gtk/gtkimhtmltoolbar.c:933 ../gtk/plugins/convcolors.c:285
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../gtk/gtkimhtmltoolbar.c:944
+#: ../gtk/gtkimhtmltoolbar.c:944 ../gtk/plugins/convcolors.c:292
 msgid "Underline"
-msgstr "Subraiado"
+msgstr "Subliñado"
 
 #: ../gtk/gtkimhtmltoolbar.c:960
 msgid "Larger font size"
@@ -3033,6 +3123,7 @@
 msgstr "Tamaño de fonte menor"
 
 #: ../gtk/gtkimhtmltoolbar.c:989
+#, fuzzy
 msgid "Font face"
 msgstr "Estilo da fonte"
 
@@ -3058,31 +3149,31 @@
 
 #: ../gtk/gtkimhtmltoolbar.c:1065
 msgid "Insert smiley"
-msgstr "Inserir emoticón"
-
-#: ../gtk/gtklog.c:219
+msgstr "Inserir emoticona"
+
+#: ../gtk/gtklog.c:234
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Conversación en %s de %s</span>"
-
-#: ../gtk/gtklog.c:224
+msgstr "<span size='larger' weight='bold'>Conversa en %s de %s</span>"
+
+#: ../gtk/gtklog.c:237
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Conversación con %s en %s</span>"
-
-#: ../gtk/gtklog.c:273
+msgstr "<span size='larger' weight='bold'>Conversa con %s en %s</span>"
+
+#: ../gtk/gtklog.c:284
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../gtk/gtklog.c:320
+#: ../gtk/gtklog.c:331
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"Só se rexistrarán os eventos do sistema cando esté activada a opción "
-"\"Rexistrar todos os cambios de estado no rexistro do sistema."
-
-#: ../gtk/gtklog.c:324
+"Só se rexistrarán os eventos do sistema cando estea activada a opción "
+"\"Rexistrar todos os cambios de estado no rexistro do sistema\"."
+
+#: ../gtk/gtklog.c:335
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -3090,31 +3181,36 @@
 "Só se rexistrarán as mensaxes instantáneas se está activada a preferencia "
 "\"Rexistrar todas as mensaxes instantáneas\"."
 
-#: ../gtk/gtklog.c:327
+#: ../gtk/gtklog.c:338
 msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Os chats só serán rexistrados se a opción \"Rexistrar todos os chats\" está "
-"activada nas preferencias"
-
-#: ../gtk/gtklog.c:331
+"As conversas só serán rexistradas se a opción \"Rexistrar todas as conversas"
+"\" está activada nas preferencias"
+
+#: ../gtk/gtklog.c:342
 msgid "No logs were found"
 msgstr "Non se atoparon rexistros"
 
-#: ../gtk/gtklog.c:410
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../gtk/gtklog.c:357
+msgid "_Browse logs folder"
+msgstr ""
+
+#: ../gtk/gtklog.c:425
 msgid "Total log size:"
 msgstr "Tamaño total de rexistro:"
 
-#: ../gtk/gtklog.c:476
+#: ../gtk/gtklog.c:494
 #, c-format
 msgid "Conversations in %s"
-msgstr "Conversacións en %s"
-
-#: ../gtk/gtklog.c:484 ../gtk/gtklog.c:535
+msgstr "Conversas en %s"
+
+#: ../gtk/gtklog.c:502 ../gtk/gtklog.c:553
 #, c-format
 msgid "Conversations with %s"
-msgstr "Conversacións con %s"
-
-#: ../gtk/gtklog.c:560
+msgstr "Conversas con %s"
+
+#: ../gtk/gtklog.c:578
 msgid "System Log"
 msgstr "Rexistro do sistema"
 
@@ -3171,16 +3267,16 @@
 "%scontactinfo.php\n"
 msgstr ""
 "Gaim tivo un fallo e tentou xerar un ficheiro core.\n"
-"Isto é un bug no programa e non se produciu por\n"
+"Isto é un erro no programa e non se produciu por\n"
 "algo que fixera.\n"
 "\n"
-"Se prode reproducir este fallo, por favor, notifíqueo aos\n"
-"desenroladores de gaim enviando un informe de erros a\n"
+"Se podes reproducir este fallo, por favor, notifíqueo aos\n"
+"desenvolvedores de gaim enviando un informe de erros a\n"
 "%sbug.php\n"
 "\n"
 "Asegúrese de que especifica o que estaba facendo no momento\n"
 "de publicar a súa traza do ficheiro core. Se non sabe como\n"
-"obter unha traza consulte as instruccións dispoñibles en\n"
+"obter unha traza consulte as instrucións dispoñibles en\n"
 "%sgdb.php\n"
 "\n"
 "Se necesita axuda pode enviar unha MI a SeanEgn ou LSchiere\n"
@@ -3188,70 +3284,71 @@
 "con Sean ou Luke a través doutros protocolos en \n"
 "%scontactinfo.php\n"
 
-#: ../gtk/gtknotify.c:348
+#: ../gtk/gtknotify.c:328
 msgid "Open All Messages"
 msgstr "Abrir todas as mensaxes"
 
-#: ../gtk/gtknotify.c:432
+#: ../gtk/gtknotify.c:380
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Ten correo!</span>"
 
-#: ../gtk/gtknotify.c:498
+#: ../gtk/gtknotify.c:474
+#, fuzzy
+msgid "Sender"
+msgstr "Xénero"
+
+#: ../gtk/gtknotify.c:500
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
-msgstr[0] "%s ten %d mensaxe novo."
+msgstr[0] "%s ten %d mensaxe nova."
 msgstr[1] "%s ten %d mensaxes novas."
 
-#: ../gtk/gtknotify.c:503
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ten correo!</span>\n"
-"\n"
-"%s"
-
-#: ../gtk/gtknotify.c:692 ../libgaim/protocols/sametime/sametime.c:5450
+#: ../gtk/gtknotify.c:511
+#, c-format
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../gtk/gtknotify.c:699 ../libgaim/protocols/sametime/sametime.c:5539
 msgid "Search Results"
 msgstr "Resultados da busca"
 
-#: ../gtk/gtknotify.c:890
+#: ../gtk/gtknotify.c:899
 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "O comando de navegador \"%s\" é inválido."
-
-#: ../gtk/gtknotify.c:892 ../gtk/gtknotify.c:904 ../gtk/gtknotify.c:917
-#: ../gtk/gtknotify.c:1045
+msgstr "O comando do navegador \"%s\" é inválido."
+
+#: ../gtk/gtknotify.c:901 ../gtk/gtknotify.c:913 ../gtk/gtknotify.c:926
+#: ../gtk/gtknotify.c:1054
 msgid "Unable to open URL"
-msgstr "Non se puido abrir a URL"
-
-#: ../gtk/gtknotify.c:902 ../gtk/gtknotify.c:915
+msgstr "Non se puido abrir o URL"
+
+#: ../gtk/gtknotify.c:911 ../gtk/gtknotify.c:924
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Erro ao lanzar \"%s\": %s"
 
-#: ../gtk/gtknotify.c:1046
+#: ../gtk/gtknotify.c:1055
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
-"Definiuse un comando de navegador 'Manual', pero non se definiu ningún "
+"Elixiuse un comando de navegador 'Manual', pero non se definiu ningún "
 "comando para executalo."
 
-#: ../gtk/gtkplugin.c:274
+#: ../gtk/gtkplugin.c:264
 msgid "The following plugins will be unloaded."
 msgstr "Desactivaranse os seguintes complementos."
 
-#: ../gtk/gtkplugin.c:293
+#: ../gtk/gtkplugin.c:283
 msgid "Multiple plugins will be unloaded."
 msgstr "Desactivaranse múltiples complementos."
 
-#: ../gtk/gtkplugin.c:295
+#: ../gtk/gtkplugin.c:285
 msgid "Unload Plugins"
 msgstr "Desactivar complementos"
 
-#: ../gtk/gtkplugin.c:407
+#: ../gtk/gtkplugin.c:397
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -3262,7 +3359,7 @@
 "<span weight=\"bold\">Sitio web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nome do ficheiro:</span>\t\t%s"
 
-#: ../gtk/gtkplugin.c:417
+#: ../gtk/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s\n"
@@ -3273,11 +3370,11 @@
 "<span·foreground=\"#ff0000\"·weight=\"bold\">Erro:·%s\n"
 "Comprobe o sitio web do complemento para obter unha actualización.</span>"
 
-#: ../gtk/gtkplugin.c:543
+#: ../gtk/gtkplugin.c:533
 msgid "Configure Pl_ugin"
-msgstr "Configurar _complemento"
-
-#: ../gtk/gtkplugin.c:603
+msgstr "Configurar o _complemento"
+
+#: ../gtk/gtkplugin.c:596
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalles do complemento</b>"
 
@@ -3285,262 +3382,260 @@
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: ../gtk/gtkpounce.c:252
+#: ../gtk/gtkpounce.c:251
 msgid "Please enter a buddy to pounce."
-msgstr "Indique o amigo do que avisar."
-
-#: ../gtk/gtkpounce.c:499
+msgstr "Indique o contacto do que avisar."
+
+#: ../gtk/gtkpounce.c:505
 msgid "New Buddy Pounce"
-msgstr "Novo aviso de amigo"
-
-#: ../gtk/gtkpounce.c:499
+msgstr "Novo aviso do contacto"
+
+#: ../gtk/gtkpounce.c:505
 msgid "Edit Buddy Pounce"
-msgstr "Editar aviso de amigo"
+msgstr "Editar aviso do contacto"
 
 #. Create the "Pounce on Whom" frame.
-#: ../gtk/gtkpounce.c:516
+#: ../gtk/gtkpounce.c:522
 msgid "Pounce on Whom"
-msgstr "A quén avisar"
-
-#: ../gtk/gtkpounce.c:543
+msgstr "A quen avisar"
+
+#: ../gtk/gtkpounce.c:549
 msgid "_Buddy name:"
-msgstr "Nome do _amigo:"
+msgstr "Nome do _contacto:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../gtk/gtkpounce.c:569
+#: ../gtk/gtkpounce.c:575
 msgid "Pounce When Buddy..."
-msgstr "Avisar cando un amigo..."
-
-#: ../gtk/gtkpounce.c:577
+msgstr "Avisar cando un contacto..."
+
+#: ../gtk/gtkpounce.c:583
 msgid "Si_gns on"
 msgstr "_Conectarse"
 
-#: ../gtk/gtkpounce.c:579
+#: ../gtk/gtkpounce.c:585
 msgid "Signs o_ff"
 msgstr "_Desconectarse"
 
-#: ../gtk/gtkpounce.c:581
-msgid "Goes a_way"
-msgstr "_Auséntarse"
-
-#: ../gtk/gtkpounce.c:583
-msgid "Ret_urns from away"
-msgstr "_Deixar de estar ausente"
-
-#: ../gtk/gtkpounce.c:585
-msgid "Becomes _idle"
-msgstr "Agora está _inactivo"
-
 #: ../gtk/gtkpounce.c:587
-msgid "Is no longer i_dle"
-msgstr "_Xa non está inactivo"
+msgid "Goes a_way"
+msgstr "_Ausentarse"
 
 #: ../gtk/gtkpounce.c:589
-msgid "Starts _typing"
-msgstr "Comeza a _escribir"
+msgid "Ret_urns from away"
+msgstr "_Deixar de estar ausente"
 
 #: ../gtk/gtkpounce.c:591
-msgid "P_auses while typing"
-msgstr "_Páusase mentras escribe"
+msgid "Becomes _idle"
+msgstr "Agora está _inactivo"
 
 #: ../gtk/gtkpounce.c:593
+msgid "Is no longer i_dle"
+msgstr "_Xa non está inactivo"
+
+#: ../gtk/gtkpounce.c:595
+msgid "Starts _typing"
+msgstr "Comeza a _escribir"
+
+#: ../gtk/gtkpounce.c:597
+msgid "P_auses while typing"
+msgstr ""
+
+#: ../gtk/gtkpounce.c:599
 msgid "Stops t_yping"
 msgstr "Deixa de escr_ibir"
 
-#: ../gtk/gtkpounce.c:595
+#: ../gtk/gtkpounce.c:601
 msgid "Sends a _message"
 msgstr "Enviar unha _mensaxe"
 
 #. Create the "Action" frame.
-#: ../gtk/gtkpounce.c:630
+#: ../gtk/gtkpounce.c:636
 msgid "Action"
 msgstr "Acción"
 
-#: ../gtk/gtkpounce.c:638
+#: ../gtk/gtkpounce.c:644
 msgid "Ope_n an IM window"
-msgstr "_Abrir unha fiestra de MI"
-
-#: ../gtk/gtkpounce.c:640
+msgstr "_Abrir unha ventá de MI"
+
+#: ../gtk/gtkpounce.c:646
 msgid "_Pop up a notification"
-msgstr "_Notificación cunha fiestra emerxente"
-
-#: ../gtk/gtkpounce.c:642
+msgstr "_Notificación cunha ventá emerxente"
+
+#: ../gtk/gtkpounce.c:648
 msgid "Send a _message"
 msgstr "Enviar unha _mensaxe"
 
-#: ../gtk/gtkpounce.c:644
+#: ../gtk/gtkpounce.c:650
 msgid "E_xecute a command"
 msgstr "E_xecutar un comando"
 
-#: ../gtk/gtkpounce.c:646
+#: ../gtk/gtkpounce.c:652
 msgid "P_lay a sound"
 msgstr "Re_producir un son"
 
-#: ../gtk/gtkpounce.c:651
+#: ../gtk/gtkpounce.c:657
 msgid "Brows_e..."
 msgstr "Exa_minar..."
 
-#: ../gtk/gtkpounce.c:653
+#: ../gtk/gtkpounce.c:659
 msgid "Br_owse..."
 msgstr "Exa_minar..."
 
-#: ../gtk/gtkpounce.c:654
+#: ../gtk/gtkpounce.c:660
 msgid "Pre_view"
 msgstr "Pre_visualizar..."
 
-#: ../gtk/gtkpounce.c:774
+#: ../gtk/gtkpounce.c:784
 msgid "P_ounce only when my status is not available"
-msgstr "Só _avisar cando o meu estado non está dispoñible"
-
-#: ../gtk/gtkpounce.c:779
+msgstr "Só _avisar cando o meu estado é non dispoñible"
+
+#: ../gtk/gtkpounce.c:789
 msgid "_Recurring"
 msgstr "_Recorrente"
 
-#: ../gtk/gtkpounce.c:1085
+#: ../gtk/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Está seguro de que quere borrar o aviso en %s para %s?"
 
-#: ../gtk/gtkpounce.c:1233
+#: ../gtk/gtkpounce.c:1243
 msgid "Pounce Target"
-msgstr "Obxectivo a avisar"
-
-#: ../gtk/gtkpounce.c:1268
+msgstr "Obxectivo para avisar"
+
+#: ../gtk/gtkpounce.c:1278
 msgid "Recurring"
 msgstr "Recorrente"
 
-#: ../gtk/gtkpounce.c:1315
+#: ../gtk/gtkpounce.c:1325
 msgid "Buddy Pounces"
-msgstr "Avisos de amigo"
-
-#: ../gtk/gtkpounce.c:1442
+msgstr "Avisos de contacto"
+
+#: ../gtk/gtkpounce.c:1452
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s comezou a escribirlle (%s)"
 
-#: ../gtk/gtkpounce.c:1444
-#, c-format
+#: ../gtk/gtkpounce.c:1454
+#, fuzzy, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s pausouse mentras lle escriba algo (%s)"
-
-#: ../gtk/gtkpounce.c:1446
+msgstr "%s comezou a escribirlle (%s)"
+
+#: ../gtk/gtkpounce.c:1456
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s conectouse (%s)"
 
-#: ../gtk/gtkpounce.c:1448
+#: ../gtk/gtkpounce.c:1458
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s volveu da súa inactividade (%s)"
 
-#: ../gtk/gtkpounce.c:1450
+#: ../gtk/gtkpounce.c:1460
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s deixou de estar ausente (%s)"
 
-#: ../gtk/gtkpounce.c:1452
+#: ../gtk/gtkpounce.c:1462
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s deixou de escribirlle (%s)"
 
-#: ../gtk/gtkpounce.c:1454
+#: ../gtk/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s desconectouse (%s)"
 
-#: ../gtk/gtkpounce.c:1456
+#: ../gtk/gtkpounce.c:1466
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s está inactivo (%s)"
 
-#: ../gtk/gtkpounce.c:1458
+#: ../gtk/gtkpounce.c:1468
 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr "%s marchouse. (%s)"
-
-#: ../gtk/gtkpounce.c:1460
+msgstr "%s marchou. (%s)"
+
+#: ../gtk/gtkpounce.c:1470
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s envioulle unha mensaxe. (%s)"
 
-#: ../gtk/gtkpounce.c:1461
+#: ../gtk/gtkpounce.c:1471
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso descoñecido. Por favor, informe disto!"
 
 #: ../gtk/gtkprefs.c:509
 msgid "Smiley theme failed to unpack."
-msgstr "Fallou o desempaquetado do tema de emoticóns."
+msgstr "Fallou o desempaquetado do tema de emoticonas."
 
 #: ../gtk/gtkprefs.c:638
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr ""
-"Seleccione da lista inferior o tema de emoticóns que desexe. Pode instalar "
-"temas novos arrastrándoos e soltándoos sobre esta lista de temas."
+"Seleccione da listaxe inferior o tema de emoticonas que desexe. Pode "
+"instalar temas novos arrastrándoos e soltándoos sobre esta listaxe de temas."
 
 #: ../gtk/gtkprefs.c:673
 msgid "Icon"
 msgstr "Icona"
 
-#: ../gtk/gtkprefs.c:680 ../libgaim/protocols/jabber/buddy.c:286
-#: ../libgaim/protocols/jabber/buddy.c:923
-#: ../libgaim/protocols/jabber/chat.c:769
-msgid "Description"
-msgstr "Descrición"
-
 #: ../gtk/gtkprefs.c:816
 msgid "System Tray Icon"
-msgstr "Icona do área de notificación do sistema"
+msgstr "Icona da área de notificación do sistema"
 
 #: ../gtk/gtkprefs.c:817
+#, fuzzy
 msgid "_Show system tray icon:"
-msgstr "A_mosar icona do área de notificación do sistema:"
-
-#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1644
+msgstr "Icona da área de notificación do sistema"
+
+#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1646
 #: ../gtk/plugins/timestamp_format.c:39 ../gtk/plugins/timestamp_format.c:48
 #: ../gtk/plugins/win32/winprefs/winprefs.c:335
 msgid "Always"
 msgstr "Sempre"
 
-#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1809
-#: ../gtk/gtkprefs.c:1823 ../gtk/plugins/win32/winprefs/winprefs.c:334
+#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1811
+#: ../gtk/gtkprefs.c:1825 ../gtk/plugins/win32/winprefs/winprefs.c:334
+#: ../libgaim/plugins/autoreply.c:360
 msgid "Never"
 msgstr "Nunca"
 
 #: ../gtk/gtkprefs.c:821
+#, fuzzy
 msgid "On unread messages"
-msgstr "Nas mensaxes sen ler"
+msgstr "Mensaxes sen ler"
 
 #: ../gtk/gtkprefs.c:826
 #, fuzzy
 msgid "Conversation Window Hiding"
-msgstr "Fiestras de conversación de MI"
+msgstr "Ventás de conversa de MI"
 
 #: ../gtk/gtkprefs.c:827
+#, fuzzy
 msgid "_Hide new IM conversations:"
-msgstr "A_gochar conversacións MI novas:"
-
-#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1824
+msgstr "A_gochar conversas MI novas"
+
+#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1826
 msgid "When away"
 msgstr "Cando está ausente"
 
 #. All the tab options!
 #: ../gtk/gtkprefs.c:838
 msgid "Tabs"
-msgstr "Tabulacións"
+msgstr ""
 
 #: ../gtk/gtkprefs.c:840
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "Amosar MIs e chats en fiestras con _solapas"
+msgstr "Amosar MI e conversas en ventás con _pestanas"
 
 #: ../gtk/gtkprefs.c:854
 msgid "Show close b_utton on tabs"
-msgstr "Amosar botóns de _peche nas solapas"
+msgstr "Amosar botóns de _peche nas pestanas"
 
 #: ../gtk/gtkprefs.c:857
 msgid "_Placement:"
-msgstr "_Ubicación:"
+msgstr "_Localización:"
 
 #: ../gtk/gtkprefs.c:859
 msgid "Top"
@@ -3568,7 +3663,7 @@
 
 #: ../gtk/gtkprefs.c:872
 msgid "N_ew conversations:"
-msgstr "Conversacións _novas:"
+msgstr "Conversas _novas:"
 
 #: ../gtk/gtkprefs.c:900
 msgid "Show _formatting on incoming messages"
@@ -3576,15 +3671,15 @@
 
 #: ../gtk/gtkprefs.c:903
 msgid "Show buddy _icons"
-msgstr "Amosar _iconas dos amigos"
+msgstr "Amosar _iconas dos contactos"
 
 #: ../gtk/gtkprefs.c:905
 msgid "Enable buddy ic_on animation"
-msgstr "Activar animacións nas i_conas de amigos"
+msgstr "Activar animacións nas i_conas dos contactos"
 
 #: ../gtk/gtkprefs.c:912
 msgid "_Notify buddies that you are typing to them"
-msgstr "_Notificar aos amigos cando lles está escribindo"
+msgstr "_Notificarlle aos contactos cando se lles está escribindo"
 
 #: ../gtk/gtkprefs.c:915
 msgid "Highlight _misspelled words"
@@ -3595,12 +3690,14 @@
 msgstr "Usar desprazamento suave"
 
 #: ../gtk/gtkprefs.c:922
+#, fuzzy
 msgid "F_lash window when IMs are received"
-msgstr "_Destello de fiestra cando se reciben MIs"
+msgstr "_Brillo de ventá cando se reciben mensaxes"
 
 #: ../gtk/gtkprefs.c:925
+#, fuzzy
 msgid "Default Formatting"
-msgstr "Formato predeterminado"
+msgstr "Reiniciar formatos"
 
 #: ../gtk/gtkprefs.c:941
 msgid ""
@@ -3610,124 +3707,125 @@
 "Desta forma verase o texto das súas mensaxes saíntes cando empregue "
 "protocolos que soportan formatos. :)"
 
-#: ../gtk/gtkprefs.c:1010 ../libgaim/protocols/oscar/oscar.c:779
-#: ../libgaim/protocols/oscar/oscar.c:3628
+#: ../gtk/gtkprefs.c:1015 ../libgaim/protocols/oscar/oscar.c:817
+#: ../libgaim/protocols/oscar/oscar.c:3701
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:697
 msgid "IP Address"
 msgstr "Enderezo IP"
 
-#: ../gtk/gtkprefs.c:1012
+#: ../gtk/gtkprefs.c:1017
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
-#: ../gtk/gtkprefs.c:1024
+#: ../gtk/gtkprefs.c:1029
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\"italic\">Examplo: stunserver.org</span>"
-
-#: ../gtk/gtkprefs.c:1028
+msgstr "<span style=\"italic\">Exemplo: stunserver.org</span>"
+
+#: ../gtk/gtkprefs.c:1033
 msgid "_Autodetect IP address"
 msgstr "_Autodetectar enderezo IP"
 
-#: ../gtk/gtkprefs.c:1037
+#: ../gtk/gtkprefs.c:1042
 msgid "Public _IP:"
 msgstr "_IP pública:"
 
-#: ../gtk/gtkprefs.c:1066
+#: ../gtk/gtkprefs.c:1071
 msgid "Ports"
 msgstr "Portos"
 
-#: ../gtk/gtkprefs.c:1069
+#: ../gtk/gtkprefs.c:1074
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente o rango de portos no que se escoitará"
 
-#: ../gtk/gtkprefs.c:1072
+#: ../gtk/gtkprefs.c:1077
 msgid "_Start port:"
 msgstr "Porto _inicial:"
 
-#: ../gtk/gtkprefs.c:1079
+#: ../gtk/gtkprefs.c:1084
 msgid "_End port:"
 msgstr "Porto _final:"
 
-#: ../gtk/gtkprefs.c:1087
+#: ../gtk/gtkprefs.c:1092
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../gtk/gtkprefs.c:1091
+#: ../gtk/gtkprefs.c:1096
 msgid "No proxy"
 msgstr "Sen proxy"
 
-#: ../gtk/gtkprefs.c:1147
+#: ../gtk/gtkprefs.c:1152
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: ../gtk/gtkprefs.c:1210
+#: ../gtk/gtkprefs.c:1216
 msgid "Seamonkey"
-msgstr "Seamonkey"
-
-#: ../gtk/gtkprefs.c:1211
+msgstr ""
+
+#: ../gtk/gtkprefs.c:1217
 msgid "Opera"
 msgstr "Opera"
 
-#: ../gtk/gtkprefs.c:1212
+#: ../gtk/gtkprefs.c:1218
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../gtk/gtkprefs.c:1213
+#: ../gtk/gtkprefs.c:1219
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../gtk/gtkprefs.c:1214
+#: ../gtk/gtkprefs.c:1220
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../gtk/gtkprefs.c:1215
+#: ../gtk/gtkprefs.c:1221
 msgid "GNOME Default"
 msgstr "Predeterminado de Gnome"
 
-#: ../gtk/gtkprefs.c:1216
+#: ../gtk/gtkprefs.c:1222
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../gtk/gtkprefs.c:1217
+#: ../gtk/gtkprefs.c:1223
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../gtk/gtkprefs.c:1218
+#: ../gtk/gtkprefs.c:1224
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../gtk/gtkprefs.c:1219
+#: ../gtk/gtkprefs.c:1225
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../gtk/gtkprefs.c:1228
+#: ../gtk/gtkprefs.c:1234
 msgid "Manual"
 msgstr "Manual"
 
-#: ../gtk/gtkprefs.c:1281
+#: ../gtk/gtkprefs.c:1287
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#: ../gtk/gtkprefs.c:1285
+#: ../gtk/gtkprefs.c:1291
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../gtk/gtkprefs.c:1293
+#: ../gtk/gtkprefs.c:1299
 msgid "_Open link in:"
 msgstr "_Abrir ligazón en:"
 
-#: ../gtk/gtkprefs.c:1295
+#: ../gtk/gtkprefs.c:1301
 msgid "Browser default"
 msgstr "Navegador por omisión"
 
-#: ../gtk/gtkprefs.c:1296
+#: ../gtk/gtkprefs.c:1302
 msgid "Existing window"
-msgstr "Fiestra existente"
-
-#: ../gtk/gtkprefs.c:1298
+msgstr "Ventá existente"
+
+#: ../gtk/gtkprefs.c:1304
 msgid "New tab"
-msgstr "Nova solapa"
-
-#: ../gtk/gtkprefs.c:1312
+msgstr "Nova pestana"
+
+#: ../gtk/gtkprefs.c:1318
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3736,79 +3834,79 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../gtk/gtkprefs.c:1352
+#: ../gtk/gtkprefs.c:1358
 msgid "Log _format:"
 msgstr "_Formato de rexistro:"
 
-#: ../gtk/gtkprefs.c:1357
+#: ../gtk/gtkprefs.c:1363
 msgid "Log all _instant messages"
 msgstr "Rexistrar todas as mensaxes _instantáneas"
 
-#: ../gtk/gtkprefs.c:1359
+#: ../gtk/gtkprefs.c:1365
 msgid "Log all c_hats"
-msgstr "Rexistrar todas as _conversacións"
-
-#: ../gtk/gtkprefs.c:1361
+msgstr "Rexistrar todas as _conversas"
+
+#: ../gtk/gtkprefs.c:1367
 msgid "Log all _status changes to system log"
-msgstr "Rexistrar todos os cambios de e_stado no rexistro do sistema"
-
-#: ../gtk/gtkprefs.c:1509
+msgstr "Rexistrar todas as mudanzas de e_stado no rexistro do sistema"
+
+#: ../gtk/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "Selección de son"
 
-#: ../gtk/gtkprefs.c:1517
+#: ../gtk/gtkprefs.c:1521
 msgid "Quietest"
 msgstr "O máis silencioso"
 
-#: ../gtk/gtkprefs.c:1519
+#: ../gtk/gtkprefs.c:1523
 msgid "Quieter"
 msgstr "Máis silencioso"
 
-#: ../gtk/gtkprefs.c:1521
-msgid "Quiet"
-msgstr "Silencio"
-
-#: ../gtk/gtkprefs.c:1523 ../libgaim/protocols/silc/silc.c:666
-msgid "Normal"
-msgstr "Normal"
-
 #: ../gtk/gtkprefs.c:1525
-msgid "Loud"
-msgstr "Ruidoso"
-
-#: ../gtk/gtkprefs.c:1527
-msgid "Louder"
-msgstr "Máis ruidoso"
+msgid "Quiet"
+msgstr "Silencioso"
+
+#: ../gtk/gtkprefs.c:1527 ../libgaim/protocols/silc/silc.c:666
+msgid "Normal"
+msgstr "Normal"
 
 #: ../gtk/gtkprefs.c:1529
+msgid "Loud"
+msgstr "Ruidoso"
+
+#: ../gtk/gtkprefs.c:1531
+msgid "Louder"
+msgstr "Máis ruidoso"
+
+#: ../gtk/gtkprefs.c:1533
 msgid "Loudest"
 msgstr "O máis ruidoso"
 
-#: ../gtk/gtkprefs.c:1592
+#: ../gtk/gtkprefs.c:1596
 msgid "Sound Method"
 msgstr "Método para reproducir sons"
 
-#: ../gtk/gtkprefs.c:1593
+#: ../gtk/gtkprefs.c:1597
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../gtk/gtkprefs.c:1595
+#: ../gtk/gtkprefs.c:1599
 msgid "Console beep"
 msgstr "Bip da consola"
 
-#: ../gtk/gtkprefs.c:1597
+#: ../gtk/gtkprefs.c:1601
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../gtk/gtkprefs.c:1602
+#: ../gtk/gtkprefs.c:1604
 msgid "Command"
 msgstr "Comando"
 
-#: ../gtk/gtkprefs.c:1603
+#: ../gtk/gtkprefs.c:1605
 msgid "No sounds"
 msgstr "Sen sons"
 
-#: ../gtk/gtkprefs.c:1611
+#: ../gtk/gtkprefs.c:1613
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3817,136 +3915,141 @@
 "C_omando para son:\n"
 "(%s para nome de ficheiro)"
 
-#: ../gtk/gtkprefs.c:1637
+#: ../gtk/gtkprefs.c:1639
 msgid "Sound Options"
 msgstr "Opcións de son"
 
-#: ../gtk/gtkprefs.c:1638
+#: ../gtk/gtkprefs.c:1640
 msgid "Sounds when conversation has _focus"
-msgstr "Soa cando a conversación obtén o _foco"
-
-#: ../gtk/gtkprefs.c:1640
-msgid "Enable sounds:"
-msgstr "Activar sons:"
+msgstr "Sons cando a conversa ten o _foco"
 
 #: ../gtk/gtkprefs.c:1642
+#, fuzzy
+msgid "Enable sounds:"
+msgstr "Activar a conta"
+
+#: ../gtk/gtkprefs.c:1644
+#, fuzzy
 msgid "Only when available"
-msgstr "Só cando esté dispoñible"
-
-#: ../gtk/gtkprefs.c:1643
+msgstr "Non dispoñible"
+
+#: ../gtk/gtkprefs.c:1645
+#, fuzzy
 msgid "Only when not available"
-msgstr "Só cando non esté dispoñible"
-
-#: ../gtk/gtkprefs.c:1651
+msgstr "Non dispoñible"
+
+#: ../gtk/gtkprefs.c:1653
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../gtk/gtkprefs.c:1679
+#: ../gtk/gtkprefs.c:1681
 msgid "Sound Events"
 msgstr "Eventos de son"
 
-#: ../gtk/gtkprefs.c:1730
+#: ../gtk/gtkprefs.c:1732
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../gtk/gtkprefs.c:1737
+#: ../gtk/gtkprefs.c:1739
 msgid "Event"
 msgstr "Evento"
 
-#: ../gtk/gtkprefs.c:1756
+#: ../gtk/gtkprefs.c:1758
 msgid "Test"
 msgstr "Probar"
 
-#: ../gtk/gtkprefs.c:1760
+#: ../gtk/gtkprefs.c:1762
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: ../gtk/gtkprefs.c:1764
+#: ../gtk/gtkprefs.c:1766
 msgid "Choose..."
 msgstr "Escoller..."
 
-#: ../gtk/gtkprefs.c:1807
+#: ../gtk/gtkprefs.c:1809
 msgid "_Report idle time:"
 msgstr "Amosar o _tempo de inactividade:"
 
-#: ../gtk/gtkprefs.c:1810
-msgid "From last sent message"
-msgstr "Da última mensaxe enviada"
-
 #: ../gtk/gtkprefs.c:1812
+msgid "From last sent message"
+msgstr "Dende a última mensaxe enviada"
+
+#: ../gtk/gtkprefs.c:1814
 msgid "Based on keyboard or mouse use"
-msgstr "Baseado no teclado ou no uso do rato"
-
-#: ../gtk/gtkprefs.c:1821
+msgstr "Baseado no uso do teclado ou do rato"
+
+#: ../gtk/gtkprefs.c:1823
 msgid "_Auto-reply:"
 msgstr "Resposta _automática:"
 
-#: ../gtk/gtkprefs.c:1825
+#: ../gtk/gtkprefs.c:1827
 msgid "When both away and idle"
 msgstr "Cando está ausente e inactivo"
 
 #. Auto-away stuff
-#: ../gtk/gtkprefs.c:1831
+#: ../gtk/gtkprefs.c:1833
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-#: ../gtk/gtkprefs.c:1833
+#: ../gtk/gtkprefs.c:1835
 msgid "Change status when _idle"
-msgstr "Cambiar o estado cando esté _inactivo"
-
-#: ../gtk/gtkprefs.c:1837
+msgstr "Mudar o estado cando esté _inactivo"
+
+#: ../gtk/gtkprefs.c:1839
 msgid "_Minutes before changing status:"
-msgstr "_Minutos antes de cambiar o estado:"
-
-#: ../gtk/gtkprefs.c:1845
+msgstr "_Minutos antes de mudar o estado:"
+
+#: ../gtk/gtkprefs.c:1847
 msgid "Change _status to:"
-msgstr "Cambiar e_stado a:"
+msgstr "Mudar o e_stado a:"
 
 #. Signon status stuff
-#: ../gtk/gtkprefs.c:1866
+#: ../gtk/gtkprefs.c:1868
+#, fuzzy
 msgid "Status at Startup"
 msgstr "Estado para o inicio"
 
-#: ../gtk/gtkprefs.c:1868
+#: ../gtk/gtkprefs.c:1870
 msgid "Use status from last _exit at startup"
 msgstr "Empregar o estado da última _saída ao comezar"
 
-#: ../gtk/gtkprefs.c:1874
+#: ../gtk/gtkprefs.c:1876
 msgid "Status to a_pply at startup:"
-msgstr "Estado a _aplicar ao comezar:"
-
-#: ../gtk/gtkprefs.c:1912
-msgid "Interface"
-msgstr "Interface"
+msgstr "Estado para _aplicar ao comezar:"
 
 #: ../gtk/gtkprefs.c:1914
+#, fuzzy
+msgid "Interface"
+msgstr "Cores da interface"
+
+#: ../gtk/gtkprefs.c:1916
 msgid "Smiley Themes"
-msgstr "Temas de emoticóns"
-
-#: ../gtk/gtkprefs.c:1915
+msgstr "Temas das emoticonas"
+
+#: ../gtk/gtkprefs.c:1917
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../gtk/gtkprefs.c:1916 ../libgaim/protocols/silc/silc.c:1847
+#: ../gtk/gtkprefs.c:1918 ../libgaim/protocols/silc/silc.c:1848
 msgid "Network"
 msgstr "Rede"
 
-#: ../gtk/gtkprefs.c:1921
+#: ../gtk/gtkprefs.c:1923
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../gtk/gtkprefs.c:1925
+#: ../gtk/gtkprefs.c:1927
 #, fuzzy
 msgid "Status / Idle"
-msgstr "Estado"
+msgstr "Ausencia / Inactividade"
 
 #: ../gtk/gtkprivacy.c:79
 msgid "Allow all users to contact me"
-msgstr "Permitir a todos os usuarios que contacten comigo"
+msgstr "Permitir que contacten comigo todos os usuarios"
 
 #: ../gtk/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
-msgstr "Permitir só aos usuarios na miña lista de amigos"
+msgstr "Permitir só aos usuarios na miña listaxe de contactos"
 
 #: ../gtk/gtkprivacy.c:81
 msgid "Allow only the users below"
@@ -3958,7 +4061,7 @@
 
 #: ../gtk/gtkprivacy.c:83
 msgid "Block only the users below"
-msgstr "Bloquear só os seguintes usuarios"
+msgstr "Bloquear só aos seguintes usuarios"
 
 #: ../gtk/gtkprivacy.c:372
 msgid "Privacy"
@@ -3966,7 +4069,7 @@
 
 #: ../gtk/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
-msgstr "Os cambios á configuración de privacidade teñen efecto inmediatamente."
+msgstr "As mudanzas da configuración de privacidade teñen efecto inmediatamente."
 
 #. "Set privacy for:" label
 #: ../gtk/gtkprivacy.c:397
@@ -3983,7 +4086,9 @@
 
 #: ../gtk/gtkprivacy.c:562
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Introduza o nome de usuario ao que quere permitir que contacte con vostede."
+msgstr ""
+"Introduza o nome de usuario ao que lle quere permitir que contacte con "
+"vostede."
 
 #: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
 msgid "_Permit"
@@ -4005,15 +4110,11 @@
 
 #: ../gtk/gtkprivacy.c:600
 msgid "Type a user to block."
-msgstr "Escriba un usuario a bloquear."
+msgstr "Escriba un usuario que desexe bloquear."
 
 #: ../gtk/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
-msgstr "Introduza o nome do usuario a bloquear."
-
-#: ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
-msgid "_Block"
-msgstr "_Bloquear"
+msgstr "Introduza o nome do usuario que desexe bloquear."
 
 #: ../gtk/gtkprivacy.c:608
 #, c-format
@@ -4023,24 +4124,23 @@
 #: ../gtk/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
-msgstr "Está seguro de que quere bloquear a %s?"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
-#.
-#: ../gtk/gtkrequest.c:267 ../libgaim/protocols/msn/dialog.c:132
-#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1920
+msgstr "Está seguro de que desexa bloquear a %s?"
+
+#: ../gtk/gtkrequest.c:267 ../libgaim/plugins/offlinemsg.c:159
+#: ../libgaim/protocols/msn/dialog.c:132 ../libgaim/protocols/msn/msn.c:554
+#: ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1918
 #: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
-#: ../libgaim/protocols/silc/wb.c:303 ../libgaim/request.h:1335
+#: ../libgaim/protocols/silc/wb.c:303
 msgid "Yes"
 msgstr "Si"
 
-#: ../gtk/gtkrequest.c:268 ../libgaim/protocols/msn/dialog.c:133
-#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1921
+#: ../gtk/gtkrequest.c:268 ../libgaim/plugins/offlinemsg.c:160
+#: ../libgaim/protocols/msn/dialog.c:133 ../libgaim/protocols/msn/msn.c:554
+#: ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1919
 #: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
-#: ../libgaim/protocols/silc/wb.c:304 ../libgaim/request.h:1335
+#: ../libgaim/protocols/silc/wb.c:304
 msgid "No"
 msgstr "Non"
 
@@ -4048,51 +4148,51 @@
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../gtk/gtkrequest.c:1467
+#: ../gtk/gtkrequest.c:1469
 msgid "That file already exists"
 msgstr "Ese ficheiro xa existe"
 
-#: ../gtk/gtkrequest.c:1468
+#: ../gtk/gtkrequest.c:1470
 msgid "Would you like to overwrite it?"
-msgstr "Quere sobrescribilo?"
-
-#: ../gtk/gtkrequest.c:1469
+msgstr "Quere sobreescribilo?"
+
+#: ../gtk/gtkrequest.c:1471
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: ../gtk/gtkrequest.c:1470
+#: ../gtk/gtkrequest.c:1472
 msgid "Choose New Name"
 msgstr "Escoller un novo nome"
 
-#: ../gtk/gtkrequest.c:1512 ../gtk/gtkrequest.c:1553
+#: ../gtk/gtkrequest.c:1514 ../gtk/gtkrequest.c:1559
 msgid "Save File..."
 msgstr "Gardar ficheiro..."
 
-#: ../gtk/gtkrequest.c:1513 ../gtk/gtkrequest.c:1554
+#: ../gtk/gtkrequest.c:1515 ../gtk/gtkrequest.c:1560
 msgid "Open File..."
 msgstr "Abrir ficheiro..."
 
-#: ../gtk/gtkrequest.c:1601 ../gtk/gtkrequest.c:1615
+#: ../gtk/gtkrequest.c:1607 ../gtk/gtkrequest.c:1621
 msgid "Select Folder..."
 msgstr "Seleccionar cartafol..."
 
-#: ../gtk/gtkroomlist.c:287
+#: ../gtk/gtkroomlist.c:308 ../libgaim/protocols/oscar/oscar.c:2466
 msgid "_Add"
 msgstr "_Engadir"
 
-#: ../gtk/gtkroomlist.c:355
+#: ../gtk/gtkroomlist.c:376
 msgid "Room List"
-msgstr "Lista de salas"
+msgstr "Listaxe de salas"
 
 #. list button
-#: ../gtk/gtkroomlist.c:425
+#: ../gtk/gtkroomlist.c:446
 msgid "_Get List"
-msgstr "_Obter a lista"
+msgstr "_Obter a listaxe"
 
 #. add button
-#: ../gtk/gtkroomlist.c:433
+#: ../gtk/gtkroomlist.c:454
 msgid "_Add Chat"
-msgstr "_Engadir Chat"
+msgstr "_Engadir conversa"
 
 #. Use button
 #: ../gtk/gtksavedstatuses.c:549 ../gtk/gtksavedstatuses.c:1183
@@ -4132,11 +4232,11 @@
 
 #: ../gtk/gtksound.c:63
 msgid "Buddy logs in"
-msgstr "Conéctase un amigo"
+msgstr "Conéctase un contacto"
 
 #: ../gtk/gtksound.c:64
 msgid "Buddy logs out"
-msgstr "Desconéctase un amigo"
+msgstr "Desconéctase un contacto"
 
 #: ../gtk/gtksound.c:65
 msgid "Message received"
@@ -4144,7 +4244,7 @@
 
 #: ../gtk/gtksound.c:66
 msgid "Message received begins conversation"
-msgstr "Recíbese unha mensaxe que comeza unha conversación "
+msgstr "Recíbese unha mensaxe que comeza unha conversa"
 
 #: ../gtk/gtksound.c:67
 msgid "Message sent"
@@ -4152,48 +4252,51 @@
 
 #: ../gtk/gtksound.c:68
 msgid "Person enters chat"
-msgstr "Alguén entra ao chat"
+msgstr "Alguén entra na conversa"
 
 #: ../gtk/gtksound.c:69
 msgid "Person leaves chat"
-msgstr "Alguén deixa o chat"
+msgstr "Alguén deixa a conversa"
 
 #: ../gtk/gtksound.c:70
 msgid "You talk in chat"
-msgstr "Fala no chat"
+msgstr "Participa na conversa"
 
 #: ../gtk/gtksound.c:71
 msgid "Others talk in chat"
-msgstr "Outros falan no chat"
+msgstr "Conversan outros"
 
 #: ../gtk/gtksound.c:74
 msgid "Someone says your screen name in chat"
-msgstr "Alguén menciona o seu nome no chat"
+msgstr "Alguén menciona o seu nome na conversa"
 
 #: ../gtk/gtksound.c:310
+#, fuzzy
 msgid "GStreamer Failure"
-msgstr "Fallou GStreamer"
+msgstr "Gardar o ficheiro"
 
 #: ../gtk/gtksound.c:311
+#, fuzzy
 msgid "GStreamer failed to initialize."
-msgstr "GStreamer fallou ao inicializar."
+msgstr "Fallou o desempaquetado do tema de emoticonas."
 
 #. connect to the server
-#: ../gtk/gtkstatusbox.c:543 ../libgaim/protocols/irc/irc.c:329
-#: ../libgaim/protocols/jabber/jabber.c:1000
+#: ../gtk/gtkstatusbox.c:569 ../libgaim/protocols/irc/irc.c:329
+#: ../libgaim/protocols/jabber/jabber.c:1019
 #: ../libgaim/protocols/msn/session.c:344
-#: ../libgaim/protocols/novell/novell.c:2185
-#: ../libgaim/protocols/oscar/oscar.c:1224 ../libgaim/protocols/qq/qq.c:134
-#: ../libgaim/protocols/sametime/sametime.c:3678
+#: ../libgaim/protocols/novell/novell.c:2183
+#: ../libgaim/protocols/oscar/oscar.c:1267 ../libgaim/protocols/qq/qq.c:136
+#: ../libgaim/protocols/sametime/sametime.c:3733
 #: ../libgaim/protocols/simple/simple.c:1669
-#: ../libgaim/protocols/yahoo/yahoo.c:2715
-#: ../libgaim/protocols/zephyr/zephyr.c:1617
+#: ../libgaim/protocols/yahoo/yahoo.c:2710
+#: ../libgaim/protocols/zephyr/zephyr.c:1621
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../gtk/gtkstatusbox.c:545
+#: ../gtk/gtkstatusbox.c:571
+#, fuzzy
 msgid "Waiting for network connection"
-msgstr "Agardando pola conexión de rede"
+msgstr "Agardando o comezo da transferencia"
 
 #: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1333
 #, c-format
@@ -4226,16 +4329,16 @@
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
-"Pode enviar esta imaxe coma unha transferencia de ficheiro, introducila na "
-"mensaxe, ou usala coma icona de amigo para este usuario."
+"Pode enviar esta imaxe coma unha transferencia de ficheiro, inserila na "
+"mensaxe, ou usala coma unha icona de contacto para este usuario."
 
 #: ../gtk/gtkutils.c:1445 ../gtk/gtkutils.c:1460
 msgid "Set as buddy icon"
-msgstr "Establecer como icona de amigo"
+msgstr "Establecer como icona de contacto"
 
 #: ../gtk/gtkutils.c:1446 ../gtk/gtkutils.c:1461
 msgid "Send image file"
-msgstr "Enviar ficheiro de imaxe"
+msgstr "Enviar un ficheiro de imaxe"
 
 #: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1461
 msgid "Insert in message"
@@ -4243,22 +4346,22 @@
 
 #: ../gtk/gtkutils.c:1450
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Desexa establecela coma a icona de amigo para este usuario?"
+msgstr "Desexa establecela coma a icona de contacto para este usuario?"
 
 #: ../gtk/gtkutils.c:1455
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
-"Pode enviar esta imaxe como unha transferencia de ficheiro, ou introducila "
-"nesta mensaxe, ou usala coma icona de amigo para este usuario."
+"Pode enviar esta imaxe como unha transferencia de ficheiro, inserila nesta "
+"mensaxe ou usala coma icona de contacto para este usuario."
 
 #: ../gtk/gtkutils.c:1457
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
-"Pode inserir esta imaxe na súa mensaxe, ou empregala coma icona de amigo "
+"Pode inserir esta imaxe na súa mensaxe, ou empregala coma icona de contacto "
 "para este usuario"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
@@ -4268,17 +4371,17 @@
 #. The original patch sent the icon used by the launcher.  That's probably wrong
 #: ../gtk/gtkutils.c:1511
 msgid "Cannot send launcher"
-msgstr "Non se pode enviar o lanzador"
+msgstr "Non se pode enviar o ficheiro"
 
 #: ../gtk/gtkutils.c:1511
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
-"Arrastrou un lanzado de escritorio. O máis probable é que queira enviar a o "
-"que apunta o lanzador máis que o lanzador en si."
-
-#: ../gtk/gtkutils.c:2340
+"Arrastrou un lanzador de escritorio. Seguramente vostede queira enviar o "
+"contido ao que apunta o lanzador e non o lanzador en si."
+
+#: ../gtk/gtkutils.c:2343
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -4290,61 +4393,80 @@
 "<b>Tamaño da imaxe:</b> %dx%d"
 
 #. Label
-#: ../gtk/gtkutils.c:2384 ../gtk/gtkutils.c:2406
+#: ../gtk/gtkutils.c:2387 ../gtk/gtkutils.c:2409
 #: ../gtk/plugins/gevolution/new_person_dialog.c:338
-#: ../libgaim/protocols/oscar/oscar.c:600
+#: ../libgaim/protocols/oscar/oscar.c:618
 msgid "Buddy Icon"
-msgstr "Icona de amigo"
-
-#: ../gtk/gtkutils.c:2733
-#, c-format
+msgstr "Icona de contacto"
+
+#: ../gtk/gtkutils.c:2653
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr ""
+
+#: ../gtk/gtkutils.c:2655
+#, fuzzy
+msgid "Icon Error"
+msgstr "Erro de token"
+
+#: ../gtk/gtkutils.c:2656
+#, fuzzy
+msgid "Could not set icon"
+msgstr "Non se puido enviar"
+
+#: ../gtk/gtkutils.c:2757
+#, fuzzy, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "Fallou ao abrir o ficheiro '%s': %s"
-
-#: ../gtk/gtkutils.c:2782
+msgstr "Non se puido almacenar a imaxe: %s\n"
+
+#: ../gtk/gtkutils.c:2806
 #, c-format
 msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr "Fallou ao cargar a imaxe '%s': razón descoñecida, probablemente un ficheiro de imaxe corrupto"
+msgstr ""
 
 #: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
 msgid "Save File"
-msgstr "Gardar ficheiro"
+msgstr "Gardar o ficheiro"
 
 #: ../gtk/gtkwhiteboard.c:863
 msgid "Select color"
-msgstr "Seleccionar cor"
+msgstr "Seleccionar a cor"
 
 #: ../gtk/plugins/cap/cap.c:446
+#, fuzzy
 msgid "Display Statistics"
-msgstr "Amosar estatísticas"
+msgstr "Estatísticas do servidor"
 
 #: ../gtk/plugins/cap/cap.c:458 ../gtk/plugins/cap/cap.c:461
+#, fuzzy
 msgid "Response Probability:"
-msgstr "Probabilidade de resposta:"
+msgstr "Respostas perdidas"
 
 #: ../gtk/plugins/cap/cap.c:807
+#, fuzzy
 msgid "Statistics Configuration"
-msgstr "Configuración das estatísticas"
+msgstr "Configuración de mensaxes de música"
 
 #. msg_difference spinner
 #: ../gtk/plugins/cap/cap.c:810
 msgid "Maximum response timeout:"
-msgstr "Tempo de espera máximo para respostas:"
+msgstr ""
 
 #: ../gtk/plugins/cap/cap.c:813 ../gtk/plugins/cap/cap.c:820
 #: ../gtk/plugins/cap/cap.c:827
+#, fuzzy
 msgid "minutes"
-msgstr "minutos"
+msgstr "minutos."
 
 #. last_seen spinner
 #: ../gtk/plugins/cap/cap.c:817
 msgid "Maximum last-seen difference:"
-msgstr "Diferencia máxima de \"visto por última vez\":"
+msgstr ""
 
 #. threshold spinner
 #: ../gtk/plugins/cap/cap.c:824
 msgid "Threshold:"
-msgstr "Umbral:"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -4356,55 +4478,53 @@
 #. *< version
 #: ../gtk/plugins/cap/cap.c:933
 msgid "Contact Availability Prediction plugin."
-msgstr "Complemento de predición de dispoñibilidade de contactos."
+msgstr ""
 
 #. *  summary
 #: ../gtk/plugins/cap/cap.c:934
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
-msgstr "O complemento de dispoñibilidade de contactos (cap) emprégase para amosar información estatística sobre os amigos na lista de contactos dun usuario."
+msgstr ""
 
 #: ../gtk/plugins/contact_priority.c:61
 msgid "Buddy is idle"
-msgstr "O amigo está inactivo"
+msgstr "O contacto está inactivo"
 
 #: ../gtk/plugins/contact_priority.c:62
 msgid "Buddy is away"
-msgstr "O amigo está ausente"
+msgstr "O contacto está ausente"
 
 #: ../gtk/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
-msgstr "O amigo está en ausencia \"extendida\""
+msgstr "O contacto está ausente por un tempo"
 
 #. Not used yet.
 #: ../gtk/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
-msgstr "O amigo está móbil"
+msgstr "O contacto está móbil"
 
 #: ../gtk/plugins/contact_priority.c:68
 msgid "Buddy is offline"
-msgstr "O amigo está desconectado"
+msgstr "O contacto está desconectado"
 
 #: ../gtk/plugins/contact_priority.c:90
 msgid "Point values to use when..."
-msgstr "Valores a usar cando..."
+msgstr "Valores para usar cando..."
 
 #: ../gtk/plugins/contact_priority.c:118
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
-msgstr ""
-"O amigo con <i>puntuación alta</i> é o amigo que terá prioridade no "
-"contacto.\n"
+msgstr "O contacto con <i>puntuación alta</i> é o que terá prioridade.\n"
 
 #: ../gtk/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
-msgstr "Usar o último amigo cando as puntuacións sexan iguais"
+msgstr "Usar o último contacto cando as puntuacións sexan iguais"
 
 #: ../gtk/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
-msgstr "Valores a usar para a conta..."
+msgstr "Valores para usar na conta..."
 
 #. *< type
 #. *< ui_requirement
@@ -4421,7 +4541,7 @@
 #. *< summary
 #: ../gtk/plugins/contact_priority.c:185
 msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Permite controlar os valores asociados aos diferentes estados dos amigos."
+msgstr "Permite controlar os valores asociados aos diferentes estados dos contactos."
 
 #. *< description
 #: ../gtk/plugins/contact_priority.c:187
@@ -4429,24 +4549,72 @@
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"Permite cambiar os puntos asignados aos estados inactivo/ausente/"
-"desconectado para os amigos en cálculos de prioridades de contacto."
+"Permite mudar os puntos asignados aos estados inactivo/ausente/desconectado "
+"para os contactos nos cálculos de prioridades de contacto."
+
+#: ../gtk/plugins/convcolors.c:82
+#, fuzzy
+msgid "Error Messages"
+msgstr "Mensaxes sen ler"
+
+#: ../gtk/plugins/convcolors.c:83
+#, fuzzy
+msgid "Highlighted Messages"
+msgstr "Coincidencias resaltadas"
+
+#: ../gtk/plugins/convcolors.c:84
+#, fuzzy
+msgid "System Messages"
+msgstr "Mensaxes sen ler"
+
+#: ../gtk/plugins/convcolors.c:85
+#, fuzzy
+msgid "Sent Messages"
+msgstr "Abrir todas as mensaxes"
+
+#: ../gtk/plugins/convcolors.c:86
+#, fuzzy
+msgid "Received Messages"
+msgstr "Mensaxes sen ler"
+
+#: ../gtk/plugins/convcolors.c:201 ../gtk/plugins/gaimrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "Seleccionar a cor para %s"
+
+#: ../gtk/plugins/convcolors.c:300 ../gtk/plugins/gaimrc.c:448
+#: ../libgaim/protocols/msn/msn.c:1532
+msgid "General"
+msgstr "Xeral"
+
+#: ../gtk/plugins/convcolors.c:301
+msgid "Ignore incoming format"
+msgstr ""
+
+#: ../gtk/plugins/convcolors.c:302
+#, fuzzy
+msgid "Apply in Chats"
+msgstr "Alcume na conversa"
+
+#: ../gtk/plugins/convcolors.c:303
+msgid "Apply in IMs"
+msgstr ""
 
 #: ../gtk/plugins/extplacement.c:80
 msgid "By conversation count"
-msgstr "Por número de conversacións"
+msgstr "Por número de conversas"
 
 #: ../gtk/plugins/extplacement.c:101
 msgid "Conversation Placement"
-msgstr "Localización da conversación"
+msgstr "Localización da conversa"
 
 #: ../gtk/plugins/extplacement.c:106
 msgid "Number of conversations per window"
-msgstr "Número de conversacións por fiestra"
+msgstr "Número de conversas por ventá"
 
 #: ../gtk/plugins/extplacement.c:112
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "Separar fiestras de MIs e chats cando se ubican por número"
+msgstr "Separar ventás de MI e conversas cando se localizan por número"
 
 #. *< type
 #. *< ui_requirement
@@ -4456,13 +4624,13 @@
 #. *< id
 #: ../gtk/plugins/extplacement.c:135
 msgid "ExtPlacement"
-msgstr "_UbicaciónExt"
+msgstr "_LocalizaciónExt"
 
 #. *< name
 #. *< version
 #: ../gtk/plugins/extplacement.c:137
 msgid "Extra conversation placement options."
-msgstr "Opcións adicionais de ubicación de conversacións."
+msgstr "Opcións adicionais de localización de conversas."
 
 #. *< summary
 #. *  description
@@ -4471,8 +4639,8 @@
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
-"Restrinxir o número de conversación por fiestra, de forma optativa utilizar "
-"fiestras distintas para MIs e chats"
+"Restrinxir o número de conversas por ventá, de forma optativa utilizar "
+"ventás distintas para MI e conversas"
 
 #. *< type
 #. *< ui_requirement
@@ -4482,7 +4650,7 @@
 #. *< id
 #: ../gtk/plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
-msgstr "Complemento de demostración de Gaim"
+msgstr "Complemento de demostración do Gaim"
 
 #. *< name
 #. *< version
@@ -4499,10 +4667,11 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
-"Este é un complemento moi interesante que foi moitas cousas:\n"
-"- Dille quén escribiu o programa cando inicia a sesión\n"
-"- Transpón o texto que lle envían\n"
-"- Envía unha mensaxe ás persoas na súa lista inmediatamente cando se conectan"
+"Este é un complemento moi interesante que fai moitas cousas:\n"
+"- Dille quen escribiu o programa cando inicia a sesión\n"
+"- Transpón os textos que lle envían\n"
+"- Envíalle inmediatamente unha mensaxe ás persoas da súa listaxe cando se "
+"conectan"
 
 #: ../gtk/plugins/gaimrc.c:41
 msgid "Cursor Color"
@@ -4510,11 +4679,11 @@
 
 #: ../gtk/plugins/gaimrc.c:42
 msgid "Secondary Cursor Color"
-msgstr "Cor secundario do cursor"
+msgstr "Cor secundaria do cursor"
 
 #: ../gtk/plugins/gaimrc.c:43
 msgid "Hyperlink Color"
-msgstr "Cor de ligazón"
+msgstr "Cor da ligazón"
 
 #: ../gtk/plugins/gaimrc.c:56
 msgid "GtkTreeView Expander Size"
@@ -4526,15 +4695,15 @@
 
 #: ../gtk/plugins/gaimrc.c:76
 msgid "Conversation Entry"
-msgstr "Entrada de conversacións"
+msgstr "Entrada de conversas"
 
 #: ../gtk/plugins/gaimrc.c:77
 msgid "Conversation History"
-msgstr "Historial de conversacións"
+msgstr "Historial de conversas"
 
 #: ../gtk/plugins/gaimrc.c:78
 msgid "Log Viewer"
-msgstr "Visor de rexistro"
+msgstr "Visor do rexistro"
 
 #: ../gtk/plugins/gaimrc.c:79
 msgid "Request Dialog"
@@ -4548,11 +4717,6 @@
 msgid "GtkTreeView Indent Expanders"
 msgstr "Sangría do expansor GtkTreeView"
 
-#: ../gtk/plugins/gaimrc.c:320
-#, c-format
-msgid "Select Color for %s"
-msgstr "Seleccionar a cor para %s"
-
 #: ../gtk/plugins/gaimrc.c:322
 msgid "Select Color"
 msgstr "Seleccionar cor"
@@ -4566,10 +4730,6 @@
 msgid "Select Interface Font"
 msgstr "Seleccionar fonte de instancia"
 
-#: ../gtk/plugins/gaimrc.c:448
-msgid "General"
-msgstr "Xeral"
-
 #: ../gtk/plugins/gaimrc.c:453
 msgid "GTK+ Interface Font"
 msgstr "Fonte da interface GTK+"
@@ -4584,7 +4744,7 @@
 
 #: ../gtk/plugins/gaimrc.c:532
 msgid "Widget Sizes"
-msgstr "Tamaños do widget"
+msgstr "Tamaño dos widget"
 
 #: ../gtk/plugins/gaimrc.c:553
 msgid "Fonts"
@@ -4597,7 +4757,7 @@
 #: ../gtk/plugins/gaimrc.c:581
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Escribir axustes en %s%sgtkrc-2.0"
+msgstr "Escribir as configuracións en %s%sgtkrc-2.0"
 
 #: ../gtk/plugins/gaimrc.c:589
 msgid "Re-read gtkrc files"
@@ -4609,7 +4769,7 @@
 
 #: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
 msgid "Provides access to commonly used gtkrc settings."
-msgstr "Provee acceso as opcións de gtkrc usadas comunmente."
+msgstr "Prové acceso ás configuracións de gtkrc usadas comunmente."
 
 #. Configuration frame
 #: ../gtk/plugins/gestures/gestures.c:235
@@ -4656,12 +4816,12 @@
 "Drag up and then to the left to switch to the previous conversation.\n"
 "Drag up and then to the right to switch to the next conversation."
 msgstr ""
-"Permite soporte de xesto do rato nas fiestras de conversación.\n"
+"Permite soporte de xesto do rato nas ventás de conversa.\n"
 "Arrastre co botón central do rato para realizar as seguintes accións:\n"
 "\n"
-"Abaixo e despois á dereita para pechar unha fiestra de conversación.\n"
-"Arriba e despois á esquerda para cambiar á conversación anterior.\n"
-"Arriba e despois á dereita para cambiar á seguinte conversación."
+"Abaixo e despois á dereita para pechar unha ventá de conversa.\n"
+"Arriba e despois á esquerda para mudar á conversa anterior.\n"
+"Arriba e despois á dereita para mudar á seguinte conversa."
 
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
@@ -4670,19 +4830,16 @@
 #. Add the label.
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:460
 msgid "Select a person from your address book below, or add a new person."
-msgstr ""
-"Seleccione unha persoa da súa axenda mostrada abaixo, ou engada unha nova "
-"persoa."
+msgstr "Seleccione unha persoa da súa axenda amosada abaixo ou engada unha nova."
 
 #. "Search"
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
 #: ../gtk/plugins/gevolution/assoc-buddy.c:358
-#: ../libgaim/protocols/jabber/buddy.c:1724
-#: ../libgaim/protocols/oscar/oscar.c:6086 ../libgaim/protocols/qq/group.c:121
-#: ../libgaim/protocols/qq/group_im.c:137
-#: ../libgaim/protocols/qq/sys_msg.c:160 ../libgaim/protocols/qq/sys_msg.c:230
-#: ../libgaim/protocols/qq/sys_msg.c:248
-#: ../libgaim/protocols/sametime/sametime.c:5523
+#: ../libgaim/protocols/jabber/buddy.c:1760
+#: ../libgaim/protocols/qq/group.c:123 ../libgaim/protocols/qq/group_im.c:139
+#: ../libgaim/protocols/qq/sys_msg.c:162 ../libgaim/protocols/qq/sys_msg.c:232
+#: ../libgaim/protocols/qq/sys_msg.c:250
+#: ../libgaim/protocols/sametime/sametime.c:5612
 msgid "Search"
 msgstr "Buscar"
 
@@ -4696,7 +4853,7 @@
 #. "Select Buddy" button
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
 msgid "Select Buddy"
-msgstr "Seleccionar amigo"
+msgstr "Seleccionar contacto"
 
 #. Add the label.
 #: ../gtk/plugins/gevolution/assoc-buddy.c:345
@@ -4704,8 +4861,8 @@
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr ""
-"Seleccione unha persoa da súa axenda á que engadir este amigo, cree unha "
-"nova persoa."
+"Seleccione unha persoa da súa axenda á que lle engadir este contacto ou cree "
+"unha nova persoa."
 
 #. Add the expander
 #: ../gtk/plugins/gevolution/assoc-buddy.c:433
@@ -4715,44 +4872,46 @@
 #. "Associate Buddy" button
 #: ../gtk/plugins/gevolution/assoc-buddy.c:486
 msgid "_Associate Buddy"
-msgstr "_Asociar amigo"
+msgstr "_Asociar contacto"
 
 #: ../gtk/plugins/gevolution/eds-utils.c:73
 #: ../gtk/plugins/gevolution/eds-utils.c:86
-#: ../libgaim/protocols/jabber/jabber.c:1145
+#: ../libgaim/protocols/jabber/jabber.c:1160
 msgid "None"
 msgstr "Ningún"
 
-#: ../gtk/plugins/gevolution/gevolution.c:263
-#: ../gtk/plugins/gevolution/gevolution.c:269
+#: ../gtk/plugins/gevolution/gevolution.c:239
+#: ../gtk/plugins/gevolution/gevolution.c:245
 msgid "Unable to send e-mail"
-msgstr "Imposible enviar correo-e"
-
-#: ../gtk/plugins/gevolution/gevolution.c:264
+msgstr "Imposible enviar correo-e."
+
+#: ../gtk/plugins/gevolution/gevolution.c:240
 msgid "The evolution executable was not found in the PATH."
-msgstr "O executable de evolution non se atopou na RUTA."
-
-#: ../gtk/plugins/gevolution/gevolution.c:270
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr "O amigo especificado non se atopou nos contactos de Evolution."
-
-#: ../gtk/plugins/gevolution/gevolution.c:287
+msgstr "O executable de evolution non se atopou no PATH."
+
+#: ../gtk/plugins/gevolution/gevolution.c:246
+msgid "An e-mail address was not found for this buddy."
+msgstr ""
+
+#: ../gtk/plugins/gevolution/gevolution.c:272
 msgid "Add to Address Book"
 msgstr "Engadir á axenda"
 
-#: ../gtk/plugins/gevolution/gevolution.c:291
+#: ../gtk/plugins/gevolution/gevolution.c:284
 msgid "Send E-Mail"
-msgstr "Enviar correo electrónico"
+msgstr "Enviar un correo"
 
 #. Configuration frame
-#: ../gtk/plugins/gevolution/gevolution.c:418
+#: ../gtk/plugins/gevolution/gevolution.c:411
 msgid "Evolution Integration Configuration"
 msgstr "Configuración da integración con Evolution"
 
 #. Label
-#: ../gtk/plugins/gevolution/gevolution.c:421
+#: ../gtk/plugins/gevolution/gevolution.c:414
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Seleccione todas as contas aos que os amigos engadiranse de forma automática"
+msgstr ""
+"Seleccione todas as contas ás que se engadirán os contactos de forma "
+"automática"
 
 #. *< type
 #. *< ui_requirement
@@ -4760,7 +4919,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../gtk/plugins/gevolution/gevolution.c:528
+#: ../gtk/plugins/gevolution/gevolution.c:521
 msgid "Evolution Integration"
 msgstr "Integración con Evolution"
 
@@ -4768,8 +4927,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../gtk/plugins/gevolution/gevolution.c:531
-#: ../gtk/plugins/gevolution/gevolution.c:533
+#: ../gtk/plugins/gevolution/gevolution.c:524
+#: ../gtk/plugins/gevolution/gevolution.c:526
 msgid "Provides integration with Evolution."
 msgstr "Ofrece integración con Evolution."
 
@@ -4779,7 +4938,7 @@
 
 #: ../gtk/plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
-msgstr "Introduza o nome de usuario do seu amigo e o tipo de conta máis abaixo."
+msgstr "Introduza o nome de usuario do contacto e o tipo de conta máis abaixo."
 
 #: ../gtk/plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
@@ -4800,7 +4959,7 @@
 
 #: ../gtk/plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
-msgstr "E-mail:"
+msgstr "Correo-e:"
 
 #. *< type
 #. *< ui_requirement
@@ -4834,7 +4993,7 @@
 #. *< id
 #: ../gtk/plugins/iconaway.c:82
 msgid "Iconify on Away"
-msgstr "Iconizar en ausencia"
+msgstr "Minimizar en ausencia"
 
 #. *< name
 #. *< version
@@ -4842,7 +5001,7 @@
 #. *  description
 #: ../gtk/plugins/iconaway.c:85 ../gtk/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Iconiza a lista de amigos e de conversacións cando vostede está ausente."
+msgstr "Minimiza a listaxe de contactos e de conversas cando está ausente."
 
 #: ../gtk/plugins/mailchk.c:160
 msgid "Mail Checker"
@@ -4854,14 +5013,28 @@
 
 #: ../gtk/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "Engade unha pequena caixa á lista de amigos que mostra se ten novo correo."
+msgstr ""
+"Engade unha pequena caixa á listaxe de contactos que amosa se ten novo "
+"correo."
+
+#: ../gtk/plugins/markerline.c:246
+msgid "Draw Markerline in "
+msgstr ""
+
+#: ../gtk/plugins/markerline.c:250 ../gtk/plugins/notify.c:691
+msgid "_IM windows"
+msgstr "Ventás de M_I"
+
+#: ../gtk/plugins/markerline.c:254 ../gtk/plugins/notify.c:698
+msgid "C_hat windows"
+msgstr "Ventás de C_hat"
 
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
-"Solicitouse unha sesión de mensaxería musical. Seleccione a icona de MM para "
+"Solicitou unha sesión de mensaxería musical. Seleccione a icona de MM para "
 "aceptala."
 
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:45
@@ -4874,13 +5047,14 @@
 
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:417
 msgid "There was a conflict in running the command:"
-msgstr "Produciuse un conflicto ao executar a orde:"
+msgstr "Produciuse un conflito ao executar a orde:"
 
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:525
 msgid "Error Running Editor"
 msgstr "Erro executando o Editor"
 
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:526
+#, fuzzy
 msgid "The following error has occurred:"
 msgstr "Ocorreu o seguinte erro:"
 
@@ -4915,30 +5089,22 @@
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
 msgstr ""
-"O complemento de mensaxería musical permite traballar a distintos usuarios "
-"de forma simultánea nunha peza de música editando unha partitura común en "
-"tempo real."
+"O complemento de mensaxería musical permítelle traballar a distintos "
+"usuarios de forma simultánea nunha peza de música editando unha partitura "
+"común en tempo real."
 
 #. ---------- "Notify For" ----------
 #: ../gtk/plugins/notify.c:687
 msgid "Notify For"
 msgstr "Notificar de"
 
-#: ../gtk/plugins/notify.c:691
-msgid "_IM windows"
-msgstr "Fiestras de M_I"
-
-#: ../gtk/plugins/notify.c:698
-msgid "C_hat windows"
-msgstr "Fiestras de C_hat"
-
 #: ../gtk/plugins/notify.c:706
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Só se alguén nomea o seu alcume"
 
 #: ../gtk/plugins/notify.c:716
 msgid "_Focused windows"
-msgstr "Fiestras en_focadas"
+msgstr "Ventás con_foco"
 
 #. ---------- "Notification Methods" ----------
 #: ../gtk/plugins/notify.c:724
@@ -4947,27 +5113,28 @@
 
 #: ../gtk/plugins/notify.c:731
 msgid "Prepend _string into window title:"
-msgstr "Prefixar a _cadea no título da fiestra:"
+msgstr "Prefixar a _cadea no título da ventá:"
 
 #. Count method button
 #: ../gtk/plugins/notify.c:750
 msgid "Insert c_ount of new messages into window title"
-msgstr "Inserir o _número de mensaxes novos no título da fiestra"
+msgstr "Inserir o _número de mensaxes novas no título da ventá"
 
 #. Count xprop method button
 #: ../gtk/plugins/notify.c:759
+#, fuzzy
 msgid "Insert count of new message into _X property"
-msgstr "Inserir o número de mensaxes novas na propiedade _X"
+msgstr "Inserir o _número de mensaxes novas no título da ventá"
 
 #. Urgent method button
 #: ../gtk/plugins/notify.c:767
 msgid "Set window manager \"_URGENT\" hint"
-msgstr "Establecer pista \"_URXENTE\" do xestor de fiestras"
+msgstr "Establecer pista \"_URXENTE\" do xestor de ventás"
 
 #. Raise window method button
 #: ../gtk/plugins/notify.c:776
 msgid "R_aise conversation window"
-msgstr "S_ubir a fiestra de conversación"
+msgstr "S_ubir a ventá de conversa"
 
 #. ---------- "Notification Removals" ----------
 #: ../gtk/plugins/notify.c:784
@@ -4977,17 +5144,17 @@
 #. Remove on focus button
 #: ../gtk/plugins/notify.c:789
 msgid "Remove when conversation window _gains focus"
-msgstr "Eliminar cando a fiestra da conversación obtén o _foco"
+msgstr "Eliminar cando a ventá da conversa ten o _foco"
 
 #. Remove on click button
 #: ../gtk/plugins/notify.c:796
 msgid "Remove when conversation window _receives click"
-msgstr "Eliminar cando a fiestra da conversación _recibe unha pulsación"
+msgstr "Eliminar cando se prema na ventá da conversa"
 
 #. Remove on type button
 #: ../gtk/plugins/notify.c:804
 msgid "Remove when _typing in conversation window"
-msgstr "Eliminar cando se _escriba na fiestra da conversación"
+msgstr "Eliminar cando se _escriba na ventá da conversa"
 
 #. Remove on message send button
 #: ../gtk/plugins/notify.c:812
@@ -4997,7 +5164,7 @@
 #. Remove on conversation switch button
 #: ../gtk/plugins/notify.c:821
 msgid "Remove on switch to conversation ta_b"
-msgstr "Eliminar ao cambiar de _solapa de conversación"
+msgstr "Eliminar ao mudar de _pestana de conversa"
 
 #. *< type
 #. *< ui_requirement
@@ -5015,24 +5182,24 @@
 #. *  description
 #: ../gtk/plugins/notify.c:913 ../gtk/plugins/notify.c:915
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Permite notificar de diversas formas a presencia de mensaxes sen ler."
+msgstr "Permite notificar de diversas formas a presenza de mensaxes sen ler."
 
 #: ../gtk/plugins/raw.c:175
 msgid "Raw"
-msgstr "En bruto"
+msgstr "Datos en bruto"
 
 #: ../gtk/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
-msgstr "Permítelle enviar datos en bruto a protocolos basados en texto."
+msgstr "Permítelle enviar datos en bruto a protocolos baseados en texto."
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"Permítelle enviar datos en bruto a protocolos basados en texto (Jabber, MSN, "
-"IRC, TOC). Prema 'Intro' na caixa de entrada para envialo. Observe a fiestra "
-"de depuración."
+"Permítelle enviar datos en bruto a protocolos baseados en texto (Jabber, "
+"MSN, IRC, TOC). Prema 'Intro' na caixa de entrada para envialo. Observe a "
+"ventá de depuración."
 
 #: ../gtk/plugins/relnot.c:69
 #, c-format
@@ -5084,75 +5251,77 @@
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
-"Comproba periodicamente se hai novas versións dispoñibles e notifica ao "
-"usuario mostrándolle o rexistro de cambios."
-
-#: ../gtk/plugins/spellchk.c:1963
+"Comproba periodicamente se hai novas versións dispoñibles e notifícalle ao "
+"usuario o rexistro de cambios."
+
+#: ../gtk/plugins/spellchk.c:1965
 msgid "Duplicate Correction"
 msgstr "Corrección duplicada"
 
-#: ../gtk/plugins/spellchk.c:1964
+#: ../gtk/plugins/spellchk.c:1966
 msgid "The specified word already exists in the correction list."
-msgstr "A palabra especificada xa existe na lista de corrección."
-
-#: ../gtk/plugins/spellchk.c:2172
+msgstr "A palabra especificada xa existe na listaxe de corrección."
+
+#: ../gtk/plugins/spellchk.c:2174
 msgid "Text Replacements"
-msgstr "Remprazos de texto"
-
-#: ../gtk/plugins/spellchk.c:2195
+msgstr "Substitucións de texto"
+
+#: ../gtk/plugins/spellchk.c:2197
 msgid "You type"
-msgstr "Vostede escribe"
-
-#: ../gtk/plugins/spellchk.c:2209
+msgstr "Escribe"
+
+#: ../gtk/plugins/spellchk.c:2211
 msgid "You send"
-msgstr "Vostede envía"
-
-#: ../gtk/plugins/spellchk.c:2223
+msgstr "Envía"
+
+#: ../gtk/plugins/spellchk.c:2225
 msgid "Whole words only"
-msgstr "Soamente palabras enteiras"
-
-#: ../gtk/plugins/spellchk.c:2235
+msgstr "Só palabras enteiras"
+
+#: ../gtk/plugins/spellchk.c:2237
 msgid "Case sensitive"
 msgstr "Sensible ás maiúsculas"
 
-#: ../gtk/plugins/spellchk.c:2261
+#: ../gtk/plugins/spellchk.c:2263
 msgid "Add a new text replacement"
-msgstr "Engadir unha nova regra de remprazo de texto"
-
-#: ../gtk/plugins/spellchk.c:2277
+msgstr "Engadir unha nova regra de substitución de texto"
+
+#: ../gtk/plugins/spellchk.c:2279
 msgid "You _type:"
-msgstr "Vostede _escribe:"
-
-#: ../gtk/plugins/spellchk.c:2294
+msgstr "_Escribe:"
+
+#: ../gtk/plugins/spellchk.c:2296
 msgid "You _send:"
-msgstr "Vostede _envía:"
+msgstr "_Envía:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../gtk/plugins/spellchk.c:2306
+#: ../gtk/plugins/spellchk.c:2308
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 "Axustar ao formato _exacto (desmarcar para xestionar maiúsculas e minúsculas "
 "automaticamente)"
 
-#: ../gtk/plugins/spellchk.c:2308
+#: ../gtk/plugins/spellchk.c:2310
 msgid "Only replace _whole words"
-msgstr "Reemprazar soamente palabras _enteiras"
-
-#: ../gtk/plugins/spellchk.c:2333
+msgstr "Substituír só palabras _enteiras"
+
+#: ../gtk/plugins/spellchk.c:2335
 msgid "General Text Replacement Options"
-msgstr "Opcións de reemprazos de texto xeral"
-
-#: ../gtk/plugins/spellchk.c:2334
+msgstr "Opcións de substitución de texto xeral"
+
+#: ../gtk/plugins/spellchk.c:2336
 msgid "Enable replacement of last word on send"
 msgstr "Activar a sustitución da última palabra ao enviar"
 
-#: ../gtk/plugins/spellchk.c:2359
+#: ../gtk/plugins/spellchk.c:2361
 msgid "Text replacement"
-msgstr "Remprazo de texto"
-
-#: ../gtk/plugins/spellchk.c:2361 ../gtk/plugins/spellchk.c:2362
+msgstr "Substitución de texto"
+
+#: ../gtk/plugins/spellchk.c:2363 ../gtk/plugins/spellchk.c:2364
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Rempraza o texto das mensaxes saíntes según as regras definidas polo usuario."
+msgstr ""
+"Substitúe o texto das mensaxes saíntes segundo as regras definidas polo "
+"usuario."
 
 #. *< type
 #. *< ui_requirement
@@ -5162,7 +5331,7 @@
 #. *< id
 #: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
 msgid "Buddy Ticker"
-msgstr "Deslizante de amigos"
+msgstr "Monitor de contactos"
 
 #. *< name
 #. *< version
@@ -5170,7 +5339,7 @@
 #. *  description
 #: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
 msgid "A horizontal scrolling version of the buddy list."
-msgstr "Unha versión horizontal deslizante da lista de amigos."
+msgstr "Unha versión da listaxe de contactos con desprazamento horizontal"
 
 #: ../gtk/plugins/timestamp.c:186
 msgid "iChat Timestamp"
@@ -5178,7 +5347,7 @@
 
 #: ../gtk/plugins/timestamp.c:193
 msgid "Delay"
-msgstr "Retardo"
+msgstr "Mora"
 
 #: ../gtk/plugins/timestamp.c:200
 msgid "minutes."
@@ -5200,7 +5369,7 @@
 #. *  description
 #: ../gtk/plugins/timestamp.c:259 ../gtk/plugins/timestamp.c:261
 msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "Engade unha marca de tempo ao estilo iChat nas conversacións cada N minutos."
+msgstr "Engade unha marca de tempo ao estilo iChat nas conversas cada N minutos."
 
 #: ../gtk/plugins/timestamp_format.c:22
 msgid "Timestamp Format Options"
@@ -5216,7 +5385,7 @@
 
 #: ../gtk/plugins/timestamp_format.c:35
 msgid "Co_nversations:"
-msgstr "Co_nversacións:"
+msgstr "Co_nversas:"
 
 #: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
 msgid "For delayed messages"
@@ -5224,7 +5393,7 @@
 
 #: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
 msgid "For delayed messages and in chats"
-msgstr "Para mensaxes diferidas e para chats"
+msgstr "Para mensaxes diferidas e para conversas"
 
 #: ../gtk/plugins/timestamp_format.c:44
 msgid "_Message Logs:"
@@ -5238,14 +5407,14 @@
 #. *< id
 #: ../gtk/plugins/timestamp_format.c:149
 msgid "Message Timestamp Formats"
-msgstr "Formatos de marca de tempo de mensaxes"
+msgstr "Formatos de marca de tempo das mensaxes"
 
 #. *< name
 #. *< version
 #. *  summary
 #: ../gtk/plugins/timestamp_format.c:152
 msgid "Customizes the message timestamp formats."
-msgstr "Personaliza o formato da marca de tempo de mensaxes."
+msgstr "Personaliza o formato da marca de tempo das mensaxes."
 
 #. *  description
 #: ../gtk/plugins/timestamp_format.c:154
@@ -5254,7 +5423,7 @@
 "timestamp formats."
 msgstr ""
 "Este complemento permite ao usuario personalizar os formatos de marca de "
-"tempo para as mensaxes de conversacións e mensaxes de rexistro."
+"tempo para as mensaxes de conversas e mensaxes de rexistro."
 
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:183
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:569
@@ -5265,19 +5434,19 @@
 #. IM Convo trans options
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:533
 msgid "IM Conversation Windows"
-msgstr "Fiestras de conversación de MI"
+msgstr "Ventás de conversa de MI"
 
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:534
 msgid "_IM window transparency"
-msgstr "Transparencia das fiestras de M_I"
+msgstr "Transparencia das ventás de M_I"
 
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:548
 msgid "_Show slider bar in IM window"
-msgstr "A_mosar barra deslizante na fiestra MI"
+msgstr "A_mosar barra de desprazamento na ventá MI"
 
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:555
 msgid "Remove IM window transparency on focus"
-msgstr "Eliminar a transparencia das fiestra MI ao enfocar"
+msgstr "Eliminar a transparencia das ventás de MI ao ter o foco"
 
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:558
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:606
@@ -5287,15 +5456,15 @@
 #. Buddy List trans options
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:590
 msgid "Buddy List Window"
-msgstr "Fiestra da lista de amigos"
+msgstr "Ventá da listaxe de contactos"
 
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:591
 msgid "_Buddy List window transparency"
-msgstr "Transparencia da fiestra de lista de _amigos"
+msgstr "Transparencia da ventá de listaxe de _contactos"
 
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:604
 msgid "Remove Buddy List window transparency on focus"
-msgstr "Eliminar transparencia da fiestra da lista de amigos ao obter o foco"
+msgstr "Eliminar transparencia da ventá da listaxe de contactos ao ter o foco"
 
 #. *< type
 #. *< ui_requirement
@@ -5312,7 +5481,7 @@
 #. *  summary
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:661
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Transparencia variable para a lista de amigos e as conversacións."
+msgstr "Transparencia variable para a listaxe de contactos e as conversas."
 
 #. *  description
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:663
@@ -5322,8 +5491,8 @@
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Este complemento activa transparencias alfa nas fiestras de conversación e "
-"na lista de amigos.\n"
+"Este complemento activa transparencias alfa nas ventás de conversa e na "
+"listaxe de contactos.\n"
 "\n"
 "* Nota: Este complemento require Win2000 ou outro máis novo."
 
@@ -5342,12 +5511,12 @@
 
 #: ../gtk/plugins/win32/winprefs/winprefs.c:328
 msgid "_Dockable Buddy List"
-msgstr "Lista de amigos a_pilable"
+msgstr "Listaxe de contactos a_pilable"
 
 #. Blist On Top
 #: ../gtk/plugins/win32/winprefs/winprefs.c:332
 msgid "_Keep Buddy List window on top:"
-msgstr "_Manter a fiestra de amigos por enriba:"
+msgstr "_Manter a ventá de contactos por enriba:"
 
 #. XXX: Did this ever work?
 #: ../gtk/plugins/win32/winprefs/winprefs.c:337
@@ -5355,8 +5524,9 @@
 msgstr "Só cando está empotrado"
 
 #: ../gtk/plugins/win32/winprefs/winprefs.c:342
+#, fuzzy
 msgid "_Flash window when chat messages are received"
-msgstr "_Destello de fiestra cando se reciben mensaxes de chat"
+msgstr "_Brillo de ventá cando se reciben mensaxes"
 
 #: ../gtk/plugins/win32/winprefs/winprefs.c:366
 msgid "WinGaim Options"
@@ -5370,77 +5540,77 @@
 #, fuzzy
 msgid "Provides options specific to Windows Gaim, such as buddy list docking."
 msgstr ""
-"Contén as opcións específicas para o Gaim de Windows, como o apilado da "
-"lista de amigos ou o palpabrexo de conversacións."
-
-#: ../libgaim/account.c:774
+"Contén as opcións específicas para o Gaim de Windows, como a acumulación da "
+"listaxe de contactos ou o pestanexo de conversas."
+
+#: ../libgaim/account.c:769
 msgid "accounts"
 msgstr "contas"
 
-#: ../libgaim/account.c:918
+#: ../libgaim/account.c:915
 msgid "Password is required to sign on."
-msgstr "O contrasinal é necesario para iniciar sesión."
-
-#: ../libgaim/account.c:943
+msgstr "O contrasinal é necesario para iniciar a sesión."
+
+#: ../libgaim/account.c:940
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Introduza o contrasinal para %s (%s)"
 
-#: ../libgaim/account.c:950
+#: ../libgaim/account.c:947
 msgid "Enter Password"
-msgstr "Introducir contrasinal"
-
-#: ../libgaim/account.c:955
+msgstr "Introducir o contrasinal"
+
+#: ../libgaim/account.c:952
 msgid "Save password"
-msgstr "Gardar contrasinal"
-
-#: ../libgaim/account.c:989 ../libgaim/connection.c:104
+msgstr "Gardar o contrasinal"
+
+#: ../libgaim/account.c:986 ../libgaim/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Falta o complemento de protocolo para %s"
 
-#: ../libgaim/account.c:1071 ../libgaim/protocols/gg/gg.c:696
-#: ../libgaim/protocols/jabber/jabber.c:1295
+#: ../libgaim/account.c:1085 ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/protocols/jabber/jabber.c:1315
 msgid "New passwords do not match."
 msgstr "Os novos contrasinais non coinciden."
 
-#: ../libgaim/account.c:1080
+#: ../libgaim/account.c:1094
 msgid "Fill out all fields completely."
-msgstr "Encha todos os campos completamente."
-
-#: ../libgaim/account.c:1103
-msgid "Original password"
-msgstr "Contrasinal orixinal"
-
-#: ../libgaim/account.c:1110
-msgid "New password"
-msgstr "Novo contrasinal"
+msgstr "Enche todos os campos completamente."
 
 #: ../libgaim/account.c:1117
-msgid "New password (again)"
-msgstr "Novo contrasinal (outra vez)"
-
-#: ../libgaim/account.c:1123
-#, c-format
-msgid "Change password for %s"
-msgstr "Cambiar o contrasinal de %s"
+msgid "Original password"
+msgstr "Contrasinal orixinal"
+
+#: ../libgaim/account.c:1124
+msgid "New password"
+msgstr "Novo contrasinal"
 
 #: ../libgaim/account.c:1131
+msgid "New password (again)"
+msgstr "Novo contrasinal (outra vez)"
+
+#: ../libgaim/account.c:1137
+#, c-format
+msgid "Change password for %s"
+msgstr "Mudar o contrasinal de %s"
+
+#: ../libgaim/account.c:1145
 msgid "Please enter your current password and your new password."
-msgstr "Introduza seu contrasinal actual e o contrasinal novo."
-
-#: ../libgaim/account.c:1161
+msgstr "Introduza o contrasinal actual e o novo."
+
+#: ../libgaim/account.c:1175
 #, c-format
 msgid "Change user information for %s"
-msgstr "Cambiar a información do usuario %s"
-
-#: ../libgaim/account.c:1164 ../libgaim/protocols/toc/toc.c:1690
+msgstr "Mudar a información do usuario %s"
+
+#: ../libgaim/account.c:1178 ../libgaim/protocols/toc/toc.c:1690
 msgid "Set User Info"
-msgstr "Establecer súa información de usuario"
+msgstr "Establecer a súa información de usuario"
 
 #: ../libgaim/blist.c:548
 msgid "buddy list"
-msgstr "lista de amigos"
+msgstr "listaxe de contactos"
 
 #: ../libgaim/blist.c:1919
 #, c-format
@@ -5452,11 +5622,11 @@
 "which are currently disabled or offline.  These buddies and the group were "
 "not removed.\n"
 msgstr[0] ""
-"%d amigo do grupo %s non se eliminou porque a súa conta non estaba "
-"conectada. Este amigo e os seus grupos non foron eliminados.\n"
+"%d contacto do grupo %s non se eliminou porque a súa conta non estaba "
+"conectada. Este contacto e os seus grupos non se eliminaron.\n"
 msgstr[1] ""
-"%d amigos do grupo %s non se eliminou porque a súa conta non estaba "
-"conectada. Este amigo e os seus grupos non foron eliminados.\n"
+"%d contactos do grupo %s non se eliminou porque a súa conta non estaba "
+"conectada. Este contacto e os seus grupos non foron eliminados.\n"
 
 #: ../libgaim/blist.c:1929
 msgid "Group not removed"
@@ -5471,7 +5641,7 @@
 msgid "+++ %s signed on"
 msgstr "+++ %s conectouse"
 
-#: ../libgaim/connection.c:325
+#: ../libgaim/connection.c:322
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s desconectouse"
@@ -5494,12 +5664,14 @@
 msgstr "Non se puido enviar a mensaxe."
 
 #: ../libgaim/conversation.c:1162
+#, fuzzy
 msgid "Send Message"
-msgstr "Enviar mensaxe"
+msgstr "Enviar unha _mensaxe"
 
 #: ../libgaim/conversation.c:1163
+#, fuzzy
 msgid "_Send Message"
-msgstr "En_viar mensaxe"
+msgstr "Enviar unha _mensaxe"
 
 #: ../libgaim/conversation.c:1566
 #, c-format
@@ -5514,12 +5686,12 @@
 #: ../libgaim/conversation.c:1674
 #, c-format
 msgid "You are now known as %s"
-msgstr "Agora se chama %s"
+msgstr "Agora chámase %s"
 
 #: ../libgaim/conversation.c:1694
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s agora se chama %s"
+msgstr "%s agora chámase %s"
 
 #: ../libgaim/conversation.c:1767
 #, c-format
@@ -5535,68 +5707,70 @@
 msgid "No name"
 msgstr "Sen nome"
 
-#: ../libgaim/dbus-server.c:577
-#, c-format
+#: ../libgaim/dbus-server.c:578
+#, fuzzy, c-format
 msgid "Failed to get connection: %s"
-msgstr "Fallou ao obter a conexión: %s"
-
-#: ../libgaim/dbus-server.c:585
-#, c-format
+msgstr "Imposible crear a conexión"
+
+#: ../libgaim/dbus-server.c:590
+#, fuzzy, c-format
 msgid "Failed to get name: %s"
-msgstr "Fallou ao obter o nome: %s"
-
-#: ../libgaim/dbus-server.c:598
-#, c-format
+msgstr "Non se puido almacenar a imaxe: %s\n"
+
+#: ../libgaim/dbus-server.c:603
+#, fuzzy, c-format
 msgid "Failed to get serv name: %s"
-msgstr "Fallou ao obter o nome do servidor: %s"
-
-#: ../libgaim/dnsquery.c:490
+msgstr "Non se puido almacenar a imaxe: %s\n"
+
+#: ../libgaim/dnsquery.c:491
 #, fuzzy
 msgid "Unable to create new resolver process\n"
-msgstr "Non se puido crear o socket"
-
-#: ../libgaim/dnsquery.c:495
+msgstr "Non se puido crear o socket "
+
+#: ../libgaim/dnsquery.c:496
+#, fuzzy
 msgid "Unable to send request to resolver process\n"
-msgstr "Non se puido enviar unha solicitude ao proceso de resolución\n"
-
-#: ../libgaim/dnsquery.c:528 ../libgaim/dnsquery.c:676
-#, c-format
+msgstr "Non se puido enviar a mensaxe a %s."
+
+#: ../libgaim/dnsquery.c:529 ../libgaim/dnsquery.c:677
+#, fuzzy, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"Erro ao resolver %s:\n"
-"%s."
-
-#: ../libgaim/dnsquery.c:531 ../libgaim/dnsquery.c:690
-#: ../libgaim/dnsquery.c:798
-#, c-format
+"Erro lendo %s:\n"
+"%s.\n"
+
+#: ../libgaim/dnsquery.c:532 ../libgaim/dnsquery.c:691
+#: ../libgaim/dnsquery.c:799
+#, fuzzy, c-format
 msgid "Error resolving %s: %d"
-msgstr "Erro resolvendo %s: %d"
-
-#: ../libgaim/dnsquery.c:553
-#, c-format
+msgstr ""
+"Erro lendo %s:\n"
+"%s.\n"
+
+#: ../libgaim/dnsquery.c:554
+#, fuzzy, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
-msgstr ""
-"Erro lendo do proceso de resolución:\n"
-"%s"
-
-#: ../libgaim/dnsquery.c:557
+msgstr "Erro ao ler do socket: %s"
+
+#: ../libgaim/dnsquery.c:558
 msgid "EOF while reading from resolver process"
-msgstr "Fin de ficheiro mentras se lía do proceso de resolución"
-
-#: ../libgaim/dnsquery.c:734
-#, c-format
-msgid "Thread creation failure: %s"
-msgstr "Fallo da creación do fío: %s"
+msgstr ""
 
 #: ../libgaim/dnsquery.c:735
+#, fuzzy, c-format
+msgid "Thread creation failure: %s"
+msgstr "Fallo de autenticación"
+
+#: ../libgaim/dnsquery.c:736
+#, fuzzy
 msgid "Unknown reason"
-msgstr "Razón descoñecida"
-
-#: ../libgaim/ft.c:189 ../libgaim/protocols/msn/msn.c:410
+msgstr "Razón descoñecida."
+
+#: ../libgaim/ft.c:195 ../libgaim/protocols/msn/msn.c:408
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -5605,7 +5779,7 @@
 "Erro lendo %s:\n"
 "%s.\n"
 
-#: ../libgaim/ft.c:193
+#: ../libgaim/ft.c:199
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -5614,7 +5788,7 @@
 "Erro escribindo %s:\n"
 "%s.\n"
 
-#: ../libgaim/ft.c:197
+#: ../libgaim/ft.c:203
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -5623,102 +5797,106 @@
 "Erro accedendo a %s:\n"
 "%s.\n"
 
-#: ../libgaim/ft.c:230
+#: ../libgaim/ft.c:239
+msgid "Directory is not writable."
+msgstr ""
+
+#: ../libgaim/ft.c:254
 msgid "Cannot send a file of 0 bytes."
 msgstr "Non se pode enviar un ficheiro de 0 bytes."
 
-#: ../libgaim/ft.c:240
+#: ../libgaim/ft.c:264
 msgid "Cannot send a directory."
 msgstr "Non se pode enviar un directorio."
 
-#: ../libgaim/ft.c:249
+#: ../libgaim/ft.c:273
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s non é un ficheiro regular. Non se sobrescribirá.\n"
 
-#: ../libgaim/ft.c:307
+#: ../libgaim/ft.c:331
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s quere enviarlle %s (%s)"
 
-#: ../libgaim/ft.c:314
+#: ../libgaim/ft.c:338
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s quere enviarlle un ficheiro"
 
-#: ../libgaim/ft.c:355
+#: ../libgaim/ft.c:379
 #, c-format
 msgid "Accept file transfer request from %s?"
-msgstr "Aceptar solicitude de transferencia de ficheiro de %s?"
-
-#: ../libgaim/ft.c:359
+msgstr "Aceptar a solicitude de transferencia de ficheiro de %s?"
+
+#: ../libgaim/ft.c:383
 #, c-format
 msgid ""
 "A file is available for download from:\n"
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"Hai un ficheiro dispoñible a descargar desde:\n"
+"Hai un ficheiro dispoñible para descargar desde:\n"
 "Servidor remoto: %s\n"
 "Porto remoto: %d"
 
-#: ../libgaim/ft.c:392
+#: ../libgaim/ft.c:416
 #, c-format
 msgid "%s is offering to send file %s"
-msgstr "Ofrécese a enviar %s a %s"
-
-#: ../libgaim/ft.c:444
+msgstr "Ofrécese para enviar %s a %s"
+
+#: ../libgaim/ft.c:468
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s non é un nome de ficheiro válido.\n"
 
-#: ../libgaim/ft.c:465
+#: ../libgaim/ft.c:489
 #, c-format
 msgid "Offering to send %s to %s"
-msgstr "Ofrécese a enviar %s a %s"
-
-#: ../libgaim/ft.c:477
+msgstr "Ofrécese para enviar %s a %s"
+
+#: ../libgaim/ft.c:501
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Iniciando transferencia de %s desde %s"
 
-#: ../libgaim/ft.c:631
+#: ../libgaim/ft.c:655
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Completouse a transferencia de %s"
 
-#: ../libgaim/ft.c:634
+#: ../libgaim/ft.c:658
 msgid "File transfer complete"
 msgstr "Transferencia de ficheiros completa"
 
-#: ../libgaim/ft.c:1023
+#: ../libgaim/ft.c:1075
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Cancelou a transferencia de %s"
 
-#: ../libgaim/ft.c:1028
+#: ../libgaim/ft.c:1080
 msgid "File transfer cancelled"
 msgstr "Transferencia de ficheiros cancelada"
 
-#: ../libgaim/ft.c:1086
+#: ../libgaim/ft.c:1138
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelou a transferencia de %s"
 
-#: ../libgaim/ft.c:1091
+#: ../libgaim/ft.c:1143
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancelou a transferencia de ficheiros"
 
-#: ../libgaim/ft.c:1148
+#: ../libgaim/ft.c:1200
 #, c-format
 msgid "File transfer to %s failed."
-msgstr "Transferencia de ficheiro a %s fallou."
-
-#: ../libgaim/ft.c:1150
+msgstr "A transferencia de ficheiro a %s fallou."
+
+#: ../libgaim/ft.c:1202
 #, c-format
 msgid "File transfer from %s failed."
-msgstr "Transferencia de ficheiro desde %s fallou."
+msgstr "A transferencia de ficheiro desde %s fallou."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:1
 msgid "Run the command in a terminal"
@@ -5892,7 +6070,7 @@
 
 #: ../libgaim/log.c:691
 msgid "Logging of this conversation failed."
-msgstr "O rexistro desta conversación fallou."
+msgstr "O rexistro desta conversa fallou."
 
 #: ../libgaim/log.c:1041
 msgid "XML"
@@ -5930,10 +6108,10 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA AUTOMÁTICA>: %s\n"
 
-#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1649
+#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1685
 #: ../libgaim/protocols/msn/servconn.c:139
 #: ../libgaim/protocols/msn/session.c:321
-#: ../libgaim/protocols/oscar/oscar.c:2678
+#: ../libgaim/protocols/oscar/oscar.c:2719
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
@@ -5945,7 +6123,7 @@
 #: ../libgaim/plugin.c:434
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr "Non houbo conincidencia no número máxico do complemento %d (necesitaba %d)"
+msgstr "Non houbo coincidencia no número máxico do complemento %d (necesitaba %d)"
 
 #: ../libgaim/plugin.c:451
 #, c-format
@@ -5967,7 +6145,7 @@
 
 #: ../libgaim/plugin.c:538
 msgid "Gaim encountered errors loading the plugin."
-msgstr "Gaim atopou erros cargando o complemento."
+msgstr "Gaim atopou erros ao cargar o complemento."
 
 #: ../libgaim/plugin.c:560
 #, c-format
@@ -5976,17 +6154,231 @@
 
 #: ../libgaim/plugin.c:564
 msgid "Gaim was unable to load your plugin."
-msgstr "Gaim non puido cargar seu complemento."
+msgstr "Gaim non puido cargar o complemento."
 
 #: ../libgaim/plugin.c:664
 #, c-format
 msgid "The dependent plugin %s failed to unload."
-msgstr "Non se puido cargar o complemento dependente %s."
+msgstr "Non se puido descargar o complemento dependente %s."
 
 #: ../libgaim/plugin.c:669
 msgid "Gaim encountered errors unloading the plugin."
 msgstr "Gaim atopou erros descargando o complemento."
 
+#: ../libgaim/plugins/autoaccept.c:80
+#, fuzzy, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr "Aceptar a solicitude de transferencia de ficheiro de %s?"
+
+#: ../libgaim/plugins/autoaccept.c:82
+msgid "Autoaccept complete"
+msgstr ""
+
+#: ../libgaim/plugins/autoaccept.c:160
+#, fuzzy, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr "Aceptar a solicitude de transferencia de ficheiro de %s?"
+
+#: ../libgaim/plugins/autoaccept.c:162
+msgid "Set Autoaccept Setting"
+msgstr ""
+
+#: ../libgaim/plugins/autoaccept.c:164 ../libgaim/plugins/autoreply.c:225
+#, fuzzy
+msgid "_Save"
+msgstr "Gardar"
+
+#: ../libgaim/plugins/autoaccept.c:165 ../libgaim/plugins/autoreply.c:226
+#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:228 ../libgaim/protocols/oscar/oscar.c:1432
+#: ../libgaim/protocols/oscar/oscar.c:2234
+#: ../libgaim/protocols/oscar/oscar.c:2280
+#: ../libgaim/protocols/oscar/oscar.c:5838
+#: ../libgaim/protocols/oscar/oscar.c:5890
+#: ../libgaim/protocols/oscar/oscar.c:6068
+#: ../libgaim/protocols/oscar/oscar.c:6124
+#: ../libgaim/protocols/oscar/oscar.c:6193 ../libgaim/request.h:1350
+#: ../libgaim/request.h:1360
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: ../libgaim/plugins/autoaccept.c:166
+msgid "Ask"
+msgstr ""
+
+#: ../libgaim/plugins/autoaccept.c:167
+#, fuzzy
+msgid "Auto Accept"
+msgstr "_Aceptar"
+
+#: ../libgaim/plugins/autoaccept.c:168
+#, fuzzy
+msgid "Auto Reject"
+msgstr "Convite rexeitado"
+
+#: ../libgaim/plugins/autoaccept.c:181
+#, fuzzy
+msgid "Autoaccept File Transfers..."
+msgstr "Transferencia de ficheiros"
+
+#. XXX: Is there a better way than this? There really should be.
+#: ../libgaim/plugins/autoaccept.c:211
+msgid ""
+"Path to save the files in\n"
+"(Please provide the full path)"
+msgstr ""
+
+#: ../libgaim/plugins/autoaccept.c:216
+#, fuzzy
+msgid "Automatically reject from users not in buddy list"
+msgstr "Activar só para usuarios da listaxe de contactos"
+
+#: ../libgaim/plugins/autoaccept.c:220
+msgid ""
+"Notify with a popup when an autoaccepted file transfer is complete\n"
+"(only when there's no conversation with the sender)"
+msgstr ""
+
+#. XXX: There should be a way to reset to the default/account-default autoreply
+#: ../libgaim/plugins/autoreply.c:218
+#, fuzzy, c-format
+msgid "Set autoreply message for %s"
+msgstr "%d mensaxe sen ler de %s\n"
+
+#: ../libgaim/plugins/autoreply.c:220
+#, fuzzy
+msgid "Set Autoreply Message"
+msgstr "Mensaxe de ausencia"
+
+#: ../libgaim/plugins/autoreply.c:221
+msgid ""
+"The following message will be sent to the buddy when the buddy sends you a "
+"message and autoreply is enabled."
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:238
+#, fuzzy
+msgid "Set _Autoreply Message"
+msgstr "Mensaxe de ausencia"
+
+#: ../libgaim/plugins/autoreply.c:249
+#, fuzzy
+msgid "Autoreply message"
+msgstr "Para mensaxes diferidas"
+
+#: ../libgaim/plugins/autoreply.c:336
+#, fuzzy
+msgid "Send autoreply messages when"
+msgstr "Enviar unha _mensaxe"
+
+#: ../libgaim/plugins/autoreply.c:340
+#, fuzzy
+msgid "When my account is _away"
+msgstr "Cando se cita o meu alcume"
+
+#: ../libgaim/plugins/autoreply.c:344
+#, fuzzy
+msgid "When my account is _idle"
+msgstr "Cando se cita o meu alcume"
+
+#: ../libgaim/plugins/autoreply.c:348
+#, fuzzy
+msgid "_Default reply"
+msgstr "Resposta _automática:"
+
+#: ../libgaim/plugins/autoreply.c:354
+#, fuzzy
+msgid "Status message"
+msgstr "Enviar unha _mensaxe"
+
+#: ../libgaim/plugins/autoreply.c:358
+msgid "Autoreply with status message"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:362
+msgid "Always when there is a status message"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:364
+msgid "Only when there's no autoreply message"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:369
+msgid "Delay between autoreplies"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:373
+msgid "_Minimum delay (mins)"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:377
+msgid "Times to send autoreplies"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:381
+msgid "Ma_ximum count"
+msgstr ""
+
+#: ../libgaim/plugins/autoreply.c:428
+msgid ""
+"I am currently not available. Please leave your message, and I will get back "
+"to you as soon as possible."
+msgstr ""
+
+#: ../libgaim/plugins/buddynote.c:46 ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/msn/msn.c:1641
+msgid "Notes"
+msgstr "Notas"
+
+#: ../libgaim/plugins/buddynote.c:47
+msgid "Enter your notes below..."
+msgstr ""
+
+#: ../libgaim/plugins/buddynote.c:61
+msgid "Edit Notes..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/buddynote.c:87
+#, fuzzy
+msgid "Buddy Notes"
+msgstr "Avisos de contacto"
+
+#. *< name
+#. *< version
+#: ../libgaim/plugins/buddynote.c:89
+msgid "Store notes on particular buddies."
+msgstr ""
+
+#. *  summary
+#: ../libgaim/plugins/buddynote.c:90
+msgid "Adds the option to store notes for buddies on your buddy list."
+msgstr ""
+
+# Ollo con ese Cipher!! É probable que sexa CIFRA
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr "Proba de cifraxe"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ciphertest.c:267 ../libgaim/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr "Proba as cifraxes que se inclúen no gaim."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5994,8 +6386,9 @@
 #. *< priority
 #. *< id
 #: ../libgaim/plugins/dbus-example.c:155
+#, fuzzy
 msgid "DBus Example"
-msgstr "Exemplo de DBus"
+msgstr "Exemplo de complemento DBus"
 
 #. *< name
 #. *< version
@@ -6013,7 +6406,7 @@
 #. *< id
 #: ../libgaim/plugins/filectl.c:248
 msgid "Gaim File Control"
-msgstr "Control de ficheiros de Gaim"
+msgstr "Control de ficheiros do Gaim"
 
 #. *< name
 #. *< version
@@ -6021,7 +6414,7 @@
 #. *  description
 #: ../libgaim/plugins/filectl.c:251 ../libgaim/plugins/filectl.c:253
 msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "Permite controlar Gaim introducindo comandos nun ficheiro."
+msgstr "Permite controlar o Gaim introducindo comandos nun ficheiro."
 
 #: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
 msgid "Minutes"
@@ -6032,7 +6425,7 @@
 #: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
 #: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
 msgid "I'dle Mak'er"
-msgstr "Xenerador de ausencia"
+msgstr "Xerador de ausencia"
 
 #: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
 msgid "Set Account Idle Time"
@@ -6040,28 +6433,23 @@
 
 #: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
 msgid "_Set"
-msgstr "_Establecer"
-
-#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
-#: ../libgaim/plugins/idle.c:228
-msgid "_Cancel"
-msgstr "_Cancelar"
+msgstr "_Configurar"
 
 #: ../libgaim/plugins/idle.c:183
 msgid "None of your accounts are idle."
-msgstr "Ningunha das túas contas están inactivas."
+msgstr "Ningunha das túas contas está inactiva."
 
 #: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
 msgid "Unset Account Idle Time"
-msgstr "Desestablecer tempo de inactividade da conta"
+msgstr "Desactivar o tempo de inactividade da conta"
 
 #: ../libgaim/plugins/idle.c:202
 msgid "_Unset"
-msgstr "_Desestablecer"
+msgstr "_Desactivar"
 
 #: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
 msgid "Set Idle Time for All Accounts"
-msgstr "Establecer o tempo de inactividade para todas as contas"
+msgstr "Configurar o tempo de inactividade para todas as contas"
 
 #: ../libgaim/plugins/idle.c:268
 msgid "Unset Idle Time for All Idled Accounts"
@@ -6069,7 +6457,7 @@
 
 #: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Permite alterar canto tempo estivo ausente"
+msgstr "Permite configurar canto tempo estivo ausente"
 
 #. *< type
 #. *< ui_requirement
@@ -6121,29 +6509,37 @@
 "Complemento de soporte IPC de proba, como un servidor. Este rexistra os "
 "comandos IPC."
 
-#: ../libgaim/plugins/log_reader.c:1412
+#. This is used in the place of a timezone abbreviation if the
+#. * 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.
+#: ../libgaim/plugins/log_reader.c:497
+msgid "(UTC)"
+msgstr ""
+
+#: ../libgaim/plugins/log_reader.c:1552
 msgid "User is offline."
 msgstr "O usuario está desconectado."
 
-#: ../libgaim/plugins/log_reader.c:1418
+#: ../libgaim/plugins/log_reader.c:1558
 msgid "Auto-response sent:"
 msgstr "Enviar resposta automática:"
 
-#: ../libgaim/plugins/log_reader.c:1428 ../libgaim/plugins/log_reader.c:1431
+#: ../libgaim/plugins/log_reader.c:1568 ../libgaim/plugins/log_reader.c:1571
 #: ../libgaim/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s desconectouse."
 
-#: ../libgaim/plugins/log_reader.c:1445
+#: ../libgaim/plugins/log_reader.c:1585
 msgid "One or more messages may have been undeliverable."
-msgstr "Unha ou máis mensaxes pode que non chegaran ao destino."
-
-#: ../libgaim/plugins/log_reader.c:1455
+msgstr "Unha ou máis mensaxes puideron non chegar ao destino."
+
+#: ../libgaim/plugins/log_reader.c:1595
 msgid "You were disconnected from the server."
 msgstr "Foi desconectado do servidor."
 
-#: ../libgaim/plugins/log_reader.c:1463
+#: ../libgaim/plugins/log_reader.c:1603
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -6151,64 +6547,64 @@
 "Está actualmente desconectado. As mensaxes non se recibirán a non ser que se "
 "conecte."
 
-#: ../libgaim/plugins/log_reader.c:1478
+#: ../libgaim/plugins/log_reader.c:1618
 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."
 
-#: ../libgaim/plugins/log_reader.c:1483
+#: ../libgaim/plugins/log_reader.c:1623
 msgid "Message could not be sent."
-msgstr "A mensaxe non puido ser enviada."
+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.
-#: ../libgaim/plugins/log_reader.c:1831 ../libgaim/plugins/log_reader.c:1940
+#: ../libgaim/plugins/log_reader.c:1976 ../libgaim/plugins/log_reader.c:2085
 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.
-#: ../libgaim/plugins/log_reader.c:1844 ../libgaim/plugins/log_reader.c:1945
+#: ../libgaim/plugins/log_reader.c:1989 ../libgaim/plugins/log_reader.c:2090
 msgid "Fire"
-msgstr "Fogo"
+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.
-#: ../libgaim/plugins/log_reader.c:1856 ../libgaim/plugins/log_reader.c:1949
+#: ../libgaim/plugins/log_reader.c:2001 ../libgaim/plugins/log_reader.c:2094
 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.
-#: ../libgaim/plugins/log_reader.c:1869 ../libgaim/plugins/log_reader.c:1954
+#: ../libgaim/plugins/log_reader.c:2014 ../libgaim/plugins/log_reader.c:2099
 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.
-#: ../libgaim/plugins/log_reader.c:1881 ../libgaim/plugins/log_reader.c:1958
+#: ../libgaim/plugins/log_reader.c:2026 ../libgaim/plugins/log_reader.c:2103
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libgaim/plugins/log_reader.c:1922
+#: ../libgaim/plugins/log_reader.c:2067
 msgid "General Log Reading Configuration"
 msgstr "Configuración de lectura de rexistro xeral"
 
-#: ../libgaim/plugins/log_reader.c:1926
+#: ../libgaim/plugins/log_reader.c:2071
 msgid "Fast size calculations"
 msgstr "Cálculos de tamaño rápido"
 
-#: ../libgaim/plugins/log_reader.c:1930
+#: ../libgaim/plugins/log_reader.c:2075
 msgid "Use name heuristics"
 msgstr "Usar nomes heurísticos"
 
 #. Add Log Directory preferences.
-#: ../libgaim/plugins/log_reader.c:1936
+#: ../libgaim/plugins/log_reader.c:2081
 msgid "Log Directory"
 msgstr "Directorio de rexistro"
 
@@ -6218,19 +6614,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/log_reader.c:1981
+#: ../libgaim/plugins/log_reader.c:2126
 msgid "Log Reader"
 msgstr "Lector de rexistro"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libgaim/plugins/log_reader.c:1985
+#: ../libgaim/plugins/log_reader.c:2130
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Incluír outros rexistros de clientes de MI no visor de rexistro."
 
 #. * description
-#: ../libgaim/plugins/log_reader.c:1989
+#: ../libgaim/plugins/log_reader.c:2134
 #, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
@@ -6245,13 +6641,71 @@
 
 #: ../libgaim/plugins/mono/loader/mono.c:213
 msgid "Mono Plugin Loader"
-msgstr "Cargador de complementos mono"
+msgstr "Cargador de complementos Mono"
 
 #: ../libgaim/plugins/mono/loader/mono.c:215
 #: ../libgaim/plugins/mono/loader/mono.c:216
 msgid "Loads .NET plugins with Mono."
 msgstr "Carga complementos .NET con Mono."
 
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/newline.c:68
+#, fuzzy
+msgid "New Line"
+msgstr "Nova ventá"
+
+#. *< name
+#. *< version
+#: ../libgaim/plugins/newline.c:70
+#, fuzzy
+msgid "Prepends a newline to displayed message."
+msgstr "Non se puido enviar a mensaxe."
+
+#. *  summary
+#: ../libgaim/plugins/newline.c:71
+msgid ""
+"Prepends a newline to messages so that the test of the message appears below "
+"the screen name in the conversation window."
+msgstr ""
+
+#: ../libgaim/plugins/offlinemsg.c:95
+msgid ""
+"The rest of the messages will be saved as pounce. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
+msgstr ""
+
+#: ../libgaim/plugins/offlinemsg.c:152
+#, c-format
+msgid ""
+"\"%s\" is currently offline. Do you want to save the rest of the messages in "
+"a pounce and automatically send them when \"%s\" logs back in?"
+msgstr ""
+
+#: ../libgaim/plugins/offlinemsg.c:156
+#, fuzzy
+msgid "Offline Message"
+msgstr "Mensaxes sen ler"
+
+#: ../libgaim/plugins/offlinemsg.c:157
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr ""
+
+#: ../libgaim/plugins/offlinemsg.c:187
+msgid "Save offline messages in pounce"
+msgstr ""
+
+#: ../libgaim/plugins/offlinemsg.c:191
+msgid "Do not ask. Always save in pounce."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6267,7 +6721,7 @@
 #. *< summary
 #: ../libgaim/plugins/perl/perl.c:590 ../libgaim/plugins/perl/perl.c:591
 msgid "Provides support for loading perl plugins."
-msgstr "Provee soporte para cargar complementos en perl."
+msgstr "Prové o soporte para cargar complementos en perl."
 
 #: ../libgaim/plugins/psychic.c:19
 msgid "Psychic Mode"
@@ -6275,37 +6729,36 @@
 
 #: ../libgaim/plugins/psychic.c:20
 msgid "Psychic mode for incoming conversation"
-msgstr "Modo psíquico para conversación entrantes"
+msgstr "Modo psíquico para conversas entrantes"
 
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
-"Fai que aparezan as fiestras de conversación cando un usuario empeza a "
-"enviarlle unha mensaxe. Isto funciona con AIM, ICQ, Jabber, Sametime e Yahoo!"
-
-#. This is a quote from Star Wars.  You should
-#. probably not translate it literally.  If
-#. you can't find a fitting cultural reference
-#. in your language, consider translating
-#. something like this instead:
-#. "You feel a new message coming."
-#: ../libgaim/plugins/psychic.c:63
+"Fai que aparezan as ventás da conversa cando un usuario comeza a enviarlle "
+"unha mensaxe. Isto funciona con AIM, ICQ, Jabber, Sametime e Yahoo!"
+
+#: ../libgaim/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
-msgstr "Sentiches unha perturbación na forza..."
-
-#: ../libgaim/plugins/psychic.c:82
+msgstr "Sentiches unha alteración na forza..."
+
+#: ../libgaim/plugins/psychic.c:85
 msgid "Only enable for users on the buddy list"
-msgstr "Activar só para usuarios da lista de amigos"
-
-#: ../libgaim/plugins/psychic.c:87
+msgstr "Activar só para usuarios da listaxe de contactos"
+
+#: ../libgaim/plugins/psychic.c:90
 msgid "Disable when away"
 msgstr "Desactivar cando está ausente"
 
-#: ../libgaim/plugins/psychic.c:91
+#: ../libgaim/plugins/psychic.c:94
 msgid "Display notification message in conversations"
-msgstr "Amosa a mensaxe de notificación nas conversación"
+msgstr "Amosa a mensaxe de notificación nas conversas"
+
+#: ../libgaim/plugins/psychic.c:99
+#, fuzzy
+msgid "Raise psychic conversations"
+msgstr "En conversas privadas"
 
 #. *< type
 #. *< ui_requirement
@@ -6323,7 +6776,7 @@
 #. *  description
 #: ../libgaim/plugins/signals-test.c:687 ../libgaim/plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
-msgstr "Probar para ver se todas as sinais funcionan correctamente."
+msgstr "Probar para ver se todos os sinais funcionan correctamente."
 
 #. *< type
 #. *< ui_requirement
@@ -6359,7 +6812,7 @@
 #. *  description
 #: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "Proporciona un recubrimento a través das bibliotecas de soporte de SSL."
+msgstr "Proporciona un wrapper a través das bibliotecas de soporte de SSL."
 
 #. *< type
 #. *< ui_requirement
@@ -6406,7 +6859,7 @@
 #: ../libgaim/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
-msgstr "%s marchouse."
+msgstr "%s marchou."
 
 #: ../libgaim/plugins/statenotify.c:62
 #, c-format
@@ -6429,15 +6882,15 @@
 
 #: ../libgaim/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
-msgstr "O amigo _auséntase"
+msgstr "O contacto _auséntase"
 
 #: ../libgaim/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
-msgstr "O amigo está _inactivo"
+msgstr "O contacto está _inactivo"
 
 #: ../libgaim/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
-msgstr "_Conéctase/Desconectouse un amigo"
+msgstr "_Conéctase/Desconéctase un contacto"
 
 #. *< type
 #. *< ui_requirement
@@ -6447,7 +6900,7 @@
 #. *< id
 #: ../libgaim/plugins/statenotify.c:142
 msgid "Buddy State Notification"
-msgstr "Notificación de estado de amigos"
+msgstr "Notificación do estado de contactos"
 
 #. *< name
 #. *< version
@@ -6458,8 +6911,8 @@
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr ""
-"Notifica nunha fiestra de conversación cando un amigo auséntase ou volve ou "
-"está inactivo."
+"Notifica nunha ventá de conversa cando un contacto se ausenta, volve ou está "
+"inactivo."
 
 #: ../libgaim/plugins/tcl/tcl.c:413
 msgid "Tcl Plugin Loader"
@@ -6467,7 +6920,7 @@
 
 #: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
 msgid "Provides support for loading Tcl plugins"
-msgstr "Provee soporte para cargar complementos Tcl"
+msgstr "Prové soporte para cargar complementos Tcl"
 
 #: ../libgaim/plugins/tcl/tcl.c:481
 msgid ""
@@ -6484,25 +6937,6 @@
 msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Imposible establecer a conexión co servidor local mDNS. Estase executando?"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:337
-#: ../libgaim/protocols/sametime/sametime.c:3236
-#, c-format
-msgid ""
-"\n"
-"<b>Status:</b> %s"
-msgstr ""
-"\n"
-"<b>Estado:</b> %s"
-
-#: ../libgaim/protocols/bonjour/bonjour.c:339
-#, c-format
-msgid ""
-"\n"
-"<b>Message:</b> %s"
-msgstr ""
-"\n"
-"<b>Mensaxe:</b> %s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6513,48 +6947,50 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/bonjour/bonjour.c:435
-#: ../libgaim/protocols/bonjour/bonjour.c:437
+#: ../libgaim/protocols/bonjour/bonjour.c:436
+#: ../libgaim/protocols/bonjour/bonjour.c:438
 msgid "Bonjour Protocol Plugin"
 msgstr "Complemento de protocolo Bonjour"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:473
-#: ../libgaim/protocols/bonjour/bonjour.c:481
-#: ../libgaim/protocols/bonjour/bonjour.c:539
+#: ../libgaim/protocols/bonjour/bonjour.c:474
+#: ../libgaim/protocols/bonjour/bonjour.c:482
+#: ../libgaim/protocols/bonjour/bonjour.c:540
 #: ../libgaim/protocols/silc/silc.c:300
 msgid "Gaim User"
 msgstr "Usuario de Gaim"
 
 #. Creating the user splits
-#: ../libgaim/protocols/bonjour/bonjour.c:577
+#: ../libgaim/protocols/bonjour/bonjour.c:578
 #: ../libgaim/protocols/silc/silc.c:931
 msgid "Hostname"
 msgstr "Nome do servidor"
 
 #. Creating the options for the protocol
-#: ../libgaim/protocols/bonjour/bonjour.c:581 ../libgaim/protocols/gg/gg.c:622
-#: ../libgaim/protocols/jabber/jabber.c:796
+#: ../libgaim/protocols/bonjour/bonjour.c:582 ../libgaim/protocols/gg/gg.c:622
+#: ../libgaim/protocols/jabber/jabber.c:805
 msgid "First name"
 msgstr "Nome"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:584 ../libgaim/protocols/gg/gg.c:617
-#: ../libgaim/protocols/jabber/jabber.c:801
+#: ../libgaim/protocols/bonjour/bonjour.c:585 ../libgaim/protocols/gg/gg.c:617
+#: ../libgaim/protocols/jabber/jabber.c:810
 msgid "Last name"
 msgstr "Apelidos"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:587 ../libgaim/protocols/gg/gg.c:468
-#: ../libgaim/protocols/jabber/jabber.c:786
+#: ../libgaim/protocols/bonjour/bonjour.c:588 ../libgaim/protocols/gg/gg.c:468
+#: ../libgaim/protocols/jabber/jabber.c:795
 #: ../libgaim/protocols/silc/silc.c:695 ../libgaim/protocols/silc/silc.c:935
 msgid "E-mail"
-msgstr "E-mail"
-
-#: ../libgaim/protocols/bonjour/bonjour.c:590
+msgstr "Correo e."
+
+#: ../libgaim/protocols/bonjour/bonjour.c:591
+#, fuzzy
 msgid "AIM Account"
-msgstr "Conta AIM"
-
-#: ../libgaim/protocols/bonjour/bonjour.c:593
+msgstr "Engadir conta"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:594
+#, fuzzy
 msgid "Jabber Account"
-msgstr "Conta Jabber"
+msgstr "Activar a conta"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -6563,7 +6999,7 @@
 #: ../libgaim/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
-msgstr "%s pechou a conversación."
+msgstr "%s pechou a conversa."
 
 #: ../libgaim/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
@@ -6574,28 +7010,30 @@
 msgstr "Erro ao establecer as opcións do socket"
 
 #: ../libgaim/protocols/bonjour/jabber.c:493
+#, fuzzy
 msgid "Could not bind socket to port"
-msgstr "Non se pode vincular o socket ao porto"
+msgstr "Non se pode vincular o socket a un porto"
 
 #: ../libgaim/protocols/bonjour/jabber.c:501
+#, fuzzy
 msgid "Could not listen on socket"
-msgstr "Non se puido escoitar no socket"
+msgstr "Non se pode escoitar no socket"
 
 #: ../libgaim/protocols/bonjour/jabber.c:594
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Non se puido enviar a mensaxe, non se puido iniciar a conversación."
-
-#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1774
+msgstr "Non se puido enviar a mensaxe, non se puido iniciar a conversa."
+
+#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1791
 msgid "Invalid proxy settings"
-msgstr "Configuración inválida de proxy"
-
-#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1774
+msgstr "Configuración incorrecta de proxy"
+
+#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1791
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"O nome do servidor ou o porto especificados non son válidos para seu tipo de "
-"proxy."
+"O nome do servidor ou o porto especificados non son válidos para o seu tipo "
+"de proxy."
 
 #: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
 #: ../libgaim/protocols/gg/gg.c:180
@@ -6609,11 +7047,11 @@
 
 #: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
-msgstr "Gardar lista de amigos..."
+msgstr "Gardar listaxe de contactos..."
 
 #: ../libgaim/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr "A túa lista de amigos está baleira, non se escribiu nada no ficheiro."
+msgstr "A túa listaxe de contactos está baleira, non se escribiu nada no ficheiro."
 
 #: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
 msgid "Couldn't open file"
@@ -6621,23 +7059,23 @@
 
 #: ../libgaim/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
-msgstr "Lista de amigos gardada correctamente!"
+msgstr "Listaxe de contactos gardada correctamente!"
 
 #: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
-msgstr "Non se puido cargar a lista de amigos"
+msgstr "Non se puido cargar a listaxe de contactos"
 
 #: ../libgaim/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
-msgstr "Cargar lista de amigos..."
+msgstr "Cargar listaxe de contactos..."
 
 #: ../libgaim/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
-msgstr "Lista de amigos cargada satisfactoriamente!"
+msgstr "Listaxe de contactos cargada satisfactoriamente!"
 
 #: ../libgaim/protocols/gg/gg.c:336
 msgid "Save buddylist..."
-msgstr "Gardar lista de amigos..."
+msgstr "Gardar listaxe de contactos..."
 
 #: ../libgaim/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
@@ -6649,7 +7087,7 @@
 
 #: ../libgaim/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
-msgstr "Non se puido rexistrar a conta nova. Ocorreu un erro.\n"
+msgstr "Non se puido rexistrar a nova conta. Produciuse un erro.\n"
 
 #: ../libgaim/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
@@ -6660,8 +7098,8 @@
 msgstr "Rexistro completado satisfactoriamente!"
 
 #: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
-#: ../libgaim/protocols/jabber/jabber.c:775
-#: ../libgaim/protocols/jabber/jabber.c:1330
+#: ../libgaim/protocols/jabber/jabber.c:784
+#: ../libgaim/protocols/jabber/jabber.c:1350
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -6685,62 +7123,48 @@
 msgid "Please, fill in the following fields"
 msgstr "Por favor, encha os seguintes campos"
 
-#. General
-#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1038
-#: ../libgaim/protocols/gg/gg.c:1104 ../libgaim/protocols/gg/gg.c:2182
-#: ../libgaim/protocols/jabber/buddy.c:271
-#: ../libgaim/protocols/jabber/buddy.c:800
-#: ../libgaim/protocols/jabber/buddy.c:1526
-#: ../libgaim/protocols/jabber/buddy.c:1708
-#: ../libgaim/protocols/jabber/jabber.c:791
-#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1536
-#: ../libgaim/protocols/qq/buddy_info.c:41
-#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
-#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1055
-msgid "Nickname"
-msgstr "Alcume"
-
-#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1043
-#: ../libgaim/protocols/gg/gg.c:1107 ../libgaim/protocols/jabber/jabber.c:811
-#: ../libgaim/protocols/oscar/oscar.c:3684
-#: ../libgaim/protocols/oscar/oscar.c:3692
-#: ../libgaim/protocols/qq/buddy_info.c:47
+#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1039
+#: ../libgaim/protocols/gg/gg.c:1113 ../libgaim/protocols/jabber/jabber.c:820
+#: ../libgaim/protocols/oscar/oscar.c:3764
+#: ../libgaim/protocols/oscar/oscar.c:3777
+#: ../libgaim/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Cidade"
 
 #: ../libgaim/protocols/gg/gg.c:637
 msgid "Year of birth"
-msgstr "Cumpreanos"
-
-#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1538
-#: ../libgaim/protocols/oscar/oscar.c:3648
-#: ../libgaim/protocols/qq/buddy_info.c:44
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1080
+msgstr "Aniversario"
+
+#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/qq/buddy_info.c:46 ../libgaim/protocols/qq/qq.c:224
+#: ../libgaim/protocols/qq/qq.c:227 ../libgaim/protocols/qq/qq.c:230
+#: ../libgaim/protocols/qq/qq.c:234
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1067
 msgid "Gender"
-msgstr "Sexo"
+msgstr "Xénero"
 
 #: ../libgaim/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "Home ou muller"
 
-#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3648
-#: ../libgaim/protocols/qq/buddy_info.c:81
+#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/qq/buddy_info.c:83 ../libgaim/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Home"
 
-#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3648
-#: ../libgaim/protocols/qq/buddy_info.c:82
+#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/qq/buddy_info.c:84 ../libgaim/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "Muller"
 
 #: ../libgaim/protocols/gg/gg.c:647
 msgid "Only online"
-msgstr "Só conectado"
+msgstr "En liña só"
 
 #: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
 msgid "Find buddies"
-msgstr "Procurar amigos"
+msgstr "Buscar contactos"
 
 #: ../libgaim/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
@@ -6752,19 +7176,20 @@
 
 #: ../libgaim/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
-msgstr "Teu contrasinal actual é diferente do primeiro que especificou."
+msgstr "O contrasinal actual é diferente do primeiro que especificou."
 
 #: ../libgaim/protocols/gg/gg.c:716
+#, fuzzy
 msgid "Unable to change password. Error occurred.\n"
-msgstr "Non se puido cambiar o contrasinal. Ocorreu un erro.\n"
+msgstr "Non se puido mudar o contrasinal. Produciuse un erro.\n"
 
 #: ../libgaim/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Cambiar o contrasinal da conta Gadu-Gadu"
+msgstr "Mudar o contrasinal da conta Gadu-Gadu"
 
 #: ../libgaim/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
-msgstr "Cambiouse con éxito o contrasinal!"
+msgstr "Mudouse con éxito o contrasinal!"
 
 #: ../libgaim/protocols/gg/gg.c:759
 msgid "Current password"
@@ -6781,133 +7206,134 @@
 #: ../libgaim/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Seleccione un chat para o amigo: %s"
+msgstr "Seleccione unha convers para o contacto: %s"
 
 #: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
 msgid "Add to chat..."
-msgstr "Engadir ao chat..."
-
-#: ../libgaim/protocols/gg/gg.c:1029 ../libgaim/protocols/gg/gg.c:1098
-#: ../libgaim/protocols/oscar/oscar.c:3620
+msgstr "Engadir á conversa..."
+
+#: ../libgaim/protocols/gg/gg.c:1028 ../libgaim/protocols/gg/gg.c:1104
+#: ../libgaim/protocols/oscar/oscar.c:2654
+#: ../libgaim/protocols/oscar/oscar.c:3693
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libgaim/protocols/gg/gg.c:1033 ../libgaim/protocols/gg/gg.c:1101
-#: ../libgaim/protocols/jabber/buddy.c:1522
-#: ../libgaim/protocols/jabber/buddy.c:1698
-#: ../libgaim/protocols/oscar/oscar.c:3631
+#: ../libgaim/protocols/gg/gg.c:1031 ../libgaim/protocols/gg/gg.c:1107
+#: ../libgaim/protocols/jabber/buddy.c:1558
+#: ../libgaim/protocols/jabber/buddy.c:1734
+#: ../libgaim/protocols/oscar/oscar.c:3704
 #: ../libgaim/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
 
-#: ../libgaim/protocols/gg/gg.c:1052 ../libgaim/protocols/gg/gg.c:1110
+#: ../libgaim/protocols/gg/gg.c:1044 ../libgaim/protocols/gg/gg.c:1116
 msgid "Birth Year"
 msgstr "Data de nacemento"
 
-#: ../libgaim/protocols/gg/gg.c:1092 ../libgaim/protocols/gg/gg.c:1161
-#: ../libgaim/protocols/oscar/oscar.c:3795
+#: ../libgaim/protocols/gg/gg.c:1098 ../libgaim/protocols/gg/gg.c:1167
+#: ../libgaim/protocols/oscar/oscar.c:3886
 msgid "Unable to display the search results."
 msgstr "Non se poden amosar os resultados da busca."
 
-#: ../libgaim/protocols/gg/gg.c:1152
+#: ../libgaim/protocols/gg/gg.c:1158
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directorio público Gadu-Gadu"
 
-#: ../libgaim/protocols/gg/gg.c:1153
+#: ../libgaim/protocols/gg/gg.c:1159
 msgid "Search results"
 msgstr "Resultados da busca"
 
-#: ../libgaim/protocols/gg/gg.c:1196
+#: ../libgaim/protocols/gg/gg.c:1202
 msgid "No matching users found"
-msgstr "Non se atoparon usuarios coincidintes"
-
-#: ../libgaim/protocols/gg/gg.c:1197
+msgstr "Non se atoparon usuarios coincidentes"
+
+#: ../libgaim/protocols/gg/gg.c:1203
 msgid "There are no users matching your search criteria."
 msgstr "Non hai usuarios que coincidan cos seus criterios de busca."
 
-#: ../libgaim/protocols/gg/gg.c:1291 ../libgaim/protocols/gg/gg.c:1440
+#: ../libgaim/protocols/gg/gg.c:1297 ../libgaim/protocols/gg/gg.c:1446
 msgid "Unable to read socket"
-msgstr "Non se puido ler o socket"
-
-#: ../libgaim/protocols/gg/gg.c:1376
+msgstr "Non se puido ler o socket "
+
+#: ../libgaim/protocols/gg/gg.c:1382
 msgid "Buddy list downloaded"
-msgstr "Lista de amigos descargada"
-
-#: ../libgaim/protocols/gg/gg.c:1377
+msgstr "Listaxe de contactos descargada"
+
+#: ../libgaim/protocols/gg/gg.c:1383
 msgid "Your buddy list was downloaded from the server."
-msgstr "A túa lista de amigos foi descargada desde o servidor."
-
-#: ../libgaim/protocols/gg/gg.c:1384
+msgstr "Listaxe de contactos descargada desde o servidor."
+
+#: ../libgaim/protocols/gg/gg.c:1390
 msgid "Buddy list uploaded"
-msgstr "Lista de amigos subida"
-
-#: ../libgaim/protocols/gg/gg.c:1385
+msgstr "Listaxe de contactos subida"
+
+#: ../libgaim/protocols/gg/gg.c:1391
 msgid "Your buddy list was stored on the server."
-msgstr "A túa lista de amigos foi almacenada no servidor."
-
-#: ../libgaim/protocols/gg/gg.c:1486 ../libgaim/protocols/gg/gg.c:1710
+msgstr "Listaxe de contactos almacenada no servidor."
+
+#: ../libgaim/protocols/gg/gg.c:1492 ../libgaim/protocols/gg/gg.c:1723
 msgid "Connection failed."
 msgstr "Fallou a conexión."
 
-#: ../libgaim/protocols/gg/gg.c:1616 ../libgaim/protocols/msn/msn.c:562
+#: ../libgaim/protocols/gg/gg.c:1629 ../libgaim/protocols/msn/msn.c:563
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../libgaim/protocols/gg/gg.c:1639
+#: ../libgaim/protocols/gg/gg.c:1652
 msgid "Add to chat"
-msgstr "Engadir ao chat"
-
-#: ../libgaim/protocols/gg/gg.c:1648
+msgstr "Engadir á conversa"
+
+#: ../libgaim/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../libgaim/protocols/gg/gg.c:1652
+#: ../libgaim/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../libgaim/protocols/gg/gg.c:1669
+#: ../libgaim/protocols/gg/gg.c:1682
 msgid "Chat _name:"
-msgstr "_Nome do chat:"
-
-#: ../libgaim/protocols/gg/gg.c:1902
+msgstr "_Nome da conversa:"
+
+#: ../libgaim/protocols/gg/gg.c:1922
 msgid "Chat error"
-msgstr "Erro do chat"
-
-#: ../libgaim/protocols/gg/gg.c:1903
+msgstr "Erro da conversa"
+
+#: ../libgaim/protocols/gg/gg.c:1923
 msgid "This chat name is already in use"
-msgstr "O nome deste chat xa está en uso"
-
-#: ../libgaim/protocols/gg/gg.c:1986
+msgstr "O nome desta conversa xa está en uso"
+
+#: ../libgaim/protocols/gg/gg.c:2006
 msgid "Not connected to the server."
 msgstr "Non conectado ao servidor."
 
-#: ../libgaim/protocols/gg/gg.c:2009
+#: ../libgaim/protocols/gg/gg.c:2029
 msgid "Find buddies..."
-msgstr "Procurar amigos..."
-
-#: ../libgaim/protocols/gg/gg.c:2015
+msgstr "Procurar contactos..."
+
+#: ../libgaim/protocols/gg/gg.c:2035
 msgid "Change password..."
-msgstr "Trocar contrasinal..."
-
-#: ../libgaim/protocols/gg/gg.c:2021
+msgstr "Mudar contrasinal..."
+
+#: ../libgaim/protocols/gg/gg.c:2041
 msgid "Upload buddylist to Server"
-msgstr "Subir lista de amigos ao servidor"
-
-#: ../libgaim/protocols/gg/gg.c:2025
+msgstr "Subir a listaxe de contactos ao servidor"
+
+#: ../libgaim/protocols/gg/gg.c:2045
 msgid "Download buddylist from Server"
-msgstr "Descargar lista de amigos do servidor"
-
-#: ../libgaim/protocols/gg/gg.c:2029
+msgstr "Descargar a listaxe de contactos do servidor"
+
+#: ../libgaim/protocols/gg/gg.c:2049
 msgid "Delete buddylist from Server"
-msgstr "Borrar lista de amigos do servidor"
-
-#: ../libgaim/protocols/gg/gg.c:2033
+msgstr "Borrar a listaxe de contactos do servidor"
+
+#: ../libgaim/protocols/gg/gg.c:2053
 msgid "Save buddylist to file..."
-msgstr "Gardar lista de amigos ao ficheiro..."
-
-#: ../libgaim/protocols/gg/gg.c:2037
+msgstr "Gardar a listaxe de contactos no ficheiro..."
+
+#: ../libgaim/protocols/gg/gg.c:2057
 msgid "Load buddylist from file..."
-msgstr "Cargar lista de amigos desde ficheiro..."
+msgstr "Cargar a listaxe de contactos desde un ficheiro..."
 
 #. magic
 #. major_version
@@ -6920,16 +7346,16 @@
 #. id
 #. name
 #. version
-#: ../libgaim/protocols/gg/gg.c:2134
+#: ../libgaim/protocols/gg/gg.c:2155
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocolo Gadu-Gadu"
 
 #. summary
-#: ../libgaim/protocols/gg/gg.c:2135
+#: ../libgaim/protocols/gg/gg.c:2156
 msgid "Polish popular IM"
-msgstr "MI polaca moi popular"
-
-#: ../libgaim/protocols/gg/gg.c:2183
+msgstr "Polish popular IM"
+
+#: ../libgaim/protocols/gg/gg.c:2204
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
@@ -6938,33 +7364,33 @@
 msgid "Unknown command: %s"
 msgstr "Comando descoñecido: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:591
+#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:593
 #: ../libgaim/protocols/silc/silc.c:1289
 #, c-format
 msgid "current topic is: %s"
-msgstr "o tópico actual é: %s"
-
-#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:595
+msgstr "o asunto actual é: %s"
+
+#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:597
 #: ../libgaim/protocols/silc/silc.c:1293
 msgid "No topic is set"
-msgstr "Non hai un tópico establecido"
-
-#: ../libgaim/protocols/irc/dcc_send.c:293
-#: ../libgaim/protocols/irc/dcc_send.c:334
+msgstr "Non hai un asunto establecido"
+
+#: ../libgaim/protocols/irc/dcc_send.c:296
+#: ../libgaim/protocols/irc/dcc_send.c:337
 #: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
 #: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
 #: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "Fallou a transferencia do ficheiro"
 
-#: ../libgaim/protocols/irc/dcc_send.c:294
-#: ../libgaim/protocols/irc/dcc_send.c:335
+#: ../libgaim/protocols/irc/dcc_send.c:297
+#: ../libgaim/protocols/irc/dcc_send.c:338
 msgid "Gaim could not open a listening port."
 msgstr "Gaim non puido abrir un porto de escoita."
 
 #: ../libgaim/protocols/irc/irc.c:80
 msgid "Error displaying MOTD"
-msgstr "Erro ao mostrar o MOTD"
+msgstr "Erro ao amosar o MOTD"
 
 #: ../libgaim/protocols/irc/irc.c:80
 msgid "No MOTD available"
@@ -6972,7 +7398,7 @@
 
 #: ../libgaim/protocols/irc/irc.c:81
 msgid "There is no MOTD associated with this connection."
-msgstr "Non hai MOTD asocidado con esta conexión."
+msgstr "Non hai MOTD asociado con esta conexión."
 
 #: ../libgaim/protocols/irc/irc.c:84
 #, c-format
@@ -6998,28 +7424,28 @@
 
 #: ../libgaim/protocols/irc/irc.c:308
 msgid "IRC nicks may not contain whitespace"
-msgstr "Os alcumes de IRC non poden ter espacios en branco"
-
-#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:571
-#: ../libgaim/protocols/jabber/jabber.c:916
+msgstr "Os alcumes de IRC non poden ter espazos en branco"
+
+#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:580
+#: ../libgaim/protocols/jabber/jabber.c:925
 msgid "SSL support unavailable"
 msgstr "Soporte SSL non dispoñible"
 
 #: ../libgaim/protocols/irc/irc.c:348 ../libgaim/protocols/simple/simple.c:464
 #: ../libgaim/protocols/simple/simple.c:1584
 msgid "Couldn't create socket"
-msgstr "Non se puido crear o socket"
-
-#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:449
-#: ../libgaim/protocols/oscar/oscar.c:1220
+msgstr "Non se puido crear o socket "
+
+#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:458
+#: ../libgaim/protocols/oscar/oscar.c:1263
 msgid "Couldn't connect to host"
 msgstr "Non se puido conectar ao servidor"
 
-#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:473
+#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:482
 msgid "Connection Failed"
 msgstr "Fallou a conexión"
 
-#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:476
+#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:485
 msgid "SSL Handshake Failed"
 msgstr "Fallou na negociación SSL"
 
@@ -7033,11 +7459,11 @@
 msgstr "Usuarios"
 
 #: ../libgaim/protocols/irc/irc.c:772
-#: ../libgaim/protocols/sametime/sametime.c:3347
-#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/sametime/sametime.c:3387
+#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1382
 #: ../libgaim/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
-msgstr "Tópico"
+msgstr "Asunto"
 
 #. *< type
 #. *< ui_requirement
@@ -7047,48 +7473,49 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/irc/irc.c:902
+#: ../libgaim/protocols/irc/irc.c:903
 msgid "IRC Protocol Plugin"
 msgstr "Complemento de protocolo IRC"
 
 #. *  summary
-#: ../libgaim/protocols/irc/irc.c:903
+#: ../libgaim/protocols/irc/irc.c:904
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Complemento de protocolo IRC menos malo"
 
 #. host to connect to
-#: ../libgaim/protocols/irc/irc.c:922 ../libgaim/protocols/irc/msgs.c:235
-#: ../libgaim/protocols/jabber/jabber.c:1961
-#: ../libgaim/protocols/msn/msn.c:2054 ../libgaim/protocols/oscar/oscar.c:6532
-#: ../libgaim/protocols/qq/qq.c:1031
-#: ../libgaim/protocols/sametime/sametime.c:5629
-#: ../libgaim/protocols/silc/ops.c:1242 ../libgaim/protocols/silc/ops.c:1344
-#: ../libgaim/protocols/simple/simple.c:1835
+#: ../libgaim/protocols/irc/irc.c:923 ../libgaim/protocols/irc/msgs.c:239
+#: ../libgaim/protocols/jabber/jabber.c:1982
+#: ../libgaim/protocols/msn/msn.c:2056 ../libgaim/protocols/oscar/libaim.c:133
+#: ../libgaim/protocols/oscar/libicq.c:133 ../libgaim/protocols/qq/qq.c:758
+#: ../libgaim/protocols/sametime/sametime.c:5718
+#: ../libgaim/protocols/silc/ops.c:1244 ../libgaim/protocols/silc/ops.c:1347
+#: ../libgaim/protocols/simple/simple.c:1836
 #: ../libgaim/protocols/toc/toc.c:2347
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libgaim/protocols/irc/irc.c:925 ../libgaim/protocols/msn/msn.c:2059
-#: ../libgaim/protocols/oscar/oscar.c:6535 ../libgaim/protocols/qq/qq.c:1034
-#: ../libgaim/protocols/sametime/sametime.c:5634
-#: ../libgaim/protocols/silc/silc.c:1855 ../libgaim/protocols/toc/toc.c:2351
+#: ../libgaim/protocols/irc/irc.c:926 ../libgaim/protocols/msn/msn.c:2061
+#: ../libgaim/protocols/oscar/libaim.c:136
+#: ../libgaim/protocols/oscar/libicq.c:136 ../libgaim/protocols/qq/qq.c:761
+#: ../libgaim/protocols/sametime/sametime.c:5723
+#: ../libgaim/protocols/silc/silc.c:1856 ../libgaim/protocols/toc/toc.c:2351
 msgid "Port"
 msgstr "Porto"
 
-#: ../libgaim/protocols/irc/irc.c:928
+#: ../libgaim/protocols/irc/irc.c:929
 msgid "Encodings"
 msgstr "Codificacións"
 
-#: ../libgaim/protocols/irc/irc.c:931 ../libgaim/protocols/irc/msgs.c:229
-#: ../libgaim/protocols/jabber/jabber.c:771
-#: ../libgaim/protocols/silc/buddy.c:1531 ../libgaim/protocols/silc/ops.c:1189
-#: ../libgaim/protocols/silc/ops.c:1191 ../libgaim/protocols/silc/ops.c:1338
-#: ../libgaim/protocols/silc/ops.c:1340 ../libgaim/protocols/silc/silc.c:929
+#: ../libgaim/protocols/irc/irc.c:932 ../libgaim/protocols/irc/msgs.c:232
+#: ../libgaim/protocols/jabber/jabber.c:780
+#: ../libgaim/protocols/silc/buddy.c:1532 ../libgaim/protocols/silc/ops.c:1191
+#: ../libgaim/protocols/silc/ops.c:1194 ../libgaim/protocols/silc/ops.c:1340
+#: ../libgaim/protocols/silc/ops.c:1343 ../libgaim/protocols/silc/silc.c:929
 msgid "Username"
 msgstr "Nome de usuario"
 
-#: ../libgaim/protocols/irc/irc.c:934 ../libgaim/protocols/irc/msgs.c:230
+#: ../libgaim/protocols/irc/irc.c:935 ../libgaim/protocols/irc/msgs.c:233
 #: ../libgaim/protocols/silc/silc.c:933
 msgid "Real name"
 msgstr "Nome real"
@@ -7097,7 +7524,7 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libgaim/protocols/irc/irc.c:942
+#: ../libgaim/protocols/irc/irc.c:943
 msgid "Use SSL"
 msgstr "Usar SSL"
 
@@ -7108,203 +7535,195 @@
 #: ../libgaim/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
-msgstr "Foi vetado desde %s."
+msgstr "Foi vedado desde %s."
 
 #: ../libgaim/protocols/irc/msgs.c:119
 msgid "Banned"
-msgstr "Vetado"
+msgstr "Vedado"
 
 #: ../libgaim/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "Non se puido vetar a %s: a lista de vetados está chea"
-
-#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/irc/msgs.c:235
-#: ../libgaim/protocols/irc/msgs.c:248
-#, c-format
-msgid "<b>%s:</b> %s"
-msgstr "<b>%s:</b> %s"
-
-#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3621
-#: ../libgaim/protocols/silc/ops.c:1412
-msgid "Nick"
-msgstr "Alcume"
+msgstr "Non se puido vedar a %s: a listaxe de vedados está chea"
+
+#: ../libgaim/protocols/irc/msgs.c:217
+msgid " <i>(ircop)</i>"
+msgstr " <i>(ircop)</i>"
 
 #: ../libgaim/protocols/irc/msgs.c:218
-msgid " <i>(ircop)</i>"
-msgstr " <i>(ircop)</i>"
-
-#: ../libgaim/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:223 ../libgaim/protocols/irc/msgs.c:229
-#: ../libgaim/protocols/irc/msgs.c:230 ../libgaim/protocols/irc/msgs.c:241
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
-#, c-format
-msgid "<b>%s:</b> %s<br>"
-msgstr "<b>%s:</b> %s<br>"
-
-#: ../libgaim/protocols/irc/msgs.c:241 ../libgaim/protocols/silc/ops.c:1255
+#: ../libgaim/protocols/irc/msgs.c:219 ../libgaim/protocols/oscar/oscar.c:3694
+#: ../libgaim/protocols/silc/ops.c:1414
+msgid "Nick"
+msgstr "Alcume"
+
+#: ../libgaim/protocols/irc/msgs.c:245 ../libgaim/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "Actualmente en"
 
-#: ../libgaim/protocols/irc/msgs.c:246
-#, c-format
-msgid "<b>Idle for:</b> %s<br>"
-msgstr "<b>Inactivo desde:</b> %s<br>"
-
-#: ../libgaim/protocols/irc/msgs.c:248
+#: ../libgaim/protocols/irc/msgs.c:250
+#, fuzzy
+msgid "Idle for"
+msgstr "Inactivo"
+
+#: ../libgaim/protocols/irc/msgs.c:253
 msgid "Online since"
 msgstr "Conectado desde"
 
-#: ../libgaim/protocols/irc/msgs.c:252
-msgid "<br><b>Defining adjective:</b> Glorious<br>"
+#: ../libgaim/protocols/irc/msgs.c:257
+#, fuzzy
+msgid "<b>Defining adjective:</b>"
 msgstr "<br><b>Adxetivo que o define:</b> Glorioso<br>"
 
-#: ../libgaim/protocols/irc/msgs.c:329
+#: ../libgaim/protocols/irc/msgs.c:257
+msgid "Glorious"
+msgstr ""
+
+#: ../libgaim/protocols/irc/msgs.c:333
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%s cambiou o tópico a: %s"
-
-#: ../libgaim/protocols/irc/msgs.c:331
+msgstr "%s mudou o asunto a: %s"
+
+#: ../libgaim/protocols/irc/msgs.c:335
 #, c-format
 msgid "%s has cleared the topic."
-msgstr "%s quitou o tópico."
-
-#: ../libgaim/protocols/irc/msgs.c:339
+msgstr "%s quitou o asunto."
+
+#: ../libgaim/protocols/irc/msgs.c:343
 #, c-format
 msgid "The topic for %s is: %s"
-msgstr "O tópico de %s é: %s"
-
-#: ../libgaim/protocols/irc/msgs.c:357
+msgstr "O asunto de %s é: %s"
+
+#: ../libgaim/protocols/irc/msgs.c:361
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensaxe descoñecida '%s'"
 
-#: ../libgaim/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:362
 msgid "Unknown message"
 msgstr "Mensaxe descoñecida"
 
-#: ../libgaim/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:362
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim enviou unha mensaxe que o servidor IRC non puido entender."
 
-#: ../libgaim/protocols/irc/msgs.c:381
+#: ../libgaim/protocols/irc/msgs.c:385
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuarios en %s: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:509
+#: ../libgaim/protocols/irc/msgs.c:515
 msgid "Time Response"
 msgstr "Resposta de hora"
 
-#: ../libgaim/protocols/irc/msgs.c:510
+#: ../libgaim/protocols/irc/msgs.c:516
 msgid "The IRC server's local time is:"
 msgstr "A hora local do servidor de IRC é:"
 
-#: ../libgaim/protocols/irc/msgs.c:521
+#: ../libgaim/protocols/irc/msgs.c:527
 msgid "No such channel"
-msgstr "Non existe ese canle"
+msgstr "Non existe esa canle"
 
 #. does this happen?
-#: ../libgaim/protocols/irc/msgs.c:532
+#: ../libgaim/protocols/irc/msgs.c:538
 msgid "no such channel"
-msgstr "non existe o canle"
-
-#: ../libgaim/protocols/irc/msgs.c:535
+msgstr "non existe a canle"
+
+#: ../libgaim/protocols/irc/msgs.c:541
 msgid "User is not logged in"
 msgstr "O usuario non está conectado"
 
-#: ../libgaim/protocols/irc/msgs.c:540
+#: ../libgaim/protocols/irc/msgs.c:546
 msgid "No such nick or channel"
-msgstr "Non existe o alcume ou canle"
-
-#: ../libgaim/protocols/irc/msgs.c:560
+msgstr "Non existe o alcume ou a canle"
+
+#: ../libgaim/protocols/irc/msgs.c:566
 msgid "Could not send"
 msgstr "Non se puido enviar"
 
-#: ../libgaim/protocols/irc/msgs.c:616
+#: ../libgaim/protocols/irc/msgs.c:622
 #, c-format
 msgid "Joining %s requires an invitation."
-msgstr "Para unirse a %s requírese unha invitación."
-
-#: ../libgaim/protocols/irc/msgs.c:617
+msgstr "Para unirse a %s requírese un convite."
+
+#: ../libgaim/protocols/irc/msgs.c:623
 msgid "Invitation only"
-msgstr "Só con invitación"
-
-#: ../libgaim/protocols/irc/msgs.c:726
+msgstr "Só con convite"
+
+#: ../libgaim/protocols/irc/msgs.c:732
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Foi expulsado por %s: (%s)"
 
 #. Remove user from channel
-#: ../libgaim/protocols/irc/msgs.c:731 ../libgaim/protocols/silc/ops.c:720
+#: ../libgaim/protocols/irc/msgs.c:737 ../libgaim/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: ../libgaim/protocols/irc/msgs.c:754
+#: ../libgaim/protocols/irc/msgs.c:760
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modo (%s %s) por %s"
 
-#: ../libgaim/protocols/irc/msgs.c:839 ../libgaim/protocols/irc/msgs.c:840
+#: ../libgaim/protocols/irc/msgs.c:845 ../libgaim/protocols/irc/msgs.c:846
 msgid "Invalid nickname"
-msgstr "Alcume inválido"
-
-#: ../libgaim/protocols/irc/msgs.c:841
+msgstr "Alcume non válido"
+
+#: ../libgaim/protocols/irc/msgs.c:847
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
 "O servidor rexeitou o alcume que escolleu para a súa conta. É posible que "
-"inclúa caracteres inválidos."
-
-#: ../libgaim/protocols/irc/msgs.c:846
+"inclúa caracteres non válidos."
+
+#: ../libgaim/protocols/irc/msgs.c:852
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
 "O servidor rexeitou o nome que escolleu para a súa conta. É posible que "
-"inclúa caracteres inválidos."
-
-#: ../libgaim/protocols/irc/msgs.c:885
+"inclúa caracteres non válidos."
+
+#: ../libgaim/protocols/irc/msgs.c:891
 msgid "Cannot change nick"
-msgstr "Non se pode cambiar o alcume"
-
-#: ../libgaim/protocols/irc/msgs.c:885
+msgstr "Non se pode mudar o alcume"
+
+#: ../libgaim/protocols/irc/msgs.c:891
 msgid "Could not change nick"
-msgstr "Non se puido cambiar o alcume"
-
-#: ../libgaim/protocols/irc/msgs.c:906
+msgstr "Non se puido mudar o alcume"
+
+#: ../libgaim/protocols/irc/msgs.c:912
 #, c-format
 msgid "You have parted the channel%s%s"
-msgstr "Abadonou o canle %s%s"
-
-#: ../libgaim/protocols/irc/msgs.c:948
+msgstr "Abandonou a canle %s%s"
+
+#: ../libgaim/protocols/irc/msgs.c:954
 msgid "Error: invalid PONG from server"
 msgstr "Erro: PONG inválido do servidor"
 
-#: ../libgaim/protocols/irc/msgs.c:950
+#: ../libgaim/protocols/irc/msgs.c:956
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr "Reposta PING -- Retraso: %lu segundos"
-
-#: ../libgaim/protocols/irc/msgs.c:1031
+msgstr "Resposta PING -- Atraso: %lu segundos"
+
+#: ../libgaim/protocols/irc/msgs.c:1037
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Non se pode unir a %s:"
 
-#: ../libgaim/protocols/irc/msgs.c:1032 ../libgaim/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/irc/msgs.c:1038 ../libgaim/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
-msgstr "Non se pode unir ao canle"
-
-#: ../libgaim/protocols/irc/msgs.c:1066
+msgstr "Non se pode unir á canle"
+
+#: ../libgaim/protocols/irc/msgs.c:1072
 msgid "Nick or channel is temporarily unavailable."
-msgstr "O alcume ou canle non están temporalmente dispoñibles."
-
-#: ../libgaim/protocols/irc/msgs.c:1078
+msgstr "O alcume ou a canle non están temporalmente dispoñibles."
+
+#: ../libgaim/protocols/irc/msgs.c:1084
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mensaxes globais de %s"
@@ -7318,8 +7737,8 @@
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
-"away [mensaxe]:  Establece a mensaxe cando está ausente, ou non empregar "
-"unha mensaxe ao deixar de estar ausente."
+"away [mensaxe]:  Establece a mensaxe cando está ausente ou non emprega unha "
+"mensaxe ao deixar de estar ausente."
 
 #: ../libgaim/protocols/irc/parse.c:118
 msgid "chanserv: Send a command to chanserv"
@@ -7339,40 +7758,39 @@
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &lt,alcume1&gt; [alcume2] ...: Silenciar a alguén, impidíndolles "
-"falar no canle se este está moderado (+m). Só o pode facer un operador de "
-"canle."
+"devoice &lt,alcume1&gt; [alcume2] ...: Silenciar a alguén, impedíndolles "
+"falar na canle se está moderada (+m). Só o pode facer un operador de canle."
 
 #: ../libgaim/protocols/irc/parse.c:121
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
-"invite &lt;alcume&gt; [sala]:  Invita a alguén a unirse ao canle "
-"especificado ou ao canle actual."
+"invite &lt;alcume&gt; [sala]:  Convida a alguén a unirse á canle "
+"especificada ou á canle actual."
 
 #: ../libgaim/protocols/irc/parse.c:122
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar nun ou máis "
-"canles empregando, opcionalmente, unha clave de canle se fora necesario."
+"j &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar nunha ou máis "
+"canles empregando, opcionalmente, unha clave de canle se fose necesaria."
 
 #: ../libgaim/protocols/irc/parse.c:123
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"join &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar nun ou "
-"máis canles empregando, opcionalmente, unha clave de canle se fora necesario."
+"join &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar nunha ou "
+"máis canles empregando, opcionalmente, unha clave de canle se fose necesaria."
 
 #: ../libgaim/protocols/irc/parse.c:124
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
-"kick &lt;alcume&gt; [mensaxe]:  Botar a alguén do canle. Só o poden facer os "
+"kick &lt;alcume&gt; [mensaxe]:  Botar a alguén da canle. Só o poden facer os "
 "operadores de canle."
 
 #: ../libgaim/protocols/irc/parse.c:125
@@ -7380,8 +7798,8 @@
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"list:  Amosa unha lista das salas de chat dispoñibles na rede. <i>Aviso: "
-"algúns servidores pode que lle desconecten se fai isto.</i>"
+"list:  Amosa unha listaxe das salas de conversa dispoñibles na rede. "
+"<i>Aviso: algúns servidores pode que lle desconecten se fai isto.</i>"
 
 #: ../libgaim/protocols/irc/parse.c:126
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -7405,16 +7823,16 @@
 "opposed to a channel)."
 msgstr ""
 "msg &lt;nick&gt; &lt;message&gt;:  Enviar unha mensaxe privada a un usuario "
-"(o oposto a un canle)."
+"(o oposto a unha canle)."
 
 #: ../libgaim/protocols/irc/parse.c:130
 msgid "names [channel]:  List the users currently in a channel."
-msgstr "names [canle]:  Obter a lista dos usuarios que están no canle."
+msgstr "names [canle]:  Obter a listaxe dos usuarios que están na canle."
 
 #: ../libgaim/protocols/irc/parse.c:131
-#: ../libgaim/protocols/jabber/jabber.c:1766
+#: ../libgaim/protocols/jabber/jabber.c:1786
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;novo alcume&gt;:  Cambia seu alcume."
+msgstr "nick &lt;novo alcume&gt;:  Muda de alcume."
 
 #: ../libgaim/protocols/irc/parse.c:132
 msgid "nickserv: Send a command to nickserv"
@@ -7445,7 +7863,7 @@
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
-"part [sala] [mensaxe]:  Abandonar o canle actual, ou un canle específico, "
+"part [sala] [mensaxe]:  Abandonar a canle actual, ou unha canle específica, "
 "cunha mensaxe opcional."
 
 #: ../libgaim/protocols/irc/parse.c:137
@@ -7462,7 +7880,7 @@
 "opposed to a channel)."
 msgstr ""
 "query &lt;alcume&gt; &lt;mensaxe&gt;:  Envía unha mensaxe privada a un "
-"usuario (o oposto a un canle)."
+"usuario (o oposto a unha canle)."
 
 #: ../libgaim/protocols/irc/parse.c:139
 msgid "quit [message]:  Disconnect from the server, with an optional message."
@@ -7472,7 +7890,7 @@
 
 #: ../libgaim/protocols/irc/parse.c:140
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]:  Enviar un comando en crú ao servidor."
+msgstr "quote [...]:  Enviar un comando ao servidor."
 
 #: ../libgaim/protocols/irc/parse.c:141
 msgid ""
@@ -7488,7 +7906,7 @@
 
 #: ../libgaim/protocols/irc/parse.c:143
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [novo tópico]:  Ver ou trocar o tópico do canle."
+msgstr "topic [novo tópico]:  Ver ou trocar o tópico da canle."
 
 #: ../libgaim/protocols/irc/parse.c:144
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
@@ -7503,8 +7921,8 @@
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"voice &lt;alcume1&gt; [alcume2] ...:  Dar a posibilidade de falar no canle a "
-"alguén. Só o pode facer un operador de canle."
+"voice &lt;alcume1&gt; [alcume2] ...:  Darlle a posibilidade de falar na "
+"canle a alguén. Só o pode facer un operador de canle."
 
 #: ../libgaim/protocols/irc/parse.c:147
 msgid ""
@@ -7529,7 +7947,7 @@
 msgid "CTCP PING reply"
 msgstr "Resposta a PING CTCP"
 
-#: ../libgaim/protocols/irc/parse.c:548 ../libgaim/protocols/irc/parse.c:552
+#: ../libgaim/protocols/irc/parse.c:554 ../libgaim/protocols/irc/parse.c:558
 #: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
 #: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -7537,146 +7955,149 @@
 
 #: ../libgaim/protocols/jabber/auth.c:49
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "O servidor require SSL para conectarlle. Non se dispón de soporte TLS/SSL."
-
-#: ../libgaim/protocols/jabber/auth.c:109
+msgstr "O servidor require SSL para conectalo. Non se dispón de soporte TLS/SSL."
+
+#: ../libgaim/protocols/jabber/auth.c:112
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "O servidor solicita autenticación en claro sobre un canle non cifrado"
-
-#: ../libgaim/protocols/jabber/auth.c:229
-msgid "Server couldn't authenticate you without a password"
-msgstr "O servidor non puido autenticarlle sen un contrasinal"
+msgstr ""
+"O servidor solicita autenticación con texto plano sobre unha canle non "
+"cifrada"
 
 #: ../libgaim/protocols/jabber/auth.c:232
-#: ../libgaim/protocols/jabber/auth.c:233
-#: ../libgaim/protocols/jabber/auth.c:401
-#: ../libgaim/protocols/jabber/auth.c:402
-#: ../libgaim/protocols/jabber/auth.c:483
-#: ../libgaim/protocols/jabber/auth.c:484
+msgid "Server couldn't authenticate you without a password"
+msgstr "O servidor non puido autenticarlle sen un contrasinal"
+
+#: ../libgaim/protocols/jabber/auth.c:235
+#: ../libgaim/protocols/jabber/auth.c:236
+#: ../libgaim/protocols/jabber/auth.c:404
+#: ../libgaim/protocols/jabber/auth.c:405
+#: ../libgaim/protocols/jabber/auth.c:486
+#: ../libgaim/protocols/jabber/auth.c:487
 msgid "Plaintext Authentication"
-msgstr "Autenticación en claro"
-
-#: ../libgaim/protocols/jabber/auth.c:234
-#: ../libgaim/protocols/jabber/auth.c:403
-#: ../libgaim/protocols/jabber/auth.c:485
+msgstr "Autenticación con texto plano"
+
+#: ../libgaim/protocols/jabber/auth.c:237
+#: ../libgaim/protocols/jabber/auth.c:406
+#: ../libgaim/protocols/jabber/auth.c:488
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr ""
-"O servidor solicita autenticación en claro sobre un canle non cifrado. "
-"Permitir isto e continuar co proceso de autenticación?"
-
-#: ../libgaim/protocols/jabber/auth.c:240
-#: ../libgaim/protocols/jabber/auth.c:411
-#: ../libgaim/protocols/jabber/auth.c:493
+"O servidor solicita autenticación con texto sobre unha canle non cifrada. "
+"Quere permitir isto e continuar co proceso de autenticación?"
+
+#: ../libgaim/protocols/jabber/auth.c:243
+#: ../libgaim/protocols/jabber/auth.c:414
+#: ../libgaim/protocols/jabber/auth.c:496
 msgid "Server does not use any supported authentication method"
 msgstr "O servidor non usa un método de autenticación coñecido"
 
 #. This should never happen!
-#: ../libgaim/protocols/jabber/auth.c:324
-#: ../libgaim/protocols/jabber/auth.c:446
-#: ../libgaim/protocols/jabber/auth.c:614
-#: ../libgaim/protocols/jabber/auth.c:747
-#: ../libgaim/protocols/jabber/auth.c:759
-#: ../libgaim/protocols/jabber/auth.c:778
-#: ../libgaim/protocols/jabber/jabber.c:112
+#: ../libgaim/protocols/jabber/auth.c:327
+#: ../libgaim/protocols/jabber/auth.c:449
+#: ../libgaim/protocols/jabber/auth.c:617
+#: ../libgaim/protocols/jabber/auth.c:751
+#: ../libgaim/protocols/jabber/auth.c:776
+#: ../libgaim/protocols/jabber/auth.c:795
+#: ../libgaim/protocols/jabber/jabber.c:113
 msgid "Invalid response from server."
 msgstr "Resposta inválida do servidor."
 
-#: ../libgaim/protocols/jabber/auth.c:635
+#: ../libgaim/protocols/jabber/auth.c:638
 msgid "Invalid challenge from server"
 msgstr "Desafío inválido do servidor"
 
-#: ../libgaim/protocols/jabber/auth.c:722
+#: ../libgaim/protocols/jabber/auth.c:726
 msgid "SASL error"
 msgstr "Erro de SASL"
 
-#: ../libgaim/protocols/jabber/buddy.c:268
-#: ../libgaim/protocols/jabber/buddy.c:769
+#: ../libgaim/protocols/jabber/buddy.c:271
+#: ../libgaim/protocols/jabber/buddy.c:783
+#: ../libgaim/protocols/sametime/sametime.c:4139
 #: ../libgaim/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: ../libgaim/protocols/jabber/buddy.c:269
-#: ../libgaim/protocols/jabber/buddy.c:782
+#: ../libgaim/protocols/jabber/buddy.c:272
+#: ../libgaim/protocols/jabber/buddy.c:796
 #: ../libgaim/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Apelidos"
 
-#: ../libgaim/protocols/jabber/buddy.c:270
-#: ../libgaim/protocols/jabber/buddy.c:786
+#: ../libgaim/protocols/jabber/buddy.c:273
+#: ../libgaim/protocols/jabber/buddy.c:800
 msgid "Given Name"
 msgstr "Nome propio"
 
-#: ../libgaim/protocols/jabber/buddy.c:272
-#: ../libgaim/protocols/jabber/jabber.c:831
+#: ../libgaim/protocols/jabber/buddy.c:275
+#: ../libgaim/protocols/jabber/jabber.c:840
 msgid "URL"
 msgstr "URL"
 
-#: ../libgaim/protocols/jabber/buddy.c:273
-#: ../libgaim/protocols/jabber/buddy.c:838
+#: ../libgaim/protocols/jabber/buddy.c:276
+#: ../libgaim/protocols/jabber/buddy.c:852
 msgid "Street Address"
 msgstr "Rúa"
 
-#: ../libgaim/protocols/jabber/buddy.c:274
-#: ../libgaim/protocols/jabber/buddy.c:834
+#: ../libgaim/protocols/jabber/buddy.c:277
+#: ../libgaim/protocols/jabber/buddy.c:848
 msgid "Extended Address"
 msgstr "Enderezo extendido"
 
-#: ../libgaim/protocols/jabber/buddy.c:275
-#: ../libgaim/protocols/jabber/buddy.c:842
+#: ../libgaim/protocols/jabber/buddy.c:278
+#: ../libgaim/protocols/jabber/buddy.c:856
 msgid "Locality"
 msgstr "Localidade"
 
-#: ../libgaim/protocols/jabber/buddy.c:276
-#: ../libgaim/protocols/jabber/buddy.c:846
+#: ../libgaim/protocols/jabber/buddy.c:279
+#: ../libgaim/protocols/jabber/buddy.c:860
 msgid "Region"
 msgstr "Rexión"
 
-#: ../libgaim/protocols/jabber/buddy.c:277
-#: ../libgaim/protocols/jabber/buddy.c:850
+#: ../libgaim/protocols/jabber/buddy.c:280
+#: ../libgaim/protocols/jabber/buddy.c:864
 msgid "Postal Code"
 msgstr "Código postal"
 
-#: ../libgaim/protocols/jabber/buddy.c:278
-#: ../libgaim/protocols/jabber/buddy.c:855
+#: ../libgaim/protocols/jabber/buddy.c:281
+#: ../libgaim/protocols/jabber/buddy.c:869
 #: ../libgaim/protocols/silc/silc.c:939
 msgid "Country"
 msgstr "País"
 
-#: ../libgaim/protocols/jabber/buddy.c:279
-#: ../libgaim/protocols/jabber/buddy.c:866
-#: ../libgaim/protocols/jabber/buddy.c:873
+#: ../libgaim/protocols/jabber/buddy.c:282
+#: ../libgaim/protocols/jabber/buddy.c:880
+#: ../libgaim/protocols/jabber/buddy.c:887
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: ../libgaim/protocols/jabber/buddy.c:280
-#: ../libgaim/protocols/jabber/buddy.c:884
-#: ../libgaim/protocols/jabber/buddy.c:892
-#: ../libgaim/protocols/jabber/buddy.c:1528
+#: ../libgaim/protocols/jabber/buddy.c:283
+#: ../libgaim/protocols/jabber/buddy.c:898
+#: ../libgaim/protocols/jabber/buddy.c:906
+#: ../libgaim/protocols/jabber/buddy.c:1564
 #: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1050
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "Correo electrónico"
 
-#: ../libgaim/protocols/jabber/buddy.c:281
-#: ../libgaim/protocols/jabber/buddy.c:907
+#: ../libgaim/protocols/jabber/buddy.c:284
+#: ../libgaim/protocols/jabber/buddy.c:921
 msgid "Organization Name"
 msgstr "Nome da organización"
 
-#: ../libgaim/protocols/jabber/buddy.c:282
-#: ../libgaim/protocols/jabber/buddy.c:911
+#: ../libgaim/protocols/jabber/buddy.c:285
+#: ../libgaim/protocols/jabber/buddy.c:925
 msgid "Organization Unit"
 msgstr "Grupo de traballo"
 
-#: ../libgaim/protocols/jabber/buddy.c:284
-#: ../libgaim/protocols/jabber/buddy.c:920
+#: ../libgaim/protocols/jabber/buddy.c:287
+#: ../libgaim/protocols/jabber/buddy.c:934
 msgid "Role"
 msgstr "Rol"
 
-#: ../libgaim/protocols/jabber/buddy.c:285
-#: ../libgaim/protocols/jabber/buddy.c:803 ../libgaim/protocols/msn/msn.c:1595
-#: ../libgaim/protocols/oscar/oscar.c:3664
+#: ../libgaim/protocols/jabber/buddy.c:288
+#: ../libgaim/protocols/jabber/buddy.c:817 ../libgaim/protocols/msn/msn.c:1609
+#: ../libgaim/protocols/oscar/oscar.c:3743
 msgid "Birthday"
 msgstr "Ano de nacemento"
 
@@ -7691,174 +8112,175 @@
 "comfortable."
 msgstr ""
 "Todos os elementos seguintes son opcionais. Introduza só a información coa "
-"que se senta cómodo."
-
-#: ../libgaim/protocols/jabber/buddy.c:640
-msgid "Client:"
+"que se sinta cómodo."
+
+#: ../libgaim/protocols/jabber/buddy.c:652
+#: ../libgaim/protocols/jabber/buddy.c:691
+#, fuzzy
+msgid "Client"
 msgstr "Cliente:"
 
-#: ../libgaim/protocols/jabber/buddy.c:644
-#: ../libgaim/protocols/jabber/buddy.c:677
+#: ../libgaim/protocols/jabber/buddy.c:656
+#: ../libgaim/protocols/jabber/buddy.c:695
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#: ../libgaim/protocols/jabber/buddy.c:654
-#: ../libgaim/protocols/jabber/jabber.c:1964
+#: ../libgaim/protocols/jabber/buddy.c:666
+#: ../libgaim/protocols/jabber/jabber.c:1985
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../libgaim/protocols/jabber/buddy.c:656
-#: ../libgaim/protocols/jabber/jabber.c:1204
-#: ../libgaim/protocols/jabber/jabber.c:1214
+#: ../libgaim/protocols/jabber/buddy.c:668
 #: ../libgaim/protocols/jabber/jabber.c:1224
 #: ../libgaim/protocols/jabber/jabber.c:1234
 #: ../libgaim/protocols/jabber/jabber.c:1244
+#: ../libgaim/protocols/jabber/jabber.c:1254
+#: ../libgaim/protocols/jabber/jabber.c:1264
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../libgaim/protocols/jabber/buddy.c:673
-msgid "Client"
-msgstr "Cliente"
-
-#: ../libgaim/protocols/jabber/buddy.c:790
+#: ../libgaim/protocols/jabber/buddy.c:804
 #: ../libgaim/protocols/silc/ops.c:1028
 msgid "Middle Name"
-msgstr "Nome medio"
-
-#: ../libgaim/protocols/jabber/buddy.c:823
-#: ../libgaim/protocols/jabber/jabber.c:806
-#: ../libgaim/protocols/oscar/oscar.c:3683
-#: ../libgaim/protocols/oscar/oscar.c:3691
-#: ../libgaim/protocols/qq/buddy_info.c:54
+msgstr "Nome do medio"
+
+#: ../libgaim/protocols/jabber/buddy.c:837
+#: ../libgaim/protocols/jabber/jabber.c:815
+#: ../libgaim/protocols/oscar/oscar.c:3763
+#: ../libgaim/protocols/oscar/oscar.c:3776
+#: ../libgaim/protocols/qq/buddy_info.c:56
 #: ../libgaim/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Enderezo"
 
-#: ../libgaim/protocols/jabber/buddy.c:830
+#: ../libgaim/protocols/jabber/buddy.c:844
 msgid "P.O. Box"
 msgstr "Código postal"
 
-#: ../libgaim/protocols/jabber/buddy.c:944
+#: ../libgaim/protocols/jabber/buddy.c:958
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libgaim/protocols/jabber/buddy.c:944
+#: ../libgaim/protocols/jabber/buddy.c:958
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libgaim/protocols/jabber/buddy.c:1308
+#: ../libgaim/protocols/jabber/buddy.c:1344
 msgid "Un-hide From"
 msgstr "Non agocharse de"
 
-#: ../libgaim/protocols/jabber/buddy.c:1312
+#: ../libgaim/protocols/jabber/buddy.c:1348
 msgid "Temporarily Hide From"
 msgstr "Agocharse temporalmente de"
 
 #. && NOT ME
-#: ../libgaim/protocols/jabber/buddy.c:1320
+#: ../libgaim/protocols/jabber/buddy.c:1356
 msgid "Cancel Presence Notification"
-msgstr "Cancelar notificación de presencia"
-
-#: ../libgaim/protocols/jabber/buddy.c:1327
+msgstr "Cancelar a notificación de presenza"
+
+#: ../libgaim/protocols/jabber/buddy.c:1363
 msgid "(Re-)Request authorization"
 msgstr "Volver a pedir autorización"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libgaim/protocols/jabber/buddy.c:1336
+#: ../libgaim/protocols/jabber/buddy.c:1372
 msgid "Unsubscribe"
 msgstr "De-subscribir"
 
-#: ../libgaim/protocols/jabber/buddy.c:1369
-#: ../libgaim/protocols/jabber/jabber.c:1213
+#: ../libgaim/protocols/jabber/buddy.c:1405
+#: ../libgaim/protocols/jabber/jabber.c:1233
 msgid "Chatty"
 msgstr "Falador"
 
-#: ../libgaim/protocols/jabber/buddy.c:1373 ../libgaim/status.c:159
+#: ../libgaim/protocols/jabber/buddy.c:1409 ../libgaim/status.c:159
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: ../libgaim/protocols/jabber/buddy.c:1375
-#: ../libgaim/protocols/jabber/jabber.c:1243
-#: ../libgaim/protocols/oscar/oscar.c:688
-#: ../libgaim/protocols/oscar/oscar.c:5655
-#: ../libgaim/protocols/sametime/sametime.c:3270
+#: ../libgaim/protocols/jabber/buddy.c:1411
+#: ../libgaim/protocols/jabber/jabber.c:1263
+#: ../libgaim/protocols/oscar/oscar.c:706
+#: ../libgaim/protocols/oscar/oscar.c:5760
+#: ../libgaim/protocols/sametime/sametime.c:3310
 msgid "Do Not Disturb"
 msgstr "Non molestar"
 
-#: ../libgaim/protocols/jabber/buddy.c:1520
+#: ../libgaim/protocols/jabber/buddy.c:1556
 msgid "JID"
 msgstr "JID"
 
-#: ../libgaim/protocols/jabber/buddy.c:1524
-#: ../libgaim/protocols/jabber/buddy.c:1703
-#: ../libgaim/protocols/oscar/oscar.c:3632
+#: ../libgaim/protocols/jabber/buddy.c:1560
+#: ../libgaim/protocols/jabber/buddy.c:1739
+#: ../libgaim/protocols/oscar/oscar.c:3705
 msgid "Last Name"
 msgstr "Apelidos"
 
-#: ../libgaim/protocols/jabber/buddy.c:1556
+#: ../libgaim/protocols/jabber/buddy.c:1592
 msgid "The following are the results of your search"
 msgstr "O seguinte son os resultados da súa busca"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libgaim/protocols/jabber/buddy.c:1631
+#: ../libgaim/protocols/jabber/buddy.c:1667
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
-
-#: ../libgaim/protocols/jabber/buddy.c:1651
+"Atopar un contacto procurando nos seguintes campos. Nota: Cada campo soporta "
+"comodíns (%)"
+
+#: ../libgaim/protocols/jabber/buddy.c:1687
+#, fuzzy
 msgid "Directory Query Failed"
-msgstr "Fallou a consulta ao directorio"
-
-#: ../libgaim/protocols/jabber/buddy.c:1652
+msgstr "Fallou a conexión directa"
+
+#: ../libgaim/protocols/jabber/buddy.c:1688
 msgid "Could not query the directory server."
-msgstr "Non se puido consultar co servidor de directorio."
+msgstr "Non se puido iniciar a transferencia de ficheiros."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libgaim/protocols/jabber/buddy.c:1686
+#: ../libgaim/protocols/jabber/buddy.c:1722
 #, c-format
 msgid "Server Instructions: %s"
-msgstr "Instruccións do servidor: %s"
-
-#: ../libgaim/protocols/jabber/buddy.c:1693
+msgstr "Instrucións do servidor: %s"
+
+#: ../libgaim/protocols/jabber/buddy.c:1729
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
-"Enche un ou máis dos campos amosados a continuación para procurar a un "
-"usuario Jabber que os teña."
-
-#: ../libgaim/protocols/jabber/buddy.c:1713
+"Enche un ou máis dos campos amosados a seguir para procurar a un usuario "
+"Jabber que os teña."
+
+#: ../libgaim/protocols/jabber/buddy.c:1749
 #: ../libgaim/protocols/novell/novell.c:1488
-#: ../libgaim/protocols/oscar/oscar.c:3634
-#: ../libgaim/protocols/oscar/oscar.c:3641
+#: ../libgaim/protocols/oscar/oscar.c:3708
+#: ../libgaim/protocols/oscar/oscar.c:3717
 msgid "E-Mail Address"
 msgstr "Enderezo de correo electrónico"
 
-#: ../libgaim/protocols/jabber/buddy.c:1722
-#: ../libgaim/protocols/jabber/buddy.c:1723
+#: ../libgaim/protocols/jabber/buddy.c:1758
+#: ../libgaim/protocols/jabber/buddy.c:1759
 msgid "Search for Jabber users"
 msgstr "Procurar usuarios de Jabber"
 
-#: ../libgaim/protocols/jabber/buddy.c:1737
+#: ../libgaim/protocols/jabber/buddy.c:1773
 msgid "Invalid Directory"
 msgstr "Directorio inválido"
 
-#: ../libgaim/protocols/jabber/buddy.c:1754
+#: ../libgaim/protocols/jabber/buddy.c:1790
 msgid "Enter a User Directory"
 msgstr "Introducir un directorio de usuario"
 
-#: ../libgaim/protocols/jabber/buddy.c:1755
+#: ../libgaim/protocols/jabber/buddy.c:1791
 msgid "Select a user directory to search"
 msgstr "Seleccione un directorio de usuario para procurar"
 
-#: ../libgaim/protocols/jabber/buddy.c:1758
+#: ../libgaim/protocols/jabber/buddy.c:1794
 msgid "Search Directory"
 msgstr "Procurar directorio"
 
 #: ../libgaim/protocols/jabber/chat.c:41
-#: ../libgaim/protocols/oscar/oscar.c:5138
+#: ../libgaim/protocols/oscar/oscar.c:5228
 #: ../libgaim/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "Sa_la:"
@@ -7871,500 +8293,499 @@
 msgid "_Handle:"
 msgstr "_Manipulador:"
 
-#: ../libgaim/protocols/jabber/chat.c:223
+#: ../libgaim/protocols/jabber/chat.c:225
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s non é un nome de sala válido"
 
-#: ../libgaim/protocols/jabber/chat.c:224
+#: ../libgaim/protocols/jabber/chat.c:226
 msgid "Invalid Room Name"
 msgstr "Nome de sala inválido"
 
-#: ../libgaim/protocols/jabber/chat.c:229
+#: ../libgaim/protocols/jabber/chat.c:231
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s non é un nome de servidor válido"
 
-#: ../libgaim/protocols/jabber/chat.c:230
-#: ../libgaim/protocols/jabber/chat.c:231
+#: ../libgaim/protocols/jabber/chat.c:232
+#: ../libgaim/protocols/jabber/chat.c:233
 msgid "Invalid Server Name"
-msgstr "Nome de servidor non válido"
-
-#: ../libgaim/protocols/jabber/chat.c:235
+msgstr "Nome de servidor inválido"
+
+#: ../libgaim/protocols/jabber/chat.c:237
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s non é un indicador de sala válido"
 
-#: ../libgaim/protocols/jabber/chat.c:236
-#: ../libgaim/protocols/jabber/chat.c:237
+#: ../libgaim/protocols/jabber/chat.c:238
+#: ../libgaim/protocols/jabber/chat.c:239
 msgid "Invalid Room Handle"
 msgstr "Indicador de sala inválido"
 
-#: ../libgaim/protocols/jabber/chat.c:396
+#: ../libgaim/protocols/jabber/chat.c:398
 msgid "Configuration error"
 msgstr "Erro de configuración"
 
-#: ../libgaim/protocols/jabber/chat.c:405
-#: ../libgaim/protocols/jabber/chat.c:548
+#: ../libgaim/protocols/jabber/chat.c:407
+#: ../libgaim/protocols/jabber/chat.c:550
 msgid "Unable to configure"
 msgstr "Non se puido configurar"
 
-#: ../libgaim/protocols/jabber/chat.c:420
+#: ../libgaim/protocols/jabber/chat.c:422
 msgid "Room Configuration Error"
 msgstr "Erro de configuración de sala"
 
-#: ../libgaim/protocols/jabber/chat.c:421
+#: ../libgaim/protocols/jabber/chat.c:423
 msgid "This room is not capable of being configured"
-msgstr "Esta sala non é capaz de ser configurada"
-
-#: ../libgaim/protocols/jabber/chat.c:470
-#: ../libgaim/protocols/jabber/chat.c:539
+msgstr "Esta sala non se pode configurar"
+
+#: ../libgaim/protocols/jabber/chat.c:472
+#: ../libgaim/protocols/jabber/chat.c:541
 msgid "Registration error"
 msgstr "Erro de rexistro"
 
-#: ../libgaim/protocols/jabber/chat.c:627
+#: ../libgaim/protocols/jabber/chat.c:629
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "O cambio de alcume non está soportado en salas de chat non-MUC"
-
-#: ../libgaim/protocols/jabber/chat.c:678
-#: ../libgaim/protocols/jabber/chat.c:689 ../libgaim/protocols/silc/ops.c:1449
+msgstr "O cambio de alcume non está soportado en salas de conversa non-MUC"
+
+#: ../libgaim/protocols/jabber/chat.c:680
+#: ../libgaim/protocols/jabber/chat.c:691 ../libgaim/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
-msgstr "Erro ao obter a lista de salas"
-
-#: ../libgaim/protocols/jabber/chat.c:737
+msgstr "Erro ao obter a listaxe de salas"
+
+#: ../libgaim/protocols/jabber/chat.c:739
 msgid "Invalid Server"
 msgstr "Servidor inválido"
 
-#: ../libgaim/protocols/jabber/chat.c:775
+#: ../libgaim/protocols/jabber/chat.c:783
 msgid "Enter a Conference Server"
 msgstr "Introduza un servidor de conferencias"
 
-#: ../libgaim/protocols/jabber/chat.c:776
+#: ../libgaim/protocols/jabber/chat.c:784
 msgid "Select a conference server to query"
 msgstr "Seleccione un servidor de conferencias ao que consultar"
 
-#: ../libgaim/protocols/jabber/chat.c:779
+#: ../libgaim/protocols/jabber/chat.c:787
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-#: ../libgaim/protocols/jabber/jabber.c:81
+#: ../libgaim/protocols/jabber/jabber.c:82
 msgid "Error initializing session"
 msgstr "Erro ao inicializar a sesión"
 
-#: ../libgaim/protocols/jabber/jabber.c:240
-#: ../libgaim/protocols/jabber/jabber.c:291
-#: ../libgaim/protocols/jabber/jabber.c:319
+#: ../libgaim/protocols/jabber/jabber.c:241
+#: ../libgaim/protocols/jabber/jabber.c:292
+#: ../libgaim/protocols/jabber/jabber.c:320
 msgid "Write error"
 msgstr "Erro de escritura"
 
-#: ../libgaim/protocols/jabber/jabber.c:387
-#: ../libgaim/protocols/jabber/jabber.c:424
+#: ../libgaim/protocols/jabber/jabber.c:388
+#: ../libgaim/protocols/jabber/jabber.c:425
 msgid "Read Error"
 msgstr "Erro de lectura"
 
-#: ../libgaim/protocols/jabber/jabber.c:493
-#: ../libgaim/protocols/jabber/jabber.c:924
+#: ../libgaim/protocols/jabber/jabber.c:502
 msgid "Unable to create socket"
-msgstr "Non se puido crear o socket"
-
-#: ../libgaim/protocols/jabber/jabber.c:541
-#: ../libgaim/protocols/jabber/jabber.c:884
+msgstr "Non se puido crear o socket "
+
+#: ../libgaim/protocols/jabber/jabber.c:550
+#: ../libgaim/protocols/jabber/jabber.c:893
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber non válido"
 
-#: ../libgaim/protocols/jabber/jabber.c:612
+#: ../libgaim/protocols/jabber/jabber.c:621
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Rexistro de %s@%s con éxito"
 
-#: ../libgaim/protocols/jabber/jabber.c:614
-#: ../libgaim/protocols/jabber/jabber.c:615
+#: ../libgaim/protocols/jabber/jabber.c:623
+#: ../libgaim/protocols/jabber/jabber.c:624
 msgid "Registration Successful"
 msgstr "Éxito no rexistro"
 
-#: ../libgaim/protocols/jabber/jabber.c:621
-#: ../libgaim/protocols/jabber/jabber.c:1479
+#: ../libgaim/protocols/jabber/jabber.c:630
+#: ../libgaim/protocols/jabber/jabber.c:1499
 msgid "Unknown Error"
 msgstr "Erro descoñecido"
 
-#: ../libgaim/protocols/jabber/jabber.c:623
-#: ../libgaim/protocols/jabber/jabber.c:624
+#: ../libgaim/protocols/jabber/jabber.c:632
+#: ../libgaim/protocols/jabber/jabber.c:633
 msgid "Registration Failed"
 msgstr "Fallou o rexistro"
 
-#: ../libgaim/protocols/jabber/jabber.c:739
-#: ../libgaim/protocols/jabber/jabber.c:740
+#: ../libgaim/protocols/jabber/jabber.c:748
+#: ../libgaim/protocols/jabber/jabber.c:749
 msgid "Already Registered"
 msgstr "Xa está rexistrado"
 
-#: ../libgaim/protocols/jabber/jabber.c:816
-#: ../libgaim/protocols/oscar/oscar.c:3685
-#: ../libgaim/protocols/oscar/oscar.c:3693
+#: ../libgaim/protocols/jabber/jabber.c:825
+#: ../libgaim/protocols/oscar/oscar.c:3765
+#: ../libgaim/protocols/oscar/oscar.c:3778
 msgid "State"
 msgstr "Estado"
 
-#: ../libgaim/protocols/jabber/jabber.c:821
+#: ../libgaim/protocols/jabber/jabber.c:830
 msgid "Postal code"
 msgstr "Código postal"
 
-#: ../libgaim/protocols/jabber/jabber.c:826
+#: ../libgaim/protocols/jabber/jabber.c:835
 #: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:697
 #: ../libgaim/protocols/silc/util.c:555
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../libgaim/protocols/jabber/jabber.c:836
+#: ../libgaim/protocols/jabber/jabber.c:845
 msgid "Date"
 msgstr "Data"
 
-#: ../libgaim/protocols/jabber/jabber.c:844
+#: ../libgaim/protocols/jabber/jabber.c:853
 msgid "Please fill out the information below to register your new account."
-msgstr "Por favor, encha a información abaixo indicada para rexistrar súa nova conta."
-
-#: ../libgaim/protocols/jabber/jabber.c:847
-#: ../libgaim/protocols/jabber/jabber.c:848
+msgstr "Por favor, encha a información abaixo indicada para rexistrar a nova conta."
+
+#: ../libgaim/protocols/jabber/jabber.c:856
+#: ../libgaim/protocols/jabber/jabber.c:857
 msgid "Register New Jabber Account"
-msgstr "Rexistrando conta nova de Jabber"
-
-#: ../libgaim/protocols/jabber/jabber.c:1004
+msgstr "Rexistrando a conta nova de Jabber"
+
+#: ../libgaim/protocols/jabber/jabber.c:1023
 msgid "Initializing Stream"
 msgstr "Inicializando fluxo"
 
-#: ../libgaim/protocols/jabber/jabber.c:1009
+#: ../libgaim/protocols/jabber/jabber.c:1028
 #: ../libgaim/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../libgaim/protocols/jabber/jabber.c:1018
+#: ../libgaim/protocols/jabber/jabber.c:1037
 msgid "Re-initializing Stream"
 msgstr "Reinicializando fluxo"
 
-#: ../libgaim/protocols/jabber/jabber.c:1092
-#: ../libgaim/protocols/jabber/jabber.c:1457
-#: ../libgaim/protocols/jabber/jabber.c:1498
-#: ../libgaim/protocols/jabber/jabber.c:1532
-#: ../libgaim/protocols/oscar/oscar.c:766
-#: ../libgaim/protocols/oscar/oscar.c:5444
+#: ../libgaim/protocols/jabber/jabber.c:1107
+#: ../libgaim/protocols/jabber/jabber.c:1477
+#: ../libgaim/protocols/jabber/jabber.c:1518
+#: ../libgaim/protocols/jabber/jabber.c:1552
+#: ../libgaim/protocols/oscar/oscar.c:805
+#: ../libgaim/protocols/oscar/oscar.c:5549
 msgid "Not Authorized"
 msgstr "Non autorizado"
 
-#: ../libgaim/protocols/jabber/jabber.c:1134
+#: ../libgaim/protocols/jabber/jabber.c:1149
 msgid "Both"
 msgstr "Ambos"
 
-#: ../libgaim/protocols/jabber/jabber.c:1136
+#: ../libgaim/protocols/jabber/jabber.c:1151
 msgid "From (To pending)"
 msgstr "Desde (Destino pendente)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1141
+#: ../libgaim/protocols/jabber/jabber.c:1156
 msgid "To"
 msgstr "A"
 
-#: ../libgaim/protocols/jabber/jabber.c:1143
+#: ../libgaim/protocols/jabber/jabber.c:1158
 msgid "None (To pending)"
 msgstr "Ninguén (Destino pendente)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1147
+#: ../libgaim/protocols/jabber/jabber.c:1163
 msgid "Subscription"
 msgstr "Subscrición"
 
-#: ../libgaim/protocols/jabber/jabber.c:1273
+#: ../libgaim/protocols/jabber/jabber.c:1293
 msgid "Password Changed"
 msgstr "Contrasinal modificado"
 
-#: ../libgaim/protocols/jabber/jabber.c:1274
+#: ../libgaim/protocols/jabber/jabber.c:1294
 msgid "Your password has been changed."
-msgstr "Seu contrasinal foi modificado."
-
-#: ../libgaim/protocols/jabber/jabber.c:1278
-#: ../libgaim/protocols/jabber/jabber.c:1279
+msgstr "O contrasinal foi modificado."
+
+#: ../libgaim/protocols/jabber/jabber.c:1298
+#: ../libgaim/protocols/jabber/jabber.c:1299
 msgid "Error changing password"
 msgstr "Erro ao cambiar o contrasinal"
 
-#: ../libgaim/protocols/jabber/jabber.c:1335
+#: ../libgaim/protocols/jabber/jabber.c:1355
 msgid "Password (again)"
 msgstr "Contrasinal (de novo)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1340
-#: ../libgaim/protocols/jabber/jabber.c:1341
+#: ../libgaim/protocols/jabber/jabber.c:1360
+#: ../libgaim/protocols/jabber/jabber.c:1361
 msgid "Change Jabber Password"
 msgstr "Cambiar contrasinal de Jabber"
 
-#: ../libgaim/protocols/jabber/jabber.c:1341
+#: ../libgaim/protocols/jabber/jabber.c:1361
 msgid "Please enter your new password"
-msgstr "Por favor, introduza o seu novo contrasinal"
-
-#: ../libgaim/protocols/jabber/jabber.c:1351
-#: ../libgaim/protocols/oscar/oscar.c:6246
+msgstr "Por favor, introduza o novo contrasinal"
+
+#: ../libgaim/protocols/jabber/jabber.c:1371
+#: ../libgaim/protocols/oscar/oscar.c:6355
 #: ../libgaim/protocols/silc/silc.c:1019
 msgid "Set User Info..."
-msgstr "Establecer súa información de usuario..."
+msgstr "Establecer a información de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libgaim/protocols/jabber/jabber.c:1356
-#: ../libgaim/protocols/oscar/oscar.c:6257
+#: ../libgaim/protocols/jabber/jabber.c:1376
+#: ../libgaim/protocols/oscar/oscar.c:6366
 #: ../libgaim/protocols/silc/silc.c:1015
 msgid "Change Password..."
-msgstr "Trocar contrasinal..."
+msgstr "Mudar contrasinal..."
 
 #. }
-#: ../libgaim/protocols/jabber/jabber.c:1361
+#: ../libgaim/protocols/jabber/jabber.c:1381
 msgid "Search for Users..."
-msgstr "Procurar usuarios..."
-
-#: ../libgaim/protocols/jabber/jabber.c:1437
+msgstr "Buscar usuarios..."
+
+#: ../libgaim/protocols/jabber/jabber.c:1457
 msgid "Bad Request"
 msgstr "Solicitude errónea"
 
-#: ../libgaim/protocols/jabber/jabber.c:1439
+#: ../libgaim/protocols/jabber/jabber.c:1459
 msgid "Conflict"
-msgstr "Conflicto"
-
-#: ../libgaim/protocols/jabber/jabber.c:1441
+msgstr "Conflito"
+
+#: ../libgaim/protocols/jabber/jabber.c:1461
 msgid "Feature Not Implemented"
 msgstr "Funcionalidade non implementada"
 
-#: ../libgaim/protocols/jabber/jabber.c:1443
+#: ../libgaim/protocols/jabber/jabber.c:1463
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1445
+#: ../libgaim/protocols/jabber/jabber.c:1465
 msgid "Gone"
-msgstr "Foise"
-
-#: ../libgaim/protocols/jabber/jabber.c:1447
-#: ../libgaim/protocols/jabber/jabber.c:1522
+msgstr "Desapareceu"
+
+#: ../libgaim/protocols/jabber/jabber.c:1467
+#: ../libgaim/protocols/jabber/jabber.c:1542
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: ../libgaim/protocols/jabber/jabber.c:1449
+#: ../libgaim/protocols/jabber/jabber.c:1469
 msgid "Item Not Found"
 msgstr "Elemento non atopado"
 
-#: ../libgaim/protocols/jabber/jabber.c:1451
+#: ../libgaim/protocols/jabber/jabber.c:1471
 msgid "Malformed Jabber ID"
-msgstr "ID de Jabber non válido"
-
-#: ../libgaim/protocols/jabber/jabber.c:1453
+msgstr "ID de Jabber inválido"
+
+#: ../libgaim/protocols/jabber/jabber.c:1473
 msgid "Not Acceptable"
 msgstr "Non aceptable"
 
-#: ../libgaim/protocols/jabber/jabber.c:1455
+#: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Not Allowed"
 msgstr "Non permitido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1459
+#: ../libgaim/protocols/jabber/jabber.c:1479
 msgid "Payment Required"
 msgstr "Pago necesario"
 
-#: ../libgaim/protocols/jabber/jabber.c:1461
+#: ../libgaim/protocols/jabber/jabber.c:1481
 msgid "Recipient Unavailable"
 msgstr "Destinatario non dispoñible"
 
-#: ../libgaim/protocols/jabber/jabber.c:1465
+#: ../libgaim/protocols/jabber/jabber.c:1485
 msgid "Registration Required"
 msgstr "Rexistro necesario"
 
-#: ../libgaim/protocols/jabber/jabber.c:1467
+#: ../libgaim/protocols/jabber/jabber.c:1487
 msgid "Remote Server Not Found"
 msgstr "Non se atopou o servidor remoto"
 
-#: ../libgaim/protocols/jabber/jabber.c:1469
+#: ../libgaim/protocols/jabber/jabber.c:1489
 msgid "Remote Server Timeout"
 msgstr "Expirou o tempo do servidor remoto"
 
-#: ../libgaim/protocols/jabber/jabber.c:1471
+#: ../libgaim/protocols/jabber/jabber.c:1491
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: ../libgaim/protocols/jabber/jabber.c:1473
+#: ../libgaim/protocols/jabber/jabber.c:1493
 msgid "Service Unavailable"
 msgstr "Servizo non dispoñible"
 
-#: ../libgaim/protocols/jabber/jabber.c:1475
-msgid "Subscription Required"
-msgstr "Subscrición necesaria"
-
-#: ../libgaim/protocols/jabber/jabber.c:1477
-msgid "Unexpected Request"
-msgstr "Solicitude non esperada"
-
-#: ../libgaim/protocols/jabber/jabber.c:1484
-msgid "Authorization Aborted"
-msgstr "Autorización interrumpida"
-
-#: ../libgaim/protocols/jabber/jabber.c:1486
-msgid "Incorrect encoding in authorization"
-msgstr "Codificación incorrecta na autorización"
-
-#: ../libgaim/protocols/jabber/jabber.c:1489
-msgid "Invalid authzid"
-msgstr "Authzid inválido"
-
-#: ../libgaim/protocols/jabber/jabber.c:1492
-msgid "Invalid Authorization Mechanism"
-msgstr "Mecanismo de autorización inválido"
-
 #: ../libgaim/protocols/jabber/jabber.c:1495
-msgid "Authorization mechanism too weak"
-msgstr "Mecanismo de autorización demasiado débil"
-
-#: ../libgaim/protocols/jabber/jabber.c:1500
-msgid "Temporary Authentication Failure"
-msgstr "Fallo temporal da autenticación"
-
-#: ../libgaim/protocols/jabber/jabber.c:1503
-msgid "Authentication Failure"
-msgstr "Fallo de autenticación"
-
-#: ../libgaim/protocols/jabber/jabber.c:1507
-msgid "Bad Format"
-msgstr "Formato erróneo"
+msgid "Subscription Required"
+msgstr "Subscrición necesaria"
+
+#: ../libgaim/protocols/jabber/jabber.c:1497
+msgid "Unexpected Request"
+msgstr "Solicitude non esperada"
+
+#: ../libgaim/protocols/jabber/jabber.c:1504
+msgid "Authorization Aborted"
+msgstr "Autorización interrumpida"
+
+#: ../libgaim/protocols/jabber/jabber.c:1506
+msgid "Incorrect encoding in authorization"
+msgstr "Codificación incorrecta na autorización"
 
 #: ../libgaim/protocols/jabber/jabber.c:1509
-msgid "Bad Namespace Prefix"
-msgstr "Prefixo do espacio de nomes erróneo"
+msgid "Invalid authzid"
+msgstr "Authzid inválido"
 
 #: ../libgaim/protocols/jabber/jabber.c:1512
+msgid "Invalid Authorization Mechanism"
+msgstr "Mecanismo de autorización inválido"
+
+#: ../libgaim/protocols/jabber/jabber.c:1515
+msgid "Authorization mechanism too weak"
+msgstr "Mecanismo de autorización demasiado feble"
+
+#: ../libgaim/protocols/jabber/jabber.c:1520
+msgid "Temporary Authentication Failure"
+msgstr "Fallo temporal da autenticación"
+
+#: ../libgaim/protocols/jabber/jabber.c:1523
+msgid "Authentication Failure"
+msgstr "Fallo de autenticación"
+
+#: ../libgaim/protocols/jabber/jabber.c:1527
+msgid "Bad Format"
+msgstr "Formato erróneo"
+
+#: ../libgaim/protocols/jabber/jabber.c:1529
+msgid "Bad Namespace Prefix"
+msgstr "Prefixo do espazo de nomes erróneo"
+
+#: ../libgaim/protocols/jabber/jabber.c:1532
 msgid "Resource Conflict"
-msgstr "Conflicto de recursos"
-
-#: ../libgaim/protocols/jabber/jabber.c:1514
-#: ../libgaim/protocols/silc/ops.c:1727
+msgstr "Conflito de recursos"
+
+#: ../libgaim/protocols/jabber/jabber.c:1534
+#: ../libgaim/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "Expirou a conexión"
 
-#: ../libgaim/protocols/jabber/jabber.c:1516
+#: ../libgaim/protocols/jabber/jabber.c:1536
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1518
+#: ../libgaim/protocols/jabber/jabber.c:1538
 msgid "Host Unknown"
 msgstr "Servidor descoñecido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1520
+#: ../libgaim/protocols/jabber/jabber.c:1540
 msgid "Improper Addressing"
 msgstr "Direccionamento incorrecto"
 
-#: ../libgaim/protocols/jabber/jabber.c:1524
+#: ../libgaim/protocols/jabber/jabber.c:1544
 msgid "Invalid ID"
 msgstr "ID non válido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1526
+#: ../libgaim/protocols/jabber/jabber.c:1546
 msgid "Invalid Namespace"
-msgstr "Espacio de nomes non válido"
-
-#: ../libgaim/protocols/jabber/jabber.c:1528
+msgstr "Espazo de nomes non válido"
+
+#: ../libgaim/protocols/jabber/jabber.c:1548
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1530
+#: ../libgaim/protocols/jabber/jabber.c:1550
 msgid "Non-matching Hosts"
-msgstr "Non existen servidores coincidintes"
-
-#: ../libgaim/protocols/jabber/jabber.c:1534
+msgstr "Non existen servidores coincidentes"
+
+#: ../libgaim/protocols/jabber/jabber.c:1554
 msgid "Policy Violation"
 msgstr "Violación da política"
 
-#: ../libgaim/protocols/jabber/jabber.c:1536
+#: ../libgaim/protocols/jabber/jabber.c:1556
 msgid "Remote Connection Failed"
 msgstr "Fallou a conexión remota"
 
-#: ../libgaim/protocols/jabber/jabber.c:1538
+#: ../libgaim/protocols/jabber/jabber.c:1558
 msgid "Resource Constraint"
-msgstr "Restricción de recursos"
-
-#: ../libgaim/protocols/jabber/jabber.c:1540
+msgstr "Restrición de recursos"
+
+#: ../libgaim/protocols/jabber/jabber.c:1560
 msgid "Restricted XML"
 msgstr "XML restrinxido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1542
+#: ../libgaim/protocols/jabber/jabber.c:1562
 msgid "See Other Host"
 msgstr "Ver outros servidores"
 
-#: ../libgaim/protocols/jabber/jabber.c:1544
+#: ../libgaim/protocols/jabber/jabber.c:1564
 msgid "System Shutdown"
 msgstr "Parada do sistema"
 
-#: ../libgaim/protocols/jabber/jabber.c:1546
+#: ../libgaim/protocols/jabber/jabber.c:1566
 msgid "Undefined Condition"
 msgstr "Condición non definida"
 
-#: ../libgaim/protocols/jabber/jabber.c:1548
+#: ../libgaim/protocols/jabber/jabber.c:1568
 msgid "Unsupported Encoding"
 msgstr "Codificación non soportada"
 
-#: ../libgaim/protocols/jabber/jabber.c:1550
+#: ../libgaim/protocols/jabber/jabber.c:1570
 msgid "Unsupported Stanza Type"
-msgstr "Tipo de Stanza non soportado"
-
-#: ../libgaim/protocols/jabber/jabber.c:1552
+msgstr "Tipo de estrofa non soportada"
+
+#: ../libgaim/protocols/jabber/jabber.c:1572
 msgid "Unsupported Version"
 msgstr "Versión non soportada"
 
-#: ../libgaim/protocols/jabber/jabber.c:1554
+#: ../libgaim/protocols/jabber/jabber.c:1574
 msgid "XML Not Well Formed"
 msgstr "XML mal formado"
 
-#: ../libgaim/protocols/jabber/jabber.c:1556
+#: ../libgaim/protocols/jabber/jabber.c:1576
 msgid "Stream Error"
 msgstr "Erro de fluxo"
 
-#: ../libgaim/protocols/jabber/jabber.c:1623
+#: ../libgaim/protocols/jabber/jabber.c:1643
 #, c-format
 msgid "Unable to ban user %s"
-msgstr "Non puido vetar ao usuario %s"
-
-#: ../libgaim/protocols/jabber/jabber.c:1643
+msgstr "Non puido vedar ao usuario %s"
+
+#: ../libgaim/protocols/jabber/jabber.c:1663
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliación descoñecida: \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1648
+#: ../libgaim/protocols/jabber/jabber.c:1668
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Non se puido afiliar ao usuario %s coma \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1667
+#: ../libgaim/protocols/jabber/jabber.c:1687
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol descoñecido: \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1674
+#: ../libgaim/protocols/jabber/jabber.c:1694
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Non se puido establecer o rol \"%s\" para o usuario: %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1727
+#: ../libgaim/protocols/jabber/jabber.c:1747
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Non puido expulsar ao usuario %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1758
+#: ../libgaim/protocols/jabber/jabber.c:1778
 msgid "config:  Configure a chat room."
-msgstr "config:  Configurar unha sala de chat."
-
-#: ../libgaim/protocols/jabber/jabber.c:1762
+msgstr "config:  Configurar unha sala de conversa."
+
+#: ../libgaim/protocols/jabber/jabber.c:1782
 msgid "configure:  Configure a chat room."
-msgstr "configure:  Configurar unha sala de chat."
-
-#: ../libgaim/protocols/jabber/jabber.c:1771
+msgstr "configure:  Configurar unha sala de conversa."
+
+#: ../libgaim/protocols/jabber/jabber.c:1791
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Abandonar a sala."
 
-#: ../libgaim/protocols/jabber/jabber.c:1776
+#: ../libgaim/protocols/jabber/jabber.c:1796
 msgid "register:  Register with a chat room."
-msgstr "register: Rexistrarse nunha sala de chat."
-
-#: ../libgaim/protocols/jabber/jabber.c:1782
+msgstr "register: Rexistrarse nunha sala de conversa."
+
+#: ../libgaim/protocols/jabber/jabber.c:1802
 msgid "topic [new topic]:  View or change the topic."
-msgstr "topic [novo tópico]:  Ver ou cambiar o tópico."
-
-#: ../libgaim/protocols/jabber/jabber.c:1788
+msgstr "topic [novo tópico]:  Ver ou mudar o asunto."
+
+#: ../libgaim/protocols/jabber/jabber.c:1808
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr "ban &lt;usuario&gt; [sala]:  Vetar a un usuario da sala."
-
-#: ../libgaim/protocols/jabber/jabber.c:1794
+msgstr "ban &lt;usuario&gt; [sala]:  Vedar a un usuario da sala."
+
+#: ../libgaim/protocols/jabber/jabber.c:1814
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -8372,7 +8793,7 @@
 "affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: "
 "Establecer a afiliación dun usuario á sala."
 
-#: ../libgaim/protocols/jabber/jabber.c:1800
+#: ../libgaim/protocols/jabber/jabber.c:1820
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -8380,22 +8801,22 @@
 "role &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Establecer "
 "o rol dun usuario na sala."
 
-#: ../libgaim/protocols/jabber/jabber.c:1806
+#: ../libgaim/protocols/jabber/jabber.c:1826
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;usuario&gt; [mensaxe]:  Invitar un usuario á sala."
-
-#: ../libgaim/protocols/jabber/jabber.c:1812
+msgstr "invite &lt;usuario&gt; [mensaxe]:  Convidar a un usuario á sala."
+
+#: ../libgaim/protocols/jabber/jabber.c:1832
 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."
 
-#: ../libgaim/protocols/jabber/jabber.c:1818
+#: ../libgaim/protocols/jabber/jabber.c:1838
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuario&gt; [sala]:  Botar a un usuario da sala."
 
-#: ../libgaim/protocols/jabber/jabber.c:1823
+#: ../libgaim/protocols/jabber/jabber.c:1843
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
-"msg &lt;usuario&gt; &lt;mensaxe&gt;:  Enviar unha mensaxe en privado a un "
+"msg &lt;usuario&gt; &lt;mensaxe&gt;:  Enviar unha mensaxe privada a un "
 "usuario."
 
 #. *< type
@@ -8408,27 +8829,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/jabber/jabber.c:1939
-#: ../libgaim/protocols/jabber/jabber.c:1941
+#: ../libgaim/protocols/jabber/jabber.c:1960
+#: ../libgaim/protocols/jabber/jabber.c:1962
 msgid "Jabber Protocol Plugin"
 msgstr "Complemento de protocolo Jabber"
 
-#: ../libgaim/protocols/jabber/jabber.c:1967
+#: ../libgaim/protocols/jabber/jabber.c:1988
 msgid "Force old (port 5223) SSL"
 msgstr "Forzar SSL antigo (porto 5223)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1972
+#: ../libgaim/protocols/jabber/jabber.c:1993
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "Permitir autenticación en claro sobre canles non cifrados"
-
-#: ../libgaim/protocols/jabber/jabber.c:1977
-#: ../libgaim/protocols/simple/simple.c:1841
+msgstr "Permitir autenticación con texto sobre as canles non cifradas"
+
+#: ../libgaim/protocols/jabber/jabber.c:1998
+#: ../libgaim/protocols/simple/simple.c:1842
 msgid "Connect port"
 msgstr "Conectar co porto"
 
 #. Account options
-#: ../libgaim/protocols/jabber/jabber.c:1981
-#: ../libgaim/protocols/silc/silc.c:1851
+#: ../libgaim/protocols/jabber/jabber.c:2002
+#: ../libgaim/protocols/silc/silc.c:1852
 msgid "Connect server"
 msgstr "Conectar co servidor"
 
@@ -8440,7 +8861,7 @@
 #: ../libgaim/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
-msgstr "%s cambiou o tópico a: %s"
+msgstr "%s mudou o tópico a: %s"
 
 #: ../libgaim/protocols/jabber/message.c:183
 #, c-format
@@ -8461,38 +8882,20 @@
 msgid " (Code %s)"
 msgstr " (Código %s)"
 
-#: ../libgaim/protocols/jabber/parser.c:179
+#: ../libgaim/protocols/jabber/parser.c:192
 msgid "XML Parse error"
 msgstr "Erro de tratamento XML"
 
-#: ../libgaim/protocols/jabber/presence.c:304
+#: ../libgaim/protocols/jabber/presence.c:280
 msgid "Unknown Error in presence"
-msgstr "Erro descoñecido en presencia"
-
-#: ../libgaim/protocols/jabber/presence.c:309
-#: ../libgaim/protocols/msn/userlist.c:98
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
-msgstr "O usuario %s quere engadir a %s a súa lista de amigos."
-
-#: ../libgaim/protocols/jabber/presence.c:318
-#: ../libgaim/protocols/oscar/oscar.c:2358
-#: ../libgaim/protocols/oscar/oscar.c:5069
-msgid "_Authorize"
-msgstr "_Autorizar"
-
-#: ../libgaim/protocols/jabber/presence.c:319
-#: ../libgaim/protocols/oscar/oscar.c:2360
-#: ../libgaim/protocols/oscar/oscar.c:5070
-msgid "_Deny"
-msgstr "_Denegar"
-
-#: ../libgaim/protocols/jabber/presence.c:376
-#: ../libgaim/protocols/jabber/presence.c:377
+msgstr "Erro descoñecido en presenza"
+
+#: ../libgaim/protocols/jabber/presence.c:354
+#: ../libgaim/protocols/jabber/presence.c:355
 msgid "Create New Room"
 msgstr "Crear unha sala nova"
 
-#: ../libgaim/protocols/jabber/presence.c:378
+#: ../libgaim/protocols/jabber/presence.c:356
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -8500,23 +8903,23 @@
 "Vai crear unha sala nova. Desexa configurala ou aceptar os valores por "
 "omisión?"
 
-#: ../libgaim/protocols/jabber/presence.c:381
+#: ../libgaim/protocols/jabber/presence.c:359
 msgid "_Configure Room"
-msgstr "_Configurar sala"
-
-#: ../libgaim/protocols/jabber/presence.c:383
+msgstr "_Configurar a sala"
+
+#: ../libgaim/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
-msgstr "_Aceptar valores por omisión"
-
-#: ../libgaim/protocols/jabber/presence.c:421
+msgstr "_Aceptar os valores por omisión"
+
+#: ../libgaim/protocols/jabber/presence.c:399
 #, c-format
 msgid "Error in chat %s"
-msgstr "Erro no chat %s"
-
-#: ../libgaim/protocols/jabber/presence.c:424
+msgstr "Erro na conversa %s"
+
+#: ../libgaim/protocols/jabber/presence.c:402
 #, c-format
 msgid "Error joining chat %s"
-msgstr "Erro ao unirse ao chat %s"
+msgstr "Erro ao unirse á conversa %s"
 
 #: ../libgaim/protocols/jabber/si.c:765
 #, c-format
@@ -8532,7 +8935,7 @@
 #: ../libgaim/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Problema de sincronización da lista de amigos en %s (%s)"
+msgstr "Problema de sincronización da listaxe de contactos en %s (%s)"
 
 #: ../libgaim/protocols/msn/dialog.c:116
 #, c-format
@@ -8540,8 +8943,8 @@
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
-"%s está na lista local dentro do grupo \"%s\" pero non está na lista do "
-"servidor. Desexa engadir a este amigo?"
+"%s está na listaxe local dentro do grupo \"%s\" pero non está na listaxe do "
+"servidor. Desexa engadir a este contacto?"
 
 #: ../libgaim/protocols/msn/dialog.c:124
 #, c-format
@@ -8549,8 +8952,8 @@
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 msgstr ""
-"%s está na lista local pero non está na lista do servidor. Desexa engadir a "
-"este amigo?"
+"%s está na listaxe local pero non está na listaxe do servidor. Desexa "
+"engadir a este contacto?"
 
 #: ../libgaim/protocols/msn/error.c:35
 msgid "Unable to parse message"
@@ -8558,7 +8961,7 @@
 
 #: ../libgaim/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
-msgstr "Erro de sintase (probablemente un erro de Gaim)"
+msgstr "Erro de sintaxe (probablemente un erro do Gaim)"
 
 #: ../libgaim/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
@@ -8569,32 +8972,37 @@
 msgstr "O usuario non existe"
 
 #: ../libgaim/protocols/msn/error.c:49
-msgid "Fully Qualified Domain Name missing"
+#, fuzzy
+msgid "Fully qualified domain name missing"
 msgstr "Falta un nome de dominio totalmente cualificado"
 
 #: ../libgaim/protocols/msn/error.c:52
-msgid "Already Logged In"
+#, fuzzy
+msgid "Already logged in"
 msgstr "Xa está conectado"
 
 #: ../libgaim/protocols/msn/error.c:55
-msgid "Invalid Username"
-msgstr "Nome de usuario inválido"
+#, fuzzy
+msgid "Invalid screen name"
+msgstr "Nome de usuario incorrecto"
 
 #: ../libgaim/protocols/msn/error.c:58
-msgid "Invalid Friendly Name"
-msgstr "Nome de amigo non válido"
+#, fuzzy
+msgid "Invalid friendly name"
+msgstr "Nome de contacto incorrecto"
 
 #: ../libgaim/protocols/msn/error.c:61
-msgid "List Full"
-msgstr "Lista chea"
+#, fuzzy
+msgid "List full"
+msgstr "Listaxe chea"
 
 #: ../libgaim/protocols/msn/error.c:64
 msgid "Already there"
-msgstr "Xa está na lista"
+msgstr "Xa está na listaxe"
 
 #: ../libgaim/protocols/msn/error.c:67
 msgid "Not on list"
-msgstr "Non está na lista"
+msgstr "Non está na listaxe"
 
 #: ../libgaim/protocols/msn/error.c:70
 #: ../libgaim/protocols/zephyr/zephyr.c:757
@@ -8607,7 +9015,7 @@
 
 #: ../libgaim/protocols/msn/error.c:76
 msgid "Already in opposite list"
-msgstr "Xa está na lista contraria"
+msgstr "Xa está na listaxe contraria"
 
 #: ../libgaim/protocols/msn/error.c:79
 msgid "Too many groups"
@@ -8615,7 +9023,7 @@
 
 #: ../libgaim/protocols/msn/error.c:82
 msgid "Invalid group"
-msgstr "Grupo inválido"
+msgstr "Grupo incorrecto"
 
 #: ../libgaim/protocols/msn/error.c:85
 msgid "User not in group"
@@ -8635,10 +9043,11 @@
 
 #: ../libgaim/protocols/msn/error.c:99
 msgid "Switchboard failed"
-msgstr "Fallou o servidor Switchboard"
+msgstr "Fallou o servidor centraliña"
 
 #: ../libgaim/protocols/msn/error.c:102
-msgid "Notify Transfer failed"
+#, fuzzy
+msgid "Notify transfer failed"
 msgstr "Fallou a notificación da transferencia"
 
 #: ../libgaim/protocols/msn/error.c:106
@@ -8649,12 +9058,13 @@
 msgid "Too many hits to a FND"
 msgstr "Demasiados resultados dun FND"
 
-#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:123
+#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:118
 msgid "Not logged in"
-msgstr "Non iniciou sesión"
+msgstr "Non iniciou a sesión"
 
 #: ../libgaim/protocols/msn/error.c:116
-msgid "Service Temporarily Unavailable"
+#, fuzzy
+msgid "Service temporarily unavailable"
 msgstr "Servizo non dispoñible temporalmente"
 
 #: ../libgaim/protocols/msn/error.c:119
@@ -8687,7 +9097,8 @@
 msgstr "Servidor non dispoñible"
 
 #: ../libgaim/protocols/msn/error.c:141
-msgid "Peer Notification server down"
+#, fuzzy
+msgid "Peer notification server down"
 msgstr "Servidor de notificación de pares caído"
 
 #: ../libgaim/protocols/msn/error.c:144
@@ -8696,7 +9107,7 @@
 
 #: ../libgaim/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
-msgstr "O servidor está apagándose (abandonen o barco!)"
+msgstr "O servidor está apagándose (abandoen o barco!)"
 
 #: ../libgaim/protocols/msn/error.c:155
 msgid "Error creating connection"
@@ -8712,7 +9123,7 @@
 
 #: ../libgaim/protocols/msn/error.c:165
 msgid "Session overload"
-msgstr "Sobrecarga de sesión"
+msgstr "Sesión sobrecargada"
 
 #: ../libgaim/protocols/msn/error.c:168
 msgid "User is too active"
@@ -8728,7 +9139,7 @@
 
 #: ../libgaim/protocols/msn/error.c:177
 msgid "Bad friend file"
-msgstr "Ficheiro de amigos incorrecto"
+msgstr "Ficheiro de contactos incorrecto"
 
 #: ../libgaim/protocols/msn/error.c:180
 msgid "Not expected"
@@ -8736,22 +9147,22 @@
 
 #: ../libgaim/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
-msgstr "Os nomes de amigos cambian demasiado rápido"
+msgstr "Os nomes dos contactos mudan demasiado rápido"
 
 #: ../libgaim/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Servidor moi ocupado"
 
 #: ../libgaim/protocols/msn/error.c:198
-#: ../libgaim/protocols/oscar/oscar.c:1311
-#: ../libgaim/protocols/silc/ops.c:1716 ../libgaim/protocols/toc/toc.c:728
+#: ../libgaim/protocols/oscar/oscar.c:1355
+#: ../libgaim/protocols/silc/ops.c:1718 ../libgaim/protocols/toc/toc.c:728
 #: ../libgaim/proxy.c:1340
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"
 
 #: ../libgaim/protocols/msn/error.c:201
 msgid "Not allowed when offline"
-msgstr "Non pode mandar mensaxes fora de liña"
+msgstr "Non pode mandar mensaxes se está desconectado"
 
 #: ../libgaim/protocols/msn/error.c:209
 msgid "Not accepting new users"
@@ -8759,15 +9170,15 @@
 
 #: ../libgaim/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
-msgstr "Pasaporte de menores sen consentemento paterno"
+msgstr "Pasaporte de menores sen consentimento paterno"
 
 #: ../libgaim/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
-msgstr "Conta passport non verificada aínda"
+msgstr "Conta passport aínda non verificada"
 
 #: ../libgaim/protocols/msn/error.c:220
 msgid "Bad ticket"
-msgstr "Ticket erróneo"
+msgstr "Billete erróneo"
 
 #: ../libgaim/protocols/msn/error.c:224
 #, c-format
@@ -8779,111 +9190,99 @@
 msgid "MSN Error: %s\n"
 msgstr "Erro MSN: %s\n"
 
-#: ../libgaim/protocols/msn/msn.c:113
+#: ../libgaim/protocols/msn/msn.c:111
 msgid "You have just sent a Nudge!"
 msgstr "Acaba de enviar un cobadazo!"
 
-#: ../libgaim/protocols/msn/msn.c:138
+#: ../libgaim/protocols/msn/msn.c:136
 msgid "Your new MSN friendly name is too long."
-msgstr "O novo nome de amigo MSN é demasiado longo."
-
-#: ../libgaim/protocols/msn/msn.c:246
+msgstr "O novo nome do contacto MSN é demasiado longo."
+
+#: ../libgaim/protocols/msn/msn.c:244
 msgid "Set your friendly name."
-msgstr "Establecer seu nome de amigo."
-
-#: ../libgaim/protocols/msn/msn.c:247
+msgstr "Establecer o seu nome de contacto."
+
+#: ../libgaim/protocols/msn/msn.c:245
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "Este é o nome baixo o que outros amigos MSN o verán."
-
-#: ../libgaim/protocols/msn/msn.c:263
+msgstr "Este é o nome que verán outros usuarios MSN."
+
+#: ../libgaim/protocols/msn/msn.c:261
 msgid "Set your home phone number."
-msgstr "Estableza o número de teléfono de seu domicilio."
-
-#: ../libgaim/protocols/msn/msn.c:278
+msgstr "Estableza o número de teléfono do seu domicilio."
+
+#: ../libgaim/protocols/msn/msn.c:276
 msgid "Set your work phone number."
-msgstr "Estableza o número de teléfono de su traballo."
-
-#: ../libgaim/protocols/msn/msn.c:293
+msgstr "Estableza o número de teléfono do seu traballo."
+
+#: ../libgaim/protocols/msn/msn.c:291
 msgid "Set your mobile phone number."
-msgstr "Estableza seu número de teléfono móvil."
-
-#: ../libgaim/protocols/msn/msn.c:306
+msgstr "Estableza o seu número de teléfono móbil."
+
+#: ../libgaim/protocols/msn/msn.c:304
 msgid "Allow MSN Mobile pages?"
-msgstr "Permitir envíos de MSN Mobile?"
-
-#: ../libgaim/protocols/msn/msn.c:307
+msgstr "Quere permitir páxinas de MSN Mobile?"
+
+#: ../libgaim/protocols/msn/msn.c:305
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
-"Quere permitir ou rexeitar o envío de mensaxes a través de MSN Mobile a seu "
-"teléfono móvil (u outro dispositivo móvil) da xente na súa lista de amigos?"
-
-#: ../libgaim/protocols/msn/msn.c:311
+"Quere permitir ou rexeitar o envío de mensaxes a través de MSN Mobile ao seu "
+"teléfono móbil (ou outro dispositivo móbil) da xente na súa listaxe de "
+"contactos?"
+
+#: ../libgaim/protocols/msn/msn.c:309
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../libgaim/protocols/msn/msn.c:312
+#: ../libgaim/protocols/msn/msn.c:310
 msgid "Disallow"
 msgstr "Rexeitar"
 
-#: ../libgaim/protocols/msn/msn.c:328
+#: ../libgaim/protocols/msn/msn.c:326
 msgid "This Hotmail account may not be active."
-msgstr "Esta conta de Hotmail quizais non esté activa."
+msgstr "Esta conta de Hotmail quizais non estea activa."
+
+#: ../libgaim/protocols/msn/msn.c:352
+msgid "Send a mobile message."
+msgstr "Enviar unha mensaxe a un móbil."
 
 #: ../libgaim/protocols/msn/msn.c:354
-msgid "Send a mobile message."
-msgstr "Enviar unha mensaxe a un móvil."
-
-#: ../libgaim/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Páxina"
 
-#: ../libgaim/protocols/msn/msn.c:546 ../libgaim/protocols/msn/msn.c:553
-#: ../libgaim/protocols/msn/msn.c:562
-#: ../libgaim/protocols/sametime/sametime.c:3232
-#: ../libgaim/protocols/yahoo/yahoo.c:3032
-#: ../libgaim/protocols/yahoo/yahoo.c:3038
-#, c-format
-msgid ""
-"\n"
-"<b>%s:</b> %s"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
 #: ../libgaim/protocols/msn/msn.c:553
 msgid "Has you"
-msgstr "Tenlle"
+msgstr "Telo"
 
 #: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
-#: ../libgaim/protocols/yahoo/yahoo.c:2861
-#: ../libgaim/protocols/yahoo/yahoo.c:3466
+#: ../libgaim/protocols/yahoo/yahoo.c:2856
+#: ../libgaim/protocols/yahoo/yahoo.c:3460
 msgid "Be Right Back"
-msgstr "Volvo enseguida"
+msgstr "Volvo deseguida"
 
 #: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
-#: ../libgaim/protocols/novell/novell.c:2859
-#: ../libgaim/protocols/novell/novell.c:2993
+#: ../libgaim/protocols/novell/novell.c:2857
+#: ../libgaim/protocols/novell/novell.c:2987
 #: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
-#: ../libgaim/protocols/yahoo/yahoo.c:2863
-#: ../libgaim/protocols/yahoo/yahoo.c:3469
+#: ../libgaim/protocols/yahoo/yahoo.c:2858
+#: ../libgaim/protocols/yahoo/yahoo.c:3463
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2871
-#: ../libgaim/protocols/yahoo/yahoo.c:3481
+#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2866
+#: ../libgaim/protocols/yahoo/yahoo.c:3475
 msgid "On the Phone"
 msgstr "Ao teléfono"
 
-#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2875
-#: ../libgaim/protocols/yahoo/yahoo.c:3487
+#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2870
+#: ../libgaim/protocols/yahoo/yahoo.c:3481
 msgid "Out to Lunch"
-msgstr "Saín a xantar"
+msgstr "Saín xantar"
 
 #: ../libgaim/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
-msgstr "Establecer nome de amigo..."
+msgstr "Establecer o nome do contacto..."
 
 #: ../libgaim/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
@@ -8895,28 +9294,28 @@
 
 #: ../libgaim/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
-msgstr "Establecer o número do teléfono móvil..."
+msgstr "Establecer o número do teléfono móbil..."
 
 #: ../libgaim/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
-msgstr "Activar/Desactivar dispositivos móviles..."
+msgstr "Activar/Desactivar dispositivos móbiles..."
 
 #: ../libgaim/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
-msgstr "Permitir/Rexeitar páxinas de móviles..."
+msgstr "Permitir/Rexeitar páxinas de móbiles..."
 
 #: ../libgaim/protocols/msn/msn.c:653
 msgid "Open Hotmail Inbox"
-msgstr "Abrir correo de entrada de Hotmail"
+msgstr "Abrir o correo de entrada de Hotmail"
 
 #: ../libgaim/protocols/msn/msn.c:677
 msgid "Send to Mobile"
-msgstr "Enviar a un móvil"
+msgstr "Enviar a un móbil"
 
 #: ../libgaim/protocols/msn/msn.c:687
-#: ../libgaim/protocols/novell/novell.c:3449
+#: ../libgaim/protocols/novell/novell.c:3443
 msgid "Initiate _Chat"
-msgstr "Iniciar _Chat"
+msgstr "Iniciar a _conversa"
 
 #: ../libgaim/protocols/msn/msn.c:725
 msgid ""
@@ -8930,235 +9329,208 @@
 msgid "Failed to connect to server."
 msgstr "Non se puido conectar ao servidor."
 
-#: ../libgaim/protocols/msn/msn.c:1363
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:685
-#: ../libgaim/protocols/zephyr/zephyr.c:788
-#: ../libgaim/protocols/zephyr/zephyr.c:1205
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>Alcume:</b> %s<br>"
-
-#. put a link to the actual profile URL
-#: ../libgaim/protocols/msn/msn.c:1370
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223 ../libgaim/util.c:1109
-#, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>%s:</b> "
-
-#: ../libgaim/protocols/msn/msn.c:1462
-msgid "MSN Profile"
-msgstr "Perfil MSN"
-
-#: ../libgaim/protocols/msn/msn.c:1467 ../libgaim/protocols/msn/msn.c:1796
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:794
+#: ../libgaim/protocols/msn/msn.c:1461 ../libgaim/protocols/msn/msn.c:1806
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Erro ao obter o perfil"
 
-#: ../libgaim/protocols/msn/msn.c:1537 ../libgaim/protocols/oscar/oscar.c:3670
-#: ../libgaim/protocols/qq/buddy_info.c:43
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1070
+#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/oscar/oscar.c:3749
+#: ../libgaim/protocols/qq/buddy_info.c:45 ../libgaim/protocols/qq/qq.c:219
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
-msgstr "Edade"
-
-#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/qq/buddy_info.c:49
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
+msgstr "Idade"
+
+#: ../libgaim/protocols/msn/msn.c:1541 ../libgaim/protocols/qq/buddy_info.c:51
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Ocupación"
 
-#: ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/msn/msn.c:1542
 #: ../libgaim/protocols/novell/novell.c:1478
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1065
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1052
+#: ../libgaim/protocols/zephyr/zephyr.c:799
+#: ../libgaim/protocols/zephyr/zephyr.c:1215
 msgid "Location"
-msgstr "Ubicación"
-
-#: ../libgaim/protocols/msn/msn.c:1545 ../libgaim/protocols/msn/msn.c:1725
-#: ../libgaim/protocols/msn/msn.c:1731 ../libgaim/protocols/msn/msn.c:1738
+msgstr "Localización"
+
+#: ../libgaim/protocols/msn/msn.c:1547 ../libgaim/protocols/msn/msn.c:1739
+#: ../libgaim/protocols/msn/msn.c:1745 ../libgaim/protocols/msn/msn.c:1752
 msgid "Hobbies and Interests"
-msgstr "Aficións e intereses"
-
-#: ../libgaim/protocols/msn/msn.c:1551 ../libgaim/protocols/msn/msn.c:1659
-#: ../libgaim/protocols/msn/msn.c:1665 ../libgaim/protocols/msn/msn.c:1672
-#: ../libgaim/protocols/msn/msn.c:1680 ../libgaim/protocols/msn/msn.c:1687
+msgstr "Afeccións e intereses"
+
+#: ../libgaim/protocols/msn/msn.c:1553 ../libgaim/protocols/msn/msn.c:1673
+#: ../libgaim/protocols/msn/msn.c:1679 ../libgaim/protocols/msn/msn.c:1686
+#: ../libgaim/protocols/msn/msn.c:1694 ../libgaim/protocols/msn/msn.c:1701
 msgid "A Little About Me"
 msgstr "Un pouco sobre min"
 
-#: ../libgaim/protocols/msn/msn.c:1557
-#, c-format
-msgid "%s<b>General</b><br>%s"
-msgstr "%s<b>Xeral</b><br>%s"
-
-#. Social
-#: ../libgaim/protocols/msn/msn.c:1566
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1075
+#: ../libgaim/protocols/msn/msn.c:1570
+msgid "Social"
+msgstr ""
+
+#: ../libgaim/protocols/msn/msn.c:1572
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../libgaim/protocols/msn/msn.c:1567
+#: ../libgaim/protocols/msn/msn.c:1573
 msgid "Interests"
-msgstr "Interés"
-
-#: ../libgaim/protocols/msn/msn.c:1568
+msgstr "Interese"
+
+#: ../libgaim/protocols/msn/msn.c:1574
 msgid "Pets"
 msgstr "Mascotas"
 
-#: ../libgaim/protocols/msn/msn.c:1569
+#: ../libgaim/protocols/msn/msn.c:1575
 msgid "Hometown"
 msgstr "Cidade"
 
-#: ../libgaim/protocols/msn/msn.c:1570
+#: ../libgaim/protocols/msn/msn.c:1576
 msgid "Places Lived"
 msgstr "Lugares nos que viviu"
 
-#: ../libgaim/protocols/msn/msn.c:1571
+#: ../libgaim/protocols/msn/msn.c:1577
 msgid "Fashion"
 msgstr "Moderno"
 
-#: ../libgaim/protocols/msn/msn.c:1572
+#: ../libgaim/protocols/msn/msn.c:1578
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libgaim/protocols/msn/msn.c:1573
+#: ../libgaim/protocols/msn/msn.c:1579
 msgid "Music"
 msgstr "Música"
 
-#: ../libgaim/protocols/msn/msn.c:1574 ../libgaim/protocols/msn/msn.c:1747
-#: ../libgaim/protocols/msn/msn.c:1753
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1127
+#: ../libgaim/protocols/msn/msn.c:1580 ../libgaim/protocols/msn/msn.c:1761
+#: ../libgaim/protocols/msn/msn.c:1767
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Cita preferida"
 
-#: ../libgaim/protocols/msn/msn.c:1578
-#, c-format
-msgid "%s<b>Social</b><br>%s"
-msgstr "%s<b>Social</b><br>%s"
-
-#: ../libgaim/protocols/msn/msn.c:1587
+#: ../libgaim/protocols/msn/msn.c:1597
+#, fuzzy
+msgid "Contact Info"
+msgstr "Información da conta"
+
+#: ../libgaim/protocols/msn/msn.c:1598
+#, fuzzy
+msgid "Personal"
+msgstr "MI persoal"
+
+#: ../libgaim/protocols/msn/msn.c:1601
 msgid "Significant Other"
 msgstr "Outro significativo"
 
-#: ../libgaim/protocols/msn/msn.c:1588
+#: ../libgaim/protocols/msn/msn.c:1602
 msgid "Home Phone"
-msgstr "Teléfono de casa"
-
-#: ../libgaim/protocols/msn/msn.c:1589
+msgstr "Teléfono da casa"
+
+#: ../libgaim/protocols/msn/msn.c:1603
 msgid "Home Phone 2"
-msgstr "Teléfono de casa 2"
-
-#: ../libgaim/protocols/msn/msn.c:1590 ../libgaim/protocols/oscar/oscar.c:3682
+msgstr "Teléfono da casa 2"
+
+#: ../libgaim/protocols/msn/msn.c:1604 ../libgaim/protocols/oscar/oscar.c:3768
 msgid "Home Address"
 msgstr "Domicilio"
 
-#: ../libgaim/protocols/msn/msn.c:1591
+#: ../libgaim/protocols/msn/msn.c:1605
 msgid "Personal Mobile"
 msgstr "Móbil persoal"
 
-#: ../libgaim/protocols/msn/msn.c:1592
+#: ../libgaim/protocols/msn/msn.c:1606
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: ../libgaim/protocols/msn/msn.c:1593
+#: ../libgaim/protocols/msn/msn.c:1607
 msgid "Personal E-Mail"
-msgstr "Correo-e persoal"
-
-#: ../libgaim/protocols/msn/msn.c:1594
+msgstr "Correo e. persoal"
+
+#: ../libgaim/protocols/msn/msn.c:1608
 msgid "Personal IM"
 msgstr "MI persoal"
 
-#: ../libgaim/protocols/msn/msn.c:1596
+#: ../libgaim/protocols/msn/msn.c:1610
 msgid "Anniversary"
 msgstr "Aniversario"
 
-#: ../libgaim/protocols/msn/msn.c:1597 ../libgaim/protocols/msn/msn.c:1622
-msgid "Notes"
-msgstr "Notas"
-
-#: ../libgaim/protocols/msn/msn.c:1601
-#, c-format
-msgid "<br><b>Personal</b><br>%s"
-msgstr "<br><b>Persoal</b><br>%s"
-
-#: ../libgaim/protocols/msn/msn.c:1609 ../libgaim/protocols/silc/ops.c:1044
+#. Business
+#: ../libgaim/protocols/msn/msn.c:1626
+#, fuzzy
+msgid "Work"
+msgstr "MI do traballo"
+
+#: ../libgaim/protocols/msn/msn.c:1628 ../libgaim/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Traballo"
 
-#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3699
+#: ../libgaim/protocols/msn/msn.c:1629 ../libgaim/protocols/oscar/oscar.c:3789
 msgid "Company"
 msgstr "Compañía"
 
-#: ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/msn/msn.c:1630
 #: ../libgaim/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departamento"
 
-#: ../libgaim/protocols/msn/msn.c:1612
+#: ../libgaim/protocols/msn/msn.c:1631
 msgid "Profession"
 msgstr "Profesión"
 
-#: ../libgaim/protocols/msn/msn.c:1613
+#: ../libgaim/protocols/msn/msn.c:1632
 msgid "Work Phone"
 msgstr "Teléfono do traballo"
 
-#: ../libgaim/protocols/msn/msn.c:1614
+#: ../libgaim/protocols/msn/msn.c:1633
 msgid "Work Phone 2"
-msgstr "Teléfono do traballo"
-
-#: ../libgaim/protocols/msn/msn.c:1615 ../libgaim/protocols/oscar/oscar.c:3690
+msgstr "Teléfono do traballo 2"
+
+#: ../libgaim/protocols/msn/msn.c:1634 ../libgaim/protocols/oscar/oscar.c:3781
 msgid "Work Address"
 msgstr "Enderezo do traballo"
 
-#: ../libgaim/protocols/msn/msn.c:1616
+#: ../libgaim/protocols/msn/msn.c:1635
 msgid "Work Mobile"
 msgstr "Móbil do traballo"
 
-#: ../libgaim/protocols/msn/msn.c:1617
+#: ../libgaim/protocols/msn/msn.c:1636
 msgid "Work Pager"
 msgstr "Paxinador do traballo"
 
-#: ../libgaim/protocols/msn/msn.c:1618
+#: ../libgaim/protocols/msn/msn.c:1637
 msgid "Work Fax"
 msgstr "Fax do traballo"
 
-#: ../libgaim/protocols/msn/msn.c:1619
+#: ../libgaim/protocols/msn/msn.c:1638
 msgid "Work E-Mail"
-msgstr "Correo-e do traballo"
-
-#: ../libgaim/protocols/msn/msn.c:1620
+msgstr "Correo e. do traballo"
+
+#: ../libgaim/protocols/msn/msn.c:1639
 msgid "Work IM"
 msgstr "MI do traballo"
 
-#: ../libgaim/protocols/msn/msn.c:1621
+#: ../libgaim/protocols/msn/msn.c:1640
 msgid "Start Date"
 msgstr "Data de inicio"
 
-#: ../libgaim/protocols/msn/msn.c:1626
-#, c-format
-msgid "<br><b>Business</b><br>%s"
-msgstr "<br><b>Ocupacións</b><br>%s"
-
-#: ../libgaim/protocols/msn/msn.c:1637
-#, c-format
-msgid "<hr><b>Contact Info</b>%s%s"
-msgstr "<hr><b>Info de contacto</b>%s%s"
-
-#: ../libgaim/protocols/msn/msn.c:1696 ../libgaim/protocols/msn/msn.c:1702
-#: ../libgaim/protocols/msn/msn.c:1709 ../libgaim/protocols/msn/msn.c:1716
+#: ../libgaim/protocols/msn/msn.c:1710 ../libgaim/protocols/msn/msn.c:1716
+#: ../libgaim/protocols/msn/msn.c:1723 ../libgaim/protocols/msn/msn.c:1730
 msgid "Favorite Things"
 msgstr "Cousas preferidas"
 
-#: ../libgaim/protocols/msn/msn.c:1761
+#: ../libgaim/protocols/msn/msn.c:1775
 msgid "Last Updated"
 msgstr "Última actualización"
 
-#: ../libgaim/protocols/msn/msn.c:1773 ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libgaim/protocols/msn/msn.c:1786 ../libgaim/protocols/qq/buddy_info.c:60
 #: ../libgaim/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Páxina persoal"
 
-#: ../libgaim/protocols/msn/msn.c:1798
+#: ../libgaim/protocols/msn/msn.c:1807
 msgid "The user has not created a public profile."
 msgstr "O usuario non creou un perfil público."
 
-#: ../libgaim/protocols/msn/msn.c:1799
+#: ../libgaim/protocols/msn/msn.c:1808
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -9168,7 +9540,7 @@
 "que ou ben o usuario non existe ou que o usuario existe pero non creou un "
 "perfil público."
 
-#: ../libgaim/protocols/msn/msn.c:1803
+#: ../libgaim/protocols/msn/msn.c:1812
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -9176,14 +9548,8 @@
 "Gaim non puido atopar información no perfil de usuario. É probable que o "
 "usuario non exista."
 
-#. put a link to the actual profile URL
-#: ../libgaim/protocols/msn/msn.c:1808
-#, c-format
-msgid "<hr><b>%s:</b> "
-msgstr "<hr><b>%s:</b> "
-
-#: ../libgaim/protocols/msn/msn.c:1808
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223
+#: ../libgaim/protocols/msn/msn.c:1820
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "URL do perfil"
 
@@ -9197,19 +9563,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/msn/msn.c:2033 ../libgaim/protocols/msn/msn.c:2035
+#: ../libgaim/protocols/msn/msn.c:2035 ../libgaim/protocols/msn/msn.c:2037
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
-#: ../libgaim/protocols/msn/msn.c:2063
+#: ../libgaim/protocols/msn/msn.c:2065
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: ../libgaim/protocols/msn/msn.c:2068
+#: ../libgaim/protocols/msn/msn.c:2070
 msgid "Show custom smileys"
-msgstr "Amosar emoticóns personalizados"
-
-#: ../libgaim/protocols/msn/msn.c:2076
+msgstr "Amosar as emoticonas personalizados"
+
+#: ../libgaim/protocols/msn/msn.c:2078
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para chamar a súa atención"
 
@@ -9219,15 +9585,15 @@
 #: ../libgaim/protocols/qq/qq_proxy.c:321
 #: ../libgaim/protocols/qq/qq_proxy.c:366
 #: ../libgaim/protocols/qq/qq_proxy.c:399
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:62
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:162
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:186
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:199
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:228
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:242
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:267
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:301
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:331
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:63
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:163
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:187
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:200
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:229
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:243
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:268
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:302
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:332
 #: ../libgaim/protocols/yahoo/yahoochat.c:1357
 #: ../libgaim/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
@@ -9252,27 +9618,27 @@
 #: ../libgaim/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
-msgstr "Non se puido engadir ao usuario a %s (%s)"
+msgstr "Non se puido engadir o usuario a %s (%s)"
 
 #: ../libgaim/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr "Non se puido bloquear ao usuario en %s (%s)"
+msgstr "Non se puido bloquear o usuario en %s (%s)"
 
 #: ../libgaim/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr "Non se puido invitar ao usuario a %s (%s)"
+msgstr "Non se puido convidar o usuario a %s (%s)"
 
 #: ../libgaim/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
-msgstr "Non se puido engadir a %s porque súa lista de amigos está chea."
+msgstr "Non se puido engadir a %s porque a súa listaxe de contactos está chea."
 
 #: ../libgaim/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
-msgstr "%s non é un nome de conta passport válida."
+msgstr "%s non é un nome válido de conta passport."
 
 #: ../libgaim/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
@@ -9280,7 +9646,7 @@
 
 #: ../libgaim/protocols/msn/notification.c:823
 msgid "Unable to rename group"
-msgstr "Non se puido cambiar o nome do grupo"
+msgstr "Non se puido mudar o nome do grupo"
 
 #: ../libgaim/protocols/msn/notification.c:878
 msgid "Unable to delete group"
@@ -9303,18 +9669,18 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-"O servidor de MSN desconectarase para tarefas de mantemento en %d minuto. "
-"Desconectaráselle automaticamente nese momento. Por favor, remate calquera "
-"conversación activa.\n"
+"O servidor de MSN desconectarase para as tarefas de mantemento en %d minuto. "
+"Desconectarase automaticamente nese momento. Por favor, remate calquera "
+"conversa activa.\n"
 "\n"
-"Despois de que se haxan realizado as tarefas de mantemento debería poder "
-"conectarse con éxito de novo."
+"Despois de que se realizasen as tarefas de mantemento poderá conectarse con "
+"éxito de novo."
 msgstr[1] ""
 "O servidor de MSN desconectarase para tarefas de mantemento en %d minutos. "
-"Desconectaráselle automaticamente nese momento. Por favor, remate calquera "
-"conversación activa.\n"
+"Desconectarase automaticamente nese momento. Por favor, remate calquera "
+"conversa activa.\n"
 "\n"
-"Despois de que se haxan realizado as tarefas de mantemento debería poder "
+"Despois de que se realizasen as tarefas de mantemento debería poder "
 "conectarse con éxito de novo."
 
 #: ../libgaim/protocols/msn/servconn.c:135
@@ -9340,19 +9706,19 @@
 
 #: ../libgaim/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
-msgstr "Erro no análise HTTP."
+msgstr "Erro na análise HTTP."
 
 #: ../libgaim/protocols/msn/session.c:307
-#: ../libgaim/protocols/oscar/oscar.c:3410
+#: ../libgaim/protocols/oscar/oscar.c:3467
 #: ../libgaim/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
-msgstr "Conectouse desde outra ubicación."
+msgstr "Conectouse desde outra localización."
 
 #: ../libgaim/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
-"Súa lista de amigos MSN non está dispoñible temporalmente. Por favor agarde "
-"e volva a intentalo máis tarde."
+"A listaxe de contactos MSN non está dispoñible temporalmente. Por favor "
+"agarde e volva a tentalo máis tarde."
 
 #: ../libgaim/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
@@ -9366,8 +9732,8 @@
 #: ../libgaim/protocols/msn/session.c:324
 msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
-"Súa lista de amigos MSN está indispoñible temporalmente. Por favor, espere e "
-"volva a tentalo máis tarde."
+"A listaxe de contactos MSN non está dispoñible temporalmente. Por favor, "
+"espere e volva a tentalo máis tarde."
 
 #: ../libgaim/protocols/msn/session.c:345
 #: ../libgaim/protocols/msn/session.c:347
@@ -9376,11 +9742,11 @@
 
 #: ../libgaim/protocols/msn/session.c:346
 msgid "Transferring"
-msgstr "Transfirindo"
+msgstr "Transferindo"
 
 #: ../libgaim/protocols/msn/session.c:348
 msgid "Starting authentication"
-msgstr "Comezando a autenticación"
+msgstr "Comezando coa autenticación"
 
 #: ../libgaim/protocols/msn/session.c:349
 msgid "Getting cookie"
@@ -9392,7 +9758,7 @@
 
 #: ../libgaim/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
-msgstr "Recuperando lista de amigos"
+msgstr "Recuperando a listaxe de contactos"
 
 #: ../libgaim/protocols/msn/state.c:34
 msgid "Away From Computer"
@@ -9404,7 +9770,7 @@
 
 #: ../libgaim/protocols/msn/state.c:36
 msgid "Out To Lunch"
-msgstr "Saín a comer"
+msgstr "Saín comer"
 
 #: ../libgaim/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
@@ -9428,54 +9794,39 @@
 
 #: ../libgaim/protocols/msn/switchboard.c:424
 msgid "Message could not be sent because an error with the switchboard occurred:"
-msgstr "Non se puido enviar a mensaxe porque se produciu un erro co switchboard:"
+msgstr "Non se puido enviar a mensaxe porque se produciu un erro coa centraliña:"
 
 #: ../libgaim/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Non se puido enviar a mensaxe porque se produciu un erro descoñecido:"
 
-#: ../libgaim/protocols/msn/switchboard.c:952
+#: ../libgaim/protocols/msn/switchboard.c:956
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s acáballe de dar un cobadazo!"
 
-#: ../libgaim/protocols/msn/userlist.c:90
-#, c-format
-msgid "The user %s (%s) wants to add %s to his or her buddy list."
-msgstr "O usuario %s (%s) quere engadir a %s a súa lista de amigos."
-
-#: ../libgaim/protocols/msn/userlist.c:105
-#: ../libgaim/protocols/yahoo/yahoo.c:1002
-msgid "Authorize"
-msgstr "Autorizar"
-
-#: ../libgaim/protocols/msn/userlist.c:106
-#: ../libgaim/protocols/yahoo/yahoo.c:1004
-msgid "Deny"
-msgstr "Denegar"
-
-#: ../libgaim/protocols/msn/userlist.c:280
+#: ../libgaim/protocols/msn/userlist.c:250
 #, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr "O usuario %s engadiuno á súa lista de amigos."
-
-#: ../libgaim/protocols/msn/userlist.c:349
+msgstr "O usuario %s engadiuno á súa listaxe de contactos."
+
+#: ../libgaim/protocols/msn/userlist.c:319
 #, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr "O usuario %s quitouno da súa lista de amigos."
-
-#: ../libgaim/protocols/msn/userlist.c:671
+msgstr "O usuario %s quitouno da súa listaxe de contactos."
+
+#: ../libgaim/protocols/msn/userlist.c:641
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Imposible engadir \"%s\"."
 
-#: ../libgaim/protocols/msn/userlist.c:673
+#: ../libgaim/protocols/msn/userlist.c:643
 msgid "The screen name specified is invalid."
-msgstr "O nome especificado é inválido."
+msgstr "O nome especificado é incorrecto."
 
 #: ../libgaim/protocols/novell/nmuser.c:1879
 msgid "Required parameters not passed in"
-msgstr "Non se recibiron os parámetros requeridos"
+msgstr "Non se recibiron os parámetros requiridos"
 
 #: ../libgaim/protocols/novell/nmuser.c:1882
 msgid "Unable to write to network"
@@ -9483,7 +9834,7 @@
 
 #: ../libgaim/protocols/novell/nmuser.c:1885
 msgid "Unable to read from network"
-msgstr "NOn se puido ler da rede"
+msgstr "Non se puido ler da rede"
 
 #: ../libgaim/protocols/novell/nmuser.c:1888
 msgid "Error communicating with server"
@@ -9510,8 +9861,9 @@
 msgstr "O contrasinal expirou"
 
 #: ../libgaim/protocols/novell/nmuser.c:1909
-msgid "Invalid password"
-msgstr "Contrasinal inválido"
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Contrasinal incorrecto."
 
 #: ../libgaim/protocols/novell/nmuser.c:1912
 msgid "User not found"
@@ -9527,11 +9879,11 @@
 
 #: ../libgaim/protocols/novell/nmuser.c:1921
 msgid "Your system administrator has disabled this operation"
-msgstr "Seu administrador do sistema desactivou esta operación"
+msgstr "O administrador do sistema desactivou esta operación"
 
 #: ../libgaim/protocols/novell/nmuser.c:1924
 msgid "The server is unavailable; try again later"
-msgstr "O servidor non está dispoñible, inténteo de novo máis tarde"
+msgstr "O servidor non está dispoñible, ténteo de novo máis tarde"
 
 #: ../libgaim/protocols/novell/nmuser.c:1927
 msgid "Cannot add a contact to the same folder twice"
@@ -9539,39 +9891,43 @@
 
 #: ../libgaim/protocols/novell/nmuser.c:1930
 msgid "Cannot add yourself"
-msgstr "Non se pode engadir un mesmo"
+msgstr "Non se pode engadir a si mesmo"
 
 #: ../libgaim/protocols/novell/nmuser.c:1933
 msgid "Master archive is misconfigured"
-msgstr "O ficheiro maestro non está ben configurado"
+msgstr "O ficheiro mestre non está ben configurado"
 
 #: ../libgaim/protocols/novell/nmuser.c:1937
-msgid "Invalid username or password"
-msgstr "Nome ou contrasinal de usuario non válido"
+#, fuzzy
+msgid "Incorrect screen name or password"
+msgstr "Nome de conta ou contrasinal incorrecto."
 
 #: ../libgaim/protocols/novell/nmuser.c:1940
-msgid "Could not recognize the host of the username you entered"
+#, fuzzy
+msgid "Could not recognize the host of the screen name you entered"
 msgstr "Non se recoñeceu o servidor do usuario que introduciu"
 
 #: ../libgaim/protocols/novell/nmuser.c:1943
-msgid ""
-"Your account has been disabled because too many invalid passwords were "
+#, fuzzy
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr ""
-"Súa conta foi deshabilitada porque introduciu demasiadas veces un "
-"contrasinal inválido"
+"A súa conta foi deshabilitada porque introduciu demasiadas veces un "
+"contrasinal incorrecto"
 
 #: ../libgaim/protocols/novell/nmuser.c:1946
 msgid "You cannot add the same person twice to a conversation"
-msgstr "Non pode engadir a mesma persoa dúas veces a unha conversación"
+msgstr "Non pode engadir á mesma persoa dúas veces nunha conversa"
 
 #: ../libgaim/protocols/novell/nmuser.c:1950
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Alcanzou o límite do número de contactos permitidos"
 
 #: ../libgaim/protocols/novell/nmuser.c:1953
-msgid "You have entered an invalid username"
-msgstr "O nome de usuario que introduciu non é válido"
+#, fuzzy
+msgid "You have entered an incorrect screen name"
+msgstr "O nome de usuario que introduciu é incorrecto"
 
 #: ../libgaim/protocols/novell/nmuser.c:1956
 msgid "An error occurred while updating the directory"
@@ -9579,7 +9935,7 @@
 
 #: ../libgaim/protocols/novell/nmuser.c:1959
 msgid "Incompatible protocol version"
-msgstr "Versión de protocolo incompatible"
+msgstr "Versión con protocolo incompatible"
 
 #: ../libgaim/protocols/novell/nmuser.c:1962
 msgid "The user has blocked you"
@@ -9590,7 +9946,7 @@
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
-"Esta versión de evaluación non permite a conexión simultánea de máis de dez "
+"Esta versión de avaliación non permite a conexión simultánea a máis de dez "
 "usuarios"
 
 #: ../libgaim/protocols/novell/nmuser.c:1968
@@ -9617,7 +9973,7 @@
 #: ../libgaim/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
-msgstr "Non se puido engadir %s a súa lista de amigos (%s)."
+msgstr "Non se puido engadir %s a súa listaxe de contactos (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
 #: ../libgaim/protocols/novell/novell.c:422
@@ -9629,7 +9985,7 @@
 #: ../libgaim/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
-msgstr "Non se puido invitar ao usuario (%s)."
+msgstr "Non se puido convidar ao usuario (%s)."
 
 #: ../libgaim/protocols/novell/novell.c:532
 #, c-format
@@ -9647,7 +10003,7 @@
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
-"Non se puido mover ao usuario %s ao cartafol %s na lista do servidor. "
+"Non se puido mover o usuario %s ao cartafol %s na listaxe do servidor. "
 "Produciuse un erro ao crear o cartafol (%s)."
 
 #: ../libgaim/protocols/novell/novell.c:632
@@ -9656,7 +10012,7 @@
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"Non se puido engadir na súa lista de amigos a %s. Produciuse un erro ao "
+"Non se puido engadir na súa listaxe de contactos a %s. Produciuse un erro ao "
 "crear o cartafol na lista do servidor (%s)."
 
 #: ../libgaim/protocols/novell/novell.c:705
@@ -9668,28 +10024,28 @@
 #: ../libgaim/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
-msgstr "Non se puido engadir ao usuario a súa lista de privacidade (%s)."
+msgstr "Non se puido engadir ao usuario a listaxe de privacidade (%s)."
 
 #: ../libgaim/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
-msgstr "Non se puido engadir %s a súa lista de rexeitados (%s)."
+msgstr "Non se puido engadir %s a súa listaxe de rexeitados (%s)."
 
 #: ../libgaim/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
-msgstr "Non se puido engadir %s a súa lista de permitidos (%s)."
+msgstr "Non se puido engadir %s a súa listaxe de permitidos (%s)."
 
 #: ../libgaim/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
-msgstr "Non se puido eliminar %s da súa lista de privacidade (%s)."
+msgstr "Non se puido eliminar %s da súa listaxe de privacidade (%s)."
 
 #: ../libgaim/protocols/novell/novell.c:942
-#: ../libgaim/protocols/novell/novell.c:1652
+#: ../libgaim/protocols/novell/novell.c:1650
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr "Non se puideron cambiar as opcións de privacidade do servidor (%s)."
+msgstr "Non se puideron mudar as opcións de privacidade do servidor (%s)."
 
 #: ../libgaim/protocols/novell/novell.c:1012
 #, c-format
@@ -9697,7 +10053,7 @@
 msgstr "Non se puido crear a conferencia (%s)."
 
 #: ../libgaim/protocols/novell/novell.c:1121
-#: ../libgaim/protocols/novell/novell.c:1697
+#: ../libgaim/protocols/novell/novell.c:1695
 msgid "Error communicating with server. Closing connection."
 msgstr "Erro comunicándose co servidor. Pecharase a conexión."
 
@@ -9711,74 +10067,74 @@
 
 #: ../libgaim/protocols/novell/novell.c:1486
 msgid "Mailstop"
-msgstr "Buzón de correo"
-
-#: ../libgaim/protocols/novell/novell.c:1504
+msgstr "Caixa de correo"
+
+#: ../libgaim/protocols/novell/novell.c:1505
+#: ../libgaim/protocols/sametime/sametime.c:4133
 msgid "User ID"
 msgstr "ID de usuario"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
-#. g_string_append_printf(info_text, "<b>%s:</b> %s<br>",
-#. tag, value);
+#. gaim_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
 #: ../libgaim/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Nome completo"
 
-#: ../libgaim/protocols/novell/novell.c:1642
+#: ../libgaim/protocols/novell/novell.c:1640
 #, c-format
 msgid "GroupWise Conference %d"
-msgstr "Conferencia GroupWise %d"
-
-#: ../libgaim/protocols/novell/novell.c:1673
+msgstr "Conferencia do grupo de sabios %d"
+
+#: ../libgaim/protocols/novell/novell.c:1671
 msgid "Unable to make SSL connection to server."
 msgstr "Non se puido establecer unha conexión SSL co servidor."
 
-#: ../libgaim/protocols/novell/novell.c:1725
+#: ../libgaim/protocols/novell/novell.c:1723
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: ../libgaim/protocols/novell/novell.c:1737
+#: ../libgaim/protocols/novell/novell.c:1735
 msgid "Unable to connect to server."
 msgstr "Non se puido conectar ao servidor."
 
-#: ../libgaim/protocols/novell/novell.c:1740
+#: ../libgaim/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
-msgstr "Esperando resposta..."
-
-#: ../libgaim/protocols/novell/novell.c:1875
+msgstr "Esperando unha resposta..."
+
+#: ../libgaim/protocols/novell/novell.c:1873
 #, c-format
 msgid "%s has been invited to this conversation."
-msgstr "Invitouse a %s a esta conversación."
-
-#: ../libgaim/protocols/novell/novell.c:1903
+msgstr "Convidouse a %s a esta conversa."
+
+#: ../libgaim/protocols/novell/novell.c:1901
 msgid "Invitation to Conversation"
-msgstr "Invitación a unha conversación"
-
-#: ../libgaim/protocols/novell/novell.c:1904
+msgstr "Convite para unha conversa"
+
+#: ../libgaim/protocols/novell/novell.c:1902
 #, c-format
 msgid ""
 "Invitation from: %s\n"
 "\n"
 "Sent: %s"
 msgstr ""
-"Invitación de: %s\n"
+"Convite de: %s\n"
 "\n"
 "Enviada: %s"
 
-#: ../libgaim/protocols/novell/novell.c:1906
+#: ../libgaim/protocols/novell/novell.c:1904
 msgid "Would you like to join the conversation?"
-msgstr "Desexa unirse á conversación?"
+msgstr "Desexa unirse á conversa?"
 
 #. we don't want to reconnect in this case
-#: ../libgaim/protocols/novell/novell.c:2015
+#: ../libgaim/protocols/novell/novell.c:2013
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Foi desconectado porque se conectou desde outra estación de traballo."
 
-#: ../libgaim/protocols/novell/novell.c:2072
+#: ../libgaim/protocols/novell/novell.c:2070
 #, c-format
 msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
@@ -9789,7 +10145,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libgaim/protocols/novell/novell.c:2170
+#: ../libgaim/protocols/novell/novell.c:2168
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -9797,11 +10153,11 @@
 "Non se puido contactar co servidor. Por favor, indique o enderezo do "
 "servidor co que desexa conectarse."
 
-#: ../libgaim/protocols/novell/novell.c:2198
+#: ../libgaim/protocols/novell/novell.c:2196
 msgid "Error. SSL support is not installed."
 msgstr "Erro. O soporte SSL non está instalado."
 
-#: ../libgaim/protocols/novell/novell.c:2507
+#: ../libgaim/protocols/novell/novell.c:2505
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Pechouse esta conferencia. Non se poden enviar máis mensaxes."
 
@@ -9815,55 +10171,108 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/novell/novell.c:3552
-#: ../libgaim/protocols/novell/novell.c:3554
+#: ../libgaim/protocols/novell/novell.c:3548
+#: ../libgaim/protocols/novell/novell.c:3550
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Mensaxería de Grupos Novell"
 
-#: ../libgaim/protocols/novell/novell.c:3573
+#: ../libgaim/protocols/novell/novell.c:3569
 msgid "Server address"
 msgstr "Enderezo do servidor"
 
-#: ../libgaim/protocols/novell/novell.c:3577
+#: ../libgaim/protocols/novell/novell.c:3573
 msgid "Server port"
 msgstr "Porto do servidor"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:237
-#: ../libgaim/protocols/yahoo/yahoo.c:2268
-#: ../libgaim/protocols/yahoo/yahoo.c:2426
+#: ../libgaim/protocols/oscar/flap_connection.c:379
+#: ../libgaim/protocols/yahoo/yahoo.c:2263
+#: ../libgaim/protocols/yahoo/yahoo.c:2421
 #: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:566
 #: ../libgaim/proxy.c:1074 ../libgaim/proxy.c:1185 ../libgaim/proxy.c:1285
 #: ../libgaim/proxy.c:1413
 msgid "Server closed the connection."
 msgstr "O servidor pechou a conexión."
 
-#: ../libgaim/protocols/oscar/flap_connection.c:239
-#: ../libgaim/protocols/yahoo/yahoo.c:2262
-#: ../libgaim/protocols/yahoo/yahoo.c:2420 ../libgaim/proxy.c:578
+#: ../libgaim/protocols/oscar/flap_connection.c:381
+#: ../libgaim/protocols/yahoo/yahoo.c:2257
+#: ../libgaim/protocols/yahoo/yahoo.c:2415 ../libgaim/proxy.c:578
 #: ../libgaim/proxy.c:1086 ../libgaim/proxy.c:1197 ../libgaim/proxy.c:1297
 #: ../libgaim/proxy.c:1425
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Lost connection with server:\n"
 "%s"
-msgstr ""
-"Perdeuse a conexión co servidor:\n"
-"%s"
-
-#: ../libgaim/protocols/oscar/flap_connection.c:242 ../libgaim/proxy.c:1103
+msgstr "Non conectado ao servidor."
+
+#: ../libgaim/protocols/oscar/flap_connection.c:384 ../libgaim/proxy.c:1103
 #: ../libgaim/proxy.c:1210 ../libgaim/proxy.c:1309 ../libgaim/proxy.c:1381
 #: ../libgaim/proxy.c:1438
+#, fuzzy
 msgid "Received invalid data on connection with server."
-msgstr "Recibíronse datos inválidos ao conectarse ao servidor."
-
-#: ../libgaim/protocols/oscar/flap_connection.c:244
-#, c-format
+msgstr "Non se puido establecer unha conexión SSL co servidor."
+
+#: ../libgaim/protocols/oscar/flap_connection.c:386
+#, fuzzy, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
 "%s"
-msgstr ""
-"Non se puido establecer unha conexión co servidor:\n"
-"%s"
+msgstr "Non se puido establecer unha conexión co servidor."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/oscar/libaim.c:112
+#: ../libgaim/protocols/oscar/libaim.c:114
+#, fuzzy
+msgid "AIM Protocol Plugin"
+msgstr "Complemento de protocolo AIM/ICQ"
+
+#: ../libgaim/protocols/oscar/libaim.c:140
+#, fuzzy
+msgid ""
+"Always use AIM/ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Empregar sempre un servidor proxy de AIM/ICQ\n"
+"(máis lento, pero non revela o teu enderezo IP)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/oscar/libicq.c:112
+#: ../libgaim/protocols/oscar/libicq.c:114
+#, fuzzy
+msgid "ICQ Protocol Plugin"
+msgstr "Complemento de protocolo IRC"
+
+#: ../libgaim/protocols/oscar/libicq.c:139
+#: ../libgaim/protocols/yahoo/yahoo.c:3945
+#: ../libgaim/protocols/zephyr/zephyr.c:2985
+msgid "Encoding"
+msgstr "Codificación"
+
+#: ../libgaim/protocols/oscar/libicq.c:143
+#, fuzzy
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Empregar sempre un servidor proxy de AIM/ICQ\n"
+"(máis lento, pero non revela o teu enderezo IP)"
 
 #: ../libgaim/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
@@ -9871,12 +10280,12 @@
 
 #: ../libgaim/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
-msgstr "O usuario remoto rexeitou a túa petición."
+msgstr "O usuario remoto rexeitou a petición."
 
 #: ../libgaim/protocols/oscar/odc.c:44
-#, c-format
+#, fuzzy, c-format
 msgid "Lost connection with the remote user:<br>%s"
-msgstr "Perdeuse a conexión co usuario remoto:<br>%s"
+msgstr "Perdeuse a conexión co usuario remoto por unha razón descoñecida."
 
 #: ../libgaim/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
@@ -9886,448 +10295,434 @@
 msgid "Could not establish a connection with the remote user."
 msgstr "Non se puido establecer a conexión co usuario remoto."
 
-#: ../libgaim/protocols/oscar/odc.c:561
+#: ../libgaim/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "MI directo establecido."
 
-#: ../libgaim/protocols/oscar/oft.c:457
+#: ../libgaim/protocols/oscar/oft.c:657
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
+#: ../libgaim/protocols/oscar/oscar.c:114
+msgid "Invalid error"
+msgstr "Erro inválido"
+
+#: ../libgaim/protocols/oscar/oscar.c:115
+msgid "Invalid SNAC"
+msgstr "SNAC inválido"
+
+#: ../libgaim/protocols/oscar/oscar.c:116
+msgid "Rate to host"
+msgstr "Taxa de mensaxes para o servidor"
+
+#: ../libgaim/protocols/oscar/oscar.c:117
+msgid "Rate to client"
+msgstr "Taxa de mensaxes para o cliente"
+
 #: ../libgaim/protocols/oscar/oscar.c:119
-msgid "Invalid error"
-msgstr "Erro inválido"
+msgid "Service unavailable"
+msgstr "Servizo non dispoñible"
 
 #: ../libgaim/protocols/oscar/oscar.c:120
-msgid "Invalid SNAC"
-msgstr "SNAC inválido"
+msgid "Service not defined"
+msgstr "Servizo non definido"
 
 #: ../libgaim/protocols/oscar/oscar.c:121
-msgid "Rate to host"
-msgstr "Tasa de mensaxes ao servidor"
+msgid "Obsolete SNAC"
+msgstr "SNAC obsoleto"
 
 #: ../libgaim/protocols/oscar/oscar.c:122
-msgid "Rate to client"
-msgstr "Tasa de mensaxes ao cliente"
+msgid "Not supported by host"
+msgstr "Non soportado polo servidor"
+
+#: ../libgaim/protocols/oscar/oscar.c:123
+msgid "Not supported by client"
+msgstr "Non soportado polo cliente"
 
 #: ../libgaim/protocols/oscar/oscar.c:124
-msgid "Service unavailable"
-msgstr "Servizo non dispoñible"
+msgid "Refused by client"
+msgstr "Rexeitado polo cliente"
 
 #: ../libgaim/protocols/oscar/oscar.c:125
-msgid "Service not defined"
-msgstr "Servizo non definido"
-
-#: ../libgaim/protocols/oscar/oscar.c:126
-msgid "Obsolete SNAC"
-msgstr "SNAC obsoleto"
-
-#: ../libgaim/protocols/oscar/oscar.c:127
-msgid "Not supported by host"
-msgstr "Non soportado polo servidor"
-
-#: ../libgaim/protocols/oscar/oscar.c:128
-msgid "Not supported by client"
-msgstr "Non soportado polo cliente"
-
-#: ../libgaim/protocols/oscar/oscar.c:129
-msgid "Refused by client"
-msgstr "Rexeitado polo cliente"
-
-#: ../libgaim/protocols/oscar/oscar.c:130
 msgid "Reply too big"
 msgstr "Resposta demasiado grande"
 
-#: ../libgaim/protocols/oscar/oscar.c:131
+#: ../libgaim/protocols/oscar/oscar.c:126
 msgid "Responses lost"
 msgstr "Respostas perdidas"
 
-#: ../libgaim/protocols/oscar/oscar.c:132
+#: ../libgaim/protocols/oscar/oscar.c:127
 msgid "Request denied"
-msgstr "Solicitude denegada"
-
-#: ../libgaim/protocols/oscar/oscar.c:133
+msgstr "Solicitude rexeitada"
+
+#: ../libgaim/protocols/oscar/oscar.c:128
 msgid "Busted SNAC payload"
 msgstr "Carga de SNAC destrozada"
 
-#: ../libgaim/protocols/oscar/oscar.c:134
+#: ../libgaim/protocols/oscar/oscar.c:129
 msgid "Insufficient rights"
 msgstr "Dereitos insuficientes"
 
-#: ../libgaim/protocols/oscar/oscar.c:135
+#: ../libgaim/protocols/oscar/oscar.c:130
 msgid "In local permit/deny"
-msgstr "Na lista local de autorizar/negar"
-
-#: ../libgaim/protocols/oscar/oscar.c:136
+msgstr "Na listaxe local de autorizar/rexeitar"
+
+#: ../libgaim/protocols/oscar/oscar.c:131
 msgid "Too evil (sender)"
 msgstr "Demasiado malvado (remitente)"
 
-#: ../libgaim/protocols/oscar/oscar.c:137
+#: ../libgaim/protocols/oscar/oscar.c:132
 msgid "Too evil (receiver)"
 msgstr "Demasiado malvado (destinatario)"
 
-#: ../libgaim/protocols/oscar/oscar.c:138
+#: ../libgaim/protocols/oscar/oscar.c:133
 msgid "User temporarily unavailable"
 msgstr "Usuario temporalmente non dispoñible"
 
-#: ../libgaim/protocols/oscar/oscar.c:139
+#: ../libgaim/protocols/oscar/oscar.c:134
 msgid "No match"
 msgstr "Non houbo coincidencia"
 
-#: ../libgaim/protocols/oscar/oscar.c:140
+#: ../libgaim/protocols/oscar/oscar.c:135
 msgid "List overflow"
-msgstr "Desbordamento da lista"
-
-#: ../libgaim/protocols/oscar/oscar.c:141
+msgstr "Límite da listaxe excedido"
+
+#: ../libgaim/protocols/oscar/oscar.c:136
 msgid "Request ambiguous"
-msgstr "Solicitude ambigua"
-
-#: ../libgaim/protocols/oscar/oscar.c:142
+msgstr "Solicitude ambigüa"
+
+#: ../libgaim/protocols/oscar/oscar.c:137
 msgid "Queue full"
 msgstr "Cola chea"
 
-#: ../libgaim/protocols/oscar/oscar.c:143
+#: ../libgaim/protocols/oscar/oscar.c:138
 msgid "Not while on AOL"
 msgstr "Non mentras está en AOL"
 
-#: ../libgaim/protocols/oscar/oscar.c:321
+#: ../libgaim/protocols/oscar/oscar.c:327
 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 "
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:424
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking to "
-"most likely has a buggy client.)"
-msgstr ""
-"(Produciuse un erro ao recibir esta mensaxe. É posible que o amigo co que "
+"(Houbo un erro recibindo a mensaxe. O contacto co que estás falando está a "
+"empregar unha codificación diferente da esperada. Se sabes cal está "
+"empregando podes especificalo nas opcións avanzadas de conta para AIM/ICQ)"
+
+#: ../libgaim/protocols/oscar/oscar.c:436
+#, fuzzy, c-format
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+msgstr ""
+"(Produciuse un erro ao recibir esta mensaxe. É posible que o contacto co que "
 "está falando teña un cliente defectuoso.)"
 
-#: ../libgaim/protocols/oscar/oscar.c:603
+#: ../libgaim/protocols/oscar/oscar.c:621
 msgid "Voice"
 msgstr "Voz"
 
-#: ../libgaim/protocols/oscar/oscar.c:606
+#: ../libgaim/protocols/oscar/oscar.c:624
 msgid "AIM Direct IM"
 msgstr "MI Directo AIM"
 
-#: ../libgaim/protocols/oscar/oscar.c:609 ../libgaim/protocols/silc/silc.c:693
+#: ../libgaim/protocols/oscar/oscar.c:627 ../libgaim/protocols/silc/silc.c:693
 #: ../libgaim/protocols/silc/util.c:551
 msgid "Chat"
-msgstr "Chat"
-
-#: ../libgaim/protocols/oscar/oscar.c:612
-#: ../libgaim/protocols/oscar/oscar.c:5853
+msgstr "Conversa"
+
+#: ../libgaim/protocols/oscar/oscar.c:630
+#: ../libgaim/protocols/oscar/oscar.c:5959
 msgid "Get File"
 msgstr "Recibir ficheiro"
 
-#: ../libgaim/protocols/oscar/oscar.c:619
+#: ../libgaim/protocols/oscar/oscar.c:637
 msgid "Games"
 msgstr "Xogos"
 
-#: ../libgaim/protocols/oscar/oscar.c:622
+#: ../libgaim/protocols/oscar/oscar.c:640
 msgid "Add-Ins"
 msgstr "Extensións"
 
-#: ../libgaim/protocols/oscar/oscar.c:625
+#: ../libgaim/protocols/oscar/oscar.c:643
 msgid "Send Buddy List"
-msgstr "Enviar lista de amigos"
-
-#: ../libgaim/protocols/oscar/oscar.c:628
-msgid "ICQ Direct Connect"
-msgstr "Conexión directa ICQ"
-
-#: ../libgaim/protocols/oscar/oscar.c:631
-msgid "AP User"
-msgstr "Usuario de AP"
-
-#: ../libgaim/protocols/oscar/oscar.c:634
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-#: ../libgaim/protocols/oscar/oscar.c:637
-msgid "Nihilist"
-msgstr "Nihilista"
-
-#: ../libgaim/protocols/oscar/oscar.c:640
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-#: ../libgaim/protocols/oscar/oscar.c:643
-msgid "Old ICQ UTF8"
-msgstr "Antigo ICQ UTF8"
+msgstr "Enviar listaxe de contactos"
 
 #: ../libgaim/protocols/oscar/oscar.c:646
-msgid "Trillian Encryption"
-msgstr "Cifrado Trillian"
+msgid "ICQ Direct Connect"
+msgstr "Conexión directa ICQ"
 
 #: ../libgaim/protocols/oscar/oscar.c:649
+msgid "AP User"
+msgstr "Usuario de AP"
+
+#: ../libgaim/protocols/oscar/oscar.c:652
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+#: ../libgaim/protocols/oscar/oscar.c:655
+msgid "Nihilist"
+msgstr "Nihilista"
+
+#: ../libgaim/protocols/oscar/oscar.c:658
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+#: ../libgaim/protocols/oscar/oscar.c:661
+msgid "Old ICQ UTF8"
+msgstr "Antigo ICQ UTF8"
+
+#: ../libgaim/protocols/oscar/oscar.c:664
+msgid "Trillian Encryption"
+msgstr "Cifraxe Trillian"
+
+#: ../libgaim/protocols/oscar/oscar.c:667
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:652
+#: ../libgaim/protocols/oscar/oscar.c:670
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libgaim/protocols/oscar/oscar.c:655
+#: ../libgaim/protocols/oscar/oscar.c:673
 msgid "Security Enabled"
 msgstr "Seguridade activada"
 
-#: ../libgaim/protocols/oscar/oscar.c:658
+#: ../libgaim/protocols/oscar/oscar.c:676
 msgid "Video Chat"
-msgstr "Video Chat"
-
-#: ../libgaim/protocols/oscar/oscar.c:662
+msgstr "Vídeoconversa"
+
+#: ../libgaim/protocols/oscar/oscar.c:680
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libgaim/protocols/oscar/oscar.c:665
+#: ../libgaim/protocols/oscar/oscar.c:683
 msgid "Live Video"
-msgstr "Vídeo en tempo real"
-
-#: ../libgaim/protocols/oscar/oscar.c:668
-msgid "Camera"
-msgstr "Cámara"
+msgstr "Vídeo en directo"
 
 #: ../libgaim/protocols/oscar/oscar.c:686
-#: ../libgaim/protocols/oscar/oscar.c:5630
+msgid "Camera"
+msgstr "Cámara"
+
+#: ../libgaim/protocols/oscar/oscar.c:704
+#: ../libgaim/protocols/oscar/oscar.c:5735
 msgid "Free For Chat"
 msgstr "Dispoñible para conversar"
 
-#: ../libgaim/protocols/oscar/oscar.c:690
-#: ../libgaim/protocols/oscar/oscar.c:5662
+#: ../libgaim/protocols/oscar/oscar.c:708
+#: ../libgaim/protocols/oscar/oscar.c:5767
 msgid "Not Available"
 msgstr "Non dispoñible"
 
-#: ../libgaim/protocols/oscar/oscar.c:692
-#: ../libgaim/protocols/oscar/oscar.c:5648
+#: ../libgaim/protocols/oscar/oscar.c:710
+#: ../libgaim/protocols/oscar/oscar.c:5753
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: ../libgaim/protocols/oscar/oscar.c:696
+#: ../libgaim/protocols/oscar/oscar.c:714
 msgid "Web Aware"
 msgstr "Capacidade Web"
 
-#: ../libgaim/protocols/oscar/oscar.c:700
+#: ../libgaim/protocols/oscar/oscar.c:718
 msgid "Online"
 msgstr "Conectado"
 
-#: ../libgaim/protocols/oscar/oscar.c:786
-#: ../libgaim/protocols/oscar/oscar.c:2805
+#: ../libgaim/protocols/oscar/oscar.c:824
+#: ../libgaim/protocols/oscar/oscar.c:2852
 msgid "Warning Level"
 msgstr "Nivel de aviso"
 
-#: ../libgaim/protocols/oscar/oscar.c:795
+#: ../libgaim/protocols/oscar/oscar.c:834
 msgid "Buddy Comment"
-msgstr "Comentario de amigo"
-
-#: ../libgaim/protocols/oscar/oscar.c:931
-#, c-format
+msgstr "Comentario de contacto"
+
+#: ../libgaim/protocols/oscar/oscar.c:974
+#, fuzzy, c-format
 msgid ""
 "Could not connect to authentication server:\n"
 "%s"
-msgstr ""
-"Non se puido conectar ao servidor de autenticación:\n"
-"%s"
-
-#: ../libgaim/protocols/oscar/oscar.c:939
-#, c-format
+msgstr "Non se puido conectar ao servidor de autenticación"
+
+#: ../libgaim/protocols/oscar/oscar.c:982
+#, fuzzy, c-format
 msgid ""
 "Could not connect to BOS server:\n"
 "%s"
-msgstr ""
-"Non se puido conectar ao servidor BOS:\n"
-"%s"
-
-#: ../libgaim/protocols/oscar/oscar.c:979
+msgstr "Non se puido conectar ao servidor BOS"
+
+#: ../libgaim/protocols/oscar/oscar.c:1022
 msgid "Screen name sent"
 msgstr "Enviouse o nome de usuario"
 
-#: ../libgaim/protocols/oscar/oscar.c:984
+#: ../libgaim/protocols/oscar/oscar.c:1027
 msgid "Connection established, cookie sent"
 msgstr "Conexión establecida, cookie enviada"
 
 #. TODO: Don't call this with ssi
-#: ../libgaim/protocols/oscar/oscar.c:1013
+#: ../libgaim/protocols/oscar/oscar.c:1056
 msgid "Finalizing connection"
 msgstr "Rematando a conexión"
 
-#: ../libgaim/protocols/oscar/oscar.c:1197
+#: ../libgaim/protocols/oscar/oscar.c:1240
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must either start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
-"Incapaz de conectar: Non puido conectarse como %s porque o nome de usuario "
-"non é válido. Os nomes de usuario deben comezar con letras e só poden conter "
-"letras, números e espacios, ou conter só números."
-
-#: ../libgaim/protocols/oscar/oscar.c:1282
+"Incapaz de conectar: Non puido conectarse como %s porque o nome de usuario é "
+"incorrecto. Os nomes de usuario deben comezar con letras e só poden conter "
+"letras, números e espazos, ou conter só números."
+
+#: ../libgaim/protocols/oscar/oscar.c:1325
+#: ../libgaim/protocols/yahoo/yahoo.c:1900
+#, fuzzy
 msgid "Invalid screen name."
-msgstr "Nome de usuario inválido."
-
-#: ../libgaim/protocols/oscar/oscar.c:1288
-#: ../libgaim/protocols/yahoo/yahoo.c:1928
+msgstr "Nome de usuario incorrecto."
+
+#: ../libgaim/protocols/oscar/oscar.c:1332
+#: ../libgaim/protocols/qq/login_logout.c:483
+#: ../libgaim/protocols/simple/simple.c:1035
+#: ../libgaim/protocols/yahoo/yahoo.c:1923
 msgid "Incorrect password."
 msgstr "Contrasinal incorrecto."
 
-#: ../libgaim/protocols/oscar/oscar.c:1293
+#: ../libgaim/protocols/oscar/oscar.c:1337
 msgid "Your account is currently suspended."
-msgstr "Súa conta está deshabilitada actualmente."
+msgstr "A conta está deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: ../libgaim/protocols/oscar/oscar.c:1297
+#: ../libgaim/protocols/oscar/oscar.c:1341
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "O servizo de Mensaxería Instantánea AOL está temporalmente non dispoñible."
-
-#: ../libgaim/protocols/oscar/oscar.c:1302
+msgstr "O servizo de mensaxería instantánea AOL está temporalmente non dispoñible."
+
+#: ../libgaim/protocols/oscar/oscar.c:1346
 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."
 msgstr ""
 "Conectouse e desconectouse demasiadas veces. Agarde dez minutos e inténteo "
-"de novo. Se segue intentándoo, necesitará agardar incluso máis tempo."
-
-#: ../libgaim/protocols/oscar/oscar.c:1307
+"de novo. Se segue a intentalo, pode que necesite agardar máis tempo."
+
+#: ../libgaim/protocols/oscar/oscar.c:1351
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "A versión do cliente que usa é demasiado antiga. Por favor, actualícea en %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:1342
+#: ../libgaim/protocols/oscar/oscar.c:1386
 msgid "Could Not Connect"
 msgstr "Non se puido conectar"
 
-#: ../libgaim/protocols/oscar/oscar.c:1347
+#: ../libgaim/protocols/oscar/oscar.c:1391
 msgid "Received authorization"
 msgstr "Recibiuse a autorización"
 
-#: ../libgaim/protocols/oscar/oscar.c:1370
+#: ../libgaim/protocols/oscar/oscar.c:1414
 msgid "The SecurID key entered is invalid."
 msgstr "A clave SecurID que se introduciu non é válida."
 
-#: ../libgaim/protocols/oscar/oscar.c:1384
+#: ../libgaim/protocols/oscar/oscar.c:1428
 msgid "Enter SecurID"
-msgstr "Introduza SecurID"
-
-#: ../libgaim/protocols/oscar/oscar.c:1385
+msgstr "Introduza o SecurID"
+
+#: ../libgaim/protocols/oscar/oscar.c:1429
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduza o díxito de seis números que aparece na pantalla."
 
-#: ../libgaim/protocols/oscar/oscar.c:1425
-#: ../libgaim/protocols/oscar/oscar.c:1468
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../libgaim/protocols/oscar/oscar.c:1431
+#: ../libgaim/protocols/oscar/oscar.c:2233
+#: ../libgaim/protocols/oscar/oscar.c:2279
+#: ../libgaim/protocols/oscar/oscar.c:5837
+#: ../libgaim/protocols/oscar/oscar.c:6067
+#: ../libgaim/protocols/oscar/oscar.c:6123 ../libgaim/request.h:1350
+#, fuzzy
+msgid "_OK"
+msgstr "Aceptar"
+
+#: ../libgaim/protocols/oscar/oscar.c:1469
+#: ../libgaim/protocols/oscar/oscar.c:1512
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
-"Quizais sexa desconectado en breve. Pode quere usar TOC ata que se resolva "
+"Quizais o desconectemos en breve. Pode querer usar TOC ata que se resolva "
 "isto. Comprobe %s para novidades."
 
-#: ../libgaim/protocols/oscar/oscar.c:1428
-#: ../libgaim/protocols/oscar/oscar.c:1471
+#: ../libgaim/protocols/oscar/oscar.c:1472
+#: ../libgaim/protocols/oscar/oscar.c:1515
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim non puido obter un hash de conexión a AIM válido."
 
-#: ../libgaim/protocols/oscar/oscar.c:1557
+#: ../libgaim/protocols/oscar/oscar.c:1601
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Quizais sexa desconectado en breve. Comprobe %s para novidades."
-
-#: ../libgaim/protocols/oscar/oscar.c:1560
+msgstr "Quizais o desconectemos en breve. Comprobe %s para novidades."
+
+#: ../libgaim/protocols/oscar/oscar.c:1604
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim non puido obter un hash de conexión válido."
 
-#: ../libgaim/protocols/oscar/oscar.c:1586
+#: ../libgaim/protocols/oscar/oscar.c:1630
 msgid "Password sent"
 msgstr "Contrasinal enviado"
 
-#: ../libgaim/protocols/oscar/oscar.c:1642
+#: ../libgaim/protocols/oscar/oscar.c:1686
+#, fuzzy
 msgid "Unable to initialize connection"
-msgstr "Imposible inicializar a conexión"
-
-#: ../libgaim/protocols/oscar/oscar.c:2140
+msgstr "Imposible crear a conexión"
+
+#: ../libgaim/protocols/oscar/oscar.c:2203
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Por favor, autoríceme para que poida engadirlle a miña lista de amigos."
-
-#: ../libgaim/protocols/oscar/oscar.c:2149
+msgstr "Por favor, autoríceme para que poida engadilo á miña listaxe de contactos."
+
+#: ../libgaim/protocols/oscar/oscar.c:2231
 msgid "Authorization Request Message:"
 msgstr "Mensaxe de solicitude de autorización:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2150
+#: ../libgaim/protocols/oscar/oscar.c:2232
 msgid "Please authorize me!"
 msgstr "Por favor, autoríceme!"
 
-#: ../libgaim/protocols/oscar/oscar.c:2182
-#, c-format
-msgid ""
-"The user %s requires authorization before being added to a buddy list.  Do "
-"you want to send an authorization request?"
-msgstr ""
-"O usuario %s require autorización antes de permitir que o incorporen a unha "
-"lista de amigos. Desexa enviar unha solicitude de autorización?"
-
-#: ../libgaim/protocols/oscar/oscar.c:2187
-msgid "Request Authorization"
-msgstr "Pedir autorización"
-
-#: ../libgaim/protocols/oscar/oscar.c:2189
-msgid "_Request Authorization"
-msgstr "_Pedir autorización"
-
-#: ../libgaim/protocols/oscar/oscar.c:2230
-#: ../libgaim/protocols/oscar/oscar.c:2237
-#: ../libgaim/protocols/oscar/oscar.c:2344
-#: ../libgaim/protocols/oscar/oscar.c:2368
-#: ../libgaim/protocols/oscar/oscar.c:5055
-#: ../libgaim/protocols/oscar/oscar.c:5107
+#: ../libgaim/protocols/oscar/oscar.c:2271
+#: ../libgaim/protocols/oscar/oscar.c:2278
+#: ../libgaim/protocols/oscar/oscar.c:2404
+#: ../libgaim/protocols/oscar/oscar.c:5197
+#: ../libgaim/protocols/yahoo/yahoo.c:959
 msgid "No reason given."
-msgstr "Non se indicou un razón."
-
-#: ../libgaim/protocols/oscar/oscar.c:2236
+msgstr "Non se indicou unha razón."
+
+#: ../libgaim/protocols/oscar/oscar.c:2277
 msgid "Authorization Denied Message:"
-msgstr "Mensaxe de autorización denegada:"
-
-#: ../libgaim/protocols/oscar/oscar.c:2346
-#, c-format
-msgid ""
-"The user %u wants to add %s to their buddy list for the following reason:\n"
-"%s"
-msgstr ""
-"O usuario %u quere engadir a %s á súa lista de amigos polo seguinte motivo:\n"
-"%s"
-
-#: ../libgaim/protocols/oscar/oscar.c:2356
-#: ../libgaim/protocols/oscar/oscar.c:5067
-msgid "Authorization Request"
-msgstr "Solicitude de autorización"
-
-#: ../libgaim/protocols/oscar/oscar.c:2368
+msgstr "Mensaxe de autorización rexeitada:"
+
+#: ../libgaim/protocols/oscar/oscar.c:2404
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"O usuario %u denegou súa petición de engadilo a súa lista de amigos pola "
+"O usuario %u rexeitou a petición de engadilo a súa listaxe de contactos pola "
 "seguinte razón:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2369
+#: ../libgaim/protocols/oscar/oscar.c:2405
 msgid "ICQ authorization denied."
-msgstr "Autorización ICQ denegada."
+msgstr "Autorización ICQ rexeitada."
 
 #. Someone has granted you authorization
-#: ../libgaim/protocols/oscar/oscar.c:2376
+#: ../libgaim/protocols/oscar/oscar.c:2412
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr "O usuario %u autorizou súa petición de engadilo a súa lista de amigos."
-
-#: ../libgaim/protocols/oscar/oscar.c:2384
+msgstr "O usuario %u autorizou a súa petición de engadilo á listaxe de contactos."
+
+#: ../libgaim/protocols/oscar/oscar.c:2420
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10340,7 +10735,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2392
+#: ../libgaim/protocols/oscar/oscar.c:2428
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10353,7 +10748,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2400
+#: ../libgaim/protocols/oscar/oscar.c:2436
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -10366,315 +10761,315 @@
 "A mensaxe é:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2421
+#: ../libgaim/protocols/oscar/oscar.c:2457
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "O usuario ICQ %u envioulle un amigo: %s (%s)"
-
-#: ../libgaim/protocols/oscar/oscar.c:2427
+msgstr "O usuario ICQ %u envioulle un contacto: %s (%s)"
+
+#: ../libgaim/protocols/oscar/oscar.c:2463
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "Desexa engadir este amigo a súa lista de amigos?"
-
-#: ../libgaim/protocols/oscar/oscar.c:2431
+msgstr "Desexa engadir este contacto á listaxe de contactos?"
+
+#: ../libgaim/protocols/oscar/oscar.c:2467
 msgid "_Decline"
-msgstr "_Declinar"
-
-#: ../libgaim/protocols/oscar/oscar.c:2515
+msgstr "_Rexeitar"
+
+#: ../libgaim/protocols/oscar/oscar.c:2551
 #, 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] "Vostede perdeu %hu mensaxe de %s porque non era válido."
-msgstr[1] "Perdéronse %hu mensaxes de %s porque non eran válidos."
-
-#: ../libgaim/protocols/oscar/oscar.c:2524
+msgstr[0] "Vostede perdeu %hu mensaxe de %s porque non era válida."
+msgstr[1] "Perdéronse %hu mensaxes de %s porque non eran válidas."
+
+#: ../libgaim/protocols/oscar/oscar.c:2560
 #, 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] "Perdéronse %hu mensaxes de %s porque eran demasiado longas."
 
-#: ../libgaim/protocols/oscar/oscar.c:2533
+#: ../libgaim/protocols/oscar/oscar.c:2569
 #, 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] "Vostede perdeu %hu mensaxe de %s porque foi mandado damasiado rápido"
-msgstr[1] "Perdéronse %hu mensaxes de %s porque foron mandadas demasiado rápido"
-
-#: ../libgaim/protocols/oscar/oscar.c:2542
+msgstr[0] "Perdeu %hu mensaxe de %s porque se mandou damasiado rápido"
+msgstr[1] "Perdéronse %hu mensaxes de %s porque se mandaron demasiado rápido"
+
+#: ../libgaim/protocols/oscar/oscar.c:2578
 #, 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 é moi malvado/a."
 msgstr[1] "Perdéronse %hu mensaxes de %s porque el/ela é moi malvado/a."
 
-#: ../libgaim/protocols/oscar/oscar.c:2551
+#: ../libgaim/protocols/oscar/oscar.c:2587
 #, 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 vostede é moi malvado/a."
 msgstr[1] "Perdéronse %hu mensaxes de %s porque vostede é moi malvado/a."
 
-#: ../libgaim/protocols/oscar/oscar.c:2560
+#: ../libgaim/protocols/oscar/oscar.c:2596
 #, 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."
 msgstr[0] "Perdeuse %hu mensaxe de %s por motivos descoñecidos."
 msgstr[1] "Perdéronse %hu mensaxes de %s por motivos descoñecidos."
 
-#: ../libgaim/protocols/oscar/oscar.c:2616
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>UIN:</B> %s<BR><B>Estado:</B> %s<HR>%s"
-
-#: ../libgaim/protocols/oscar/oscar.c:2677
+#: ../libgaim/protocols/oscar/oscar.c:2718
 #, c-format
 msgid "SNAC threw error: %s\n"
-msgstr "SNAC eviou o erro: %s\n"
+msgstr "SNAC enviou o erro: %s\n"
 
 #. Data is assumed to be the destination sn
-#: ../libgaim/protocols/oscar/oscar.c:2713
+#: ../libgaim/protocols/oscar/oscar.c:2758
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Non se puido enviar a mensaxe: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2713
-#: ../libgaim/protocols/oscar/oscar.c:2718
-#: ../libgaim/protocols/oscar/oscar.c:2780
-#: ../libgaim/protocols/oscar/oscar.c:2784
+#: ../libgaim/protocols/oscar/oscar.c:2758
+#: ../libgaim/protocols/oscar/oscar.c:2763
+#: ../libgaim/protocols/oscar/oscar.c:2825
+#: ../libgaim/protocols/oscar/oscar.c:2829
 msgid "Unknown reason."
 msgstr "Razón descoñecida."
 
-#: ../libgaim/protocols/oscar/oscar.c:2716
-#: ../libgaim/protocols/sametime/sametime.c:2360
+#: ../libgaim/protocols/oscar/oscar.c:2761
+#: ../libgaim/protocols/sametime/sametime.c:2400
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Non se puido enviar a mensaxe a %s:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2780
+#: ../libgaim/protocols/oscar/oscar.c:2825
 #, c-format
 msgid "User information not available: %s"
 msgstr "Información de usuario non dispoñible: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2783
+#: ../libgaim/protocols/oscar/oscar.c:2828
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Información de usuario de %s non dispoñible:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2809
+#: ../libgaim/protocols/oscar/oscar.c:2857
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libgaim/protocols/oscar/oscar.c:2814
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1174
+#: ../libgaim/protocols/oscar/oscar.c:2862
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Membro desde"
 
-#: ../libgaim/protocols/oscar/oscar.c:2819
+#: ../libgaim/protocols/oscar/oscar.c:2867
 msgid "Capabilities"
 msgstr "Capacidades"
 
-#: ../libgaim/protocols/oscar/oscar.c:2837
+#: ../libgaim/protocols/oscar/oscar.c:2885
 msgid "Available Message"
 msgstr "Mensaxe dispoñible"
 
-#: ../libgaim/protocols/oscar/oscar.c:2937
+#: ../libgaim/protocols/oscar/oscar.c:2911
+#, fuzzy
+msgid "Profile"
+msgstr "Perfil MSN"
+
+#: ../libgaim/protocols/oscar/oscar.c:2988
 msgid "Your AIM connection may be lost."
-msgstr "Súa conexión AIM pode que se perdera."
+msgstr "Pode que se perdera a conexión AIM."
 
 #. The conversion failed!
-#: ../libgaim/protocols/oscar/oscar.c:3118
+#: ../libgaim/protocols/oscar/oscar.c:3175
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 "[Non se puido amosar unha mensaxe deste usuario porque contén caracteres "
-"inválidos.]"
-
-#: ../libgaim/protocols/oscar/oscar.c:3339
+"incorrectos.]"
+
+#: ../libgaim/protocols/oscar/oscar.c:3396
 msgid "Rate limiting error."
-msgstr "Erro do limitador de tasa de mensaxes."
-
-#: ../libgaim/protocols/oscar/oscar.c:3340
+msgstr "Erro do limitador da taxa de mensaxes."
+
+#: ../libgaim/protocols/oscar/oscar.c:3397
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
-"A última acción que intentou non se puido realizar por haber superado o "
-"límite na tasa de envío de mensaxes. Por favor, agarde 10 segundos e volva a "
+"A última acción que intentou non se puido realizar porque superou o límite "
+"na taxa de envío de mensaxes. Por favor, agarde 10 segundos e volva a "
 "intentalo."
 
-#: ../libgaim/protocols/oscar/oscar.c:3412
+#: ../libgaim/protocols/oscar/oscar.c:3469
 msgid "You have been signed off for an unknown reason."
-msgstr "Foi desconectado por motivos descoñecidos."
-
-#: ../libgaim/protocols/oscar/oscar.c:3425 ../libgaim/protocols/toc/toc.c:977
+msgstr "Desconectouse por motivos descoñecidos."
+
+#: ../libgaim/protocols/oscar/oscar.c:3482 ../libgaim/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "Foi desconectado da sala de chat: %s."
-
-#: ../libgaim/protocols/oscar/oscar.c:3646
+msgstr "Desconectouse da sala de conversa: %s."
+
+#: ../libgaim/protocols/oscar/oscar.c:3723
 #: ../libgaim/protocols/silc/util.c:583
 msgid "Mobile Phone"
-msgstr "Teléfono móvil"
-
-#: ../libgaim/protocols/oscar/oscar.c:3673
+msgstr "Teléfono móbil"
+
+#: ../libgaim/protocols/oscar/oscar.c:3753
 msgid "Personal Web Page"
-msgstr "Páxina web persoal"
-
-#: ../libgaim/protocols/oscar/oscar.c:3677
-#: ../libgaim/protocols/qq/buddy_info.c:38
+msgstr "Sitio web persoal"
+
+#: ../libgaim/protocols/oscar/oscar.c:3758
+#: ../libgaim/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: ../libgaim/protocols/oscar/oscar.c:3686
-#: ../libgaim/protocols/oscar/oscar.c:3694
+#: ../libgaim/protocols/oscar/oscar.c:3766
+#: ../libgaim/protocols/oscar/oscar.c:3779
 msgid "Zip Code"
 msgstr "Código postal"
 
-#: ../libgaim/protocols/oscar/oscar.c:3698
-msgid "Work Information"
-msgstr "Información do traballo"
-
-#: ../libgaim/protocols/oscar/oscar.c:3700
+#: ../libgaim/protocols/oscar/oscar.c:3790
 msgid "Division"
 msgstr "Sección"
 
-#: ../libgaim/protocols/oscar/oscar.c:3701
+#: ../libgaim/protocols/oscar/oscar.c:3791
 msgid "Position"
 msgstr "Cargo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3703
+#: ../libgaim/protocols/oscar/oscar.c:3793
 msgid "Web Page"
 msgstr "Páxina web"
 
-#: ../libgaim/protocols/oscar/oscar.c:3761
+#: ../libgaim/protocols/oscar/oscar.c:3796
+msgid "Work Information"
+msgstr "Información do traballo"
+
+#: ../libgaim/protocols/oscar/oscar.c:3852
 msgid "Pop-Up Message"
 msgstr "Mensaxe emerxente"
 
-#: ../libgaim/protocols/oscar/oscar.c:3801
+#: ../libgaim/protocols/oscar/oscar.c:3892
 #, 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] "Os seguintes nomes de usuarios están asociados a %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:3806
+#: ../libgaim/protocols/oscar/oscar.c:3897
 msgid "Screen name"
 msgstr "Nome de usuario"
 
-#: ../libgaim/protocols/oscar/oscar.c:3832
+#: ../libgaim/protocols/oscar/oscar.c:3923
 #, c-format
 msgid "No results found for e-mail address %s"
-msgstr "Non se atoparon resultados para o enderezo de correo-e %s"
-
-#: ../libgaim/protocols/oscar/oscar.c:3853
+msgstr "Non se atoparon resultados para o enderezo de correo e. %s"
+
+#: ../libgaim/protocols/oscar/oscar.c:3944
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Debería recibir un correo-e solicitando confirmación de %s."
-
-#: ../libgaim/protocols/oscar/oscar.c:3855
+msgstr "Debería recibir un correo e. solicitando confirmación de %s."
+
+#: ../libgaim/protocols/oscar/oscar.c:3946
 msgid "Account Confirmation Requested"
 msgstr "Confirmación de conta solicitada"
 
-#: ../libgaim/protocols/oscar/oscar.c:3886
+#: ../libgaim/protocols/oscar/oscar.c:3977
 msgid "Error Changing Account Info"
 msgstr "Erro cambiando a información da conta"
 
-#: ../libgaim/protocols/oscar/oscar.c:3889
+#: ../libgaim/protocols/oscar/oscar.c:3980
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
-"Erro 0x%04x: Non se pode dar formato ao nome de usuario porque o nome de "
-"usuario solicitado difire do orixinal."
-
-#: ../libgaim/protocols/oscar/oscar.c:3892
+"Erro 0x%04x: Non se lle pode dar formato ao nome de usuario porque o nome "
+"solicitado difire do orixinal."
+
+#: ../libgaim/protocols/oscar/oscar.c:3983
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "Erro 0x%04x: Non se pode dar formato ao nome de usuario porque é inválido."
-
-#: ../libgaim/protocols/oscar/oscar.c:3895
+msgstr "Erro 0x%04x: Non se pode dar formato ao nome de usuario porque é incorrecto."
+
+#: ../libgaim/protocols/oscar/oscar.c:3986
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
-"Erro 0x%04x: Non se pode dar formato ao nome de usuario porque o nome de "
-"usuario solicitado é demasiado longo."
-
-#: ../libgaim/protocols/oscar/oscar.c:3898
+"Erro 0x%04x: Non se pode dar formato ao nome de usuario porque o nome "
+"solicitado é demasiado longo."
+
+#: ../libgaim/protocols/oscar/oscar.c:3989
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque xa "
-"existe unha solicitude pendente para este nome de usuario."
-
-#: ../libgaim/protocols/oscar/oscar.c:3901
+"Erro 0x%04x: Non se pode mudar o enderezo de correo e. porque xa existe unha "
+"solicitude pendente para este usuario."
+
+#: ../libgaim/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque o "
-"enderezo dado xa ten demasiados nomes de usuarios asociados."
-
-#: ../libgaim/protocols/oscar/oscar.c:3904
+"Erro 0x%04x: Non se pode mudar o enderezo de correo e. porque o enderezo "
+"dado xa ten demasiados usuarios asociados."
+
+#: ../libgaim/protocols/oscar/oscar.c:3995
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-"Erro 0x%04x: Non es pode cambiar o enderezo de correo electrónico porque o "
-"enderezo dado é inválido."
-
-#: ../libgaim/protocols/oscar/oscar.c:3907
+"Erro 0x%04x: Non es pode mudar o enderezo de correo e. porque o enderezo "
+"dado é incorrecto."
+
+#: ../libgaim/protocols/oscar/oscar.c:3998
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro descoñecido."
 
-#: ../libgaim/protocols/oscar/oscar.c:3917
+#: ../libgaim/protocols/oscar/oscar.c:4008
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
-"O formato de seu nome de usuario é actualmente o seguinte:\n"
+"O formato do nome de usuario é actualmente o seguinte:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:3918
-#: ../libgaim/protocols/oscar/oscar.c:3925
+#: ../libgaim/protocols/oscar/oscar.c:4009
+#: ../libgaim/protocols/oscar/oscar.c:4016
 msgid "Account Info"
 msgstr "Información da conta"
 
-#: ../libgaim/protocols/oscar/oscar.c:3923
+#: ../libgaim/protocols/oscar/oscar.c:4014
 #, c-format
 msgid "The e-mail address for %s is %s"
-msgstr "O enderezo de correo electrónico de %s é %s"
-
-#: ../libgaim/protocols/oscar/oscar.c:4098
+msgstr "O enderezo de correo e. de %s é %s"
+
+#: ../libgaim/protocols/oscar/oscar.c:4189
 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."
 
-#: ../libgaim/protocols/oscar/oscar.c:4350
+#: ../libgaim/protocols/oscar/oscar.c:4441
 msgid "Unable to set AIM profile."
 msgstr "Non se puido establecer o perfil AIM."
 
-#: ../libgaim/protocols/oscar/oscar.c:4351
+#: ../libgaim/protocols/oscar/oscar.c:4442
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
-"Probablemente intentou cambiar o perfil antes de que o procedemento de "
-"conexión completárase. Seu perfil quedará sen cambiar, inténteo novamente "
-"cando xa estea conectado completamente."
-
-#: ../libgaim/protocols/oscar/oscar.c:4365
+"Probablemente intentou mudar o perfil antes de que o procedemento de "
+"conexión se completase. O perfil non se mudará, inténteo novamente cando xa "
+"estea conectado completamente."
+
+#: ../libgaim/protocols/oscar/oscar.c:4456
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -10689,11 +11084,11 @@
 "Excedeuse o límite de %d bytes de lonxitude na mensaxe de ausencia. Gaim "
 "truncouno."
 
-#: ../libgaim/protocols/oscar/oscar.c:4370
+#: ../libgaim/protocols/oscar/oscar.c:4461
 msgid "Profile too long."
 msgstr "Perfil demasiado longo."
 
-#: ../libgaim/protocols/oscar/oscar.c:4414
+#: ../libgaim/protocols/oscar/oscar.c:4505
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -10708,297 +11103,948 @@
 "Excedeuse o límite de %d bytes de lonxitude na mensaxe de ausencia. Gaim "
 "truncouno."
 
-#: ../libgaim/protocols/oscar/oscar.c:4419
+#: ../libgaim/protocols/oscar/oscar.c:4510
 msgid "Away message too long."
-msgstr "Mensaxe de ausencia demasiado longo."
-
-#: ../libgaim/protocols/oscar/oscar.c:4488
+msgstr "Mensaxe de ausencia demasiado longa."
+
+#: ../libgaim/protocols/oscar/oscar.c:4579
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
 "must either start with a letter and contain only letters, numbers and "
 "spaces, or contain only numbers."
 msgstr ""
-"Non se puido engadir ao amigo %s porque o nome de usuario non é válido. Os "
-"nome de usuario deben comezar con letras só poden conter letras, número e "
-"espacios, ou conter só números."
-
-#: ../libgaim/protocols/oscar/oscar.c:4490
-#: ../libgaim/protocols/oscar/oscar.c:4903
-#: ../libgaim/protocols/oscar/oscar.c:4917
+"Non se puido engadir o contacto %s porque o nome de usuario non é correcto. "
+"Os nomes de usuario deben comezar con letras só poden conter letras, "
+"números, espazos ou conter só números."
+
+#: ../libgaim/protocols/oscar/oscar.c:4581
+#: ../libgaim/protocols/oscar/oscar.c:5004
+#: ../libgaim/protocols/oscar/oscar.c:5018
 msgid "Unable To Add"
 msgstr "Non se puido engadir"
 
-#: ../libgaim/protocols/oscar/oscar.c:4594
+#: ../libgaim/protocols/oscar/oscar.c:4685
 msgid "Unable To Retrieve Buddy List"
-msgstr "Non se puido obter a lista de amigos"
-
-#: ../libgaim/protocols/oscar/oscar.c:4595
+msgstr "Non se puido obter a listaxe de contactos"
+
+#: ../libgaim/protocols/oscar/oscar.c:4686
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 msgstr ""
-"Gaim non pode obter neste momento a lista de amigos dos servidores de AIM. A "
-"lista non borrou, e seguramente volverá a estar dispoñible nunhas horas."
-
-#: ../libgaim/protocols/oscar/oscar.c:4798
-#: ../libgaim/protocols/oscar/oscar.c:4799
-#: ../libgaim/protocols/oscar/oscar.c:4804
-#: ../libgaim/protocols/oscar/oscar.c:4971
-#: ../libgaim/protocols/oscar/oscar.c:4972
-#: ../libgaim/protocols/oscar/oscar.c:4977
+"Gaim non pode obter neste momento a listaxe de contactos dos servidores de "
+"AIM. A listaxe non se perdeu, e seguramente volverá estar dispoñible nunhas "
+"horas."
+
+#: ../libgaim/protocols/oscar/oscar.c:4890
+#: ../libgaim/protocols/oscar/oscar.c:4891
+#: ../libgaim/protocols/oscar/oscar.c:4896
+#: ../libgaim/protocols/oscar/oscar.c:5072
+#: ../libgaim/protocols/oscar/oscar.c:5073
+#: ../libgaim/protocols/oscar/oscar.c:5078
 msgid "Orphans"
 msgstr "Orfos"
 
-#: ../libgaim/protocols/oscar/oscar.c:4901
+#: ../libgaim/protocols/oscar/oscar.c:5002
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"Non se puido engadir o amigo %s porque hai demasiados contactos na lista de "
-"amigos. Por favor, elimine un e volva a probar."
-
-#: ../libgaim/protocols/oscar/oscar.c:4901
-#: ../libgaim/protocols/oscar/oscar.c:4915
+"Non se puido engadir o contacto %s porque hai demasiados contactos na "
+"listaxe de contactos. Por favor, elimine un e volva probar."
+
+#: ../libgaim/protocols/oscar/oscar.c:5002
+#: ../libgaim/protocols/oscar/oscar.c:5016
 msgid "(no name)"
 msgstr "(sen nome)"
 
-#: ../libgaim/protocols/oscar/oscar.c:4915
+#: ../libgaim/protocols/oscar/oscar.c:5016
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 msgstr ""
-"Non se puido engadir o amigo %s por unha razón descoñecida. A razón máis "
-"habitual é que chegou ao máximo número de amigos permitidos na súa lista de "
-"amigos."
-
-#: ../libgaim/protocols/oscar/oscar.c:5008
+"Non se puido engadir o contacto %s por unha razón descoñecida. A razón máis "
+"habitual é que chegou ao máximo número permitido na listaxe de contactos."
+
+#: ../libgaim/protocols/oscar/oscar.c:5109
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
-"O usuario %s deulle permiso para engadirlle a súa lista de amigos. Desexa "
+"O usuario %s deulle permiso para engadilo na listaxe de contactos. Desexa "
 "facelo?"
 
-#: ../libgaim/protocols/oscar/oscar.c:5014
+#: ../libgaim/protocols/oscar/oscar.c:5115
 msgid "Authorization Given"
-msgstr "Autorización otorgada"
-
-#: ../libgaim/protocols/oscar/oscar.c:5058
-#, c-format
-msgid ""
-"The user %s wants to add %s to their buddy list for the following reason:\n"
-"%s"
-msgstr ""
-"O usuario %s quere engadir %s a súa lista de amigos polo seguinte motivo:\n"
-"%s"
+msgstr "Autorización outorgada"
 
 #. Granted
-#: ../libgaim/protocols/oscar/oscar.c:5103
+#: ../libgaim/protocols/oscar/oscar.c:5193
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "O usuario %s autorizou a súa solicitude de engadilo a súa lista de amigos."
-
-#: ../libgaim/protocols/oscar/oscar.c:5104
+msgstr ""
+"O usuario %s autorizou a súa solicitude de engadilo a súa listaxe de "
+"contactos."
+
+#: ../libgaim/protocols/oscar/oscar.c:5194
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"
 
 #. Denied
-#: ../libgaim/protocols/oscar/oscar.c:5107
+#: ../libgaim/protocols/oscar/oscar.c:5197
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"O usuario %s denegou súa solicitude de engadilo a súa lista de amigos pola "
+"O usuario %s denegou súa solicitude de engadilo a listaxe de contactos pola "
 "seguinte razón:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5108
+#: ../libgaim/protocols/oscar/oscar.c:5198
 msgid "Authorization Denied"
 msgstr "Autorización denegada"
 
-#: ../libgaim/protocols/oscar/oscar.c:5144 ../libgaim/protocols/toc/toc.c:1378
+#: ../libgaim/protocols/oscar/oscar.c:5234 ../libgaim/protocols/toc/toc.c:1378
 msgid "_Exchange:"
-msgstr "_Troco:"
-
-#: ../libgaim/protocols/oscar/oscar.c:5184
+msgstr "Int_ercambio:"
+
+#: ../libgaim/protocols/oscar/oscar.c:5274
 msgid "Invalid chat name specified."
-msgstr "Especificouse un nome de chat inválido."
-
-#: ../libgaim/protocols/oscar/oscar.c:5254
+msgstr "Especificouse un nome de conversa incorrecto."
+
+#: ../libgaim/protocols/oscar/oscar.c:5344
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "Non se enviou súa imaxe MI. Non se poden enviar imaxes MI en chats AIM."
-
-#: ../libgaim/protocols/oscar/oscar.c:5416
+msgstr "Non se enviou a imaxe MI. Non se poden enviar imaxes MI en conversas AIM."
+
+#: ../libgaim/protocols/oscar/oscar.c:5516
+#: ../libgaim/protocols/oscar/oscar.c:5521
+#, fuzzy
+msgid "Away Message"
+msgstr "Mensaxe de ausencia"
+
+#: ../libgaim/protocols/oscar/oscar.c:5521
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obtendo)</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:5729
+#: ../libgaim/protocols/oscar/oscar.c:5834
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "Comentario de amigo para %s"
-
-#: ../libgaim/protocols/oscar/oscar.c:5730
+msgstr "Comentario de contacto para %s"
+
+#: ../libgaim/protocols/oscar/oscar.c:5835
 msgid "Buddy Comment:"
-msgstr "Comentario de amigo:"
-
-#: ../libgaim/protocols/oscar/oscar.c:5776
+msgstr "Comentario de contacto:"
+
+#: ../libgaim/protocols/oscar/oscar.c:5881
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "Vostede pediu abrir unha conexión MI directa con %s."
-
-#: ../libgaim/protocols/oscar/oscar.c:5780
-#, fuzzy
+msgstr "Pediu abrir unha conexión MI directa con %s."
+
+#: ../libgaim/protocols/oscar/oscar.c:5885
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
-"Como isto revela seu enderezo IP, pode ser considerado como un resgo a súa "
+"Como isto revela o seu enderezo IP, pode ser considerado como un risco de "
 "privacidade. Quere continuar?"
 
-#: ../libgaim/protocols/oscar/oscar.c:5784
-#: ../libgaim/protocols/oscar/peer.c:990
-msgid "_Connect"
-msgstr "_Conectar"
-
-#: ../libgaim/protocols/oscar/oscar.c:5818
+#: ../libgaim/protocols/oscar/oscar.c:5889
+#, fuzzy
+msgid "C_onnect"
+msgstr "Conectar"
+
+#: ../libgaim/protocols/oscar/oscar.c:5924
+#, fuzzy
 msgid "Get AIM Info"
-msgstr "Obter información de AIM"
-
-#: ../libgaim/protocols/oscar/oscar.c:5824
+msgstr "Obter información"
+
+#: ../libgaim/protocols/oscar/oscar.c:5930
 msgid "Edit Buddy Comment"
-msgstr "Editar comentario de amigo"
-
-#: ../libgaim/protocols/oscar/oscar.c:5832
+msgstr "Editar comentario de contacto"
+
+#: ../libgaim/protocols/oscar/oscar.c:5938
 msgid "Get Status Msg"
-msgstr "Obter msx de estado"
-
-#: ../libgaim/protocols/oscar/oscar.c:5845
+msgstr "Obter mensaxe de estado"
+
+#: ../libgaim/protocols/oscar/oscar.c:5951
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: ../libgaim/protocols/oscar/oscar.c:5867
+#: ../libgaim/protocols/oscar/oscar.c:5973
 msgid "Re-request Authorization"
-msgstr "Solicitar autorización outra vez"
-
-#: ../libgaim/protocols/oscar/oscar.c:5926
+msgstr "Solicitar unha autorización outra vez"
+
+#: ../libgaim/protocols/oscar/oscar.c:6032
 msgid "Require authorization"
-msgstr "Pedir autorización"
-
-#: ../libgaim/protocols/oscar/oscar.c:5929
+msgstr "Pedir unha autorización"
+
+#: ../libgaim/protocols/oscar/oscar.c:6035
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Capacidade web (se activa isto fará que reciba SPAM!)"
 
-#: ../libgaim/protocols/oscar/oscar.c:5934
+#: ../libgaim/protocols/oscar/oscar.c:6040
 msgid "ICQ Privacy Options"
 msgstr "Opcións de privacidade ICQ"
 
-#: ../libgaim/protocols/oscar/oscar.c:5951
+#: ../libgaim/protocols/oscar/oscar.c:6057
 msgid "The new formatting is invalid."
-msgstr "O novo formato é inválido."
-
-#: ../libgaim/protocols/oscar/oscar.c:5952
+msgstr "O novo formato é incorrecto."
+
+#: ../libgaim/protocols/oscar/oscar.c:6058
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
-"O formato do nome de usuario só pode cambiar na capitalización e espacio en "
+"O formato do nome de usuario só pode mudar na capitalización e espazo en "
 "branco."
 
-#: ../libgaim/protocols/oscar/oscar.c:5959
+#: ../libgaim/protocols/oscar/oscar.c:6065
 msgid "New screen name formatting:"
 msgstr "Novo formato do nome de usuario:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6015
+#: ../libgaim/protocols/oscar/oscar.c:6121
 msgid "Change Address To:"
-msgstr "Cambiar enderezo a:"
-
-#: ../libgaim/protocols/oscar/oscar.c:6060
+msgstr "Mudar enderezo para:"
+
+#: ../libgaim/protocols/oscar/oscar.c:6166
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>vostede non está agardando autorización</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:6063
+#: ../libgaim/protocols/oscar/oscar.c:6169
 msgid "You are awaiting authorization from the following buddies"
-msgstr "Agardando a autorización dos seguintes amigos"
-
-#: ../libgaim/protocols/oscar/oscar.c:6064
+msgstr "Agardando a autorización dos seguintes contactos"
+
+#: ../libgaim/protocols/oscar/oscar.c:6170
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"Pode volver a pedir autorización a estos amigos premendo o botón dereito do "
+"Pode volver pedir autorización a estes contactos premendo o botón dereito do "
 "rato sobre eles e escollendo \"Solicitar autorización outra vez.\""
 
-#: ../libgaim/protocols/oscar/oscar.c:6081
+#: ../libgaim/protocols/oscar/oscar.c:6187
 msgid "Find Buddy by E-Mail"
-msgstr "Procurar un amigo polo correo electrónico"
-
-#: ../libgaim/protocols/oscar/oscar.c:6082
+msgstr "Procurar un contacto polo correo e."
+
+#: ../libgaim/protocols/oscar/oscar.c:6188
 msgid "Search for a buddy by e-mail address"
-msgstr "Buscar amigo polo enderezo de correo electrónico"
-
-#: ../libgaim/protocols/oscar/oscar.c:6083
+msgstr "Buscar contacto polo enderezo de correo e."
+
+#: ../libgaim/protocols/oscar/oscar.c:6189
 msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Escriba o enderezo de correo electrónico do amigo que está buscando."
-
-#: ../libgaim/protocols/oscar/oscar.c:6252
+msgstr "Escriba o enderezo de correo e. do contacto que está buscando."
+
+#: ../libgaim/protocols/oscar/oscar.c:6192
+#, fuzzy
+msgid "_Search"
+msgstr "Buscar"
+
+#: ../libgaim/protocols/oscar/oscar.c:6361
 msgid "Set User Info (URL)..."
-msgstr "Establecer súa información de usuario (URL)..."
-
-#: ../libgaim/protocols/oscar/oscar.c:6263
+msgstr "Editar a información de usuario (URL)..."
+
+#: ../libgaim/protocols/oscar/oscar.c:6372
 msgid "Change Password (URL)"
-msgstr "Trocar contrasinal (URL)"
-
-#: ../libgaim/protocols/oscar/oscar.c:6267
+msgstr "Mudar contrasinal (URL)"
+
+#: ../libgaim/protocols/oscar/oscar.c:6376
 msgid "Configure IM Forwarding (URL)"
-msgstr "Configurar reenvío de MI (URL)"
+msgstr "Configurar o reenvío de MI (URL)"
 
 #. ICQ actions
-#: ../libgaim/protocols/oscar/oscar.c:6277
+#: ../libgaim/protocols/oscar/oscar.c:6386
 msgid "Set Privacy Options..."
-msgstr "Establecer opcións de privacidade..."
+msgstr "Editar opcións de privacidade..."
 
 #. AIM actions
-#: ../libgaim/protocols/oscar/oscar.c:6284
+#: ../libgaim/protocols/oscar/oscar.c:6393
 msgid "Format Screen Name..."
 msgstr "Formato do nome de usuario..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6288
+#: ../libgaim/protocols/oscar/oscar.c:6397
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: ../libgaim/protocols/oscar/oscar.c:6292
+#: ../libgaim/protocols/oscar/oscar.c:6401
 msgid "Display Currently Registered E-Mail Address"
-msgstr "Mostrar enderezos de correo rexistrados actualmente"
-
-#: ../libgaim/protocols/oscar/oscar.c:6296
+msgstr "Amosar o enderezo rexistrado actualmente"
+
+#: ../libgaim/protocols/oscar/oscar.c:6405
 msgid "Change Currently Registered E-Mail Address..."
-msgstr "Cambiar o enderezo de correo rexistrado actualmente..."
-
-#: ../libgaim/protocols/oscar/oscar.c:6303
+msgstr "Mudar o enderezo rexistrado..."
+
+#: ../libgaim/protocols/oscar/oscar.c:6412
 msgid "Show Buddies Awaiting Authorization"
-msgstr "Amosar amigos pendentes de autorización"
-
-#: ../libgaim/protocols/oscar/oscar.c:6309
+msgstr "Amosar contactos pendentes de autorización"
+
+#: ../libgaim/protocols/oscar/oscar.c:6418
 msgid "Search for Buddy by E-Mail Address..."
-msgstr "Procurar un amigo polo enderezo de correo electrónico..."
-
-#: ../libgaim/protocols/oscar/oscar.c:6314
+msgstr "Buscar un contacto polo enderezo de correo e..."
+
+#: ../libgaim/protocols/oscar/oscar.c:6423
 msgid "Search for Buddy by Information"
-msgstr "Buscar un amigo a través da súa información"
-
-#: ../libgaim/protocols/oscar/oscar.c:6382
+msgstr "Buscar un contacto a través da súa información"
+
+#: ../libgaim/protocols/oscar/oscar.c:6491
 msgid "Use recent buddies group"
-msgstr "Usar grupo de amigos recente"
-
-#: ../libgaim/protocols/oscar/oscar.c:6385
+msgstr "Usar un grupo de contactos recente"
+
+#: ../libgaim/protocols/oscar/oscar.c:6494
 msgid "Show how long you have been idle"
-msgstr "Amosar canto tempo estivo inactivo"
+msgstr "Amosar o tempo que estivo inactivo"
+
+#: ../libgaim/protocols/oscar/peer.c:674
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "Preguntando a %s para conectarnos a %s: %hu para MI Directo"
+
+#: ../libgaim/protocols/oscar/peer.c:759
+#, fuzzy, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "Non se puido conectar ao servidor."
+
+#: ../libgaim/protocols/oscar/peer.c:833
+#, fuzzy
+msgid "Attempting to connect via proxy server."
+msgstr "Non se puido conectar ao servidor."
+
+#: ../libgaim/protocols/oscar/peer.c:1010
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s cambiou o asunto a: %s"
+
+#: ../libgaim/protocols/oscar/peer.c:1014
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+"Requírese una conexión directa entre os dous ordenadores e é preciso por "
+"empregar imaxes MI. O teu enderezo IP será revelado, esto pode ter riscos de "
+"privacidade."
+
+#: ../libgaim/protocols/oscar/peer.c:1020
+msgid "_Connect"
+msgstr "_Conectar"
+
+#: ../libgaim/protocols/qq/buddy_info.c:39
+#, fuzzy
+msgid "Primary Information"
+msgstr "Información persoal"
+
+#: ../libgaim/protocols/qq/buddy_info.c:41
+#, fuzzy
+msgid "Personal Introduction"
+msgstr "Información persoal"
+
+#: ../libgaim/protocols/qq/buddy_info.c:42
+msgid "QQ Number"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:47
+#, fuzzy
+msgid "Country/Region"
+msgstr "País"
+
+#: ../libgaim/protocols/qq/buddy_info.c:48
+msgid "Province/State"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:50
+msgid "Horoscope Symbol"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:52
+msgid "Zodiac Sign"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:53
+msgid "Blood Type"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:54
+#, fuzzy
+msgid "College"
+msgstr "_Contraer"
+
+#: ../libgaim/protocols/qq/buddy_info.c:55
+#, fuzzy
+msgid "Email"
+msgstr "Correo e."
+
+#: ../libgaim/protocols/qq/buddy_info.c:57
+#, fuzzy
+msgid "Zipcode"
+msgstr "Código postal"
+
+#: ../libgaim/protocols/qq/buddy_info.c:58
+#, fuzzy
+msgid "Cellphone Number"
+msgstr "Número de teléfono"
+
+#: ../libgaim/protocols/qq/buddy_info.c:59
+#, fuzzy
+msgid "Phone Number"
+msgstr "Número de teléfono"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Aquarius"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+#, fuzzy
+msgid "Pisces"
+msgstr "Voces"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+#, fuzzy
+msgid "Aries"
+msgstr "Enderezo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+#, fuzzy
+msgid "Taurus"
+msgstr "Turco"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+#, fuzzy
+msgid "Gemini"
+msgstr "Alemán"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+#, fuzzy
+msgid "Cancer"
+msgstr "Cancelar"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Leo"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Virgo"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Libra"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:66
+#, fuzzy
+msgid "Scorpio"
+msgstr "Subscrición"
+
+#: ../libgaim/protocols/qq/buddy_info.c:66
+msgid "Sagittarius"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:66
+msgid "Capricorn"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+#, fuzzy
+msgid "Rat"
+msgstr "Datos en bruto"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Ox"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+#, fuzzy
+msgid "Tiger"
+msgstr "Título"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Rabbit"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Dragon"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+#, fuzzy
+msgid "Snake"
+msgstr "Gardar"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+#, fuzzy
+msgid "Horse"
+msgstr "Nome do servidor"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Goat"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+#, fuzzy
+msgid "Monkey"
+msgstr "Ningún"
+
+#: ../libgaim/protocols/qq/buddy_info.c:73
+#, fuzzy
+msgid "Rooster"
+msgstr "Rexistrar"
+
+#: ../libgaim/protocols/qq/buddy_info.c:73
+msgid "Dog"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:73
+#, fuzzy
+msgid "Pig"
+msgstr "Ping"
+
+#: ../libgaim/protocols/qq/buddy_info.c:78
+#, fuzzy
+msgid "Other"
+msgstr "Opera"
+
+#: ../libgaim/protocols/qq/buddy_info.c:481
+#: ../libgaim/protocols/qq/buddy_info.c:482
+#, fuzzy
+msgid "Modify my information"
+msgstr "Información do contacto"
+
+#: ../libgaim/protocols/qq/buddy_info.c:483
+#, fuzzy
+msgid "Update my information"
+msgstr "Información de usuario"
+
+#: ../libgaim/protocols/qq/buddy_info.c:506
+#, fuzzy
+msgid "Your information has been updated"
+msgstr "O contrasinal foi modificado."
+
+#: ../libgaim/protocols/qq/buddy_info.c:565
+msgid ""
+"You are attempting to set a custom face. Gaim currently only allows the "
+"standard faces. Please choose an image from "
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:582
+#: ../libgaim/protocols/qq/buddy_info.c:595
+#, fuzzy
+msgid "Invalid QQ Face"
+msgstr "Nome de sala inválido"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:207
+#: ../libgaim/protocols/qq/group_opt.c:135
+#, fuzzy, c-format
+msgid "You rejected %d's request"
+msgstr "Solicitude non esperada"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:208
+#: ../libgaim/protocols/qq/group_opt.c:136
+msgid "Input your reason:"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+#, fuzzy
+msgid "Reject request"
+msgstr "Solicitude non esperada"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:211
+#: ../libgaim/protocols/qq/group_opt.c:139
+msgid "Sorry, you are not my type..."
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:212
+#: ../libgaim/protocols/qq/group_im.c:136
+#: ../libgaim/protocols/qq/group_opt.c:125
+#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+#, fuzzy
+msgid "Reject"
+msgstr "Reiniciar"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:272
+#, fuzzy
+msgid "Add buddy with auth request fails"
+msgstr "Engadir o contacto á súa listaxe?"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:303
+msgid "You have successfully removed a buddy"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:331
+msgid "You have successfully removed yourself from a buddy"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:395
+#, fuzzy, c-format
+msgid "User %d needs authentication"
+msgstr "Comezando coa autenticación"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:397
+#: ../libgaim/protocols/qq/group_join.c:134
+msgid "Input request here"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:398
+#: ../libgaim/protocols/qq/group_join.c:135
+#, fuzzy
+msgid "Would you be my friend?"
+msgstr "Quere sobreescribilo?"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:399
+#: ../libgaim/protocols/qq/group_join.c:136
+#: ../libgaim/protocols/qq/group_opt.c:140
+#, fuzzy
+msgid "Send"
+msgstr "_Enviar"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:406
+#, fuzzy, c-format
+msgid "You have added %d in buddy list"
+msgstr "O usuario %s engadiuno á súa listaxe de contactos."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:503
+#, fuzzy
+msgid "QQid Error"
+msgstr "Erro de lectura"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:504
+#, fuzzy
+msgid "Invalid QQid"
+msgstr "Authzid inválido"
+
+#: ../libgaim/protocols/qq/group.c:65
+msgid "ID: "
+msgstr ""
+
+#: ../libgaim/protocols/qq/group.c:98
+#, fuzzy
+msgid "Group ID"
+msgstr "Grupo:"
+
+#: ../libgaim/protocols/qq/group.c:100
+#, fuzzy
+msgid "Creator"
+msgstr "Crear"
+
+#: ../libgaim/protocols/qq/group.c:103
+#, fuzzy
+msgid "Group Description"
+msgstr "Descrición"
+
+#: ../libgaim/protocols/qq/group.c:109
+#, fuzzy
+msgid "Auth"
+msgstr "Autorizar"
+
+#: ../libgaim/protocols/qq/group.c:119
+msgid "QQ Qun"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group.c:120
+msgid "Please input external group ID"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group.c:121
+msgid "You can only search for permanent QQ groups\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:122
+#, fuzzy, c-format
+msgid "User %d applied to join group %d"
+msgstr "O usuario non está no grupo"
+
+#: ../libgaim/protocols/qq/group_im.c:123
+#: ../libgaim/protocols/qq/group_im.c:172
+#: ../libgaim/protocols/qq/sys_msg.c:180
+#, fuzzy, c-format
+msgid "Reason: %s"
+msgstr "Usuarios en %s: %s"
+
+#: ../libgaim/protocols/qq/group_im.c:130
+#: ../libgaim/protocols/qq/group_im.c:174
+#: ../libgaim/protocols/qq/group_im.c:214
+#: ../libgaim/protocols/qq/group_im.c:249
+#: ../libgaim/protocols/qq/group_im.c:283
+#: ../libgaim/protocols/qq/group_join.c:229
+#: ../libgaim/protocols/qq/group_join.c:355
+#: ../libgaim/protocols/qq/group_opt.c:230
+#: ../libgaim/protocols/qq/group_opt.c:300
+#: ../libgaim/protocols/qq/group_opt.c:386
+#, fuzzy
+msgid "QQ Qun Operation"
+msgstr "Opcións de son"
+
+#: ../libgaim/protocols/qq/group_im.c:133
+#: ../libgaim/protocols/qq/group_opt.c:127
+#: ../libgaim/protocols/qq/sys_msg.c:87 ../libgaim/protocols/qq/sys_msg.c:230
+msgid "Approve"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:171
+#, c-format
+msgid "You request to join group %d has been rejected by admin %d"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:212
+#, c-format
+msgid "You request to join group %d has been approved by admin %d"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:248
+#, c-format
+msgid "You [%d] has exit group \"%d\""
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:282
+#, c-format
+msgid "You [%d] has been added by group \"%d\""
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:283
+#, fuzzy
+msgid "This group has been added to your buddy list"
+msgstr "O usuario %s engadiuno á súa listaxe de contactos."
+
+#: ../libgaim/protocols/qq/group_internal.c:41
+msgid "I am not member"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_internal.c:44
+msgid "I am a member"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_internal.c:47
+msgid "I am applying to join"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_internal.c:50
+msgid "I am the admin"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_internal.c:53
+#, fuzzy
+msgid "Unknown status"
+msgstr "Mensaxe descoñecida"
+
+#: ../libgaim/protocols/qq/group_join.c:80
+#, fuzzy
+msgid "This group does not allow others to join"
+msgstr ""
+"Esta versión de avaliación non permite a conexión simultánea a máis de dez "
+"usuarios"
+
+#: ../libgaim/protocols/qq/group_join.c:229
+msgid "You have successfully exited the group"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:253
+msgid "QQ Group Auth"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:254
+msgid "Your authorization operation has been accepted by the QQ server"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:325
+msgid "You inputted a group id outside the acceptable range"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:356
+#, fuzzy
+msgid "Are you sure to exit this Qun?"
+msgstr "Estás seguro de que queres borrar %s?"
+
+#: ../libgaim/protocols/qq/group_join.c:358
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:361
+msgid "Go ahead"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_network.c:90
+#, c-format
+msgid "Code [0x%02X]: %s"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_network.c:91
+#, fuzzy
+msgid "Group Operation Error"
+msgstr "Erro de operación de ficheiros"
+
+#: ../libgaim/protocols/qq/group_opt.c:124
+#: ../libgaim/protocols/qq/sys_msg.c:84
+msgid "Do you wanna approve the request?"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:230
+msgid "You have successfully modify Qun member"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:300
+msgid "You have successfully modify Qun information"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:387
+msgid "You have successfully created a Qun"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:389
+#, fuzzy
+msgid "Would you like to set up the Qun details now?"
+msgstr "Desexa establecela coma a icona de contacto para este usuario?"
+
+#: ../libgaim/protocols/qq/group_opt.c:390
+#, fuzzy
+msgid "Setup"
+msgstr "_Configurar"
+
+#: ../libgaim/protocols/qq/im.c:423
+#, fuzzy
+msgid "System Message"
+msgstr "Rexistro do sistema"
+
+#: ../libgaim/protocols/qq/im.c:567
+#, fuzzy
+msgid "Server ACK"
+msgstr "Servidor"
+
+#: ../libgaim/protocols/qq/im.c:567
+#, fuzzy
+msgid "Send IM fail\n"
+msgstr "Enviar un correo"
+
+#: ../libgaim/protocols/qq/keep_alive.c:85
+msgid "Keep alive error, seems connection lost!"
+msgstr ""
+
+#: ../libgaim/protocols/qq/login_logout.c:408
+msgid "Request login token error!"
+msgstr ""
+
+#: ../libgaim/protocols/qq/login_logout.c:486
+msgid "Unable to login, check debug log"
+msgstr ""
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../libgaim/protocols/qq/qq.c:139 ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/yahoo/yahoo.c:2351
+#: ../libgaim/protocols/yahoo/yahoo.c:2378
+#: ../libgaim/protocols/yahoo/yahoo.c:2485
+#: ../libgaim/protocols/yahoo/yahoo.c:2506
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libgaim/protocols/yahoo/ycht.c:549
+msgid "Unable to connect."
+msgstr "Non se puido conectar."
+
+#: ../libgaim/protocols/qq/qq.c:186
+#, fuzzy, c-format
+msgid "Unknown-%d"
+msgstr "Descoñecido"
+
+#: ../libgaim/protocols/qq/qq.c:209
+#, fuzzy, c-format
+msgid "%s Address"
+msgstr "Enderezo"
+
+#: ../libgaim/protocols/qq/qq.c:240
+#, fuzzy
+msgid "Level"
+msgstr "Nunca"
+
+#: ../libgaim/protocols/qq/qq.c:294
+#, fuzzy
+msgid "QQ: Available"
+msgstr "Dispoñible"
+
+#: ../libgaim/protocols/qq/qq.c:298
+#, fuzzy
+msgid "QQ: Away"
+msgstr "Ausente"
+
+#: ../libgaim/protocols/qq/qq.c:302
+#, fuzzy
+msgid "QQ: Invisible"
+msgstr "Invisible"
+
+#: ../libgaim/protocols/qq/qq.c:306
+#, fuzzy
+msgid "QQ: Offline"
+msgstr "Desconectado"
+
+#: ../libgaim/protocols/qq/qq.c:383
+#, fuzzy
+msgid "Invalid name"
+msgstr "Alcume non válido"
+
+#: ../libgaim/protocols/qq/qq.c:450
+#, fuzzy, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr "<b>Título do grupo:</b> %s<br>"
+
+#: ../libgaim/protocols/qq/qq.c:451
+#, fuzzy, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr "<b>Usuario:</b> %s<br>"
+
+#: ../libgaim/protocols/qq/qq.c:455
+#, fuzzy, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>Inactivo desde:</b> %s<br>"
+
+#: ../libgaim/protocols/qq/qq.c:456
+#, fuzzy, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>ID de usuario:</b> %s<br>"
+
+#: ../libgaim/protocols/qq/qq.c:457
+#, fuzzy, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr "<b>Alcume:</b> %s<br>"
+
+#: ../libgaim/protocols/qq/qq.c:462
+#, fuzzy, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>Título do grupo:</b> %s<br>"
+
+#: ../libgaim/protocols/qq/qq.c:463
+#, fuzzy, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>ID de usuario:</b> %s<br>"
+
+#: ../libgaim/protocols/qq/qq.c:464
+#, fuzzy, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr "<b>Último cliente coñecido:</b>"
+
+#: ../libgaim/protocols/qq/qq.c:468
+#, fuzzy
+msgid "Login Information"
+msgstr "Información de depuración"
+
+#: ../libgaim/protocols/qq/qq.c:543
+#, fuzzy
+msgid "Modify My Information"
+msgstr "Información do contacto"
+
+#: ../libgaim/protocols/qq/qq.c:546 ../libgaim/protocols/toc/toc.c:1700
+msgid "Change Password"
+msgstr "Mudar o contrasinal"
+
+#: ../libgaim/protocols/qq/qq.c:549
+#, fuzzy
+msgid "Show Login Information"
+msgstr "Información de depuración"
+
+#: ../libgaim/protocols/qq/qq.c:570
+msgid "Exit this QQ Qun"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -11010,989 +12056,318 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/oscar.c:6511
-#: ../libgaim/protocols/oscar/oscar.c:6513
-msgid "AIM/ICQ Protocol Plugin"
-msgstr "Complemento de protocolo AIM/ICQ"
-
-#: ../libgaim/protocols/oscar/oscar.c:6538
-#: ../libgaim/protocols/yahoo/yahoo.c:3950
-#: ../libgaim/protocols/zephyr/zephyr.c:2980
-msgid "Encoding"
-msgstr "Codificación"
-
-#: ../libgaim/protocols/oscar/oscar.c:6542
-#, fuzzy
-msgid ""
-"Always use AIM/ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"Empregar sempre un servidor proxy de AIM/ICQ\n"
-"(máis lento, pero non revela o teu enderezo IP)"
-
-#: ../libgaim/protocols/oscar/peer.c:623
-#, c-format
-msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr ""
-
-#: ../libgaim/protocols/oscar/peer.c:703 ../libgaim/protocols/oscar/peer.c:738
-#, fuzzy, c-format
-msgid "Attempting to connect to %s:%hu."
-msgstr "Non se puido conectar ao servidor."
-
-#: ../libgaim/protocols/oscar/peer.c:803
-#, fuzzy
-msgid "Attempting to connect via proxy server."
-msgstr "Non se puido conectar ao servidor."
-
-#: ../libgaim/protocols/oscar/peer.c:980
-#, fuzzy, c-format
-msgid "%s has just asked to directly connect to %s"
-msgstr "%s cambiou o tópico a: %s"
-
-#: ../libgaim/protocols/oscar/peer.c:984
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:37
-msgid "Primary Information"
-msgstr "Información primaria"
-
-#: ../libgaim/protocols/qq/buddy_info.c:39
-msgid "Personal Introduction"
-msgstr "Introdución persoal"
-
-#: ../libgaim/protocols/qq/buddy_info.c:40
-msgid "QQ Number"
-msgstr "Número QQ"
-
-#: ../libgaim/protocols/qq/buddy_info.c:45
-msgid "Country/Region"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:46
-msgid "Province/State"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:48
-msgid "Horoscope Symbol"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:50
-msgid "Zodiac Sign"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:51
-msgid "Blood Type"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:52
-#, fuzzy
-msgid "College"
-msgstr "_Contraer"
-
-#: ../libgaim/protocols/qq/buddy_info.c:53
-msgid "Email"
-msgstr "Email"
-
-#: ../libgaim/protocols/qq/buddy_info.c:55
-msgid "Zipcode"
-msgstr "Código postal"
-
-#: ../libgaim/protocols/qq/buddy_info.c:56
-#, fuzzy
-msgid "Cellphone Number"
-msgstr "Número de teléfono"
-
-#: ../libgaim/protocols/qq/buddy_info.c:57
-#, fuzzy
-msgid "Phone Number"
-msgstr "Número de teléfono"
-
-#: ../libgaim/protocols/qq/buddy_info.c:62
-msgid "Aquarius"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:62
-msgid "Pisces"
-msgstr "Piscis"
-
-#: ../libgaim/protocols/qq/buddy_info.c:62
-msgid "Aries"
-msgstr "Aries"
-
-#: ../libgaim/protocols/qq/buddy_info.c:62
-#, fuzzy
-msgid "Taurus"
-msgstr "Turco"
-
-#: ../libgaim/protocols/qq/buddy_info.c:63
-msgid "Gemini"
-msgstr "Xéminis"
-
-#: ../libgaim/protocols/qq/buddy_info.c:63
-msgid "Cancer"
-msgstr "Cáncer"
-
-#: ../libgaim/protocols/qq/buddy_info.c:63
-msgid "Leo"
-msgstr "Leo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:63
-msgid "Virgo"
-msgstr "Virgo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:63
-msgid "Libra"
-msgstr "Libra"
-
-#: ../libgaim/protocols/qq/buddy_info.c:64
-msgid "Scorpio"
-msgstr "Scorpio"
-
-#: ../libgaim/protocols/qq/buddy_info.c:64
-msgid "Sagittarius"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:64
-msgid "Capricorn"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:69
-#, fuzzy
-msgid "Rat"
-msgstr "En bruto"
-
-#: ../libgaim/protocols/qq/buddy_info.c:69
-msgid "Ox"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:69
-#, fuzzy
-msgid "Tiger"
-msgstr "Título"
-
-#: ../libgaim/protocols/qq/buddy_info.c:69
-msgid "Rabbit"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:70
-msgid "Dragon"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:70
-#, fuzzy
-msgid "Snake"
-msgstr "Gardar"
-
-#: ../libgaim/protocols/qq/buddy_info.c:70
-msgid "Horse"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:70
-msgid "Goat"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:70
-#, fuzzy
-msgid "Monkey"
-msgstr "Ningún"
-
-#: ../libgaim/protocols/qq/buddy_info.c:71
-#, fuzzy
-msgid "Rooster"
-msgstr "Rexistrar"
-
-#: ../libgaim/protocols/qq/buddy_info.c:71
-msgid "Dog"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:71
-#, fuzzy
-msgid "Pig"
-msgstr "Ping"
-
-#: ../libgaim/protocols/qq/buddy_info.c:76
-msgid "Other"
-msgstr "Outro"
-
-#: ../libgaim/protocols/qq/buddy_info.c:477
-#: ../libgaim/protocols/qq/buddy_info.c:478
-msgid "Modify my information"
-msgstr "Modificar a miña información"
-
-#: ../libgaim/protocols/qq/buddy_info.c:479
-msgid "Update my information"
-msgstr "Actualizar a miña información"
-
-#: ../libgaim/protocols/qq/buddy_info.c:502
-msgid "Your information has been updated"
-msgstr "A súa información foi actualizada"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:205
-#: ../libgaim/protocols/qq/group_opt.c:133
-#, fuzzy, c-format
-msgid "You rejected %d's request"
-msgstr "Solicitude non esperada"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:206
-#: ../libgaim/protocols/qq/group_opt.c:134
-msgid "Input your reason:"
-msgstr "Introduza a súa razón:"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:208
-msgid "Reject request"
-msgstr "Rexeitar solicitude"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:209
-#: ../libgaim/protocols/qq/group_opt.c:137
-msgid "Sorry, you are not my type..."
-msgstr "Síntoo, non eres o meu tipo..."
-
-#: ../libgaim/protocols/qq/buddy_opt.c:210
-#: ../libgaim/protocols/qq/group_im.c:134
-#: ../libgaim/protocols/qq/group_opt.c:123
-#: ../libgaim/protocols/qq/sys_msg.c:83 ../libgaim/protocols/qq/sys_msg.c:226
-msgid "Reject"
-msgstr "Rexeitar"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:270
-#, fuzzy
-msgid "Add buddy with auth request fails"
-msgstr "Engadir o amigo a súa lista?"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:301
-msgid "You have successfully removed a buddy"
-msgstr "Eliminou correctamente un amigo"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:329
-msgid "You have successfully removed yourself from a buddy"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_opt.c:393
-#, c-format
-msgid "User %d needs authentication"
-msgstr "O usuario %d necesita autenticación"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:395
-#: ../libgaim/protocols/qq/group_join.c:132
-msgid "Input request here"
-msgstr "Introduza a solicitude aquí"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:396
-#: ../libgaim/protocols/qq/group_join.c:133
-msgid "Would you be my friend?"
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_opt.c:397
-#: ../libgaim/protocols/qq/group_join.c:134
-#: ../libgaim/protocols/qq/group_opt.c:138
-#: ../libgaim/protocols/qq/sendqueue.c:198
-msgid "Send"
-msgstr "Enviar"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:404
-#, fuzzy, c-format
-msgid "You have added %d in buddy list"
-msgstr "O usuario %s engadiuno á súa lista de amigos."
-
-#: ../libgaim/protocols/qq/buddy_opt.c:501
-msgid "QQid Error"
-msgstr "Erro de QQid"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:502
-msgid "Invalid QQid"
-msgstr "QQid inválido"
-
-#: ../libgaim/protocols/qq/group.c:63
-msgid "ID: "
-msgstr "ID: "
-
-#: ../libgaim/protocols/qq/group.c:96
-msgid "Group ID"
-msgstr "ID de grupo"
-
-#: ../libgaim/protocols/qq/group.c:98
-#, fuzzy
-msgid "Creator"
-msgstr "Crear"
-
-#: ../libgaim/protocols/qq/group.c:101
-msgid "Group Description"
-msgstr "Descrición do grupo"
-
-#: ../libgaim/protocols/qq/group.c:107
-msgid "Auth"
-msgstr "Autorizar"
-
-#: ../libgaim/protocols/qq/group.c:117
-msgid "QQ Qun"
-msgstr "QQ Qun"
-
-#: ../libgaim/protocols/qq/group.c:118
-msgid "Please input external group ID"
-msgstr "Introduza un ID de grupo externo"
-
-#: ../libgaim/protocols/qq/group.c:119
-msgid "You can only search for permanent QQ groups\n"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_im.c:120
-#, fuzzy, c-format
-msgid "User %d applied to join group %d"
-msgstr "O usuario non está no grupo"
-
-#: ../libgaim/protocols/qq/group_im.c:121
-#: ../libgaim/protocols/qq/group_im.c:170
-#: ../libgaim/protocols/qq/sys_msg.c:178
-#, c-format
-msgid "Reason: %s"
-msgstr "Razón: %s"
-
-#: ../libgaim/protocols/qq/group_im.c:128
-#: ../libgaim/protocols/qq/group_im.c:172
-#: ../libgaim/protocols/qq/group_im.c:212
-#: ../libgaim/protocols/qq/group_im.c:247
-#: ../libgaim/protocols/qq/group_im.c:281
-#: ../libgaim/protocols/qq/group_join.c:227
-#: ../libgaim/protocols/qq/group_join.c:353
-#: ../libgaim/protocols/qq/group_opt.c:228
-#: ../libgaim/protocols/qq/group_opt.c:298
-#: ../libgaim/protocols/qq/group_opt.c:384
-#, fuzzy
-msgid "QQ Qun Operation"
-msgstr "Opcións de son"
-
-#: ../libgaim/protocols/qq/group_im.c:131
-#: ../libgaim/protocols/qq/group_opt.c:125
-#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
-msgid "Approve"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_im.c:169
-#, c-format
-msgid "You request to join group %d has been rejected by admin %d"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_im.c:210
-#, c-format
-msgid "You request to join group %d has been approved by admin %d"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_im.c:246
-#, c-format
-msgid "You [%d] has exit group \"%d\""
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_im.c:280
-#, c-format
-msgid "You [%d] has been added by group \"%d\""
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_im.c:281
-#, fuzzy
-msgid "This group has been added to your buddy list"
-msgstr "O usuario %s engadiuno á súa lista de amigos."
-
-#: ../libgaim/protocols/qq/group_internal.c:39
-msgid "I am not member"
-msgstr "Non son un membro"
-
-#: ../libgaim/protocols/qq/group_internal.c:42
-msgid "I am a member"
-msgstr "Son un membro"
-
-#: ../libgaim/protocols/qq/group_internal.c:45
-msgid "I am applying to join"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_internal.c:48
-msgid "I am the admin"
-msgstr "Son o administrador"
-
-#: ../libgaim/protocols/qq/group_internal.c:51
-msgid "Unknown status"
-msgstr "Estado descoñecido"
-
-#: ../libgaim/protocols/qq/group_join.c:78
-#, fuzzy
-msgid "This group does not allow others to join"
-msgstr ""
-"Esta versión de evaluación non permite a conexión simultánea de máis de dez "
-"usuarios"
-
-#: ../libgaim/protocols/qq/group_join.c:227
-msgid "You have successfully exited the group"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_join.c:251
-msgid "QQ Group Auth"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_join.c:252
-msgid "Your authorization operation has been accepted by the QQ server"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_join.c:323
-msgid "You inputted a group id outside the acceptable range"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_join.c:354
-#, fuzzy
-msgid "Are you sure to exit this Qun?"
-msgstr "Está seguro de que quere borrar %s?"
-
-#: ../libgaim/protocols/qq/group_join.c:356
-msgid ""
-"Note, if you are the creator, \n"
-"this operation will eventually remove this Qun."
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_join.c:359
-msgid "Go ahead"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_network.c:88
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_network.c:89
-msgid "Group Operation Error"
-msgstr "Erro de operación de grupo"
-
-#: ../libgaim/protocols/qq/group_opt.c:122
-#: ../libgaim/protocols/qq/sys_msg.c:82
-msgid "Do you wanna approve the request?"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_opt.c:228
-msgid "You have successfully modify Qun member"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_opt.c:298
-msgid "You have successfully modify Qun information"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_opt.c:385
-msgid "You have successfully created a Qun"
-msgstr ""
-
-#: ../libgaim/protocols/qq/group_opt.c:387
-#, fuzzy
-msgid "Would you like to set up the Qun details now?"
-msgstr "Desexa establecela coma a icona de amigo para este usuario?"
-
-#: ../libgaim/protocols/qq/group_opt.c:388
-#, fuzzy
-msgid "Setup"
-msgstr "_Establecer"
-
-#: ../libgaim/protocols/qq/im.c:421
-msgid "System Message"
-msgstr "Mensaxe do sistema"
-
-#: ../libgaim/protocols/qq/im.c:565
-msgid "Server ACK"
-msgstr "Servidor ACK"
-
-#: ../libgaim/protocols/qq/im.c:565
-#, fuzzy
-msgid "Send IM fail\n"
-msgstr "Enviar correo electrónico"
-
-#: ../libgaim/protocols/qq/keep_alive.c:81
-msgid "Keep alive error, seems connection lost!"
-msgstr ""
-
-#: ../libgaim/protocols/qq/login_logout.c:404
-msgid "Request login token error!"
-msgstr ""
-
-#: ../libgaim/protocols/qq/login_logout.c:479
-msgid "Wrong password!"
-msgstr "Contrasinal erróneo!"
-
-#: ../libgaim/protocols/qq/login_logout.c:482
-msgid "Unable to login, check debug log"
-msgstr ""
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libgaim/protocols/qq/qq.c:137 ../libgaim/protocols/toc/toc.c:173
-#: ../libgaim/protocols/yahoo/yahoo.c:2356
-#: ../libgaim/protocols/yahoo/yahoo.c:2383
-#: ../libgaim/protocols/yahoo/yahoo.c:2490
-#: ../libgaim/protocols/yahoo/yahoo.c:2511
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
-#: ../libgaim/protocols/yahoo/ycht.c:549
-msgid "Unable to connect."
-msgstr "Non se puido conectar."
-
-#: ../libgaim/protocols/qq/qq.c:283
-msgid "QQ: Available"
-msgstr "QQ: Dispoñible"
-
-#: ../libgaim/protocols/qq/qq.c:287
-msgid "QQ: Away"
-msgstr "QQ: Ausente"
-
-#: ../libgaim/protocols/qq/qq.c:291
-msgid "QQ: Invisible"
-msgstr "QQ: Invisible"
-
-#: ../libgaim/protocols/qq/qq.c:295
-msgid "QQ: Offline"
-msgstr "QQ: Desconectado"
-
-#: ../libgaim/protocols/qq/qq.c:372
-msgid "Invalid name"
-msgstr "Nome inválido"
-
-#: ../libgaim/protocols/qq/qq.c:442
-msgid "Selection"
-msgstr "Selección"
-
-#: ../libgaim/protocols/qq/qq.c:445
-msgid "Select a number"
-msgstr "Seleccionar un número"
-
-#: ../libgaim/protocols/qq/qq.c:451
-#, fuzzy
-msgid "Faces"
-msgstr "Xogos"
-
-#: ../libgaim/protocols/qq/qq.c:456
-msgid "Change Your QQ Face"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:457
-#, fuzzy
-msgid "Change Face"
-msgstr "Cambiar estado"
-
-#: ../libgaim/protocols/qq/qq.c:458
-msgid "Update"
-msgstr "Actualizar"
-
-#: ../libgaim/protocols/qq/qq.c:512
-#, fuzzy, c-format
-msgid "<b>Current Online</b>: %d<br>\n"
-msgstr "<b>Título do grupo:</b> %s<br>"
-
-#: ../libgaim/protocols/qq/qq.c:513
-#, c-format
-msgid "<b>Last Refresh</b>: %s<br>\n"
-msgstr "<b>Última actualización</b>: %s<br>\n"
-
-#: ../libgaim/protocols/qq/qq.c:517
-#, c-format
-msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr "<b>Modo de conexión</b>: %s<br>\n"
-
-#: ../libgaim/protocols/qq/qq.c:518
-#, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>IP do servidor</b>: %s: %d<br>\n"
-
-#: ../libgaim/protocols/qq/qq.c:519
-#, c-format
-msgid "<b>My Public IP</b>: %s<br>\n"
-msgstr "<b>A miña IP pública</b>: %s<br>\n"
-
-#: ../libgaim/protocols/qq/qq.c:522
-msgid "<i>Information below may not be accurate</i><br>\n"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:524
-#, fuzzy, c-format
-msgid "<b>Login Time</b>: %s<br>\n"
-msgstr "<b>Título do grupo:</b> %s<br>"
-
-#: ../libgaim/protocols/qq/qq.c:525
-#, fuzzy, c-format
-msgid "<b>Last Login IP</b>: %s<br>\n"
-msgstr "<b>ID de usuario:</b> %s<br>"
-
-#: ../libgaim/protocols/qq/qq.c:526
-#, fuzzy, c-format
-msgid "<b>Last Login Time</b>: %s\n"
-msgstr "<b>Último cliente coñecido:</b>"
-
-#: ../libgaim/protocols/qq/qq.c:530
-#, fuzzy
-msgid "Login Information"
-msgstr "Información de depuración"
-
-#: ../libgaim/protocols/qq/qq.c:802
-msgid "Modify My Information"
-msgstr "Modificar a miña información"
-
-#: ../libgaim/protocols/qq/qq.c:805
-msgid "Change My Face"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:808 ../libgaim/protocols/toc/toc.c:1700
-msgid "Change Password"
-msgstr "Cambiar o contrasinal"
-
-#: ../libgaim/protocols/qq/qq.c:811
-#, fuzzy
-msgid "Show Login Information"
-msgstr "Información de depuración"
-
-#: ../libgaim/protocols/qq/qq.c:837
-msgid "Exit this QQ Qun"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:922
-msgid "This function has not be implemented yet"
-msgstr ""
-
-#: ../libgaim/protocols/qq/qq.c:922
-msgid "Please wait for new version"
-msgstr "Por favor, agarde por unha nova versión"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libgaim/protocols/qq/qq.c:1004 ../libgaim/protocols/qq/qq.c:1006
+#: ../libgaim/protocols/qq/qq.c:731 ../libgaim/protocols/qq/qq.c:733
+#, fuzzy
 msgid "QQ Protocol\tPlugin"
-msgstr "Protocolo QQ\tComplemento"
-
-#: ../libgaim/protocols/qq/qq.c:1025
+msgstr "Complemento de protocolo IRC"
+
+#: ../libgaim/protocols/qq/qq.c:752
 #, fuzzy
 msgid "Login in TCP"
-msgstr "Unirse a un chat"
-
-#: ../libgaim/protocols/qq/qq.c:1028
+msgstr "Unirse a unha conversa"
+
+#: ../libgaim/protocols/qq/qq.c:755
 #, fuzzy
 msgid "Login Hidden"
 msgstr "Opcións de conexión"
 
-#: ../libgaim/protocols/qq/qq_proxy.c:493
+#: ../libgaim/protocols/qq/qq_proxy.c:497
 #, fuzzy
 msgid "Socket send error"
 msgstr "Erro de token"
 
-#: ../libgaim/protocols/qq/qq_proxy.c:496
+#: ../libgaim/protocols/qq/qq_proxy.c:500
+#, fuzzy
 msgid "Connection refused"
-msgstr "Conexión rexeitada"
-
-#: ../libgaim/protocols/qq/recv_core.c:304
+msgstr "Conexión reiniciada"
+
+#: ../libgaim/protocols/qq/recv_core.c:309
+#, fuzzy
 msgid "Socket error"
-msgstr "Erro de Socket"
-
-#: ../libgaim/protocols/qq/recv_core.c:314
+msgstr "Erro de token"
+
+#: ../libgaim/protocols/qq/recv_core.c:319
+#, fuzzy
 msgid "Unable to read from socket"
-msgstr "Non se puido ler do socket"
+msgstr "Non se puido ler o socket "
 
 #: ../libgaim/protocols/qq/send_file.c:706
 #, fuzzy, c-format
 msgid "%d has declined the file %s"
-msgstr "%s cambiou o tópico a: %s"
+msgstr "%s mudou o asunto a: %s"
 
 #: ../libgaim/protocols/qq/send_file.c:709
 #: ../libgaim/protocols/qq/send_file.c:738
+#, fuzzy
 msgid "File Send"
-msgstr "Envío de ficheiro"
+msgstr "Fallou no envío do ficheiro"
 
 #: ../libgaim/protocols/qq/send_file.c:735
 #, fuzzy, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%s cancelou a transferencia de %s"
 
-#: ../libgaim/protocols/qq/sendqueue.c:167
-msgid "Connection lost!"
-msgstr "Conexión perdida!"
-
-#. cancel logging progress
-#: ../libgaim/protocols/qq/sendqueue.c:174
-msgid "Login failed, no reply!"
-msgstr "Fallou a conexión, sen resposta!"
-
-#: ../libgaim/protocols/qq/sendqueue.c:179
-#, fuzzy
-msgid "Connection timeout!"
-msgstr "Expirou a conexión"
-
-#: ../libgaim/protocols/qq/sendqueue.c:179
-#, fuzzy
-msgid "User info is not updated"
-msgstr "O usuario non está no grupo"
-
-#: ../libgaim/protocols/qq/sendqueue.c:194
-#, fuzzy
-msgid "Send packet"
-msgstr "Enviando cookie"
-
-#: ../libgaim/protocols/qq/sendqueue.c:196
-msgid "Packets lost, send again?"
-msgstr ""
-
-#: ../libgaim/protocols/qq/sys_msg.c:101
+#: ../libgaim/protocols/qq/sendqueue.c:122
+#, fuzzy
+msgid "Connection lost"
+msgstr "Conexión pechada"
+
+#. cancel login progress
+#: ../libgaim/protocols/qq/sendqueue.c:130
+#, fuzzy
+msgid "Login failed, no reply"
+msgstr "Fallo na conexión (%s)."
+
+#: ../libgaim/protocols/qq/sys_msg.c:103
 #, fuzzy
 msgid "Do you wanna add this buddy?"
-msgstr "Desexa engadir este amigo a súa lista de amigos?"
+msgstr "Desexa engadir este contacto á listaxe de contactos?"
 
 #. only need to get value
-#: ../libgaim/protocols/qq/sys_msg.c:153
+#: ../libgaim/protocols/qq/sys_msg.c:155
 #, fuzzy, c-format
 msgid "You have been added by %s"
 msgstr "Foi expulsado por %s (%s)"
 
-#: ../libgaim/protocols/qq/sys_msg.c:156
+#: ../libgaim/protocols/qq/sys_msg.c:158
 #, fuzzy
 msgid "Would like to add him?"
-msgstr "Quere sobrescribilo?"
-
-#: ../libgaim/protocols/qq/sys_msg.c:162
+msgstr "Quere sobreescribilo?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:164
 #, fuzzy, c-format
 msgid "%s has added you [%s]"
 msgstr "%s conectouse (%s)"
 
-#: ../libgaim/protocols/qq/sys_msg.c:177
+#: ../libgaim/protocols/qq/sys_msg.c:179
 #, fuzzy, c-format
 msgid "User %s rejected your request"
-msgstr "O usuario remoto rexeitou a túa petición."
-
-#: ../libgaim/protocols/qq/sys_msg.c:197
+msgstr "O usuario remoto rexeitou a petición."
+
+#: ../libgaim/protocols/qq/sys_msg.c:199
 #, fuzzy, c-format
 msgid "User %s has approved your request"
-msgstr "O usuario remoto rexeitou a túa petición."
-
-#: ../libgaim/protocols/qq/sys_msg.c:220
+msgstr "O usuario remoto rexeitou a petición."
+
+#: ../libgaim/protocols/qq/sys_msg.c:222
 #, fuzzy, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s quere enviarlle un ficheiro"
 
-#: ../libgaim/protocols/qq/sys_msg.c:221
+#: ../libgaim/protocols/qq/sys_msg.c:223
 #, fuzzy, c-format
 msgid "Message: %s"
 msgstr "_Mensaxe:"
 
-#: ../libgaim/protocols/qq/sys_msg.c:242
+#: ../libgaim/protocols/qq/sys_msg.c:244
 #, fuzzy, c-format
 msgid "%s is not in your buddy list"
-msgstr "O usuario %s engadiuno á súa lista de amigos."
-
-#: ../libgaim/protocols/qq/sys_msg.c:244
+msgstr "O usuario %s engadiuno á súa listaxe de contactos."
+
+#: ../libgaim/protocols/qq/sys_msg.c:246
 #, fuzzy
 msgid "Would you like to add him?"
-msgstr "Quere sobrescribilo?"
-
-#: ../libgaim/protocols/sametime/sametime.c:414
+msgstr "Quere sobreescribilo?"
+
+#: ../libgaim/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Conexión pechada (escribindo)"
 
-#: ../libgaim/protocols/sametime/sametime.c:1260
+#: ../libgaim/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título do grupo:</b> %s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1261
+#: ../libgaim/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>ID de grupo Notes:</b>%s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1263
+#: ../libgaim/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr "Información sobre o grupo %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:1265
+#: ../libgaim/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
 msgstr "Información do libro de enderezos Notes"
 
-#: ../libgaim/protocols/sametime/sametime.c:1297
+#: ../libgaim/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
-msgstr "Invitar grupo á conferencia..."
-
-#: ../libgaim/protocols/sametime/sametime.c:1307
+msgstr "Convidar o grupo á conferencia..."
+
+#: ../libgaim/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr "Obter a información do libro de enderezos Notes"
 
-#: ../libgaim/protocols/sametime/sametime.c:1460
+#: ../libgaim/protocols/sametime/sametime.c:1498
 msgid "Sending Handshake"
-msgstr "Enviando negociación"
-
-#: ../libgaim/protocols/sametime/sametime.c:1465
+msgstr "Enviando a negociación"
+
+#: ../libgaim/protocols/sametime/sametime.c:1503
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "Agardando á aceptación do saúdo inicial"
-
-#: ../libgaim/protocols/sametime/sametime.c:1470
+msgstr "Agardando a aceptación do saúdo inicial"
+
+#: ../libgaim/protocols/sametime/sametime.c:1508
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Aceptouse o saúdo inicial. Enviando a identificación"
 
-#: ../libgaim/protocols/sametime/sametime.c:1475
+#: ../libgaim/protocols/sametime/sametime.c:1513
 msgid "Waiting for Login Acknowledgement"
-msgstr "Agardando á aceptación da identificación"
-
-#: ../libgaim/protocols/sametime/sametime.c:1480
+msgstr "Agardando a aceptación da identificación"
+
+#: ../libgaim/protocols/sametime/sametime.c:1518
 msgid "Login Redirected"
 msgstr "Conexión redirixida"
 
-#: ../libgaim/protocols/sametime/sametime.c:1486
+#: ../libgaim/protocols/sametime/sametime.c:1524
 msgid "Forcing Login"
-msgstr "Forzando conexión"
-
-#: ../libgaim/protocols/sametime/sametime.c:1490
+msgstr "Forzando identificación"
+
+#: ../libgaim/protocols/sametime/sametime.c:1528
 msgid "Login Acknowledged"
 msgstr "Identificación aceptada"
 
-#: ../libgaim/protocols/sametime/sametime.c:1495
+#: ../libgaim/protocols/sametime/sametime.c:1533
 msgid "Starting Services"
 msgstr "Iniciando servizos"
 
-#: ../libgaim/protocols/sametime/sametime.c:1500
+#: ../libgaim/protocols/sametime/sametime.c:1538
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libgaim/protocols/sametime/sametime.c:1598
+#: ../libgaim/protocols/sametime/sametime.c:1636
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
-msgstr "Un administrador de Sametime eviou o seguinte anuncio no servidor %s"
-
-#: ../libgaim/protocols/sametime/sametime.c:1603
+msgstr "Un administrador de Sametime enviou o seguinte anuncio no servidor %s"
+
+#: ../libgaim/protocols/sametime/sametime.c:1641
 msgid "Sametime Administrator Announcement"
 msgstr "Anuncio do administrador Sametime"
 
-#: ../libgaim/protocols/sametime/sametime.c:1655
+#: ../libgaim/protocols/sametime/sametime.c:1693
 msgid "Connection reset"
 msgstr "Conexión reiniciada"
 
-#: ../libgaim/protocols/sametime/sametime.c:1662
+#: ../libgaim/protocols/sametime/sametime.c:1700
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Erro ao ler do socket: %s"
 
 #. this is a regular connect, error out
-#: ../libgaim/protocols/sametime/sametime.c:1685
-#: ../libgaim/protocols/sametime/sametime.c:3681
+#: ../libgaim/protocols/sametime/sametime.c:1723
+#: ../libgaim/protocols/sametime/sametime.c:3736
 msgid "Unable to connect to host"
 msgstr "Non se puido conectar ao servidor"
 
-#: ../libgaim/protocols/sametime/sametime.c:1723
+#: ../libgaim/protocols/sametime/sametime.c:1761
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aviso de %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:1897
+#: ../libgaim/protocols/sametime/sametime.c:1935
 msgid "Conference Closed"
 msgstr "Conferencia pechada"
 
-#: ../libgaim/protocols/sametime/sametime.c:2354
+#: ../libgaim/protocols/sametime/sametime.c:2394
 msgid "Unable to send message: "
 msgstr "Non se puido enviar a mensaxe: "
 
-#: ../libgaim/protocols/sametime/sametime.c:2911
+#: ../libgaim/protocols/sametime/sametime.c:2951
 msgid "Place Closed"
 msgstr "Lugar pechado"
 
-#: ../libgaim/protocols/sametime/sametime.c:3202
+#: ../libgaim/protocols/sametime/sametime.c:3242
 msgid "Microphone"
 msgstr "Micrófono"
 
-#: ../libgaim/protocols/sametime/sametime.c:3203
+#: ../libgaim/protocols/sametime/sametime.c:3243
 msgid "Speakers"
-msgstr "Altavoces"
-
-#: ../libgaim/protocols/sametime/sametime.c:3204
+msgstr "Altofalantes"
+
+#: ../libgaim/protocols/sametime/sametime.c:3244
 msgid "Video Camera"
-msgstr "Video cámara"
-
-#: ../libgaim/protocols/sametime/sametime.c:3208
+msgstr "Videocámara"
+
+#: ../libgaim/protocols/sametime/sametime.c:3248
 msgid "File Transfer"
 msgstr "Transferencia de ficheiros"
 
-#: ../libgaim/protocols/sametime/sametime.c:3242
-#, c-format
-msgid ""
-"\n"
-"<b>Supports:</b> %s"
-msgstr ""
-"\n"
-"<b>Soporte:</b> %s"
-
-#: ../libgaim/protocols/sametime/sametime.c:3247
-msgid ""
-"\n"
-"<b>External User</b>"
+#: ../libgaim/protocols/sametime/sametime.c:3282
+#: ../libgaim/protocols/sametime/sametime.c:4156
+#, fuzzy
+msgid "Supports"
+msgstr "soporte"
+
+#: ../libgaim/protocols/sametime/sametime.c:3287
+#: ../libgaim/protocols/sametime/sametime.c:4130
+#, fuzzy
+msgid "External User"
 msgstr ""
 "\n"
 "<b>Usuario externo</b>"
 
-#: ../libgaim/protocols/sametime/sametime.c:3353
+#: ../libgaim/protocols/sametime/sametime.c:3393
 msgid "Create conference with user"
 msgstr "Crear conferencia co usuario"
 
-#: ../libgaim/protocols/sametime/sametime.c:3354
+#: ../libgaim/protocols/sametime/sametime.c:3394
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 "Por favor introduza un tema para a nova conferencia, e unha mensaxe de "
-"invitación que se enviará a %s"
-
-#: ../libgaim/protocols/sametime/sametime.c:3358
+"convite que se enviará a %s"
+
+#: ../libgaim/protocols/sametime/sametime.c:3398
 msgid "New Conference"
 msgstr "Nova conferencia"
 
-#: ../libgaim/protocols/sametime/sametime.c:3360
+#: ../libgaim/protocols/sametime/sametime.c:3400
 msgid "Create"
 msgstr "Crear"
 
-#: ../libgaim/protocols/sametime/sametime.c:3424
+#: ../libgaim/protocols/sametime/sametime.c:3464
 msgid "Available Conferences"
 msgstr "Conferencias dispoñibles"
 
-#: ../libgaim/protocols/sametime/sametime.c:3430
+#: ../libgaim/protocols/sametime/sametime.c:3470
 msgid "Create New Conference..."
 msgstr "Crear unha nova conferencia..."
 
-#: ../libgaim/protocols/sametime/sametime.c:3437
+#: ../libgaim/protocols/sametime/sametime.c:3477
 msgid "Invite user to a conference"
-msgstr "Invitar ao usuario a unha conferencia"
-
-#: ../libgaim/protocols/sametime/sametime.c:3438
+msgstr "Convidar ao usuario a unha conferencia"
+
+#: ../libgaim/protocols/sametime/sametime.c:3478
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"Seleccionar unha conferencia da lista amosada para invitar ao usuario %s. "
+"Seleccionar unha conferencia da listaxe amosada para convidar ao usuario %s. "
 "Seleccione \"Crear nova conferencia\" se quere crear unha nova conferencia "
-"para invitar a este usuario tamén."
-
-#: ../libgaim/protocols/sametime/sametime.c:3443
+"para convidar a este usuario tamén."
+
+#: ../libgaim/protocols/sametime/sametime.c:3483
 msgid "Invite to Conference"
-msgstr "Invitar a unha conferencia"
-
-#: ../libgaim/protocols/sametime/sametime.c:3533
+msgstr "Convidar a unha conferencia"
+
+#: ../libgaim/protocols/sametime/sametime.c:3573
 msgid "Invite to Conference..."
-msgstr "Invitar a unha conferencia.."
-
-#: ../libgaim/protocols/sametime/sametime.c:3538
+msgstr "Convidar a unha conferencia.."
+
+#: ../libgaim/protocols/sametime/sametime.c:3578
 msgid "Send TEST Announcement"
 msgstr "Enviar anuncio de PROBA"
 
-#: ../libgaim/protocols/sametime/sametime.c:3585
+#: ../libgaim/protocols/sametime/sametime.c:3625
 msgid "No Sametime Community Server specified"
 msgstr "Non se especificou o servidor de comunidade Sametime"
 
-#: ../libgaim/protocols/sametime/sametime.c:3607
+#: ../libgaim/protocols/sametime/sametime.c:3647
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -12001,93 +12376,70 @@
 "Non se configurou ningún enderezo IP ou nome de equipo para a conta "
 "Meanwhile %s. Introduza un máis abaixo para continuar o rexistro."
 
-#: ../libgaim/protocols/sametime/sametime.c:3612
+#: ../libgaim/protocols/sametime/sametime.c:3652
 msgid "Meanwhile Connection Setup"
 msgstr "Configuración da conexión Meanwhile"
 
-#: ../libgaim/protocols/sametime/sametime.c:3613
+#: ../libgaim/protocols/sametime/sametime.c:3653
 msgid "No Sametime Community Server Specified"
 msgstr "Non se especificou un servidor de comunidade Sametime"
 
-#: ../libgaim/protocols/sametime/sametime.c:4075
-msgid "<b>External User</b><br>"
-msgstr "<b>Usuario externo</b><br>"
-
-#: ../libgaim/protocols/sametime/sametime.c:4078
-#, c-format
-msgid "<b>User ID:</b> %s<br>"
-msgstr "<b>ID de usuario:</b> %s<br>"
-
-#: ../libgaim/protocols/sametime/sametime.c:4084
-#, c-format
-msgid "<b>Full Name:</b> %s<br>"
-msgstr "<b>Nome completo:</b> %s<br>"
-
-#: ../libgaim/protocols/sametime/sametime.c:4090
-msgid "<b>Last Known Client:</b> "
-msgstr "<b>Último cliente coñecido:</b>"
-
-#: ../libgaim/protocols/sametime/sametime.c:4098
+#: ../libgaim/protocols/sametime/sametime.c:4146
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Descoñecido (0x%04x)<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:4105
-#, c-format
-msgid "<b>Supports:</b> %s<br>"
-msgstr "<b>Soporta:</b> %s<br>"
-
-#: ../libgaim/protocols/sametime/sametime.c:4111
-#, c-format
-msgid "<b>Status:</b> %s"
-msgstr "<b>Estado:</b> %s"
-
-#: ../libgaim/protocols/sametime/sametime.c:4254
-#: ../libgaim/protocols/sametime/sametime.c:5418
+#: ../libgaim/protocols/sametime/sametime.c:4148
+#, fuzzy
+msgid "Last Known Client"
+msgstr "<b>Último cliente coñecido:</b>"
+
+#: ../libgaim/protocols/sametime/sametime.c:4312
+#: ../libgaim/protocols/sametime/sametime.c:5507
 msgid "User Name"
 msgstr "Nome de usuario"
 
-#: ../libgaim/protocols/sametime/sametime.c:4257
-#: ../libgaim/protocols/sametime/sametime.c:5421
+#: ../libgaim/protocols/sametime/sametime.c:4315
+#: ../libgaim/protocols/sametime/sametime.c:5510
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libgaim/protocols/sametime/sametime.c:4281
+#: ../libgaim/protocols/sametime/sametime.c:4339
 msgid "An ambiguous user ID was entered"
 msgstr "Introduciuse un ID de usuario ambiguo"
 
-#: ../libgaim/protocols/sametime/sametime.c:4282
+#: ../libgaim/protocols/sametime/sametime.c:4340
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
 "O identificador '%s' pode referirse a calquera dos seguintes usuarios. Por "
-"favor seleccione o usuario da lista amosada para engadilo a súa lista de "
-"amigos."
-
-#: ../libgaim/protocols/sametime/sametime.c:4287
+"favor seleccione o usuario da listaxe amosada para engadilo á súa listaxe de "
+"contactos."
+
+#: ../libgaim/protocols/sametime/sametime.c:4345
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: ../libgaim/protocols/sametime/sametime.c:4357
+#: ../libgaim/protocols/sametime/sametime.c:4429
 msgid "Unable to add user: user not found"
-msgstr "Non se puido engadir ao usuario: usuario non atopado"
-
-#: ../libgaim/protocols/sametime/sametime.c:4359
+msgstr "Non se puido engadir o usuario: usuario non atopado"
+
+#: ../libgaim/protocols/sametime/sametime.c:4431
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
 "O identificador '%s' non coincide con ningún usuario na comunidade Sametime. "
-"Eliminouse esta entrada da lista de amigos."
-
-#: ../libgaim/protocols/sametime/sametime.c:4364
+"Eliminouse esta entrada da listaxe de contactos."
+
+#: ../libgaim/protocols/sametime/sametime.c:4436
 msgid "Unable to add user"
-msgstr "Imposible engadir ao usuario"
-
-#: ../libgaim/protocols/sametime/sametime.c:4936
+msgstr "Imposible engadir o usuario"
+
+#: ../libgaim/protocols/sametime/sametime.c:5022
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -12096,108 +12448,108 @@
 "Erro lendo o ficheiro %s: \n"
 "%s.\n"
 
-#: ../libgaim/protocols/sametime/sametime.c:5068
+#: ../libgaim/protocols/sametime/sametime.c:5157
 msgid "Remotely Stored Buddy List"
-msgstr "Lista de amigos remotamente almacenada"
-
-#: ../libgaim/protocols/sametime/sametime.c:5073
+msgstr "Listaxe de contactos remotamente almacenada"
+
+#: ../libgaim/protocols/sametime/sametime.c:5162
 msgid "Buddy List Storage Mode"
-msgstr "Modo de almacenamiento da lista de amigos"
-
-#: ../libgaim/protocols/sametime/sametime.c:5076
+msgstr "Modo de almacenaxe da listaxe de contactos"
+
+#: ../libgaim/protocols/sametime/sametime.c:5165
 msgid "Local Buddy List Only"
-msgstr "Só lista de amigos local"
-
-#: ../libgaim/protocols/sametime/sametime.c:5078
+msgstr "Só listaxe de contactos local"
+
+#: ../libgaim/protocols/sametime/sametime.c:5167
 msgid "Merge List from Server"
-msgstr "Combinar lista desde o servidor"
-
-#: ../libgaim/protocols/sametime/sametime.c:5080
+msgstr "Combinar a listaxe desde o servidor"
+
+#: ../libgaim/protocols/sametime/sametime.c:5169
 msgid "Merge and Save List to Server"
-msgstr "Combinar e gardar a lista no servidor"
-
-#: ../libgaim/protocols/sametime/sametime.c:5082
+msgstr "Combinar e gardar a listaxe no servidor"
+
+#: ../libgaim/protocols/sametime/sametime.c:5171
 msgid "Synchronize List with Server"
-msgstr "Sincronizar a lista co servidor"
-
-#: ../libgaim/protocols/sametime/sametime.c:5131
+msgstr "Sincronizar a listaxe co servidor"
+
+#: ../libgaim/protocols/sametime/sametime.c:5220
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr "Importar a lista Sametime para a conta %s"
-
-#: ../libgaim/protocols/sametime/sametime.c:5170
+msgstr "Importar a listaxe Sametime para a conta %s"
+
+#: ../libgaim/protocols/sametime/sametime.c:5259
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr "Exportar a lista Sametime para a conta %s"
-
-#: ../libgaim/protocols/sametime/sametime.c:5223
+msgstr "Exportar a listaxe Sametime para a conta %s"
+
+#: ../libgaim/protocols/sametime/sametime.c:5312
 msgid "Unable to add group: group exists"
 msgstr "Imposible engadir o grupo: o grupo existe"
 
-#: ../libgaim/protocols/sametime/sametime.c:5224
+#: ../libgaim/protocols/sametime/sametime.c:5313
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr "Un grupo chamado '%s' xa existe na súa lista de amigos."
-
-#: ../libgaim/protocols/sametime/sametime.c:5227
-#: ../libgaim/protocols/sametime/sametime.c:5356
+msgstr "Un grupo chamado '%s' xa existe na listaxe de contactos."
+
+#: ../libgaim/protocols/sametime/sametime.c:5316
+#: ../libgaim/protocols/sametime/sametime.c:5445
 msgid "Unable to add group"
 msgstr "Imposible engadir o grupo"
 
-#: ../libgaim/protocols/sametime/sametime.c:5286
+#: ../libgaim/protocols/sametime/sametime.c:5375
 msgid "Possible Matches"
 msgstr "Coincidencias posibles"
 
-#: ../libgaim/protocols/sametime/sametime.c:5302
+#: ../libgaim/protocols/sametime/sametime.c:5391
 msgid "Notes Address Book group results"
 msgstr "Resultados das notas dos grupos do libro de enderezos"
 
-#: ../libgaim/protocols/sametime/sametime.c:5303
+#: ../libgaim/protocols/sametime/sametime.c:5392
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-"É posible que o identificador '%s' refírase a calquera dos grupos do libro "
-"de enderezos. Escolla o grupo mái apropiado da lista que se amosa abaixo "
-"para engadilo a súa lista de amigos."
-
-#: ../libgaim/protocols/sametime/sametime.c:5308
+"É posible que o identificador '%s' se refira a calquera dos grupos do libro "
+"de enderezos. Escolla o grupo máis axeitado da listaxe que se amosa abaixo "
+"para engadilo á listaxe de contactos."
+
+#: ../libgaim/protocols/sametime/sametime.c:5397
 msgid "Select Notes Address Book"
-msgstr "Seleccionar notas do libro de enderezos"
-
-#: ../libgaim/protocols/sametime/sametime.c:5350
+msgstr "Seleccionar as notas do libro de enderezos"
+
+#: ../libgaim/protocols/sametime/sametime.c:5439
 msgid "Unable to add group: group not found"
-msgstr "Imposible engadir o grupo: grupo non atopado"
-
-#: ../libgaim/protocols/sametime/sametime.c:5352
+msgstr "Imposible engadir o grupo: non se atopou"
+
+#: ../libgaim/protocols/sametime/sametime.c:5441
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 "O identificador '%s' non coincide con ningunha das notas dos grupos do libro "
-"de enderezos nas súa comunidade Sametime."
-
-#: ../libgaim/protocols/sametime/sametime.c:5393
+"de enderezos da comunidade Sametime."
+
+#: ../libgaim/protocols/sametime/sametime.c:5482
 msgid "Notes Address Book Group"
 msgstr "Notas do grupo do libro de enderezos"
 
-#: ../libgaim/protocols/sametime/sametime.c:5394
+#: ../libgaim/protocols/sametime/sametime.c:5483
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
 "Introduza o nome dun grupo do libro de enderezos Notes no campo a "
-"continuación para engadir o grupo e os seus membros na súa lista de amigos."
-
-#: ../libgaim/protocols/sametime/sametime.c:5442
+"continuación para engadir o grupo e os seus membros na listaxe de contactos."
+
+#: ../libgaim/protocols/sametime/sametime.c:5531
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados da busca para '%s'"
 
-#: ../libgaim/protocols/sametime/sametime.c:5443
+#: ../libgaim/protocols/sametime/sametime.c:5532
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -12205,62 +12557,62 @@
 "buttons below."
 msgstr ""
 "O identificador '%s' pode referirse a calquera dos usuarios amosados a "
-"continuación. Pode engadir estos usuarios a súa lista de amigos ou "
-"enviarlles mensaxes cos botóns de accións amosados abaixo."
-
-#: ../libgaim/protocols/sametime/sametime.c:5475
+"continuación. Pode engadir estes usuarios a súa listaxe de contactos ou "
+"enviarlles mensaxes cos botóns de acción amosados abaixo."
+
+#: ../libgaim/protocols/sametime/sametime.c:5564
 msgid "No matches"
 msgstr "Non houbo coincidencia"
 
-#: ../libgaim/protocols/sametime/sametime.c:5476
+#: ../libgaim/protocols/sametime/sametime.c:5565
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "O identificador '%s' non coincide con ningún usuario na comunidade Sametime."
 
-#: ../libgaim/protocols/sametime/sametime.c:5480
+#: ../libgaim/protocols/sametime/sametime.c:5569
 msgid "No Matches"
 msgstr "Non houbo coincidencia"
 
-#: ../libgaim/protocols/sametime/sametime.c:5517
+#: ../libgaim/protocols/sametime/sametime.c:5606
 msgid "Search for a user"
 msgstr "Procurar un usuario"
 
-#: ../libgaim/protocols/sametime/sametime.c:5518
+#: ../libgaim/protocols/sametime/sametime.c:5607
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
-"Introduza o nome ou identificador parcial no campo amosado a continuación "
-"para procurar usuarios coincidentes na súa comunidade Sametime."
-
-#: ../libgaim/protocols/sametime/sametime.c:5521
+"Introduza o nome ou o identificador parcial no campo amosado a seguir para "
+"buscar usuarios coincidentes na comunidade Sametime."
+
+#: ../libgaim/protocols/sametime/sametime.c:5610
 msgid "User Search"
 msgstr "Busca de usuario"
 
-#: ../libgaim/protocols/sametime/sametime.c:5533
+#: ../libgaim/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
-msgstr "Importar a lista Sametime..."
-
-#: ../libgaim/protocols/sametime/sametime.c:5537
+msgstr "Importar a listaxe Sametime..."
+
+#: ../libgaim/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
-msgstr "Exportar a lista Sametime..."
-
-#: ../libgaim/protocols/sametime/sametime.c:5541
+msgstr "Exportar a listaxe Sametime..."
+
+#: ../libgaim/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Engadir notas ao grupo do libro de enderezos..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5545
+#: ../libgaim/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Busca de usuario..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5642
+#: ../libgaim/protocols/sametime/sametime.c:5731
 msgid "Force login (ignore server redirects)"
 msgstr "Forzar conexión (ignorar redireccións do servidor)"
 
 #. pretend to be Sametime Connect
-#: ../libgaim/protocols/sametime/sametime.c:5652
+#: ../libgaim/protocols/sametime/sametime.c:5741
 msgid "Hide client identity"
-msgstr "Agochar identificación do cliente"
+msgstr "Agochar a identificación do cliente"
 
 #: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
 #: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
@@ -12274,35 +12626,35 @@
 #: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
 #: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
 msgid "Key Agreement"
-msgstr "Acordo de claves"
+msgstr "Acordo de clave"
 
 #: ../libgaim/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
-msgstr "Non se puido establecer o acordo de claves"
+msgstr "Non se puido establecer o acordo de clave"
 
 #: ../libgaim/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
-msgstr "Produciuse un erro durante o acordo de claves"
+msgstr "Produciuse un erro durante o acordo de clave"
 
 #: ../libgaim/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
-msgstr "Fallou o acordo de claves"
+msgstr "Fallou o acordo de clave"
 
 #: ../libgaim/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
-msgstr "Expirou o tempo durante o acordo de claves"
+msgstr "Expirou o tempo durante o acordo de clave"
 
 #: ../libgaim/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
-msgstr "Interrumpiuse o acordo de claves"
+msgstr "Interrompeuse o acordo de clave"
 
 #: ../libgaim/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
-msgstr "Iniciouse xa o acordo de claves"
+msgstr "Iniciouse xa o acordo de clave"
 
 #: ../libgaim/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
-msgstr "Non se pode comezar o acordo de claves consigo mesmo"
+msgstr "Non se pode comezar o acordo de clave consigo mesmo"
 
 #: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
 #: ../libgaim/protocols/silc/buddy.c:513
@@ -12315,8 +12667,8 @@
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr ""
-"Recibiuse unha solicitude de acordo de claves de %s. Desexa realizar o troco "
-"de claves?"
+"Recibiuse unha solicitude de acordo de clave de %s. Desexa realizar o cambio "
+"de clave?"
 
 #: ../libgaim/protocols/silc/buddy.c:298
 #, c-format
@@ -12325,13 +12677,13 @@
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"O usuario remoto está agardando un acordo de claves en:\n"
+"O usuario remoto está agardando un acordo de clave en:\n"
 "Servidor remoto: %s\n"
 "Porto remoto: %d"
 
 #: ../libgaim/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
-msgstr "Solicitude de acordo de claves"
+msgstr "Solicitude de acordo de clave"
 
 #: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
 #: ../libgaim/protocols/silc/buddy.c:464
@@ -12347,12 +12699,12 @@
 msgstr "Establecer contrasinal MI"
 
 #: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
-#: ../libgaim/protocols/silc/ops.c:1492 ../libgaim/protocols/silc/ops.c:1503
+#: ../libgaim/protocols/silc/ops.c:1494 ../libgaim/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "Obter clave pública"
 
-#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1493
-#: ../libgaim/protocols/silc/ops.c:1504
+#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1495
+#: ../libgaim/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Non se puido obter a clave pública"
 
@@ -12380,15 +12732,15 @@
 #: ../libgaim/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
-msgstr "Non se confía no amigo %s"
+msgstr "Non se confía no contacto %s"
 
 #: ../libgaim/protocols/silc/buddy.c:737
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
-"Non pode recibir notificacións deste amigo que importe súa clave pública. "
-"Pode empregar o comando \"Obter clave pública\" para importala."
+"Non pode recibir notificacións deste contacto que importe a súa clave "
+"pública. Pode empregar o comando \"Obter clave pública\" para importala."
 
 #. Open file selector to select the public key.
 #: ../libgaim/protocols/silc/buddy.c:1064
@@ -12398,15 +12750,15 @@
 #: ../libgaim/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
-msgstr "Non se atopa o amigo %s na rede"
+msgstr "Non se atopa o contacto %s na rede"
 
 #: ../libgaim/protocols/silc/buddy.c:1076
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr ""
-"Para engadir ao amigo debe importar súa clave pública. Prema Importar para "
-"importar unha clave pública."
+"Para engadir o contacto debe importar a súa clave pública. Prema en Importar "
+"para importar unha clave pública."
 
 #: ../libgaim/protocols/silc/buddy.c:1079
 msgid "_Import..."
@@ -12422,7 +12774,7 @@
 "user from the list to add to the buddy list."
 msgstr ""
 "Atopouse máis dun usuario coa mesma clave pública. Seleccione o usuario que "
-"desexa engadir a súa lista de amigos da lista amosada."
+"desexa engadir á listaxe de contactos da listaxe amosada."
 
 #: ../libgaim/protocols/silc/buddy.c:1179
 msgid ""
@@ -12430,11 +12782,11 @@
 "from the list to add to the buddy list."
 msgstr ""
 "Atopouse máis dun usuario co mesmo nome. Seleccione o usuario que desexa "
-"engadir a súa lista de amigos da lista amosada."
+"engadir a listaxe de contactos da listaxe amosada."
 
 #: ../libgaim/protocols/silc/buddy.c:1467
 msgid "Detached"
-msgstr "Desligado"
+msgstr "Desconectado"
 
 #: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
 msgid "Indisposed"
@@ -12442,11 +12794,11 @@
 
 #: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
 msgid "Wake Me Up"
-msgstr "Despértame"
+msgstr "Espértame"
 
 #: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
 msgid "Hyper Active"
-msgstr "Hiper-activo"
+msgstr "Hiperactivo"
 
 #: ../libgaim/protocols/silc/buddy.c:1479
 msgid "Robot"
@@ -12470,7 +12822,7 @@
 #: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:674
 #: ../libgaim/protocols/silc/util.c:520
 msgid "Jealous"
-msgstr "Celoso"
+msgstr "Envexoso"
 
 #: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:676
 #: ../libgaim/protocols/silc/util.c:522
@@ -12484,7 +12836,7 @@
 
 #: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
 msgid "In Love"
-msgstr "Enamorado"
+msgstr "Namorado"
 
 #: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:682
 #: ../libgaim/protocols/silc/util.c:528
@@ -12506,32 +12858,32 @@
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: ../libgaim/protocols/silc/buddy.c:1534 ../libgaim/protocols/silc/ops.c:1196
+#: ../libgaim/protocols/silc/buddy.c:1538 ../libgaim/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "Modos de usuario"
 
-#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1205
+#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1207
 msgid "Mood"
-msgstr "Ánimo"
-
-#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1217
+msgstr "Disposición"
+
+#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Contacto preferido"
 
-#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1222
+#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1224
 msgid "Preferred Language"
-msgstr "Linguaxe preferida"
-
-#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1227
+msgstr "Lingua preferida"
+
+#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1232
+#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1234
 #: ../libgaim/protocols/silc/silc.c:736 ../libgaim/protocols/silc/silc.c:738
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1237
+#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "Localización"
 
@@ -12541,7 +12893,7 @@
 
 #: ../libgaim/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
-msgstr "MI con troco de claves"
+msgstr "MI con cambio de clave"
 
 #: ../libgaim/protocols/silc/buddy.c:1640
 msgid "IM with Password"
@@ -12551,9 +12903,9 @@
 msgid "Get Public Key..."
 msgstr "Obter clave pública..."
 
-#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1622
+#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1624
 msgid "Kill User"
-msgstr "Matar usuario"
+msgstr "Matar o usuario"
 
 #: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
@@ -12561,25 +12913,25 @@
 
 #: ../libgaim/protocols/silc/chat.c:39
 msgid "_Passphrase:"
-msgstr "Con_trasinal:"
+msgstr "_Sinal:"
 
 #: ../libgaim/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
-msgstr "Non existe o canle %s na rede"
+msgstr "Non existe a canle %s na rede"
 
 #: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
 msgid "Channel Information"
-msgstr "Información do canle"
+msgstr "Información da canle"
 
 #: ../libgaim/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
-msgstr "Non se puido trocar a información do canle"
+msgstr "Non se puido cambiar a información da canle"
 
 #: ../libgaim/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
-msgstr "<b>Nome do canle:</b> %s"
+msgstr "<b>Nome da canle:</b> %s"
 
 #: ../libgaim/protocols/silc/chat.c:122
 #, c-format
@@ -12589,27 +12941,27 @@
 #: ../libgaim/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
-msgstr "<br><b>Fundador do canle:</b> %s"
+msgstr "<br><b>Fundador da canle:</b> %s"
 
 #: ../libgaim/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr "<br><b>Cifrado do canle:</b> %s"
+msgstr "<br><b>Cifraxe da canle:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
 #: ../libgaim/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
-msgstr "<br><b>HMAC do canle:</b> %s"
+msgstr "<br><b>HMAC da canle:</b> %s"
 
 #: ../libgaim/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
-msgstr "<br><b>Tópico do canle:</b><br>%s"
+msgstr "<br><b>Asunto da canle:</b><br>%s"
 
 #: ../libgaim/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
-msgstr "<br><b>Modos do canle:</b> "
+msgstr "<br><b>Modos da canle:</b> "
 
 #: ../libgaim/protocols/silc/chat.c:165
 #, c-format
@@ -12623,7 +12975,7 @@
 
 #: ../libgaim/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
-msgstr "Engadir clave pública do canle"
+msgstr "Engadir clave pública da canle"
 
 #. Add new public key
 #: ../libgaim/protocols/silc/chat.c:291
@@ -12632,11 +12984,11 @@
 
 #: ../libgaim/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
-msgstr "Contrasinal do canle"
+msgstr "Contrasinal da canle"
 
 #: ../libgaim/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
-msgstr "Lista de claves públicas do canle"
+msgstr "Listaxe de claves públicas da canle"
 
 #: ../libgaim/protocols/silc/chat.c:412
 msgid ""
@@ -12646,17 +12998,17 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"Utilízase a autenticación de canle para prever o acceso non autorizado. A "
-"autenticación pode estar basada nun contrasinal ou en firmas dixitais. "
-"Necesítase o contrasinal do canle se está este estableceuse. Só poderán "
-"conectarse os usuarios que están na lista de claves públicas se se utilizan "
-"claves públicas para o acceso."
+"Utilízase a autenticación da canle para prever o acceso non autorizado. A "
+"autenticación pode estar baseada nun contrasinal ou en sinatura dixitais. "
+"Necesítase o contrasinal da canle se está este estableceuse. Só poderán "
+"conectarse os usuarios que están na listaxe de claves públicas se se "
+"utilizan claves públicas para o acceso."
 
 #: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
 #: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
 #: ../libgaim/protocols/silc/chat.c:906
 msgid "Channel Authentication"
-msgstr "Autenticación do canle"
+msgstr "Autenticación da canle"
 
 #: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
 msgid "Add / Remove"
@@ -12666,7 +13018,7 @@
 msgid "Group Name"
 msgstr "Nome do grupo"
 
-#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1907
+#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1909
 #: ../libgaim/protocols/silc/silc.c:944
 msgid "Passphrase"
 msgstr "Contrasinal"
@@ -12674,11 +13026,11 @@
 #: ../libgaim/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "Introduza o nome do grupo de canles privados %s e un contrasinal."
+msgstr "Introduza o nome do grupo de canles privadas %s e unha contrasinal."
 
 #: ../libgaim/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
-msgstr "Engadir grupo de canles privados"
+msgstr "Engadir un grupo de canles privadas"
 
 #: ../libgaim/protocols/silc/chat.c:722
 msgid "User Limit"
@@ -12687,20 +13039,20 @@
 #: ../libgaim/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
-"Fixar un límite de usuarios no canle. Poñer a cero para quitar o límite de "
+"Fixar un límite de usuarios na canle. Poñer a cero para quitar o límite de "
 "usuarios."
 
 #: ../libgaim/protocols/silc/chat.c:886
 msgid "Invite List"
-msgstr "Lista de invitados"
+msgstr "Listaxe de convidados"
 
 #: ../libgaim/protocols/silc/chat.c:891
 msgid "Ban List"
-msgstr "Lista de vetados"
+msgstr "Listaxe de vedados"
 
 #: ../libgaim/protocols/silc/chat.c:899
 msgid "Add Private Group"
-msgstr "Engadir grupo privado"
+msgstr "Engadir un grupo privado"
 
 #: ../libgaim/protocols/silc/chat.c:912
 msgid "Reset Permanent"
@@ -12712,46 +13064,46 @@
 
 #: ../libgaim/protocols/silc/chat.c:925
 msgid "Set User Limit"
-msgstr "Establecer límite de usuarios"
+msgstr "Establecer un límite de usuarios"
 
 #: ../libgaim/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
-msgstr "Quitar restriccións de tópicos"
+msgstr "Quitar restricións de asuntos"
 
 #: ../libgaim/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
-msgstr "Establecer restriccións de tópico"
+msgstr "Establecer restricións de asunto"
 
 #: ../libgaim/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
-msgstr "Limpar canle privado"
+msgstr "Limpar a canle privada"
 
 #: ../libgaim/protocols/silc/chat.c:948
 msgid "Set Private Channel"
-msgstr "Establecer canle privado"
+msgstr "Establecer a canle privada"
 
 #: ../libgaim/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
-msgstr "Limpar canle secreto"
+msgstr "Limpar a canle secreta"
 
 #: ../libgaim/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
-msgstr "Establecer canle secreto"
+msgstr "Establecer a canle secreta"
 
 #: ../libgaim/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
-msgstr "É o fundador do canle en <I>%s</I>"
+msgstr "É o fundador da canle en <I>%s</I>"
 
 #: ../libgaim/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "O fundador do canle en <I>%s</I> é <I>%s</I>"
+msgstr "O fundador da canle en <I>%s</I> é <I>%s</I>"
 
 #: ../libgaim/protocols/silc/chat.c:1097
 #, c-format
 msgid "You have to join the %s channel before you are able to join the private group"
-msgstr "Ten que unirse ao canle %s antes de poder unirse ao grupo privado"
+msgstr "Ten que unirse á canle %s antes de poder unirse ao grupo privado"
 
 #: ../libgaim/protocols/silc/chat.c:1099
 msgid "Join Private Group"
@@ -12789,11 +13141,11 @@
 
 #: ../libgaim/protocols/silc/ft.c:94
 msgid "Permission denied"
-msgstr "Permiso denegado"
+msgstr "Permiso rexeitado"
 
 #: ../libgaim/protocols/silc/ft.c:98
 msgid "Key agreement failed"
-msgstr "Fallou o acordo de claves"
+msgstr "Fallou o acordo de clave"
 
 #: ../libgaim/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
@@ -12810,7 +13162,7 @@
 #: ../libgaim/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr ""
-"Non se puido realizar o acordo de claves para realizar a transferencia de "
+"Non se puido realizar o acordo de clave para realizar a transferencia de "
 "ficheiros"
 
 #: ../libgaim/protocols/silc/ft.c:222
@@ -12825,17 +13177,17 @@
 #: ../libgaim/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
-msgstr "%s cambiou o tópico de <I>%s</I> a: %s"
+msgstr "%s mudou o asunto de <I>%s</I> a: %s"
 
 #: ../libgaim/protocols/silc/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
-msgstr "<I>%s</I> fixou os modos do canle <I>%s</I> a: %s"
+msgstr "<I>%s</I> fixou os modos da canle <I>%s</I> a: %s"
 
 #: ../libgaim/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
-msgstr "<I>%s</I> quitou todos os modos do canle <I>%s</I>"
+msgstr "<I>%s</I> quitou todos os modos da canle <I>%s</I>"
 
 #: ../libgaim/protocols/silc/ops.c:675
 #, c-format
@@ -12878,7 +13230,7 @@
 
 #: ../libgaim/protocols/silc/ops.c:1048
 msgid "Job Role"
-msgstr "Rol laboral"
+msgstr "Posto de traballo"
 
 #: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:937
 msgid "Organization"
@@ -12894,22 +13246,22 @@
 
 #: ../libgaim/protocols/silc/ops.c:1128
 msgid "Join Chat"
-msgstr "Unirse a un Chat"
+msgstr "Unirse a unha conversa"
 
 #: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1060
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "Nome real"
 
-#: ../libgaim/protocols/silc/ops.c:1211
+#: ../libgaim/protocols/silc/ops.c:1213
 msgid "Status Text"
 msgstr "Texto de estado"
 
-#: ../libgaim/protocols/silc/ops.c:1284 ../libgaim/protocols/silc/ops.c:1354
+#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Pegada dixital da clave pública"
 
-#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1355
+#: ../libgaim/protocols/silc/ops.c:1286 ../libgaim/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Pegada babble da clave pública"
 
@@ -12917,55 +13269,55 @@
 msgid "_More..."
 msgstr "_Máis..."
 
-#: ../libgaim/protocols/silc/ops.c:1369 ../libgaim/protocols/silc/silc.c:1003
+#: ../libgaim/protocols/silc/ops.c:1371 ../libgaim/protocols/silc/silc.c:1003
 msgid "Detach From Server"
-msgstr "Desligar do servidor"
-
-#: ../libgaim/protocols/silc/ops.c:1369
+msgstr "Desconectar do servidor"
+
+#: ../libgaim/protocols/silc/ops.c:1371
 msgid "Cannot detach"
-msgstr "Non se pode desligar"
-
-#: ../libgaim/protocols/silc/ops.c:1380
+msgstr "Non se pode desconectar"
+
+#: ../libgaim/protocols/silc/ops.c:1382
 msgid "Cannot set topic"
-msgstr "Non se pode establecer o tópico"
-
-#: ../libgaim/protocols/silc/ops.c:1412
+msgstr "Non se pode establecer o asunto"
+
+#: ../libgaim/protocols/silc/ops.c:1414
 msgid "Failed to change nickname"
-msgstr "Non se pode trocar o alcume"
-
-#: ../libgaim/protocols/silc/ops.c:1460
+msgstr "Non se pode mudar o alcume"
+
+#: ../libgaim/protocols/silc/ops.c:1462
 msgid "Roomlist"
-msgstr "Lista de salas"
-
-#: ../libgaim/protocols/silc/ops.c:1460
+msgstr "Listaxe de salas"
+
+#: ../libgaim/protocols/silc/ops.c:1462
 msgid "Cannot get room list"
-msgstr "Non pode obter a lista de salas"
-
-#: ../libgaim/protocols/silc/ops.c:1505
+msgstr "Non pode obter a listaxe de salas"
+
+#: ../libgaim/protocols/silc/ops.c:1507
 msgid "No public key was received"
 msgstr "Non se recibiu unha clave pública"
 
-#: ../libgaim/protocols/silc/ops.c:1517 ../libgaim/protocols/silc/ops.c:1530
+#: ../libgaim/protocols/silc/ops.c:1519 ../libgaim/protocols/silc/ops.c:1532
 msgid "Server Information"
 msgstr "Información do servidor"
 
-#: ../libgaim/protocols/silc/ops.c:1518
+#: ../libgaim/protocols/silc/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Non se pode obter a información do servidor"
 
-#: ../libgaim/protocols/silc/ops.c:1547 ../libgaim/protocols/silc/ops.c:1556
+#: ../libgaim/protocols/silc/ops.c:1549 ../libgaim/protocols/silc/ops.c:1558
 msgid "Server Statistics"
 msgstr "Estatísticas do servidor"
 
-#: ../libgaim/protocols/silc/ops.c:1548
+#: ../libgaim/protocols/silc/ops.c:1550
 msgid "Cannot get server statistics"
-msgstr "Non se pode obter as estatísticas do servidor"
-
-#: ../libgaim/protocols/silc/ops.c:1557
+msgstr "Non se poden obter as estatísticas do servidor"
+
+#: ../libgaim/protocols/silc/ops.c:1559
 msgid "No server statistics available"
-msgstr "Non se dispoñen de estatísticas do servidor"
-
-#: ../libgaim/protocols/silc/ops.c:1579
+msgstr "Non se dispón de estatísticas do servidor"
+
+#: ../libgaim/protocols/silc/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -12984,15 +13336,15 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 msgstr ""
-"Hora de arrinque do servidor local: %s\n"
+"Hora de arranque do servidor local: %s\n"
 "Tempo de encendido do servidor local: %s\n"
 "Clientes do servidor local: %d\n"
 "Canles do servidor local: %d\n"
 "Operadores do servidor local: %d\n"
 "Operadores do encamiñador local: %d\n"
-"Clientes da celda local: %d\n"
-"Canles da celda local: %d\n"
-"Servidores da celda local: %d\n"
+"Clientes da cela local: %d\n"
+"Canles da cela local: %d\n"
+"Servidores da cela local: %d\n"
 "Clientes en total: %d\n"
 "Canles en total: %d\n"
 "Servidores en total: %d\n"
@@ -13000,98 +13352,98 @@
 "Operadores de servidor en total: %d\n"
 "Operadores de encamiñadores en total: %d\n"
 
-#: ../libgaim/protocols/silc/ops.c:1602
+#: ../libgaim/protocols/silc/ops.c:1604
 msgid "Network Statistics"
 msgstr "Estatísticas de rede"
 
-#: ../libgaim/protocols/silc/ops.c:1610 ../libgaim/protocols/silc/ops.c:1615
+#: ../libgaim/protocols/silc/ops.c:1612 ../libgaim/protocols/silc/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libgaim/protocols/silc/ops.c:1610
+#: ../libgaim/protocols/silc/ops.c:1612
 msgid "Ping failed"
 msgstr "Fallou o ping"
 
-#: ../libgaim/protocols/silc/ops.c:1615
+#: ../libgaim/protocols/silc/ops.c:1617
 msgid "Ping reply received from server"
-msgstr "Recibiuse unha resposta ao ping do servidor"
-
-#: ../libgaim/protocols/silc/ops.c:1623
+msgstr "Recibiuse a resposta ao ping do servidor"
+
+#: ../libgaim/protocols/silc/ops.c:1625
 msgid "Could not kill user"
-msgstr "Non se puido expulsar ao usuario"
-
-#: ../libgaim/protocols/silc/ops.c:1707
+msgstr "Non se puido expulsar o usuario"
+
+#: ../libgaim/protocols/silc/ops.c:1709
 msgid "Error during connecting to SILC Server"
 msgstr "Produciuse un erro durante a conexión ao servidor SILC"
 
-#: ../libgaim/protocols/silc/ops.c:1712
+#: ../libgaim/protocols/silc/ops.c:1714
 msgid "Key Exchange failed"
-msgstr "Fallou o troco de claves"
-
-#: ../libgaim/protocols/silc/ops.c:1721
+msgstr "Fallou o intercambio de claves"
+
+#: ../libgaim/protocols/silc/ops.c:1723
 msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
-"Produciuse un erro ao retomar a sesión desligada. Prema Reconectar para "
+"Produciuse un erro ao retomar a sesión desconectada. Prema Reconectar para "
 "crear unha nova conexión."
 
-#: ../libgaim/protocols/silc/ops.c:1756
+#: ../libgaim/protocols/silc/ops.c:1758
 msgid "Disconnected by server"
 msgstr "Desconectado polo servidor"
 
-#: ../libgaim/protocols/silc/ops.c:1818 ../libgaim/protocols/silc/ops.c:1865
+#: ../libgaim/protocols/silc/ops.c:1820 ../libgaim/protocols/silc/ops.c:1867
 #: ../libgaim/protocols/silc/silc.c:188
 msgid "Resuming session"
 msgstr "Reanudando a sesión"
 
-#: ../libgaim/protocols/silc/ops.c:1820
+#: ../libgaim/protocols/silc/ops.c:1822
 msgid "Authenticating connection"
 msgstr "Autenticando a conexión"
 
-#: ../libgaim/protocols/silc/ops.c:1867
+#: ../libgaim/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
 msgstr "Comprobando a clave pública do servidor"
 
-#: ../libgaim/protocols/silc/ops.c:1908
+#: ../libgaim/protocols/silc/ops.c:1910
 msgid "Passphrase required"
-msgstr "Necesítase un contrasinal"
-
-#: ../libgaim/protocols/silc/ops.c:1937
+msgstr "Precísase un contrasinal"
+
+#: ../libgaim/protocols/silc/ops.c:1939
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Fallo: Existe unha diferencia nas versións, por favor, actualice seu cliente"
-
-#: ../libgaim/protocols/silc/ops.c:1940
+msgstr "Fallo: Existe unha diferenza nas versións, por favor, actualice o cliente"
+
+#: ../libgaim/protocols/silc/ops.c:1942
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Fallo: O servidor remoto non soporta/confía na súa clave pública"
 
-#: ../libgaim/protocols/silc/ops.c:1943
+#: ../libgaim/protocols/silc/ops.c:1945
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "Fallo: O servidor remoto non soporta o grupo de IC proposto"
-
-#: ../libgaim/protocols/silc/ops.c:1946
+msgstr "Fallo: O servidor remoto non soporta o grupo de KE proposto"
+
+#: ../libgaim/protocols/silc/ops.c:1948
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "Fallo: O servidor remoto non soporta os sistemas de cifrado propostos"
-
-#: ../libgaim/protocols/silc/ops.c:1949
+msgstr "Fallo: O servidor remoto non soporta os sistemas de cifraxe propostos"
+
+#: ../libgaim/protocols/silc/ops.c:1951
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fallo: O servidor remoto non soporta os PKCS propostos"
 
-#: ../libgaim/protocols/silc/ops.c:1952
+#: ../libgaim/protocols/silc/ops.c:1954
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Fallo: O servidor remoto non soporta a función de hash proposta"
 
-#: ../libgaim/protocols/silc/ops.c:1955
+#: ../libgaim/protocols/silc/ops.c:1957
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fallo: O servidor remoto non soporta o HMAC proposto"
 
-#: ../libgaim/protocols/silc/ops.c:1957
+#: ../libgaim/protocols/silc/ops.c:1959
 msgid "Failure: Incorrect signature"
 msgstr "Fallo: Sinatura incorrecta"
 
-#: ../libgaim/protocols/silc/ops.c:1959
+#: ../libgaim/protocols/silc/ops.c:1961
 msgid "Failure: Invalid cookie"
-msgstr "Fallo: Cookie inválida"
-
-#: ../libgaim/protocols/silc/ops.c:1970
+msgstr "Fallo: Cookie incorrecta"
+
+#: ../libgaim/protocols/silc/ops.c:1972
 msgid "Failure: Authentication failed"
 msgstr "Fallo: Fallou a autenticación"
 
@@ -13101,8 +13453,8 @@
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
-"Recibiuse a clave pública de %s. Súa copia local non coincide con esta "
-"clave. Desexa aceptar a clave pública de todas maneiras?"
+"Recibiuse a clave pública de %s. A súa copia local non coincide con esta "
+"clave. Desexa aceptar a clave pública de todas as maneiras?"
 
 #: ../libgaim/protocols/silc/pk.c:108
 #, c-format
@@ -13144,7 +13496,7 @@
 
 #: ../libgaim/protocols/silc/silc.c:191
 msgid "Performing key exchange"
-msgstr "Realizando troco de claves"
+msgstr "Realizando intercambio de claves"
 
 #: ../libgaim/protocols/silc/silc.c:277
 msgid "Out of memory"
@@ -13166,7 +13518,7 @@
 #: ../libgaim/protocols/silc/silc.c:344
 #, c-format
 msgid "Could not load SILC key pair: %s"
-msgstr "Non se puido cargar a chave pública SILC: %s"
+msgstr "Non se puido cargar a clave pública SILC: %s"
 
 #: ../libgaim/protocols/silc/silc.c:365
 msgid "Unable to create connection"
@@ -13174,11 +13526,11 @@
 
 #: ../libgaim/protocols/silc/silc.c:664
 msgid "Your Current Mood"
-msgstr "Seu estado de ánimo actual"
+msgstr "O seu estado de ánimo actual"
 
 #: ../libgaim/protocols/silc/silc.c:680
 msgid "In love"
-msgstr "Enamorado"
+msgstr "Namorado"
 
 #: ../libgaim/protocols/silc/silc.c:691
 msgid ""
@@ -13186,7 +13538,7 @@
 "Your Preferred Contact Methods"
 msgstr ""
 "\n"
-"Seus métodos de contacto preferidos"
+"Métodos de contacto preferidos"
 
 #: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/util.c:559
 msgid "SMS"
@@ -13198,11 +13550,11 @@
 
 #: ../libgaim/protocols/silc/silc.c:703
 msgid "Video conferencing"
-msgstr "Vídeo conferencia"
+msgstr "Videoconferencia"
 
 #: ../libgaim/protocols/silc/silc.c:708
 msgid "Your Current Status"
-msgstr "Seu estado actual"
+msgstr "Estado actual"
 
 #: ../libgaim/protocols/silc/silc.c:715
 msgid "Online Services"
@@ -13210,15 +13562,15 @@
 
 #: ../libgaim/protocols/silc/silc.c:718
 msgid "Let others see what services you are using"
-msgstr "Permitir que outros consulten que servizos está empregando"
+msgstr "Permitir que outros consulten os servizos que está empregando"
 
 #: ../libgaim/protocols/silc/silc.c:724
 msgid "Let others see what computer you are using"
-msgstr "Permitir que outros consulten qué ordenador está empregando"
+msgstr "Permitir que outros consulten que computador está empregando"
 
 #: ../libgaim/protocols/silc/silc.c:731
 msgid "Your VCard File"
-msgstr "Seu ficheiro VCard"
+msgstr "O teu ficheiro VCard"
 
 #: ../libgaim/protocols/silc/silc.c:743 ../libgaim/protocols/silc/silc.c:744
 msgid "User Online Status Attributes"
@@ -13230,8 +13582,8 @@
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
-"Pode permitir que outros usuarios consulten a información de seu estado en "
-"liña así como súa información persoal. Por favor, encha a información que "
+"Pode permitir que outros usuarios consulten a información do seu estado en "
+"liña así como a súa información persoal. Por favor, encha a información que "
 "desexa que outros usuarios vexan de vostede."
 
 #: ../libgaim/protocols/silc/silc.c:785 ../libgaim/protocols/silc/silc.c:791
@@ -13241,7 +13593,7 @@
 
 #: ../libgaim/protocols/silc/silc.c:785
 msgid "No Message of the Day available"
-msgstr "Non hai dispoñible un mensaxe do día"
+msgstr "Non hai dispoñible unha mensaxe do día"
 
 #: ../libgaim/protocols/silc/silc.c:786 ../libgaim/protocols/silc/silc.c:1425
 msgid "There is no Message of the Day associated with this connection"
@@ -13250,7 +13602,7 @@
 #: ../libgaim/protocols/silc/silc.c:837 ../libgaim/protocols/silc/silc.c:881
 #: ../libgaim/protocols/silc/silc.c:952 ../libgaim/protocols/silc/silc.c:953
 msgid "Create New SILC Key Pair"
-msgstr "Creando o novo par de claves SILC..."
+msgstr "Crear o novo par de claves SILC..."
 
 #: ../libgaim/protocols/silc/silc.c:837
 msgid "Passphrases do not match"
@@ -13258,7 +13610,7 @@
 
 #: ../libgaim/protocols/silc/silc.c:881
 msgid "Key Pair Generation failed"
-msgstr "Fallou a xeneración de claves"
+msgstr "Fallou a xeración de claves"
 
 #: ../libgaim/protocols/silc/silc.c:920
 msgid "Key length"
@@ -13266,11 +13618,11 @@
 
 #: ../libgaim/protocols/silc/silc.c:922
 msgid "Public key file"
-msgstr "Ficheiro de clave pública"
+msgstr "Ficheiro da clave pública"
 
 #: ../libgaim/protocols/silc/silc.c:924
 msgid "Private key file"
-msgstr "Ficheiro de clave privada"
+msgstr "Ficheiro da clave privada"
 
 #: ../libgaim/protocols/silc/silc.c:947
 msgid "Passphrase (retype)"
@@ -13278,7 +13630,7 @@
 
 #: ../libgaim/protocols/silc/silc.c:954
 msgid "Generate Key Pair"
-msgstr "Xerar par de claves"
+msgstr "Xerar un par de claves"
 
 #: ../libgaim/protocols/silc/silc.c:998
 msgid "Online Status"
@@ -13286,11 +13638,11 @@
 
 #: ../libgaim/protocols/silc/silc.c:1007
 msgid "View Message of the Day"
-msgstr "Amosar mensaxe do sía"
+msgstr "Amosar a mensaxe do día"
 
 #: ../libgaim/protocols/silc/silc.c:1011
 msgid "Create SILC Key Pair..."
-msgstr "Crear par de claves SILC..."
+msgstr "Crear un par de claves SILC..."
 
 #: ../libgaim/protocols/silc/silc.c:1110
 #, c-format
@@ -13299,7 +13651,7 @@
 
 #: ../libgaim/protocols/silc/silc.c:1301
 msgid "Topic too long"
-msgstr "Tópico demasiado longo"
+msgstr "Asunto demasiado longo"
 
 #: ../libgaim/protocols/silc/silc.c:1382
 msgid "You must specify a nick"
@@ -13308,22 +13660,22 @@
 #: ../libgaim/protocols/silc/silc.c:1484
 #, c-format
 msgid "channel %s not found"
-msgstr "non se atopou o canle %s"
+msgstr "non se atopou a canle %s"
 
 #: ../libgaim/protocols/silc/silc.c:1489
 #, c-format
 msgid "channel modes for %s: %s"
-msgstr "os modos do canle de %s son: %s"
+msgstr "os modos da canle de %s son: %s"
 
 #: ../libgaim/protocols/silc/silc.c:1491
 #, c-format
 msgid "no channel modes are set on %s"
-msgstr "non se definiron modos de canle para %s"
+msgstr "non se definiron modos da canle para %s"
 
 #: ../libgaim/protocols/silc/silc.c:1504
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "Non se puideron fixar os modos de canle para %s"
+msgstr "Non se puideron fixar os modos da canle para %s"
 
 #: ../libgaim/protocols/silc/silc.c:1534
 #, c-format
@@ -13332,37 +13684,39 @@
 
 #: ../libgaim/protocols/silc/silc.c:1597
 msgid "part [channel]:  Leave the chat"
-msgstr "part [canle]:  Abandonar un chat"
+msgstr "part [canle]:  Abandonar unha conversa"
 
 #: ../libgaim/protocols/silc/silc.c:1601
 msgid "leave [channel]:  Leave the chat"
-msgstr "leave [canle]:  Abandonar o chat"
+msgstr "leave [canle]:  Abandonar unha conversa"
 
 #: ../libgaim/protocols/silc/silc.c:1605
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "topic [&lt;novo tópico&gt;]:  Ver ou trocar o tópico"
+msgstr "topic [&lt;novo tópico&gt;]:  Ver ou mudar o asunto"
 
 #: ../libgaim/protocols/silc/silc.c:1610
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;canle&gt; [&lt;contrasinal&gt;]:  Unirse a un chat nesta rede"
+msgstr "join &lt;canle&gt; [&lt;contrasinal&gt;]:  Unirse a unha conversa nesta rede"
 
 #: ../libgaim/protocols/silc/silc.c:1614
 msgid "list:  List channels on this network"
-msgstr "list:  Amosar os canles nesta rede"
+msgstr "list:  Amosar as canles nesta rede"
 
 #: ../libgaim/protocols/silc/silc.c:1618
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;alcume&gt;:  Ver información do alcume"
+msgstr "whois &lt;alcume&gt;:  Ver a información do alcume"
 
 #: ../libgaim/protocols/silc/silc.c:1622
-#: ../libgaim/protocols/zephyr/zephyr.c:2681
+#: ../libgaim/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr "msg &lt;alcume&gt; &lt;mensaxe&gt;:  Enviar unha mensaxe privada a un usuario"
+msgstr ""
+"msg &lt;alcume&gt; &lt;mensaxe&gt;:  Enviarlle unha mensaxe privada a un "
+"usuario"
 
 #: ../libgaim/protocols/silc/silc.c:1626
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
-"query &lt;alcume&gt; [&lt;mensaxe&gt;]:  Enviar unha mensaxe privada ao "
+"query &lt;alcume&gt; [&lt;mensaxe&gt;]:  Enviarlle unha mensaxe privada ao "
 "usuario"
 
 #: ../libgaim/protocols/silc/silc.c:1630
@@ -13371,7 +13725,7 @@
 
 #: ../libgaim/protocols/silc/silc.c:1634
 msgid "detach:  Detach this session"
-msgstr "detach:  Desligar esta sesión"
+msgstr "detach:  Desconectar esta sesión"
 
 #: ../libgaim/protocols/silc/silc.c:1638
 msgid "quit [message]:  Disconnect from the server, with an optional message"
@@ -13389,31 +13743,31 @@
 
 #: ../libgaim/protocols/silc/silc.c:1652
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;novo alcume&gt;:  Troca seu alcume"
+msgstr "nick &lt;novo alcume&gt;:  Muda de alcume"
 
 #: ../libgaim/protocols/silc/silc.c:1656
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;alcume&gt;:  Amosar información do alcume"
+msgstr "whowas &lt;alcume&gt;:  Amosar a información do alcume"
 
 #: ../libgaim/protocols/silc/silc.c:1660
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
-"cmode &lt;canle&gt; [+|-&lt;modos&gt;] [argumentos]:  Cambia ou mostra os "
-"modos do canle"
+"cmode &lt;canle&gt; [+|-&lt;modos&gt;] [argumentos]:  Muda ou amosa os modos "
+"da canle"
 
 #: ../libgaim/protocols/silc/silc.c:1664
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
-"cumode &lt;canle&gt; +|-&lt;modos&gt; &lt;alcume&gt;:  Cambio os modos do "
-"usuario ou do canle"
+"cumode &lt;canle&gt; +|-&lt;modos&gt; &lt;alcume&gt;:  Muda os modos do "
+"usuario ou da canle"
 
 #: ../libgaim/protocols/silc/silc.c:1668
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;modos de usuario&gt;:  Establecer seus modos na rede"
+msgstr "umode &lt;modos de usuario&gt;:  Establecer os modos na rede"
 
 #: ../libgaim/protocols/silc/silc.c:1672
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
@@ -13424,12 +13778,12 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"invite &lt;canle&gt; [-|+]&lt;alcume&gt;:  invita un alcume ou engade/"
-"elimina o alcume da lista de invitados para o canle"
+"invite &lt;canle&gt; [-|+]&lt;alcume&gt;:  convida un alcume ou engade/"
+"elimina o alcume da listaxe de convidados para a canle"
 
 #: ../libgaim/protocols/silc/silc.c:1680
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr "kick &lt;canle&gt; &lt;alcume&gt; [comentario]:  Botar a un cliente do canle"
+msgstr "kick &lt;canle&gt; &lt;alcume&gt; [comentario]:  Botar a un cliente da canle"
 
 #: ../libgaim/protocols/silc/silc.c:1684
 msgid "info [server]:  View server administrative details"
@@ -13437,7 +13791,7 @@
 
 #: ../libgaim/protocols/silc/silc.c:1688
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban [&lt;canle&gt; +|-&lt;alcume&gt;]:  Vetar a un cliente do canle"
+msgstr "ban [&lt;canle&gt; +|-&lt;alcume&gt;]:  Vedar a un cliente da canle"
 
 #: ../libgaim/protocols/silc/silc.c:1692
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
@@ -13455,7 +13809,7 @@
 
 #: ../libgaim/protocols/silc/silc.c:1705
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "users &lt;canle&gt;:  Obtén a lista dos usuarios que están no canle"
+msgstr "users &lt;canle&gt;:  Obtén a listaxe dos usuarios que están na canle"
 
 #: ../libgaim/protocols/silc/silc.c:1709
 msgid ""
@@ -13463,7 +13817,7 @@
 "specific users in channel(s)"
 msgstr ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;canle(s)&gt;:  Amosa os "
-"usuarios do canle ou canles"
+"usuarios da canle ou canles"
 
 #. *< type
 #. *< ui_requirement
@@ -13474,60 +13828,60 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/protocols/silc/silc.c:1819
+#: ../libgaim/protocols/silc/silc.c:1820
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"
 
 #. *  description
-#: ../libgaim/protocols/silc/silc.c:1821
+#: ../libgaim/protocols/silc/silc.c:1822
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "Protocolo de conferencia segura en vivo en Internet (SILC)"
-
-#: ../libgaim/protocols/silc/silc.c:1858
+msgstr "Protocolo de conferencia segura en vivo na Internet (SILC)"
+
+#: ../libgaim/protocols/silc/silc.c:1859
 msgid "Public Key file"
 msgstr "Ficheiro de clave pública"
 
-#: ../libgaim/protocols/silc/silc.c:1862
+#: ../libgaim/protocols/silc/silc.c:1863
 msgid "Private Key file"
 msgstr "Ficheiro de clave privada"
 
-#: ../libgaim/protocols/silc/silc.c:1872
+#: ../libgaim/protocols/silc/silc.c:1873
 msgid "Cipher"
 msgstr "Cipher"
 
-#: ../libgaim/protocols/silc/silc.c:1882
+#: ../libgaim/protocols/silc/silc.c:1883
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libgaim/protocols/silc/silc.c:1885
+#: ../libgaim/protocols/silc/silc.c:1886
 msgid "Public key authentication"
 msgstr "Autenticación de clave pública"
 
-#: ../libgaim/protocols/silc/silc.c:1888
+#: ../libgaim/protocols/silc/silc.c:1889
 msgid "Reject watching by other users"
-msgstr "Impedir que outros usuarios vexan"
-
-#: ../libgaim/protocols/silc/silc.c:1891
+msgstr "Impedir que outros usuarios o vexan"
+
+#: ../libgaim/protocols/silc/silc.c:1892
 msgid "Block invites"
-msgstr "Bloquear invitacións"
-
-#: ../libgaim/protocols/silc/silc.c:1894
+msgstr "Bloquear convites"
+
+#: ../libgaim/protocols/silc/silc.c:1895
 msgid "Block IMs without Key Exchange"
-msgstr "Bloquear MIs que non fagan un troco de claves"
-
-#: ../libgaim/protocols/silc/silc.c:1897
+msgstr "Bloquear MI que non fagan un intercambio de claves"
+
+#: ../libgaim/protocols/silc/silc.c:1898
 msgid "Reject online status attribute requests"
-msgstr "Rexeitar solicitudes dos atributos do estado de liña"
-
-#: ../libgaim/protocols/silc/silc.c:1900
+msgstr "Rexeitar solicitudes dos atributos do estado en liña"
+
+#: ../libgaim/protocols/silc/silc.c:1901
 msgid "Block messages to whiteboard"
-msgstr "Bloquear mensaxes ao encerado"
-
-#: ../libgaim/protocols/silc/silc.c:1903
+msgstr "Bloquear as mensaxes para o encerado"
+
+#: ../libgaim/protocols/silc/silc.c:1904
 msgid "Automatically open whiteboard"
 msgstr "Abrir o encerado automaticamente"
 
-#: ../libgaim/protocols/silc/silc.c:1906
+#: ../libgaim/protocols/silc/silc.c:1907
 msgid "Digitally sign and verify all messages"
 msgstr "Asinar dixitalmente todas as mensaxes instantáneas"
 
@@ -13551,7 +13905,7 @@
 #: ../libgaim/protocols/silc/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
-msgstr "E-Mail: \t\t%s\n"
+msgstr "Correo e.: \t\t%s\n"
 
 #: ../libgaim/protocols/silc/util.c:361
 #, c-format
@@ -13604,15 +13958,15 @@
 
 #: ../libgaim/protocols/silc/util.c:557
 msgid "Paging"
-msgstr "Enviar"
+msgstr "Chamar"
 
 #: ../libgaim/protocols/silc/util.c:563
 msgid "Video Conferencing"
-msgstr "Vídeo conferencia"
+msgstr "Videoconferencia"
 
 #: ../libgaim/protocols/silc/util.c:581
 msgid "Computer"
-msgstr "Ordenador"
+msgstr "Computador"
 
 #: ../libgaim/protocols/silc/util.c:585
 msgid "PDA"
@@ -13648,10 +14002,6 @@
 msgid "Could not connect"
 msgstr "Non se puido conectar"
 
-#: ../libgaim/protocols/simple/simple.c:1035
-msgid "Wrong Password"
-msgstr "Contrasinal erróneo"
-
 #: ../libgaim/protocols/simple/simple.c:1516
 #: ../libgaim/protocols/simple/simple.c:1558
 #: ../libgaim/protocols/simple/simple.c:1571
@@ -13669,7 +14019,8 @@
 msgstr "Non se puido resolver o servidor"
 
 #: ../libgaim/protocols/simple/simple.c:1647
-msgid "SIP usernames may not contain whitespaces or @ symbols"
+#, fuzzy
+msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "Os alcumes de SIP non poden ter espazos en branco nin o símbolo @"
 
 #. *< type
@@ -13680,36 +14031,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/simple/simple.c:1815
+#: ../libgaim/protocols/simple/simple.c:1816
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Complemento de protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../libgaim/protocols/simple/simple.c:1816
+#: ../libgaim/protocols/simple/simple.c:1817
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "O complemento de protocolo SIP/SIMPLE"
 
-#: ../libgaim/protocols/simple/simple.c:1838
+#: ../libgaim/protocols/simple/simple.c:1839
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Estado público (nota: todos poderán velo)"
 
-#: ../libgaim/protocols/simple/simple.c:1844
+#: ../libgaim/protocols/simple/simple.c:1845
 msgid "Use UDP"
 msgstr "Usar UDP"
 
-#: ../libgaim/protocols/simple/simple.c:1846
+#: ../libgaim/protocols/simple/simple.c:1847
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../libgaim/protocols/simple/simple.c:1848
+#: ../libgaim/protocols/simple/simple.c:1849
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libgaim/protocols/simple/simple.c:1850
+#: ../libgaim/protocols/simple/simple.c:1851
 msgid "Auth User"
 msgstr "Usuario de autenticación"
 
-#: ../libgaim/protocols/simple/simple.c:1852
+#: ../libgaim/protocols/simple/simple.c:1853
 msgid "Auth Domain"
 msgstr "Dominio de autenticación"
 
@@ -13762,7 +14113,7 @@
 #: ../libgaim/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
-msgstr "Non está dispoñible o chat en %s."
+msgstr "Non está dispoñible a conversa en %s."
 
 #: ../libgaim/protocols/toc/toc.c:509
 #, c-format
@@ -13777,7 +14128,7 @@
 #: ../libgaim/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Perdeu un MI de %s porque foi mandado demasiado rápido."
+msgstr "Perdeu un MI de %s porque se mandou demasiado rápido."
 
 #: ../libgaim/protocols/toc/toc.c:518
 msgid "Failure."
@@ -13789,7 +14140,7 @@
 
 #: ../libgaim/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
-msgstr "Necesito máis calificadores."
+msgstr "Necesítanse máis cualificadores."
 
 #: ../libgaim/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
@@ -13797,7 +14148,7 @@
 
 #: ../libgaim/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
-msgstr "Busca de enderezos de correo electrónico restrinxida."
+msgstr "Busca de enderezos de correo e. restrinxida."
 
 #: ../libgaim/protocols/toc/toc.c:533
 msgid "Keyword ignored."
@@ -13821,7 +14172,8 @@
 msgstr "Fallo descoñecido: %s."
 
 #: ../libgaim/protocols/toc/toc.c:549
-msgid "Incorrect nickname or password."
+#, fuzzy
+msgid "Incorrect screen name or password."
 msgstr "Nome de conta ou contrasinal incorrecto."
 
 #: ../libgaim/protocols/toc/toc.c:552
@@ -13830,7 +14182,7 @@
 
 #: ../libgaim/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
-msgstr "Seu nivel de advertencias é demasiado alto para conectarse."
+msgstr "O nivel de advertencias é demasiado alto para conectarse."
 
 #: ../libgaim/protocols/toc/toc.c:558
 msgid ""
@@ -13838,7 +14190,7 @@
 "and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
 "Conectouse e desconectouse demasiadas veces. Agarde dez minutos e inténteo "
-"de novo. Se segue intentándoo, necesitará agardar incluso máis tempo."
+"de novo. Se segue intentándoo, pode que necesite agardar máis tempo."
 
 #: ../libgaim/protocols/toc/toc.c:560
 #, c-format
@@ -13852,7 +14204,7 @@
 
 #: ../libgaim/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
-msgstr "Nome de grupo inválido"
+msgstr "Nome de grupo incorrecto"
 
 #: ../libgaim/protocols/toc/toc.c:674
 msgid "Connection Closed"
@@ -13864,7 +14216,7 @@
 
 #: ../libgaim/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC rematou súa pausa. Xa pode volver a mandar mensaxes."
+msgstr "TOC rematou a pausa. Xa pode volver a enviar mensaxes."
 
 #: ../libgaim/protocols/toc/toc.c:995
 msgid "Password Change Successful"
@@ -13880,9 +14232,9 @@
 "if you send a message. Gaim will prevent anything from going through. This "
 "is only temporary, please be patient."
 msgstr ""
-"Cando isto ocorre, TOC ignora as mensaxes que se lle envían e pode "
-"expulsarlle se envía mensaxes. Gaim evitará que lle chegue calquer cousa. "
-"Isto é só temporal, por favor, sexa pacente."
+"Cando isto ocorre, TOC ignora as mensaxes que se lle envían e pode expulsalo "
+"se envía mensaxes. Gaim evitará que lle chegue calquera cousa. Isto é só "
+"temporal, por favor, teña paciencia."
 
 #: ../libgaim/protocols/toc/toc.c:1373
 msgid "_Group:"
@@ -13890,11 +14242,11 @@
 
 #: ../libgaim/protocols/toc/toc.c:1555
 msgid "Get Dir Info"
-msgstr "Obter información do directorio"
+msgstr "Obter a información do directorio"
 
 #: ../libgaim/protocols/toc/toc.c:1695
 msgid "Set Dir Info"
-msgstr "Establecer información do directorio"
+msgstr "Editar a información do directorio"
 
 #: ../libgaim/protocols/toc/toc.c:1817
 #, c-format
@@ -13915,7 +14267,7 @@
 #: ../libgaim/protocols/toc/toc.c:2095
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
-"Non se puido escribir a cabeceira de ficheiro. O ficheiro non será "
+"Non se puido escribir a cabeceira do ficheiro. O ficheiro non será "
 "transferido."
 
 #: ../libgaim/protocols/toc/toc.c:2195
@@ -13932,7 +14284,7 @@
 #: ../libgaim/protocols/toc/toc.c:2236
 #, c-format
 msgid "%s requests you to send them a file"
-msgstr "%s solicítalle que lle mande un ficheiro"
+msgstr "%s solicítalle que lle envíe un ficheiro"
 
 #. *< type
 #. *< ui_requirement
@@ -13950,10 +14302,10 @@
 
 #: ../libgaim/protocols/yahoo/yahoo.c:793
 msgid "Your Yahoo! message did not get sent."
-msgstr "Súa mensaxe Yahoo! non se enviou."
+msgstr "A mensaxe Yahoo! non se enviou."
 
 #: ../libgaim/protocols/yahoo/yahoo.c:852
-#: ../libgaim/protocols/yahoo/yahoo.c:3738
+#: ../libgaim/protocols/yahoo/yahoo.c:3732
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
@@ -13962,39 +14314,32 @@
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaxe do sistema Yahoo! para %s:"
 
-#. TODO: this is almost exactly the same as what MSN does,
-#. * this should probably be moved to the core.
-#.
-#: ../libgaim/protocols/yahoo/yahoo.c:994
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list%s%s."
-msgstr "O usuario %s quere engadir a %s a súa lista de amigos %s%s."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1000
-msgid "Message (optional) :"
-msgstr "Mensaxe (opcional) :"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1042
+#: ../libgaim/protocols/yahoo/yahoo.c:958
+#, fuzzy
+msgid "Authorization denied message:"
+msgstr "Mensaxe de autorización rexeitada:"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1037
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
-"O usuario %s rechazou súa solicitude de engadilo a súa lista de amigos (de "
-"forma retroactiva)."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1045
+"O usuario %s rexeitou a solicitude de engadilo á súa listaxe de contactos "
+"(de forma retroactiva)."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1040
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"O usuario %s negou (de forma retroactiva) súa solicitude de engadilo a súa "
-"lista de amigos pola seguinte razón: %s."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1048
+"O usuario %s negou (de forma retroactiva) a solicitude de engadilo á súa "
+"listaxe de contactos pola seguinte razón: %s."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1043
 msgid "Add buddy rejected"
-msgstr "Rechazouse a adición do amigo"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1799
+msgstr "Rexeitouse a adición do contacto"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1794
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -14005,182 +14350,178 @@
 "Esta versión de Gaim posiblemente non sexa capaz de conectarse a Yahoo. "
 "Comprobe %s para obter unha actualización."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1802
+#: ../libgaim/protocols/yahoo/yahoo.c:1797
 msgid "Failed Yahoo! Authentication"
 msgstr "Fallou a autenticación en Yahoo!"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1868
+#: ../libgaim/protocols/yahoo/yahoo.c:1863
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
-"Intentou ignorar a %s, pero o usuario está na súa lista de amigos. Se "
-"selecciona \"Si\" eliminaráselle e ignorarase a este amigo."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1871
+"Intentou ignorar a %s, pero o usuario está na súa listaxe de contactos. Se "
+"selecciona \"Si\" eliminaráselle e ignorarase este contacto."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1866
 msgid "Ignore buddy?"
-msgstr "Ignorar amigo?"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1905
-msgid "Invalid username."
-msgstr "Nome de usuario inválido."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1919
+msgstr "Ignorar o contacto?"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1914
 msgid "Normal authentication failed!"
 msgstr "Fallou a autenticación habitual!"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1920
+#: ../libgaim/protocols/yahoo/yahoo.c:1915
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
 "attempt to log in using Web Messenger authentication, which will result in "
 "reduced functionality and features."
 msgstr ""
-"O método de autenticación habitual fallou. Isto significa ou ben que seu "
+"O método de autenticación habitual fallou. Isto significa: ou ben que o seu "
 "contrasinal non é correcto ou ben que o sistema de autenticación de Yahoo! "
-"cambiou. Gaim tentará conectarse a través da autenticación de Mensaxería web "
+"cambiou. Gaim tentará conectarse a través da autenticación de mensaxería web "
 "que poderá dar lugar a un acceso a menos funcionalidades e funcións."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1931
+#: ../libgaim/protocols/yahoo/yahoo.c:1926
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Súa conta está bloqueada. Por favor, conéctese ao servidor de web de Yahoo!."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1934
+msgstr "A conta está bloqueada. Por favor, conéctese ao servidor de web de Yahoo!."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1929
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Erro descoñecido número %d. Se se conecta ao servidor de web de Yahoo! é "
-"posible que isto arrégrese."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1988
+"posible que isto se arranxe."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1983
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Non se puido engadir ao amigo %s ao grupo %s da lista no servidor para a "
+"Non se puido engadir o contacto %s ao grupo %s da listaxe no servidor para a "
 "conta %s."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1991
+#: ../libgaim/protocols/yahoo/yahoo.c:1986
 msgid "Could not add buddy to server list"
-msgstr "Non se puido engadir o amigo á lista do servidor"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:2110
+msgstr "Non se puido engadir o contacto á listaxe do servidor"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2105
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2441
+#: ../libgaim/protocols/yahoo/yahoo.c:2436
 #, fuzzy
 msgid "Received unexpected HTTP response from server."
 msgstr "Resposta inválida do servidor."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2465
-#: ../libgaim/protocols/yahoo/yahoo.c:2637
-#: ../libgaim/protocols/yahoo/yahoo.c:2740
-#: ../libgaim/protocols/yahoo/yahoo.c:2750
+#: ../libgaim/protocols/yahoo/yahoo.c:2460
+#: ../libgaim/protocols/yahoo/yahoo.c:2632
+#: ../libgaim/protocols/yahoo/yahoo.c:2735
+#: ../libgaim/protocols/yahoo/yahoo.c:2745
 #: ../libgaim/protocols/yahoo/yahoochat.c:1455
 #: ../libgaim/protocols/yahoo/yahoochat.c:1525
 #: ../libgaim/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problema de conexión"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2865
-#: ../libgaim/protocols/yahoo/yahoo.c:3472
+#: ../libgaim/protocols/yahoo/yahoo.c:2860
+#: ../libgaim/protocols/yahoo/yahoo.c:3466
 msgid "Not at Home"
-msgstr "Fora da casa"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:2867
-#: ../libgaim/protocols/yahoo/yahoo.c:3475
+msgstr "Fóra da casa"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2862
+#: ../libgaim/protocols/yahoo/yahoo.c:3469
 msgid "Not at Desk"
-msgstr "Lexos do escritorio"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:2869
-#: ../libgaim/protocols/yahoo/yahoo.c:3478
+msgstr "Lonxe do escritorio"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2864
+#: ../libgaim/protocols/yahoo/yahoo.c:3472
 msgid "Not in Office"
-msgstr "Fora da oficina"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:2873
-#: ../libgaim/protocols/yahoo/yahoo.c:3484
+msgstr "Fóra da oficina"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2868
+#: ../libgaim/protocols/yahoo/yahoo.c:3478
 msgid "On Vacation"
 msgstr "De vacacións"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2877
-#: ../libgaim/protocols/yahoo/yahoo.c:3490
+#: ../libgaim/protocols/yahoo/yahoo.c:2872
+#: ../libgaim/protocols/yahoo/yahoo.c:3484
 msgid "Stepped Out"
 msgstr "Abandonou"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2970
-#: ../libgaim/protocols/yahoo/yahoo.c:3000
+#: ../libgaim/protocols/yahoo/yahoo.c:2965
+#: ../libgaim/protocols/yahoo/yahoo.c:2995
 msgid "Not on server list"
-msgstr "Non está na lista do servidor"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3017
-#: ../libgaim/protocols/yahoo/yahoo.c:3076
+msgstr "Non está na listaxe do servidor"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3012
+#: ../libgaim/protocols/yahoo/yahoo.c:3070
 msgid "Appear Online"
-msgstr "Parecer conectado"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3020
-#: ../libgaim/protocols/yahoo/yahoo.c:3097
+msgstr "Aparecer conectado"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3015
+#: ../libgaim/protocols/yahoo/yahoo.c:3091
 msgid "Appear Permanently Offline"
-msgstr "Parecer permanentemente desconectado"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3039
+msgstr "Aparecer permanentemente desconectado"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3033
 msgid "Presence"
-msgstr "Presencia"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3082
+msgstr "Presenza"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3076
 msgid "Appear Offline"
-msgstr "Parecer desconectado"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3091
+msgstr "Aparecer desconectado"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3085
 msgid "Don't Appear Permanently Offline"
 msgstr "Non aparecer sempre desconectado"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3139
+#: ../libgaim/protocols/yahoo/yahoo.c:3133
 msgid "Join in Chat"
-msgstr "Unirse a un chat"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3145
+msgstr "Unirse a unha conversa"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3139
 msgid "Initiate Conference"
-msgstr "Iniciar conferencia"
+msgstr "Iniciar a conferencia"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3167
+msgid "Presence Settings"
+msgstr "Configuración do contorno"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3173
-msgid "Presence Settings"
-msgstr "Configuración do entorno"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3179
 msgid "Start Doodling"
-msgstr "Iniciar Doodle"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3211
+msgstr "Iniciar o Doodle"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3205
 msgid "Active which ID?"
 msgstr "Que ID quere activar?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3220
+#: ../libgaim/protocols/yahoo/yahoo.c:3214
 msgid "Join who in chat?"
-msgstr "Xuntarse con quen nun chat?"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3230
+msgstr "A quen quere xuntar na conversa?"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3224
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3234
+#: ../libgaim/protocols/yahoo/yahoo.c:3228
 msgid "Join User in Chat..."
-msgstr "Xuntarse cun usuario nun chat..."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3797
+msgstr "Xuntarse cun usuario nunha conversa..."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3791
 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"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3802
+#: ../libgaim/protocols/yahoo/yahoo.c:3796
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Amosar as canles da rede Yahoo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3806
+#: ../libgaim/protocols/yahoo/yahoo.c:3800
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: Avisar a un contacto para chamar súa atención"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3810
+msgstr "buzz: Avisar a un contacto para chamar a súa atención"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3804
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitar ao usuario o comezo dunha sesión Doodle"
 
@@ -14194,73 +14535,73 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/yahoo/yahoo.c:3904
-#: ../libgaim/protocols/yahoo/yahoo.c:3906
+#: ../libgaim/protocols/yahoo/yahoo.c:3899
+#: ../libgaim/protocols/yahoo/yahoo.c:3901
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3923
+#: ../libgaim/protocols/yahoo/yahoo.c:3918
 msgid "Yahoo Japan"
 msgstr "Yahoo Xapón"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3926
+#: ../libgaim/protocols/yahoo/yahoo.c:3921
 #, fuzzy
 msgid "Pager server"
 msgstr "Servidor de conexión"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3929
+#: ../libgaim/protocols/yahoo/yahoo.c:3924
 #, fuzzy
 msgid "Japan Pager server"
 msgstr "Servidor de buscapersoas xaponés"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3932
+#: ../libgaim/protocols/yahoo/yahoo.c:3927
 msgid "Pager port"
 msgstr "Porto do buscapersoas"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3935
+#: ../libgaim/protocols/yahoo/yahoo.c:3930
 msgid "File transfer server"
 msgstr "Servidor de transferencia de ficheiros"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3938
+#: ../libgaim/protocols/yahoo/yahoo.c:3933
 msgid "Japan file transfer server"
 msgstr "Servidor de transferencia de ficheiros xaponés"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3941
+#: ../libgaim/protocols/yahoo/yahoo.c:3936
 msgid "File transfer port"
 msgstr "Porto de transferencia de ficheiros"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3944
+#: ../libgaim/protocols/yahoo/yahoo.c:3939
 msgid "Chat room locale"
-msgstr "Ubicación da sala de chat"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3947
+msgstr "Localización da sala de conversa"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3942
 msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorar as invitacións a salas de conferencias ou chat"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3955
+msgstr "Ignorar os convites a salas de conferencias ou de conversa"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3950
 msgid "Chat room list URL"
-msgstr "Url de lista de salas de chat"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3958
+msgstr "Url de listaxe de salas da conversa"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3953
 msgid "Yahoo Chat server"
-msgstr "Servidor de chat de Yahoo"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3961
+msgstr "Servidor de conversa de Yahoo"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3956
 msgid "Yahoo Chat port"
-msgstr "Porto de chat de Yahoo"
+msgstr "Porto de conversa de Yahoo"
 
 #: ../libgaim/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s declinou súa invitación de conferencia na sala \"%s\" porque \"%s\"."
+msgstr "%s declinou o seu convite de conferencia na sala \"%s\" porque \"%s\"."
 
 #: ../libgaim/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
-msgstr "Invitación rexeitada"
+msgstr "Convite rexeitado"
 
 #: ../libgaim/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
-msgstr "Non se puido unir ao chat"
+msgstr "Non se puido unir á conversa"
 
 #. -6
 #: ../libgaim/protocols/yahoo/yahoochat.c:364
@@ -14283,7 +14624,7 @@
 "able to rejoin a chatroom"
 msgstr ""
 "Erro descoñecido. Pode que teña que desconectarse e agardar cinco minutos "
-"antes de poder unirse á sala do chat"
+"antes de poder unirse á sala da conversa"
 
 #: ../libgaim/protocols/yahoo/yahoochat.c:452
 #, c-format
@@ -14292,16 +14633,16 @@
 
 #: ../libgaim/protocols/yahoo/yahoochat.c:627
 msgid "Failed to join buddy in chat"
-msgstr "Non se puido unir ao amigo ao chat"
+msgstr "Non se puido unir o contacto á conversa"
 
 #: ../libgaim/protocols/yahoo/yahoochat.c:628
 msgid "Maybe they're not in a chat?"
-msgstr "Quizais non están nun chat?"
+msgstr "Quizais non están nunha conversa?"
 
 #: ../libgaim/protocols/yahoo/yahoochat.c:1357
 #: ../libgaim/protocols/yahoo/yahoochat.c:1383
 msgid "Fetching the room list failed."
-msgstr "Non se puido obter a lista de salas."
+msgstr "Non se puido obter a listaxe de salas."
 
 #: ../libgaim/protocols/yahoo/yahoochat.c:1441
 msgid "Voices"
@@ -14314,7 +14655,7 @@
 #: ../libgaim/protocols/yahoo/yahoochat.c:1455
 #: ../libgaim/protocols/yahoo/yahoochat.c:1525
 msgid "Unable to fetch room list."
-msgstr "Non se puido obter a lista de salas."
+msgstr "Non se puido obter a listaxe de salas."
 
 #: ../libgaim/protocols/yahoo/yahoochat.c:1518
 msgid "User Rooms"
@@ -14325,7 +14666,7 @@
 #.
 #: ../libgaim/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
-msgstr "Enviar petición Doodle."
+msgstr "Enviar unha petición Doodle."
 
 #: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
 #: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
@@ -14338,96 +14679,92 @@
 msgid "Write Error"
 msgstr "Erro de escritura"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:707
-#, c-format
-msgid "<b>IP Address:</b> %s<br>"
-msgstr "<b>Enderezo IP:</b> %s<br>"
-
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:782
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:773
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil de Yahoo! xaponés"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:783
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:774
 msgid "Yahoo! Profile"
 msgstr "Perfil Yahoo!"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:827
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:814
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr "Síntoo, os perfiles con contido só para adultos non están soportados aínda."
-
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:829
+msgstr "Síntoo, os perfís con contido só para adultos non están soportados aínda."
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:816
+#, fuzzy
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
-"web browser"
-msgstr "Se desexa ver este perfil, debería visitar este ligazón co seu navegador web"
-
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1026
+"web browser:"
+msgstr "Se desexa ver este perfil, debería visitar esta ligazón co seu navegador web"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1010
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1098
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1102
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1106
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1089
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1093
 msgid "Hobbies"
-msgstr "Aficións"
-
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1116
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1120
+msgstr "Afeccións"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1103
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1107
 msgid "Latest News"
-msgstr "Últimas noticias"
-
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1141
+msgstr "Últimas novas"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1128
 msgid "Home Page"
 msgstr "Páxina persoal"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1156
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1143
 msgid "Cool Link 1"
 msgstr "Ligazón interesante 1"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1148
 msgid "Cool Link 2"
 msgstr "Ligazón interesante 2"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1165
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1152
 msgid "Cool Link 3"
 msgstr "Ligazón interesante 3"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1179
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1166
 msgid "Last Update"
 msgstr "Última actualización"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1186
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1175
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Información de usuario de %s non dispoñible"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1192
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1181
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr "Síntoo, este perfil parece estar nun idioma ou formato aínda non soportado."
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1208
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1197
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
 "Non se puido obter o perfil do usuario. Isto é usualmente un problema "
-"temporal no lado do servidor. Por favor, probe de novo máis tarde."
-
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1211
+"temporal no servidor. Por favor, probe de novo máis tarde."
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1200
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
 msgstr ""
 "Non se puido obter o perfil do usuario. Isto habitualmente significa que o "
-"usuario non existe. Nembargantes, a vece Yahoo! faia ao buscar un perfil de "
+"usuario non existe. No entanto, ás veces Yahoo! falla ao buscar un perfil de "
 "usuario. Se está seguro de que o usuario existe inténteo de novo máis tarde."
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1218
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1207
 msgid "The user's profile is empty."
 msgstr "O perfil do usuario está baleiro."
 
@@ -14453,80 +14790,83 @@
 #: ../libgaim/protocols/zephyr/zephyr.c:753
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
-msgstr "Non se puido enviar ao chat %s,%s,%s"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:786
-#: ../libgaim/protocols/zephyr/zephyr.c:1203
-#, c-format
-msgid "<b>User:</b> %s<br>"
-msgstr "<b>Usuario:</b> %s<br>"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:790
-#: ../libgaim/protocols/zephyr/zephyr.c:1208
-msgid "<br>Hidden or not logged-in"
+msgstr "Non se puido enviar á conversa %s,%s,%s"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:787
+#: ../libgaim/protocols/zephyr/zephyr.c:1204
+#, fuzzy
+msgid "User"
+msgstr "Usuarios"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:792
+#: ../libgaim/protocols/zephyr/zephyr.c:1210
+#, fuzzy
+msgid "Hidden or not logged-in"
 msgstr "<br>Agochado ou non conectado"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:795
-#: ../libgaim/protocols/zephyr/zephyr.c:1210
+#: ../libgaim/protocols/zephyr/zephyr.c:798
+#: ../libgaim/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>En %s desde %s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:1542
-#: ../libgaim/protocols/zephyr/zephyr.c:1543
+#: ../libgaim/protocols/zephyr/zephyr.c:1546
+#: ../libgaim/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Calquera"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2350
+#: ../libgaim/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Clase"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2356
+#: ../libgaim/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Instancia:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2362
+#: ../libgaim/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Destinatario:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2373
+#: ../libgaim/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr "Fallou o intento de suscrición a %s,%s,%s"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:2686
+msgstr "Fallou o intento de subscrición a %s,%s,%s"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;alcume&gt;: Localiza un usuario"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2691
+#: ../libgaim/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;alcume&gt;: Localiza un usuario"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2696
+#: ../libgaim/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "instance &lt;instancia&gt;: Fixar a instancia a empregar nesta clase"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:2701
+msgstr ""
+"instance &lt;instancia&gt;: Fixar a instancia que se debe empregar nesta "
+"clase"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instancia&gt;: Fixar a instancia a empregar nesta clase"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:2706
+msgstr "inst &lt;instancia&gt;: Fixar a instancia que se debe empregar nesta clase"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "topic &lt;instancia&gt;: Fixar a instancia a empregar nesta clase"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:2712
+msgstr "topic &lt;instancia&gt;: Fixar a instancia que se debe empregar nesta clase"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
-"sub &lt;clase&gt; &lt;instancia&gt; &lt;destinatario&gt;: Unirse a un novo "
-"chat"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:2717
+"sub &lt;clase&gt; &lt;instancia&gt; &lt;destinatario&gt;: Unirse a unha nova "
+"conversa"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2721
 msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instancia&gt;: Enviar unha mensaxe a &lt;mensaxe,<i>instancia</i>,"
 "*&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2723
+#: ../libgaim/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -14534,7 +14874,7 @@
 "zci &lt;clase&gt; &lt;instance&gt;: Enviar unha mensaxe a &lt;<i>clase</i>,"
 "<i>instancia</i>,*&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2729
+#: ../libgaim/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -14542,7 +14882,7 @@
 "zcir &lt;clase&gt; &lt;instancia&gt; &lt;destinatario&gt;: Enviar unha "
 "mensaxe a &lt;<i>clase</i>,<i>instancia</i>,<i>destinatario</i>&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2735
+#: ../libgaim/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -14550,17 +14890,17 @@
 "zir &lt;instancia&gt; &lt;destinatario&gt;: Enviar unha mensaxe a &lt;"
 "MENSAXE,<i>instancia</i>,<i>destinatario</i>&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2740
+#: ../libgaim/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;clase&gt;: Enviar unha mensaxe a &lt;<i>clase</i>,PERSOAL,*&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2846
+#: ../libgaim/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
-msgstr "Re-suscribir"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:2849
+msgstr "Re-subscribir"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
-msgstr "Obter as suscricións do servidor"
+msgstr "Obter as subscricións do servidor"
 
 #. *< type
 #. *< ui_requirement
@@ -14572,40 +14912,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/zephyr/zephyr.c:2935
-#: ../libgaim/protocols/zephyr/zephyr.c:2937
+#: ../libgaim/protocols/zephyr/zephyr.c:2940
+#: ../libgaim/protocols/zephyr/zephyr.c:2942
 msgid "Zephyr Protocol Plugin"
 msgstr "Complemento de protocolo Zephyr"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2956
+#: ../libgaim/protocols/zephyr/zephyr.c:2961
 msgid "Use tzc"
 msgstr "Usar tzc"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2959
+#: ../libgaim/protocols/zephyr/zephyr.c:2964
 msgid "tzc command"
 msgstr "Comando tzc"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2962
+#: ../libgaim/protocols/zephyr/zephyr.c:2967
 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2965
+#: ../libgaim/protocols/zephyr/zephyr.c:2970
 msgid "Export to .zephyr.subs"
 msgstr "Exportar a .zephyr.subs"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2968
+#: ../libgaim/protocols/zephyr/zephyr.c:2973
 msgid "Import from .anyone"
 msgstr "Importar desde .anyone"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2971
+#: ../libgaim/protocols/zephyr/zephyr.c:2976
 msgid "Import from .zephyr.subs"
 msgstr "Importar desde .zephyr.subs"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2974
+#: ../libgaim/protocols/zephyr/zephyr.c:2979
 msgid "Realm"
 msgstr "Reino"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2977
+#: ../libgaim/protocols/zephyr/zephyr.c:2982
 msgid "Exposure"
 msgstr "Exposición"
 
@@ -14615,7 +14955,7 @@
 msgid ""
 "Unable to create socket:\n"
 "%s"
-msgstr "Non se puido crear o socket"
+msgstr "Non se puido crear o socket "
 
 #: ../libgaim/proxy.c:644
 #, fuzzy, c-format
@@ -14631,22 +14971,35 @@
 #: ../libgaim/proxy.c:764
 #, fuzzy, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Acceso denegado: o servidor proxy non permite túneles no porto %d."
+msgstr "Acceso denegado: o servidor proxy non permite \"tunneling\" no porto %d."
 
 #: ../libgaim/proxy.c:984
 #, fuzzy, c-format
 msgid "Error resolving %s"
-msgstr "Erro executando %s"
-
-#: ../libgaim/proxy.c:1673
+msgstr "Erro ao executar %s"
+
+#: ../libgaim/proxy.c:1676
 #, fuzzy
 msgid "Could not resolve host name"
 msgstr "Non se puido resolver o servidor"
 
 #. *
+#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#.
+#: ../libgaim/request.h:1341
+#, fuzzy
+msgid "_Yes"
+msgstr "Si"
+
+#: ../libgaim/request.h:1341
+#, fuzzy
+msgid "_No"
+msgstr "Non"
+
+#. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libgaim/request.h:1354
+#: ../libgaim/request.h:1360
 msgid "_Accept"
 msgstr "_Aceptar"
 
@@ -14664,29 +15017,29 @@
 #: ../libgaim/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
-msgstr "%s agora se chama %s.\n"
-
-#: ../libgaim/server.c:686
+msgstr "%s agora chámase %s.\n"
+
+#: ../libgaim/server.c:674
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
-"%s invitou a %s á sala de chat %s:\n"
+"%s convidou a %s á sala de conversa %s:\n"
 "%s"
 
-#: ../libgaim/server.c:691
+#: ../libgaim/server.c:679
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr "%s invitou a %s á sala de chat %s\n"
-
-#: ../libgaim/server.c:695
+msgstr "%s invitou a %s á sala de conversa %s\n"
+
+#: ../libgaim/server.c:683
 msgid "Accept chat invitation?"
-msgstr "Aceptar a invitación de chat?"
+msgstr "Aceptar o convite para a conversa?"
 
 #: ../libgaim/status.c:153
 msgid "Unset"
-msgstr "Desestablecer"
+msgstr "Quitar"
 
 #: ../libgaim/status.c:156
 msgid "Unavailable"
@@ -14736,12 +15089,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libgaim/util.c:2429
+#: ../libgaim/util.c:2434
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erro lendo %s"
 
-#: ../libgaim/util.c:2430
+#: ../libgaim/util.c:2435
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -14750,81 +15103,81 @@
 "Atopouse un erro ao ler o seu %s. Non se cargou e o ficheiro antigo foi "
 "renomeado a %s~."
 
-#: ../libgaim/util.c:2893
+#: ../libgaim/util.c:2898
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libgaim/util.c:2896
+#: ../libgaim/util.c:2901
 msgid "Unknown."
 msgstr "Descoñecido."
 
-#: ../libgaim/util.c:2922
+#: ../libgaim/util.c:2927
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../libgaim/util.c:2934
+#: ../libgaim/util.c:2939
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: ../libgaim/util.c:2942
+#: ../libgaim/util.c:2947
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../libgaim/util.c:2948
+#: ../libgaim/util.c:2953
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../libgaim/util.c:2956
+#: ../libgaim/util.c:2961
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../libgaim/util.c:2962
+#: ../libgaim/util.c:2967
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../libgaim/util.c:3161 ../libgaim/util.c:3460
+#: ../libgaim/util.c:3166 ../libgaim/util.c:3464
 #, fuzzy, c-format
 msgid "Unable to connect to %s"
 msgstr "Non se puido conectar ao servidor"
 
-#: ../libgaim/util.c:3287
+#: ../libgaim/util.c:3292
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libgaim/util.c:3324
+#: ../libgaim/util.c:3327
 #, fuzzy, c-format
 msgid "Error reading from %s: %s"
 msgstr "Erro ao ler do socket: %s"
 
-#: ../libgaim/util.c:3355
+#: ../libgaim/util.c:3358
 #, fuzzy, c-format
 msgid "Error writing to %s: %s"
 msgstr ""
 "Erro escribindo %s:\n"
 "%s.\n"
 
-#: ../libgaim/util.c:3380
+#: ../libgaim/util.c:3383
 #, fuzzy, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Non se puido conectar ao servidor"