im.pidgin.pidgin: 3aeefaab905e186cdef292e3f93c15aecb81ba09

Wed Nov 14 15:32:00 EST 2007

-----------------------------------------------------------------
Revision: 3aeefaab905e186cdef292e3f93c15aecb81ba09
Ancestor: 2fbd093c6acc18376722869650f7568fa6af9fc8
Author: josep.puigdemont at gmail.com
Date: 2007-11-14T20:25:27
Branch: im.pidgin.pidgin

Modified files:
        po/ca.po

ChangeLog: 

Updated Catalan translation.

-------------- next part --------------
============================================================

--- po/ca.po	bfe5beed403976ba9e26ab8716df55801f0021bb
+++ po/ca.po	150a88a9a25609a3ec7d379d3cab7d68385ebe8c
@@ -33,8 +33,8 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-21 18:08+0200\n"
-"PO-Revision-Date: 2007-10-21 18:09+0200\n"
+"POT-Creation-Date: 2007-11-13 21:49+0100\n"
+"PO-Revision-Date: 2007-11-14 21:21+0100\n"
 "Last-Translator: Josep Puigdemont i CasamajÃ³ <josep.puigdemont at gmail.com>\n"
 "Language-Team: Catalan <tradgnome at softcatala.net>\n"
 "MIME-Version: 1.0\n"
@@ -42,10 +42,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
-#: ../finch/finch.c:417
+#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
+#: ../finch/finch.c:418
 msgid "Finch"
 msgstr "Finch"
 
@@ -75,7 +73,7 @@ msgstr ""
 "  -n, --nologin       no entra automÃ ticament\n"
 "  -v, --version       mostra la versiÃ³ actual i surt\n"
 
-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:730
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -86,97 +84,107 @@ msgstr ""
 "mica i completeu la migraciÃ³ manualment. Informeu d'aquest error a http://"
 "developer.pidgin.im"
 
-#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
-#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
-#: ../libpurple/protocols/jabber/buddy.c:1464
+#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:189
+#: ../finch/gntplugin.c:237 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1553
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Error"
 
-#: ../finch/gntaccount.c:123
+#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "No s'ha afegit el compte"
 
-#: ../finch/gntaccount.c:124
+#: ../finch/gntaccount.c:125
 msgid "Screenname of an account must be non-empty."
 msgstr "El nom d'usuari d'un compte no pot ser buit."
 
-#: ../finch/gntaccount.c:436
+#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "Notifica si hi ha correu nou"
 
-#: ../finch/gntaccount.c:446
+#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Recorda la contrasenya"
 
-#: ../finch/gntaccount.c:484
+#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
-msgstr "No hi ha connectors de protocl instalÂ·lats."
+msgstr "No hi ha connectors de protocol instalÂ·lats."
 
-#: ../finch/gntaccount.c:485
+#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Segurament us heu oblidat de fer un Â«make installÂ».)"
 
-#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1468
-#: ../pidgin/gtkblist.c:4025
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4501
 msgid "Modify Account"
 msgstr "Modifica el compte"
 
-#: ../finch/gntaccount.c:495
+#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "Compte nou"
 
-#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../finch/gntaccount.c:528
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../finch/gntaccount.c:529
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Screen name:"
 msgstr "Nom d'usuari:"
 
-#: ../finch/gntaccount.c:541
+#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../finch/gntaccount.c:551
+#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Ã€lies:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
-#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
-#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:666 ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1054 ../finch/gntstatus.c:144 ../finch/gntstatus.c:484
-#: ../finch/gntstatus.c:609 ../libpurple/account.c:984
-#: ../libpurple/account.c:1234 ../libpurple/account.c:1269
-#: ../libpurple/conversation.c:1173 ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:661
-#: ../libpurple/protocols/gg/gg.c:798 ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1826
-#: ../libpurple/protocols/jabber/buddy.c:1862
+#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
+#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
+#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2226 ../finch/gntblist.c:2289
+#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:475 ../finch/gntpounce.c:472
+#: ../finch/gntpounce.c:680 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
+#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../libpurple/account.c:1105 ../libpurple/account.c:1394
+#: ../libpurple/account.c:1429 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:508
+#: ../libpurple/protocols/gg/gg.c:667 ../libpurple/protocols/gg/gg.c:804
+#: ../libpurple/protocols/gg/gg.c:886
+#: ../libpurple/protocols/jabber/buddy.c:728
+#: ../libpurple/protocols/jabber/buddy.c:2426
+#: ../libpurple/protocols/jabber/buddy.c:2462
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6044
-#: ../libpurple/protocols/oscar/peer.c:1023
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/jabber/jabber.c:1035
+#: ../libpurple/protocols/jabber/jabber.c:1044
+#: ../libpurple/protocols/jabber/jabber.c:1746
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/usermood.c:202
+#: ../libpurple/protocols/jabber/usernick.c:78
+#: ../libpurple/protocols/jabber/xdata.c:400
+#: ../libpurple/protocols/msn/msn.c:291 ../libpurple/protocols/msn/msn.c:308
+#: ../libpurple/protocols/msn/msn.c:325 ../libpurple/protocols/msn/msn.c:342
+#: ../libpurple/protocols/msn/msn.c:363 ../libpurple/protocols/msnp9/msn.c:287
+#: ../libpurple/protocols/msnp9/msn.c:304
+#: ../libpurple/protocols/msnp9/msn.c:321
+#: ../libpurple/protocols/msnp9/msn.c:338
+#: ../libpurple/protocols/msnp9/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6144
+#: ../libpurple/protocols/oscar/peer.c:1048
+#: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
@@ -187,397 +195,417 @@ msgstr "Ã€lies:"
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:3430
+#: ../libpurple/protocols/sametime/sametime.c:3516
+#: ../libpurple/protocols/sametime/sametime.c:3690
+#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5533
+#: ../libpurple/protocols/sametime/sametime.c:5658
 #: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1194
+#: ../libpurple/protocols/silc/chat.c:620
+#: ../libpurple/protocols/silc/chat.c:750
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/silc.c:966
+#: ../libpurple/protocols/silc/silc.c:1174
 #: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/buddy.c:1087
+#: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../libpurple/protocols/silc10/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:730
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3476
-#: ../libpurple/protocols/yahoo/yahoo.c:3487 ../pidgin/gtkaccount.c:1903
-#: ../pidgin/gtkaccount.c:2497 ../pidgin/gtkblist.c:5927
-#: ../pidgin/gtkdialogs.c:750 ../pidgin/gtkdialogs.c:888
-#: ../pidgin/gtkdialogs.c:980 ../pidgin/gtkdialogs.c:1000
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1046
-#: ../pidgin/gtkdialogs.c:1094 ../pidgin/gtkdialogs.c:1135
-#: ../pidgin/gtkdialogs.c:1191 ../pidgin/gtkdialogs.c:1230
-#: ../pidgin/gtkdialogs.c:1257 ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
-#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1573
+#: ../libpurple/protocols/silc10/silc.c:943
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3509
+#: ../libpurple/protocols/yahoo/yahoo.c:3520 ../pidgin/gtkaccount.c:1913
+#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:6668
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:787
+#: ../pidgin/gtkdialogs.c:926 ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1038 ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1084 ../pidgin/gtkdialogs.c:1132
+#: ../pidgin/gtkdialogs.c:1173 ../pidgin/gtkdialogs.c:1229
+#: ../pidgin/gtkdialogs.c:1268 ../pidgin/gtkdialogs.c:1295
+#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1121
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:606 ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkrequest.c:321 ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "CancelÂ·la"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:578 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1051 ../finch/gntstatus.c:487
-#: ../finch/gntstatus.c:597 ../libpurple/account.c:1268
-#: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
-#: ../pidgin/gtkrequest.c:276
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:475 ../finch/gntpounce.c:478 ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1428 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:754
+#: ../pidgin/gtkrequest.c:327
 msgid "Save"
 msgstr "Desa"
 
-#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1895
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1905
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Esteu segur que voleu suprimir %s?"
 
-#: ../finch/gntaccount.c:634
+#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "Suprimeix el compte"
 
 #. Delete button
-#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
-#: ../finch/gntpounce.c:665 ../finch/gntpounce.c:728 ../finch/gntstatus.c:143
-#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1902 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
+#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
+#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
+#: ../pidgin/gtkaccount.c:1912 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1120 ../pidgin/gtkrequest.c:324
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:81
-#: ../pidgin/gtkaccount.c:2320 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2123 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2331 ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ../finch/gntaccount.c:674
+#: ../finch/gntaccount.c:675
 msgid "You can enable/disable accounts from the following list."
 msgstr "Podeu habilitar/inhabilitar comptes d'aquesta llista."
 
 #. Add button
-#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
-#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2381
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:726
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:885
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2496
-#: ../pidgin/gtkblist.c:5926 ../pidgin/gtkconv.c:1624
-#: ../pidgin/gtkrequest.c:274
+#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/silc/chat.c:619
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
+#: ../pidgin/gtkblist.c:6667 ../pidgin/gtkconv.c:1713
+#: ../pidgin/gtkrequest.c:325
 msgid "Add"
 msgstr "Afegeix"
 
 #. Modify button
-#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:734
 msgid "Modify"
 msgstr "Modifica"
 
-#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2443
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2447
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s ha fet a %s un dels seus amics%s%s"
 
-#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2495
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "Voleu afegir l'amic a la llista?"
 
-#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2553
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2557
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "L'usuari %s%s%s%s vol afegir %s a la seva llista d'amics%s%s"
 
-#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
-#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2576
-#: ../pidgin/gtkaccount.c:2582
+#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2580
+#: ../pidgin/gtkaccount.c:2586
 msgid "Authorize buddy?"
 msgstr "Voleu autoritzar l'amic?"
 
-#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
-#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
+#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
+#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
 msgid "Authorize"
 msgstr "Autoritza"
 
-#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
-#: ../pidgin/gtkaccount.c:2578 ../pidgin/gtkaccount.c:2584
+#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2582 ../pidgin/gtkaccount.c:2588
 msgid "Deny"
 msgstr "Denega"
 
-#: ../finch/gntblist.c:288
+#: ../finch/gntblist.c:289
 msgid "You must provide a screename for the buddy."
 msgstr "Heu de proporcionar el nom d'usuari per a l'amic."
 
-#: ../finch/gntblist.c:290
+#: ../finch/gntblist.c:291
 msgid "You must provide a group."
 msgstr "Heu de proporcionar un grup."
 
-#: ../finch/gntblist.c:292
+#: ../finch/gntblist.c:293
 msgid "You must select an account."
 msgstr "Heu de seleccionar un compte."
 
-#: ../finch/gntblist.c:294
+#: ../finch/gntblist.c:295
 msgid "The selected account is not online."
 msgstr "El compte seleccionat no estÃ  en lÃnia."
 
-#: ../finch/gntblist.c:299
+#: ../finch/gntblist.c:300
 msgid "Error adding buddy"
 msgstr "S'ha produÃ¯t un error en afegir un amic"
 
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2858
-#: ../pidgin/gtkaccount.c:1976 ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2898
+#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:986
 msgid "Screen Name"
 msgstr "Nom d'usuari"
 
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
-#: ../libpurple/protocols/msn/msn.c:1364
-#: ../libpurple/protocols/silc/chat.c:606
+#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
+#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msnp9/msn.c:1402
+#: ../libpurple/protocols/silc/chat.c:610
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:999
-#: ../pidgin/gtkdialogs.c:1023 ../pidgin/gtkdialogs.c:1045
-#: ../pidgin/gtkrequest.c:277
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1037
+#: ../pidgin/gtkdialogs.c:1061 ../pidgin/gtkdialogs.c:1083
+#: ../pidgin/gtkrequest.c:328
 msgid "Alias"
 msgstr "Ã€lies"
 
-#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
 msgid "Group"
 msgstr "Grup"
 
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2988 ../pidgin/gtknotify.c:488
-#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
+#: ../finch/gntblist.c:2212 ../finch/gntblist.c:2276 ../finch/gntnotify.c:174
+#: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3242
+#: ../pidgin/gtknotify.c:512 ../pidgin/gtkpounce.c:1288
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Comptes"
 
-#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
+#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
 #: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1185
 #: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3321 ../pidgin/gtkblist.c:5433
+#: ../libpurple/protocols/silc10/buddy.c:1036
+#: ../libpurple/protocols/silc10/buddy.c:1083
+#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/yahoo/yahoo.c:3354 ../pidgin/gtkblist.c:6169
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Afegeix un amic"
 
-#: ../finch/gntblist.c:340
+#: ../finch/gntblist.c:341
 msgid "Please enter buddy information."
 msgstr "IntroduÃ¯u informaciÃ³ sobre l'amic."
 
-#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "Xats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:617
+#: ../finch/gntblist.c:407 ../finch/gntblist.c:2207
+#: ../libpurple/protocols/jabber/jabber.c:951
+#: ../libpurple/protocols/jabber/jabber.c:954
+#: ../libpurple/protocols/msn/msn.c:1732 ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msnp9/msn.c:1585
+#: ../libpurple/protocols/msnp9/msn.c:1650
+#: ../libpurple/protocols/msnp9/msn.c:1677
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:608
+#: ../pidgin/gtkroomlist.c:931
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nom"
 
-#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
+#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
 msgid "Auto-join"
 msgstr "Entra automÃ ticament"
 
-#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5812
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6553
 msgid "Add Chat"
 msgstr "Afegeix un xat"
 
-#: ../finch/gntblist.c:419
+#: ../finch/gntblist.c:420
 msgid "You can edit more information from the context menu later."
-msgstr "MÃ©s endavant podreu editar-ne mÃ©s informaciÃ³ des del menÃº contextual."
+msgstr "MÃ©s endavant podreu editar-ne mÃ©s informaciÃ³ des del menÃº emergent."
 
-#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
 msgid "Error adding group"
 msgstr "S'ha produÃ¯t un error en afegir el grup"
 
-#: ../finch/gntblist.c:433
+#: ../finch/gntblist.c:434
 msgid "You must give a name for the group to add."
 msgstr "Heu de donar un nom al grup que vulgueu afegir."
 
-#: ../finch/gntblist.c:446
+#: ../finch/gntblist.c:447
 msgid "A group with the name already exists."
 msgstr "Ja existeix un grup amb aquest nom."
 
-#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5923
+#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
+#: ../libpurple/protocols/sametime/sametime.c:5442
+#: ../libpurple/protocols/sametime/sametime.c:5530 ../pidgin/gtkblist.c:6664
 msgid "Add Group"
 msgstr "Afegeix un grup"
 
-#: ../finch/gntblist.c:453
+#: ../finch/gntblist.c:454
 msgid "Enter the name of the group"
 msgstr "IntroduÃ¯u el nom del grup"
 
-#: ../finch/gntblist.c:801
+#: ../finch/gntblist.c:802
 msgid "Edit Chat"
 msgstr "Edita el xat"
 
-#: ../finch/gntblist.c:801
+#: ../finch/gntblist.c:802
 msgid "Please Update the necessary fields."
 msgstr "Actualitzeu els camps necessaris."
 
-#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
+#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Edita"
 
-#: ../finch/gntblist.c:827
+#: ../finch/gntblist.c:828
 msgid "Edit Settings"
 msgstr "Edita els parÃ metres"
 
-#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Information"
 msgstr "InformaciÃ³"
 
-#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Retrieving..."
 msgstr "S'estÃ  recuperant..."
 
-#: ../finch/gntblist.c:903 ../finch/gntconv.c:436
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:528
+#: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Aconsegueix informaciÃ³"
 
-#: ../finch/gntblist.c:907
+#: ../finch/gntblist.c:908
 msgid "Add Buddy Pounce"
 msgstr "Afegeix un avÃs per a l'amic"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:914 ../finch/gntconv.c:448
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1572
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:540
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
-msgstr "Envia un fitxer"
+msgstr "Envia el fitxer"
 
-#: ../finch/gntblist.c:918
+#: ../finch/gntblist.c:919
 msgid "View Log"
 msgstr "Visualitza el registre"
 
-#: ../finch/gntblist.c:999
+#: ../finch/gntblist.c:1000
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "IntroduÃ¯u un nou nom per a %s"
 
-#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
+#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
 msgid "Rename"
 msgstr "Reanomena"
 
-#: ../finch/gntblist.c:1001
+#: ../finch/gntblist.c:1002
 msgid "Set Alias"
 msgstr "Estableix un Ã lies"
 
-#: ../finch/gntblist.c:1002
+#: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
-msgstr "IntroduÃ¯u una cadena buida per a reiniciar el nom."
+msgstr "IntroduÃ¯u una cadena buida per a reinicialitzar el nom."
 
-#: ../finch/gntblist.c:1078
+#: ../finch/gntblist.c:1079
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 "En suprimir aquest contacte, tambÃ© se suprimiran tots els amics que hi hagi"
 
-#: ../finch/gntblist.c:1086
+#: ../finch/gntblist.c:1087
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
 "En suprimir aquest grup, tambÃ© se suprimiran tots els amics que hi hagi"
 
-#: ../finch/gntblist.c:1091
+#: ../finch/gntblist.c:1092
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Esteu segur que voleu suprimir %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1094
+#: ../finch/gntblist.c:1095
 msgid "Confirm Remove"
 msgstr "Confirmeu que voleu suprimir"
 
-#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
-#: ../pidgin/gtkconv.c:1621 ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtkstatusbox.c:263
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
+#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:326
+#: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Suprimeix"
 
 #. Buddy List
-#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4269
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2434 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:4927
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Llista d'amics"
 
-#: ../finch/gntblist.c:1256
+#: ../finch/gntblist.c:1257
 msgid "Place tagged"
 msgstr "Lloc etiquetat"
 
-#: ../finch/gntblist.c:1261
+#: ../finch/gntblist.c:1262
 msgid "Toggle Tag"
 msgstr "Commuta l'etiqueta"
 
 #. General
-#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
-#: ../libpurple/protocols/gg/gg.c:2202
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1627
-#: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:638
+#: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
+#: ../libpurple/protocols/gg/gg.c:2228
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1247
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2409
+#: ../libpurple/protocols/jabber/jabber.c:964
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1615
+#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/msn/msn.c:1559 ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msnp9/msn.c:1410
+#: ../libpurple/protocols/msnp9/msn.c:1588
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/buddy.c:1538
 #: ../libpurple/protocols/silc/ops.c:1002
 #: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1324
+#: ../libpurple/protocols/silc10/buddy.c:1538
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3012
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3266
 msgid "Nickname"
 msgstr "Sobrenom"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:333
-#: ../libpurple/protocols/jabber/buddy.c:647
-#: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3075
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3040
-#: ../pidgin/gtkblist.c:3445 ../pidgin/gtkprefs.c:1920
+#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:359
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:629
+#: ../libpurple/protocols/msn/msn.c:637 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msnp9/msn.c:544
+#: ../libpurple/protocols/msnp9/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2842
+#: ../libpurple/protocols/oscar/oscar.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3108
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3294
+#: ../pidgin/gtkblist.c:3700 ../pidgin/gtkprefs.c:2026
 msgid "Idle"
 msgstr "Inactiu"
 
-#: ../finch/gntblist.c:1333
+#: ../finch/gntblist.c:1334
 msgid "On Mobile"
 msgstr "Al mÃ²bil"
 
-#: ../finch/gntblist.c:1414
+#: ../finch/gntblist.c:1415
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -586,12 +614,12 @@ msgstr ""
 "En lÃnia: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:1423
+#: ../finch/gntblist.c:1424
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Compte: %s (%s)"
 
-#: ../finch/gntblist.c:1435
+#: ../finch/gntblist.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -600,113 +628,253 @@ msgstr ""
 "\n"
 "Vist per darrera vegada: fa %s"
 
-#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1706 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Nou..."
 
-#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../finch/gntblist.c:1713 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Desat..."
 
-#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:86
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
+#: ../finch/gntblist.c:2091 ../finch/gntplugin.c:345 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:555
 msgid "Plugins"
 msgstr "Connectors"
 
-#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:731
-#: ../pidgin/gtkdialogs.c:869 ../pidgin/gtkdialogs.c:950
-msgid "_Name"
-msgstr "_Nom"
-
-#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:736
-#: ../pidgin/gtkdialogs.c:874 ../pidgin/gtkdialogs.c:955
-msgid "_Account"
-msgstr "_Compte"
-
-#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:744
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:781
 msgid "New Instant Message"
 msgstr "Missatge instantani nou"
 
-#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:746
+#: ../finch/gntblist.c:2222 ../pidgin/gtkdialogs.c:783
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "IntroduÃ¯u el nom d'usuari o l'Ã lies de la persona a qui vulgueu enviar un MI."
 
-#: ../finch/gntblist.c:2220 ../finch/gntnotify.c:79 ../libpurple/account.c:983
-#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
-#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
-#: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6043
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2225 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
+#: ../finch/gntnotify.c:80 ../libpurple/account.c:1104
+#: ../libpurple/account.c:1393 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1745
+#: ../libpurple/protocols/jabber/xdata.c:399
+#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/msnp9/msn.c:286
+#: ../libpurple/protocols/msnp9/msn.c:303
+#: ../libpurple/protocols/msnp9/msn.c:320
+#: ../libpurple/protocols/msnp9/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6143
 #: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc/buddy.c:1193
+#: ../libpurple/protocols/silc/chat.c:449
+#: ../libpurple/protocols/silc/chat.c:486
+#: ../libpurple/protocols/silc/chat.c:749
+#: ../libpurple/protocols/silc/ops.c:1293
+#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/silc.c:965
 #: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3475
-#: ../libpurple/protocols/yahoo/yahoo.c:3486 ../pidgin/gtkblist.c:4024
-#: ../pidgin/gtkdialogs.c:749 ../pidgin/gtkdialogs.c:887
-#: ../pidgin/gtkdialogs.c:979 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/yahoo/yahoo.c:3519 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:786 ../pidgin/gtkdialogs.c:925
+#: ../pidgin/gtkdialogs.c:1017 ../pidgin/gtkrequest.c:320
 msgid "OK"
 msgstr "D'acord"
 
+#: ../finch/gntblist.c:2272
+msgid "Channel"
+msgstr "Canal"
+
+#: ../finch/gntblist.c:2284 ../pidgin/gtkblist.c:940
+msgid "Join a Chat"
+msgstr "Entra a un xat"
+
+#: ../finch/gntblist.c:2286
+msgid "Please enter the name of the chat you want to join."
+msgstr "IntroduÃ¯u el nom del xat al qual vulgueu entrar."
+
+#: ../finch/gntblist.c:2288 ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "Entra"
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
+#: ../finch/gntblist.c:2326 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:810
 msgid "Options"
 msgstr "Opcions"
 
-#: ../finch/gntblist.c:2246
+#: ../finch/gntblist.c:2332
 msgid "Send IM..."
 msgstr "Envia MI..."
 
-#: ../finch/gntblist.c:2250
-msgid "Show empty groups"
-msgstr "Mostra els grups buits"
+#: ../finch/gntblist.c:2337
+msgid "Join Chat..."
+msgstr "Entra al xat..."
 
-#: ../finch/gntblist.c:2256
-msgid "Show offline buddies"
-msgstr "Mostra amics desconnectats"
+#: ../finch/gntblist.c:2342
+msgid "Show"
+msgstr "Mostra"
 
-#: ../finch/gntblist.c:2262
-msgid "Sort by status"
-msgstr "Ordena per estat"
+#: ../finch/gntblist.c:2347
+msgid "Empty groups"
+msgstr "Els grups buits"
 
-#: ../finch/gntblist.c:2266
-msgid "Sort alphabetically"
-msgstr "Ordena alfabÃ¨ticament"
+#: ../finch/gntblist.c:2354
+msgid "Offline buddies"
+msgstr "Els amics desconnectats"
 
-#: ../finch/gntblist.c:2270
-msgid "Sort by log size"
-msgstr "Ordena per la mida del registre"
+#: ../finch/gntblist.c:2361
+msgid "Sort"
+msgstr "Ordena"
 
-#: ../finch/gntconn.c:110
+#: ../finch/gntblist.c:2366
+msgid "By Status"
+msgstr "Per estat"
+
+#: ../finch/gntblist.c:2371 ../pidgin/gtkblist.c:4191
+msgid "Alphabetically"
+msgstr "AlfabÃ¨ticament"
+
+#: ../finch/gntblist.c:2376
+msgid "By Log Size"
+msgstr "Per la mida del registre"
+
+# TÃtol de finestra (josep)
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+msgid "Certificate Import"
+msgstr "ImportaciÃ³ de certificats"
+
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgid "Specify a hostname"
+msgstr "Idiqueu el nom de l'ordiador"
+
+#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+msgid "Type the host name this certificate is for."
+msgstr "Entreu el nom de l'ordiador al qual pertay aquest certificat."
+
+#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
 #, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+"No s'ha pogut importar el fitxer %s.\n"
+"Assegureu-vos que es pot llegir i que estÃ  en format PEM.\n"
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+msgid "Certificate Import Error"
+msgstr "S'ha produÃ¯t un error en la importaciÃ³ del certificat"
+
+#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
+msgid "X.509 certificate import failed"
+msgstr "No s'ha pogut importar el certificat X.509"
+
+#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
+msgid "Select a PEM certificate"
+msgstr "Seleccioneu un certificat PEM"
+
+#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"No s'ha pogut exportar al fitxer %s.\n"
+"Assegureu-vos que teniu permÃs per escriure al directori de destinaciÃ³\n"
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+msgid "Certificate Export Error"
+msgstr "Error en exportar el certificat"
+
+#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
+msgid "X.509 certificate export failed"
+msgstr "No s'ha pogut exportar el certificat X.509"
+
+# TÃtol de finestra (josep)
+#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
+msgid "PEM X.509 Certificate Export"
+msgstr "ExportaciÃ³ de certificats PEM X.509"
+
+#: ../finch/gntcertmgr.c:188
+#, c-format
+msgid "Certificate for %s"
+msgstr "Certificat per a %s"
+
+#: ../finch/gntcertmgr.c:195
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"Nom: %s\n"
+"\n"
+"Empremta SHA1:\n"
+"%s"
+
+# tÃtol de finestra (josep)
+#: ../finch/gntcertmgr.c:198
+msgid "SSL Host Certificate"
+msgstr "Certificat SSL de l'ordinador central"
+
+#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "Esteu segur que voleu suprimir el certificat de %s?"
+
+# TÃtol de finestra (josep)
+#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+msgid "Confirm certificate delete"
+msgstr "ConfirmaciÃ³ de la supressiÃ³"
+
+#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:603
+msgid "Certificate Manager"
+msgstr "Gestor de certificats"
+
+#. Creating the user splits
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:671
+#: ../libpurple/protocols/silc/silc.c:1150
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr "Ordinador"
+
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
+#: ../pidgin/gtkdebug.c:840
+msgid "Info"
+msgstr "Info"
+
+#. Close button
+#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:213 ../finch/gntplugin.c:406 ../finch/gntpounce.c:751
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
+#: ../libpurple/protocols/msnp9/msn.c:403
+#: ../libpurple/protocols/silc/util.c:388
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
+#: ../pidgin/gtkrequest.c:323
+msgid "Close"
+msgstr "Tanca"
+
+#: ../finch/gntconn.c:125
+#, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:113
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s s'ha desconnectat."
 
-#: ../finch/gntconn.c:114
+#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
@@ -719,47 +887,51 @@ msgstr ""
 "El Finch no intentarÃ  connectar de nou aquest compte fins que no corregiu "
 "l'error i rehabiliteu el compte."
 
-#: ../finch/gntconv.c:118
+#: ../finch/gntconn.c:138
+msgid "Re-enable Account"
+msgstr "Rehabilita el compte"
+
+#: ../finch/gntconv.c:137
 msgid "No such command."
 msgstr "No existeix l'ordre."
 
-#: ../finch/gntconv.c:122 ../pidgin/gtkconv.c:465
+#: ../finch/gntconv.c:141 ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Error de sintaxi: heu escrit un nombre d'arguments equivocat per a aquesta "
 "ordre."
 
-#: ../finch/gntconv.c:127 ../pidgin/gtkconv.c:471
+#: ../finch/gntconv.c:146 ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "L'ordre ha fallat per motius desconeguts."
 
-#: ../finch/gntconv.c:132 ../pidgin/gtkconv.c:478
+#: ../finch/gntconv.c:151 ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "Aquesta ordre nomÃ©s funciona en xats, no en MI."
 
-#: ../finch/gntconv.c:135 ../pidgin/gtkconv.c:481
+#: ../finch/gntconv.c:154 ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "Aquesta ordre nomÃ©s funciona en MI, no en xats."
 
-#: ../finch/gntconv.c:139 ../pidgin/gtkconv.c:486
+#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "Aquesta ordre no funciona per a aquest protocol."
 
-#: ../finch/gntconv.c:147
+#: ../finch/gntconv.c:166
 msgid "Message was not sent, because you are not signed on."
 msgstr "El missatge no s'ha enviat perquÃ¨ no esteu connectat."
 
-#: ../finch/gntconv.c:230
+#: ../finch/gntconv.c:245
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:253
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:258 ../finch/gntconv.c:677
+#: ../finch/gntconv.c:273 ../finch/gntconv.c:795
 #, c-format
 msgid ""
 "\n"
@@ -768,49 +940,70 @@ msgstr ""
 "\n"
 "L'usuari %s estÃ  escrivint..."
 
-#: ../finch/gntconv.c:277
+#: ../finch/gntconv.c:292
 msgid "You have left this chat."
 msgstr "Heu sortit d'aquest xat"
 
-#: ../finch/gntconv.c:371
+#: ../finch/gntconv.c:408 ../pidgin/gtkconv.c:1416
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"S'ha iniciat el registre. Es registraran els propers missatges d'aquesta "
+"conversa."
+
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1424
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"S'ha aturat el registre. Els propers missatges d'aquesta conversa no es "
+"registraran."
+
+#: ../finch/gntconv.c:463
 msgid "Send To"
 msgstr "Envia a"
 
-#: ../finch/gntconv.c:415
+#: ../finch/gntconv.c:507
 msgid "Conversation"
 msgstr "Conversa"
 
 # FIXME ?
-#: ../finch/gntconv.c:421
+#: ../finch/gntconv.c:513
 msgid "Clear Scrollback"
 msgstr "Neteja la finestra"
 
-#: ../finch/gntconv.c:425 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:517 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Mostra marques horÃ ries"
 
-#: ../finch/gntconv.c:441
+#: ../finch/gntconv.c:533
 msgid "Add Buddy Pounce..."
 msgstr "Afegeix un avÃs per a l'amic..."
 
-#: ../finch/gntconv.c:643
+#: ../finch/gntconv.c:548
+msgid "Enable Logging"
+msgstr "Habilita el registre"
+
+#: ../finch/gntconv.c:554
+msgid "Enable Sounds"
+msgstr "Habilita els sons"
+
+#: ../finch/gntconv.c:760
 msgid "<AUTO-REPLY> "
 msgstr "<RESPOSTA-AUTOMÃ€TICA> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:765
+#: ../finch/gntconv.c:883
 msgid "List of users:\n"
 msgstr "Llista d'usuaris:\n"
 
-#: ../finch/gntconv.c:910 ../pidgin/gtkconv.c:308
+#: ../finch/gntconv.c:1045 ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "Les opcions de depuraciÃ³ disponibles sÃ³n:  version"
 
-#: ../finch/gntconv.c:945 ../pidgin/gtkconv.c:357
+#: ../finch/gntconv.c:1081 ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "L'ordre no existeix (en aquest context)."
 
-#: ../finch/gntconv.c:948 ../pidgin/gtkconv.c:360
+#: ../finch/gntconv.c:1084 ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -818,7 +1011,7 @@ msgstr ""
 "Feu servir Â«/help &lt;ordre&gt;Â» per a obtenir ajuda sobre una ordre.\n"
 "Les segÃ¼ents ordres estan disponibles en aquest context:\n"
 
-#: ../finch/gntconv.c:1006 ../pidgin/gtkconv.c:7320
+#: ../finch/gntconv.c:1142 ../pidgin/gtkconv.c:7755
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -826,11 +1019,11 @@ msgstr ""
 "say &lt;missatge&gt;: envia un missatge normalment com si no fÃ©ssiu servir "
 "cap ordre."
 
-#: ../finch/gntconv.c:1009 ../pidgin/gtkconv.c:7323
+#: ../finch/gntconv.c:1145 ../pidgin/gtkconv.c:7758
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;acciÃ³&gt;: envia una acciÃ³ a l'estil IRC a un amic o xat."
 
-#: ../finch/gntconv.c:1012 ../pidgin/gtkconv.c:7326
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7761
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -838,43 +1031,48 @@ msgstr ""
 "debug &lt;opciÃ³&gt;: envia informaciÃ³ de depuraciÃ³ diversa a la conversa "
 "actual."
 
-#: ../finch/gntconv.c:1015 ../pidgin/gtkconv.c:7329
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7764
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Neteja la conversa."
 
-#: ../finch/gntconv.c:1018 ../pidgin/gtkconv.c:7335
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7770
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;ordre&gt;: ajuda especÃfica quant a l'ordre."
 
-#: ../finch/gntconv.c:1021
+#: ../finch/gntconv.c:1157
 msgid "users:  Show the list of users in the chat."
 msgstr "users: mostra la llista d'usuaris del xat."
 
-#: ../finch/gntconv.c:1026
+#: ../finch/gntconv.c:1162
 msgid "plugins: Show the plugins window."
 msgstr "plugins: mostra la finestra de connectors."
 
-#: ../finch/gntconv.c:1029
+#: ../finch/gntconv.c:1165
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: mostra la llista d'amics."
 
-#: ../finch/gntconv.c:1032
+#: ../finch/gntconv.c:1168
 msgid "accounts: Show the accounts window."
 msgstr "accounts: mostra la finestra dels comptes."
 
-#: ../finch/gntconv.c:1035
+#: ../finch/gntconv.c:1171
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: mostra la finestra de depuraciÃ³."
 
-#: ../finch/gntconv.c:1038
+#: ../finch/gntconv.c:1174
 msgid "prefs: Show the preference window."
 msgstr "prefs: mostra la finestra de preferÃ¨ncies."
 
-#: ../finch/gntconv.c:1041
+#: ../finch/gntconv.c:1177
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: mostra la finestra d'estats desats."
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:84 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
+#: ../pidgin/gtkdebug.c:220 ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "No s'ha pogut obrir el fitxer."
+
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:700
 msgid "Debug Window"
 msgstr "Finestra de depuraciÃ³"
 
@@ -882,199 +1080,185 @@ msgstr "Finestra de depuraciÃ³"
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:759
 msgid "Clear"
 msgstr "Neteja"
 
-#: ../finch/gntdebug.c:261
-msgid "Filter: "
-msgstr "Filtre: "
+#: ../finch/gntdebug.c:303
+msgid "Filter:"
+msgstr "Filtre:"
 
-#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:768
 msgid "Pause"
 msgstr "Fes una pausa"
 
-#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
+#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "TransferÃ¨ncia de fitxers - %d%% de %d fitxers"
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:85
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
+#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
+#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
 msgid "File Transfers"
 msgstr "TransferÃ¨ncia de fitxers"
 
-#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "ProgrÃ©s"
 
-#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Nom del fitxer"
 
-#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Mida"
 
-#: ../finch/gntft.c:200
+#: ../finch/gntft.c:201
 msgid "Speed"
 msgstr "Velocitat"
 
-#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Restant"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
-#: ../libpurple/protocols/bonjour/bonjour.c:337
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
-#: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2670
-#: ../libpurple/protocols/oscar/oscar.c:3750
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3226 ../pidgin/gtkblist.c:3084
-#: ../pidgin/gtkblist.c:3097 ../pidgin/gtkblist.c:3099
-#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
+#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/gg/gg.c:1592
+#: ../libpurple/protocols/jabber/buddy.c:778
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:631
+#: ../libpurple/protocols/msn/msn.c:636 ../libpurple/protocols/msn/msn.c:639
+#: ../libpurple/protocols/msnp9/msn.c:543
+#: ../libpurple/protocols/novell/novell.c:2852
+#: ../libpurple/protocols/oscar/oscar.c:821
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:2710
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/sametime/sametime.c:3305
+#: ../libpurple/protocols/sametime/sametime.c:4196
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkblist.c:3338
+#: ../pidgin/gtkblist.c:3352 ../pidgin/gtkblist.c:3354
+#: ../pidgin/gtksavedstatuses.c:1005 ../pidgin/gtksavedstatuses.c:1150
 msgid "Status"
 msgstr "Estat"
 
-#: ../finch/gntft.c:210
+#: ../finch/gntft.c:211
 msgid "Close this window when all transfers finish"
 msgstr "Tanca aquesta finestra quan totes les transferÃ¨ncies hagin finalitzat"
 
-#: ../finch/gntft.c:217
+#: ../finch/gntft.c:218
 msgid "Clear finished transfers"
 msgstr "Neteja les transferÃ¨ncies acabades"
 
-#: ../finch/gntft.c:231
+#: ../finch/gntft.c:232
 msgid "Stop"
 msgstr "Atura"
 
-#. Close button
-#: ../finch/gntft.c:236 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
-#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:737 ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2470
-#: ../pidgin/gtkrequest.c:272
-msgid "Close"
-msgstr "Tanca"
-
-#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr "S'estÃ  esperant a iniciar la transferÃ¨ncia"
 
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr "S'ha cancelÂ·lat"
 
-#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr "Ha fallat"
 
-#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KB/s"
 
-#: ../finch/gntft.c:430
+#: ../finch/gntft.c:431
 #, c-format
 msgid "The file was saved as %s."
 msgstr "S'ha desat el fitxer com a %s."
 
-#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1115
+#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
+#: ../pidgin/gtkft.c:1116
 msgid "Finished"
 msgstr "S'ha finalitzat"
 
-#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Transferring"
 msgstr "S'estÃ  transferint"
 
-#: ../finch/gntnotify.c:164
+#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "Correus electrÃ²nics"
 
-#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Teniu correu!"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:519
 msgid "Sender"
 msgstr "Remitent"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:526
 msgid "Subject"
 msgstr "Assumpte"
 
-#: ../finch/gntnotify.c:200
+#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) tÃ© %d missatge nou."
 msgstr[1] "%s (%s) tÃ© %d missatges nous."
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:342
 msgid "New Mail"
 msgstr "Nou correu electrÃ²nic"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:949
 #, c-format
 msgid "Info for %s"
 msgstr "InformaciÃ³ quant a %s"
 
-#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:909
+#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:950
 msgid "Buddy Information"
 msgstr "InformaciÃ³ sobre l'amic"
 
-#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continua"
 
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1600 ../pidgin/gtkdebug.c:834
-msgid "Info"
-msgstr "Info"
-
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1561
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "MI"
 
-#: ../finch/gntnotify.c:388
-msgid "Join"
-msgstr "Entra"
-
-#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite"
 msgstr "Convida"
 
-#: ../finch/gntnotify.c:394
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(cap)"
 
-#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
+#: ../finch/gntplugin.c:77 ../finch/gntplugin.c:86
 msgid "ERROR"
 msgstr "ERROR"
 
-#: ../finch/gntplugin.c:74
+#: ../finch/gntplugin.c:77
 msgid "loading plugin failed"
 msgstr "no s'ha pogut carregar el connector"
 
-#: ../finch/gntplugin.c:83
+#: ../finch/gntplugin.c:86
 msgid "unloading plugin failed"
 msgstr "no s'ha pogut descarregar el connector"
 
-#: ../finch/gntplugin.c:128
+#: ../finch/gntplugin.c:132
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1091,19 +1275,42 @@ msgstr ""
 "Web: %s\n"
 "Nom del fitxer: %s\n"
 
-#: ../finch/gntplugin.c:186
+#: ../finch/gntplugin.c:190
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Cal que carregueu el connector abans de poder-lo configurar."
 
-#: ../finch/gntplugin.c:234
+#: ../finch/gntplugin.c:238
 msgid "No configuration options for this plugin."
 msgstr "No hi ha opcions de configuraciÃ³ per a aquest connector."
 
 #: ../finch/gntplugin.c:259
+msgid "Error loading plugin"
+msgstr "S'ha produÃ¯t un error en carregar el connector"
+
+#: ../finch/gntplugin.c:260
+msgid "The selected file is not a valid plugin."
+msgstr "El fitxer seleccionat no Ã©s un connector vÃ lid."
+
+#: ../finch/gntplugin.c:261
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+"Obriu la finestra de depuraciÃ³ i proveu de nou si podeu veure el missatge "
+"d'error exacte."
+
+#: ../finch/gntplugin.c:324
+msgid "Select plugin to install"
+msgstr "Seleccioneu el connector a instalÂ·lar"
+
+#: ../finch/gntplugin.c:350
 msgid "You can (un)load plugins from the following list."
 msgstr "Podeu carregar o descarregar connectors de la llista segÃ¼ent."
 
-#: ../finch/gntplugin.c:314
+#: ../finch/gntplugin.c:401
+msgid "Install Plugin..."
+msgstr "InstalÂ·la el connector..."
+
+#: ../finch/gntplugin.c:411
 msgid "Configure Plugin"
 msgstr "Configura el connector"
 
@@ -1112,362 +1319,363 @@ msgstr "Configura el connector"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:88 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2062
+#: ../finch/gntplugin.c:467 ../finch/gntplugin.c:474 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2169
 msgid "Preferences"
 msgstr "PreferÃ¨ncies"
 
-#: ../finch/gntpounce.c:182 ../pidgin/gtkpounce.c:255
+#: ../finch/gntpounce.c:194 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "IntroduÃ¯u un amic a qui avisar."
 
-#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "New Buddy Pounce"
 msgstr "AvÃs nou per a l'amic"
 
-#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "Edit Buddy Pounce"
 msgstr "Edita l'avÃs per a l'amic"
 
 # FIXME
-#: ../finch/gntpounce.c:332
+#: ../finch/gntpounce.c:344
 msgid "Pounce Who"
 msgstr "Avisa dels Who"
 
 #. Account:
-#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
+#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Compte:"
 
-#: ../finch/gntpounce.c:357
+#: ../finch/gntpounce.c:369
 msgid "Buddy name:"
 msgstr "Nom de l'amic:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
+#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:600
 msgid "Pounce When Buddy..."
 msgstr "Avisa quan..."
 
-#: ../finch/gntpounce.c:375
+#: ../finch/gntpounce.c:389
 msgid "Signs on"
 msgstr "Es connecti"
 
-#: ../finch/gntpounce.c:376
+#: ../finch/gntpounce.c:390
 msgid "Signs off"
 msgstr "Es desconnecti"
 
-#: ../finch/gntpounce.c:377
+#: ../finch/gntpounce.c:391
 msgid "Goes away"
 msgstr "Passi a absent"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:392
 msgid "Returns from away"
 msgstr "Torni a estar present"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:393
 msgid "Becomes idle"
 msgstr "Passi a inactiu"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:394
 msgid "Is no longer idle"
 msgstr "Ja no estigui inactiu"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "Comenci a escriure"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:396
 msgid "Pauses while typing"
 msgstr "S'aturi mentre tecleja"
 
-#: ../finch/gntpounce.c:383
+#: ../finch/gntpounce.c:397
 msgid "Stops typing"
 msgstr "Pari d'escriure"
 
-#: ../finch/gntpounce.c:384
+#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "EnviÃ¯ un missatge"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
+#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:661
 msgid "Action"
 msgstr "AcciÃ³"
 
-#: ../finch/gntpounce.c:415
+#: ../finch/gntpounce.c:429
 msgid "Open an IM window"
 msgstr "Obre una finestra de MI"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:430
 msgid "Pop up a notification"
 msgstr "Mostra una notificaciÃ³ emergent"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:431
 msgid "Send a message"
 msgstr "Envia un missatge"
 
-#: ../finch/gntpounce.c:418
+#: ../finch/gntpounce.c:432
 msgid "Execute a command"
 msgstr "Executa una ordre"
 
-#: ../finch/gntpounce.c:419
+#: ../finch/gntpounce.c:433
 msgid "Play a sound"
 msgstr "Reprodueix un so"
 
-#: ../finch/gntpounce.c:447
+#: ../finch/gntpounce.c:461
 msgid "Pounce only when my status is not available"
 msgstr "Avisa nomÃ©s quan el meu estat no estigui disponible"
 
-#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
+#: ../finch/gntpounce.c:463 ../pidgin/gtkpounce.c:1301
 msgid "Recurring"
 msgstr "Recurrent"
 
-#: ../finch/gntpounce.c:617
+#: ../finch/gntpounce.c:631
 msgid "Cannot create pounce"
 msgstr "No s'ha pogut crear l'avÃs"
 
-#: ../finch/gntpounce.c:618
+#: ../finch/gntpounce.c:632
 msgid "You do not have any accounts."
 msgstr "No teniu cap compte."
 
-#: ../finch/gntpounce.c:619
+#: ../finch/gntpounce.c:633
 msgid "You must create an account first before you can create a pounce."
 msgstr "Abans de poder crear un avÃs heu de crear un compte."
 
-#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:675 ../pidgin/gtkpounce.c:1116
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Esteu segur que voleu suprimir l'avÃs a %s per a %s?"
 
-#: ../finch/gntpounce.c:695 ../finch/gntui.c:83 ../pidgin/gtkpounce.c:1324
+#: ../finch/gntpounce.c:709 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1352
 msgid "Buddy Pounces"
 msgstr "Avisos per a amics"
 
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s us ha comenÃ§at a escriure (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s s'ha aturat mentre us escrivia (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s s'ha connectat (%s)"
 
-#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1486
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s ha deixat d'estar inactiu (%s)"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
+#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1488
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ha deixat d'estar absent (%s)"
 
-#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
+#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1490
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha deixat d'escriure-us (%s)"
 
-#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
+#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1492
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s s'ha desconnectat (%s)"
 
-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
+#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1494
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s ha passat a inactiu (%s)"
 
-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
+#: ../finch/gntpounce.c:839 ../pidgin/gtkpounce.c:1496
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s ha passat a absent (%s)"
 
-#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
+#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1498
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s us ha enviat un missatge. (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1499
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Esdeveniment d'avÃs desconegut, informeu-nos-en."
 
-#: ../finch/gntprefs.c:91
+#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "Basat en l'Ãºs del teclat"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1925
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2031
 msgid "From last sent message"
 msgstr "Des del darrer missatge enviat"
 
-#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1924 ../pidgin/gtkprefs.c:1938
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:900 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:2030 ../pidgin/gtkprefs.c:2044
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Mai"
 
-#: ../finch/gntprefs.c:183
+#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "Mostra el temps d'inactivitat"
 
-#: ../finch/gntprefs.c:184
+#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "Mostra els amics desconnectats"
 
-#: ../finch/gntprefs.c:191
+#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "Notifica als amics quan els escrigui"
 
-#: ../finch/gntprefs.c:197
+#: ../finch/gntprefs.c:198
 msgid "Log format"
 msgstr "Format del registre"
 
-#: ../finch/gntprefs.c:198
+#: ../finch/gntprefs.c:199
 msgid "Log IMs"
 msgstr "Registra els missatges instantanis"
 
-#: ../finch/gntprefs.c:199
+#: ../finch/gntprefs.c:200
 msgid "Log chats"
 msgstr "Registra els xats"
 
-#: ../finch/gntprefs.c:200
+#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Registra tots els canvis d'estat"
 
-#: ../finch/gntprefs.c:206
+#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
 msgstr "Informa del temps d'inactivitat"
 
-#: ../finch/gntprefs.c:207
+#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
 msgstr "Canvia l'estat quan estigui inactiu"
 
-#: ../finch/gntprefs.c:208
+#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr "Minuts abans de canviar l'estat"
 
-#: ../finch/gntprefs.c:209
+#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr "Canvia l'estat a"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2028
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:995 ../pidgin/gtkprefs.c:2135
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Converses"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1464 ../pidgin/gtkprefs.c:2039
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1563 ../pidgin/gtkprefs.c:2146
 msgid "Logging"
 msgstr "Registre"
 
-#: ../finch/gntrequest.c:563
+#: ../finch/gntrequest.c:585
 msgid "Not implemented yet."
 msgstr "Encara no estÃ  implementat."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1699
+#: ../pidgin/gtkrequest.c:1745
 msgid "Save File..."
 msgstr "Desa el fitxer..."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1700
+#: ../pidgin/gtkrequest.c:1746
 msgid "Open File..."
 msgstr "Obre un fitxer..."
 
-#: ../finch/gntsound.c:94 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Un amic es connecta"
 
-#: ../finch/gntsound.c:95 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Un amic es desconnecta"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Es rep un missatge"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "El missatge rebut inicia una conversa"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "S'envia un missatge"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Una persona entra al xat"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Una persona surt del xat"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Parleu en un xat"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Altres parlen en un xat"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:74
+#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "AlgÃº diu el vostre nom en un xat"
 
-#: ../finch/gntsound.c:357 ../pidgin/gtksound.c:310
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "Fallada del GStreamer"
 
-#: ../finch/gntsound.c:358 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "Ha fallat la inicialitzaciÃ³ del GStreamer."
 
-#: ../finch/gntsound.c:712 ../finch/gntsound.c:798 ../pidgin/gtkprefs.c:1584
-#: ../pidgin/gtkprefs.c:1673 ../pidgin/gtkprefs.c:1867
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1687
+#: ../pidgin/gtkprefs.c:1776 ../pidgin/gtkprefs.c:1972
 msgid "(default)"
 msgstr "(predeterminat)"
 
-#: ../finch/gntsound.c:725
+#: ../finch/gntsound.c:729
 msgid "Select Sound File ..."
 msgstr "Seleccioneu un fitxer de so..."
 
-#: ../finch/gntsound.c:900
+#: ../finch/gntsound.c:904
 msgid "Sound Preferences"
 msgstr "PreferÃ¨ncies del so"
 
-#: ../finch/gntsound.c:911
+#: ../finch/gntsound.c:915
 msgid "Profiles"
 msgstr "Perfils"
 
-#: ../finch/gntsound.c:950 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1817
 msgid "Automatic"
 msgstr "AutomÃ tic"
 
-#: ../finch/gntsound.c:953
+#: ../finch/gntsound.c:957
 msgid "Console Beep"
 msgstr "AvÃs sonor del terminal"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1716
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1821
 msgid "Command"
 msgstr "Ordre"
 
-#: ../finch/gntsound.c:955
+#: ../finch/gntsound.c:959
 msgid "No Sound"
 msgstr "Sense so"
 
-#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1707
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1812
 msgid "Sound Method"
 msgstr "MÃ¨todes de reproducciÃ³ del so"
 
-#: ../finch/gntsound.c:962
+#: ../finch/gntsound.c:966
 msgid "Method: "
 msgstr "MÃ¨tode: "
 
-#: ../finch/gntsound.c:969
+#: ../finch/gntsound.c:973
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1477,80 +1685,81 @@ msgstr ""
 "(%s per al nom de fitxer)"
 
 #. Sound options
-#: ../finch/gntsound.c:977 ../pidgin/gtkprefs.c:1751
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1856
 msgid "Sound Options"
 msgstr "Opcions de so"
 
-#: ../finch/gntsound.c:978
+#: ../finch/gntsound.c:982
 msgid "Sounds when conversation has focus"
 msgstr "Sons quan la conversa tingui el focus"
 
-#: ../finch/gntsound.c:986 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1758 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:910
+#: ../pidgin/gtkprefs.c:1863 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Sempre"
 
-#: ../finch/gntsound.c:987 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1861
 msgid "Only when available"
 msgstr "Si estic disponible"
 
-#: ../finch/gntsound.c:988 ../pidgin/gtkprefs.c:1757
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1862
 msgid "Only when not available"
 msgstr "NomÃ©s si no estic disponible"
 
-#: ../finch/gntsound.c:995
+#: ../finch/gntsound.c:999
 msgid "Volume(0-100):"
 msgstr "Volum (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1014 ../pidgin/gtkprefs.c:1793
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1898
 msgid "Sound Events"
 msgstr "Esdeveniments de so"
 
-#: ../finch/gntsound.c:1016 ../pidgin/gtkprefs.c:1852
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1957
 msgid "Event"
 msgstr "Esdeveniment"
 
-#: ../finch/gntsound.c:1016
+#: ../finch/gntsound.c:1020
 msgid "File"
 msgstr "Fitxer"
 
-#: ../finch/gntsound.c:1035 ../pidgin/gtkprefs.c:1871
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1976
 msgid "Test"
 msgstr "Prova"
 
-#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1980
 msgid "Reset"
 msgstr "Reinicia"
 
-#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1984
 msgid "Choose..."
 msgstr "Tria..."
 
-#: ../finch/gntstatus.c:137
+#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Esteu segur que voleu suprimir Â«%sÂ»?"
 
-#: ../finch/gntstatus.c:140
+#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Estat de la supressiÃ³"
 
-#: ../finch/gntstatus.c:175 ../pidgin/gtksavedstatuses.c:596
+#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Estats desats"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:973
-#: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:499
+#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
+#: ../libpurple/protocols/jabber/buddy.c:298
+#: ../libpurple/protocols/jabber/buddy.c:1359
+#: ../libpurple/protocols/msn/msn.c:725
+#: ../libpurple/protocols/novell/novell.c:1493
+#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "TÃtol"
 
-#: ../finch/gntstatus.c:182 ../pidgin/gtksavedstatuses.c:514
+#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Tipus"
 
@@ -1562,108 +1771,133 @@ msgstr "Tipus"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
-#: ../libpurple/protocols/bonjour/bonjour.c:249
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:339
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
-#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
-#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
-#: ../libpurple/protocols/myspace/myspace.c:269
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5504
-#: ../libpurple/protocols/oscar/oscar.c:5722
-#: ../libpurple/protocols/oscar/oscar.c:5736
-#: ../libpurple/protocols/oscar/oscar.c:5752
-#: ../libpurple/protocols/oscar/oscar.c:5759
-#: ../libpurple/protocols/oscar/oscar.c:5766
-#: ../libpurple/protocols/sametime/sametime.c:3286
-#: ../libpurple/protocols/sametime/sametime.c:3292
-#: ../libpurple/protocols/sametime/sametime.c:3298
-#: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3729
-#: ../libpurple/protocols/yahoo/yahoo.c:3735
+#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:275
+#: ../libpurple/protocols/bonjour/bonjour.c:282
+#: ../libpurple/protocols/bonjour/bonjour.c:365
+#: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
+#: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
+#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:238
+#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/msn/msn.c:677 ../libpurple/protocols/msn/msn.c:683
+#: ../libpurple/protocols/msn/msn.c:689 ../libpurple/protocols/msn/msn.c:695
+#: ../libpurple/protocols/msn/msn.c:700 ../libpurple/protocols/msn/msn.c:705
+#: ../libpurple/protocols/myspace/myspace.c:148
+#: ../libpurple/protocols/novell/novell.c:2855
+#: ../libpurple/protocols/novell/novell.c:2958
+#: ../libpurple/protocols/novell/novell.c:2964
+#: ../libpurple/protocols/novell/novell.c:2970
+#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/oscar/oscar.c:5822
+#: ../libpurple/protocols/oscar/oscar.c:5836
+#: ../libpurple/protocols/oscar/oscar.c:5852
+#: ../libpurple/protocols/oscar/oscar.c:5859
+#: ../libpurple/protocols/oscar/oscar.c:5866
+#: ../libpurple/protocols/sametime/sametime.c:3328
+#: ../libpurple/protocols/sametime/sametime.c:3334
+#: ../libpurple/protocols/sametime/sametime.c:3340
+#: ../libpurple/protocols/sametime/sametime.c:3419
+#: ../libpurple/protocols/silc/buddy.c:1554
+#: ../libpurple/protocols/silc10/buddy.c:1554
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
+#: ../libpurple/protocols/yahoo/yahoo.c:3768
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1016
 msgid "Message"
 msgstr "Missatge"
 
 #. Use
-#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
+#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Empra"
 
-#: ../finch/gntstatus.c:300
+#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "El tÃtol no Ã©s vÃ lid"
 
-#: ../finch/gntstatus.c:301
+#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "IntroduÃ¯u un tÃtol que no estigui buit per a l'estat."
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "El tÃtol estÃ  duplicat"
 
-#: ../finch/gntstatus.c:310
+#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "IntroduÃ¯u un tÃtol diferent per a l'estat."
 
-#: ../finch/gntstatus.c:451
+#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Sub-estat"
 
-#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Estat:"
 
-#: ../finch/gntstatus.c:478
+#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Missatge:"
 
-#: ../finch/gntstatus.c:527
+#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Edita l'estat"
 
-#: ../finch/gntstatus.c:569
+#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Utilitza un estat diferent per a aquests comptes"
 
 #. Save & Use
-#: ../finch/gntstatus.c:603
+#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "Desa i fes servir"
 
-#: ../finch/gntui.c:87 ../pidgin/gtkprefs.c:2030
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Certificats"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2137
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../finch/gntui.c:89
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Estats"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "S'ha produÃ¯t un error en carregar el connector."
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "No s'ha pogut trobar cap pantalla X"
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "No s'ha pogut trobar la finestra"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr ""
+"No s'ha pogut carregar aquest connector perquÃ¨ no es va compilar per a X11."
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "Porta-retalls Gnt"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Connector per al porta-retalls"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1733,16 +1967,16 @@ msgstr "Connector per a missatges emerge
 msgid "Toaster plugin"
 msgstr "Connector per a missatges emergents"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Converses amb %s a %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "El connector per a l'historial requereix que s'habiliti el registre"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1759,11 +1993,11 @@ msgstr "GntHistory"
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Mostra les converses registrades recentment en converses noves."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1775,102 +2009,103 @@ msgstr "Lastlog"
 msgid "Lastlog"
 msgstr "Lastlog"
 
-#: ../finch/plugins/lastlog.c:99
+#. Translator Note: The "backlog" is the conversation buffer/history.
+#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: cerca cadenes al registre."
 
-#: ../finch/plugins/lastlog.c:121
+#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Connector lastlog."
 
-#: ../libpurple/account.c:790
+#: ../libpurple/account.c:875
 msgid "accounts"
 msgstr "comptes"
 
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:1050 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "Es necessita la contrasenya per a poder connectar."
 
-#: ../libpurple/account.c:963
+#: ../libpurple/account.c:1084
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "IntroduÃ¯u la contrasenya de %s (%s)"
 
-#: ../libpurple/account.c:970
+#: ../libpurple/account.c:1091
 msgid "Enter Password"
 msgstr "IntroduÃ¯u la contrasenya"
 
-#: ../libpurple/account.c:975
+#: ../libpurple/account.c:1096
 msgid "Save password"
 msgstr "Desa la contrasenya"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1131 ../libpurple/connection.c:105
+#: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "No s'ha trobat el connector per al protocol %s"
 
-#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4021
+#: ../libpurple/account.c:1133 ../libpurple/connection.c:108
 msgid "Connection Error"
 msgstr "Error de connexiÃ³"
 
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/account.c:1330 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1698
 msgid "New passwords do not match."
 msgstr "Les contrasenyes noves no coincideixen."
 
-#: ../libpurple/account.c:1179
+#: ../libpurple/account.c:1339
 msgid "Fill out all fields completely."
 msgstr "Ompliu tots els camps completament."
 
-#: ../libpurple/account.c:1202
+#: ../libpurple/account.c:1362
 msgid "Original password"
 msgstr "Contrasenya original"
 
-#: ../libpurple/account.c:1209
+#: ../libpurple/account.c:1369
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: ../libpurple/account.c:1216
+#: ../libpurple/account.c:1376
 msgid "New password (again)"
 msgstr "Nova contrasenya (repetiu-la)"
 
-#: ../libpurple/account.c:1222
+#: ../libpurple/account.c:1382
 #, c-format
 msgid "Change password for %s"
 msgstr "Canvia la contrasenya de %s"
 
-#: ../libpurple/account.c:1230
+#: ../libpurple/account.c:1390
 msgid "Please enter your current password and your new password."
 msgstr "IntroduÃ¯u la contrasenya actual, i la nova."
 
-#: ../libpurple/account.c:1261
+#: ../libpurple/account.c:1421
 #, c-format
 msgid "Change user information for %s"
 msgstr "Canvia la informaciÃ³ d'usuari de %s"
 
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1424 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Estableix les dades d'usuari"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:1462
-#: ../libpurple/protocols/jabber/buddy.c:1479
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
+#: ../libpurple/account.c:1895 ../libpurple/protocols/gg/gg.c:1019
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2848
+#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
-#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5323 ../pidgin/plugins/gevolution/gevolution.c:96
-#: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3272 ../pidgin/gtkblist.c:6059
+#: ../pidgin/plugins/gevolution/gevo-util.c:67
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Amics"
 
@@ -1878,24 +2113,192 @@ msgstr "llista d'amics"
 msgid "buddy list"
 msgstr "llista d'amics"
 
-#: ../libpurple/connection.c:106
+#: ../libpurple/certificate.c:558
+msgid "(DOES NOT MATCH)"
+msgstr "(NO COINCIDEIX)"
+
+#. Make messages
+#: ../libpurple/certificate.c:562
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "%s ha presentat aquest certificat d'un sol Ãºs:"
+
+#: ../libpurple/certificate.c:563
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"Nom: %s %s\n"
+"Empremta (SHA1): %s"
+
+# TÃtol de finestra (josep)
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:568
+msgid "Single-use Certificate Verification"
+msgstr "VerificaciÃ³ d'un certificat d'un sol Ãºs"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:886
+msgid "Certificate Authorities"
+msgstr "Entitats certificadores"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1054
+msgid "SSL Peers Cache"
+msgstr ""
+
+#. Make messages
+#: ../libpurple/certificate.c:1185
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "Voleu acceptar el certificat de %s?"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1191
+msgid "SSL Certificate Verification"
+msgstr "VerificaciÃ³ d'un certificat SSL"
+
+#. Number of actions
+#: ../libpurple/certificate.c:1201
+msgid "Accept"
+msgstr "Accepta"
+
+#: ../libpurple/certificate.c:1202 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr "Rebutja"
+
+#: ../libpurple/certificate.c:1203
+msgid "_View Certificate..."
+msgstr "_Mostra el certificat..."
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1303
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"El certificat de Â«%sÂ» sembla indicar que Ã©s de Â«%sÂ». AixÃ² podria voler dir "
+"que us esteu connectant a un servei diferent del que us penseu."
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1328
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"No es pot comprovar el certificat que presenta Â«%sÂ» atÃ¨s que estÃ  auto-"
+"signat."
+
+#: ../libpurple/certificate.c:1346
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "La cadena de certificaciÃ³ que presenta %s no Ã©s vÃ lida."
+
+# TÃtol de finestra (josep)
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#: ../libpurple/certificate.c:1354 ../libpurple/certificate.c:1423
+msgid "SSL Certificate Error"
+msgstr "Error en el certificat SSL"
+
+#: ../libpurple/certificate.c:1355
+msgid "Invalid certificate chain"
+msgstr "La cadena de certificats no Ã©s vÃ lida"
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1375
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Aquest certificat no es pot validar perquÃ¨ no teniu cap base de dades de "
+"certificats arrel."
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1398
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr "El Pidgin no coneix el certificat arrel d'aquest certificat."
+
+#: ../libpurple/certificate.c:1415
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+"El certificat %s afirma tenir una signatura d'una entitat certificadora, "
+"perÃ² la cadena de certificaciÃ³ no contÃ© cap signatura digital vÃ lida "
+"d'aquesta l'entitat."
+
+#: ../libpurple/certificate.c:1424
+msgid "Invalid certificate authority signature"
+msgstr "La signatura de l'entitat certificadora no Ã©s vÃ lida"
+
+#. Make messages
+#: ../libpurple/certificate.c:1888
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+"Nom: %s\n"
+"\n"
+"Empremta (SHA1): %s\n"
+"\n"
+"Data d'activaciÃ³: %s\n"
+"Data de venciment: %s\n"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1897
+msgid "Certificate Information"
+msgstr "InformaciÃ³ del certificat"
+
+# Titol de finestra (josep)
+#: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "Error en el registre"
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:180
+msgid "Unregistration Error"
+msgstr "Error en desconnectar"
+
+#: ../libpurple/connection.c:350
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s s'ha connectat"
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:380
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s se n'ha anat"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1750
-#: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/connection.c:525 ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2350
+#: ../libpurple/protocols/msn/servconn.c:141
+#: ../libpurple/protocols/msn/session.c:377
+#: ../libpurple/protocols/msnp9/servconn.c:139
+#: ../libpurple/protocols/msnp9/session.c:330
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -1912,45 +2315,45 @@ msgstr "El missatge Ã©s massa llarg."
 msgid "The message is too large."
 msgstr "El missatge Ã©s massa llarg."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:267
+#: ../libpurple/protocols/bonjour/jabber.c:310
 msgid "Unable to send message."
 msgstr "No s'ha pogut enviar el missatge."
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "Envia el missatge"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "_Envia el missatge"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ha entrat a la sala."
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ha entrat a la sala."
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "Ara us feu dir %s"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ara es fa dir %s"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha sortit de la sala."
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha sortit de la sala (%s)."
@@ -1974,21 +2377,21 @@ msgstr "No s'estÃ  executant el servidor
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "No s'estÃ  executant el servidor D-BUS del purple pel motiu d'aquÃ sota"
 
-#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Sense nom"
 
 # FIXME
-#: ../libpurple/dnsquery.c:510
+#: ../libpurple/dnsquery.c:511
 msgid "Unable to create new resolver process\n"
 msgstr "No s'ha pogut crear un procÃ©s resoledor nou\n"
 
 # FIXME
-#: ../libpurple/dnsquery.c:515
+#: ../libpurple/dnsquery.c:516
 msgid "Unable to send request to resolver process\n"
 msgstr "No s'ha pogut enviar la solÂ·licitud al procÃ©s resoledor\n"
 
-#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -1997,14 +2400,14 @@ msgstr ""
 "S'ha produÃ¯t un error en resoldre %s: \n"
 "%s."
 
-#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
 #: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "S'ha produÃ¯t un error en resoldre %s: %d"
 
 # FIXME
-#: ../libpurple/dnsquery.c:573
+#: ../libpurple/dnsquery.c:574
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2013,20 +2416,21 @@ msgstr ""
 "S'ha produÃ¯t un error en llegir del procÃ©s resoledor:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:577
+#: ../libpurple/dnsquery.c:578
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "S'ha arribat al final del fitxer (EOF) en llegir del procÃ©s resoledor"
 
-#: ../libpurple/dnsquery.c:760
+#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "S'ha produÃ¯t un error en crear un fil: %s"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "Motiu desconegut"
 
-#: ../libpurple/ft.c:207
+#: ../libpurple/ft.c:209
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2035,7 +2439,7 @@ msgstr ""
 "S'ha produÃ¯t un error en llegir %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:211
+#: ../libpurple/ft.c:213
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2044,7 +2448,7 @@ msgstr ""
 "S'ha produÃ¯t un error en escriure %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:215
+#: ../libpurple/ft.c:217
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2053,39 +2457,39 @@ msgstr ""
 "S'ha produÃ¯t un error en accedir %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:251
+#: ../libpurple/ft.c:253
 msgid "Directory is not writable."
 msgstr "No es pot escriure al directori."
 
-#: ../libpurple/ft.c:266
+#: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
 msgstr "No es pot enviar un fitxer de 0 octets."
 
-#: ../libpurple/ft.c:276
+#: ../libpurple/ft.c:278
 msgid "Cannot send a directory."
 msgstr "No es pot enviar un directori."
 
-#: ../libpurple/ft.c:285
+#: ../libpurple/ft.c:287
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s no Ã©s un fitxer normal, no se sobreescriurÃ .\n"
 
-#: ../libpurple/ft.c:345
+#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s us vol enviar %s (%s)"
 
-#: ../libpurple/ft.c:352
+#: ../libpurple/ft.c:354
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s us vol enviar un fitxer"
 
-#: ../libpurple/ft.c:395
+#: ../libpurple/ft.c:397
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Voleu acceptar la transferÃ¨ncia del fitxer de %s?"
 
-#: ../libpurple/ft.c:399
+#: ../libpurple/ft.c:401
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2096,60 +2500,62 @@ msgstr ""
 "Ordinador remot: %s\n"
 "Port remot: %d"
 
-#: ../libpurple/ft.c:434
+#: ../libpurple/ft.c:436
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s us ofereix enviar el fitxer %s"
 
-#: ../libpurple/ft.c:486
+#: ../libpurple/ft.c:488
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s no Ã©s un nom de fitxer vÃ lid.\n"
 
-#: ../libpurple/ft.c:507
+#: ../libpurple/ft.c:509
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "S'estÃ  oferint enviar %s a %s"
 
-#: ../libpurple/ft.c:519
+#: ../libpurple/ft.c:521
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "S'estÃ  iniciant la transferÃ¨ncia de %s de %s?"
 
-#: ../libpurple/ft.c:680
+#: ../libpurple/ft.c:682
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "S'ha completat la transferÃ¨ncia del fitxer %s"
 
-#: ../libpurple/ft.c:683
+#: ../libpurple/ft.c:685
+#, c-format
 msgid "File transfer complete"
 msgstr "S'ha completat la transferÃ¨ncia del fitxer"
 
-#: ../libpurple/ft.c:1101
+#: ../libpurple/ft.c:1103
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Heu cancelÂ·lat la transferÃ¨ncia de %s"
 
-#: ../libpurple/ft.c:1106
+#: ../libpurple/ft.c:1108
+#, c-format
 msgid "File transfer cancelled"
 msgstr "S'ha cancelÂ·lat la transferÃ¨ncia del fitxer"
 
-#: ../libpurple/ft.c:1164
+#: ../libpurple/ft.c:1166
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s ha cancelÂ·lat la transferÃ¨ncia de %s"
 
-#: ../libpurple/ft.c:1169
+#: ../libpurple/ft.c:1171
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s ha cancelÂ·lat la transferÃ¨ncia del fitxer"
 
-#: ../libpurple/ft.c:1226
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Ha fallat la transferÃ¨ncia a %s."
 
-#: ../libpurple/ft.c:1228
+#: ../libpurple/ft.c:1230
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Ha fallat la transferÃ¨ncia de %s."
@@ -2318,32 +2724,32 @@ msgstr "Si l'ordre especificada ha de ge
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Si l'ordre especificada ha de gestionar URL Â«ymsgrÂ»"
 
-#: ../libpurple/log.c:182
+#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">El registrador no tÃ© cap funciÃ³ de lectura</font></b>"
 
-#: ../libpurple/log.c:597
+#: ../libpurple/log.c:598
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:611
+#: ../libpurple/log.c:612
 msgid "Plain text"
 msgstr "Text"
 
-#: ../libpurple/log.c:625
+#: ../libpurple/log.c:626
 msgid "Old flat format"
 msgstr "Format pla antic"
 
-#: ../libpurple/log.c:838
+#: ../libpurple/log.c:839
 msgid "Logging of this conversation failed."
 msgstr "Ha fallat el registre d'aquesta conversa."
 
-#: ../libpurple/log.c:1281
+#: ../libpurple/log.c:1282
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1365
+#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2352,7 +2758,7 @@ msgstr ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "RESPOSTA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1367
+#: ../libpurple/log.c:1368
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2361,45 +2767,46 @@ msgstr ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "RESPOSTA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
+#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>No s'ha pogut trobar la ruta del registre.</b></font>"
 
-#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
+#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>No s'ha pogut llegir el fitxer: %s</b></font>"
 
-#: ../libpurple/log.c:1499
+#: ../libpurple/log.c:1500
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA-AUTOMÃ€TICA>: %s\n"
 
-#: ../libpurple/plugin.c:365
+#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Esteu emprant %s, perÃ² aquest connector requereix %s."
 
-#: ../libpurple/plugin.c:380
+#: ../libpurple/plugin.c:375
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Aques connector no ha definit cap ID."
 
-#: ../libpurple/plugin.c:448
+#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "La versiÃ³ %d del connector no coincideix (cal %d)"
 
-#: ../libpurple/plugin.c:465
+#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Hi ha un error de coincidÃ¨ncia de l'ABI %d.%d.x (cal %d.%d.x)"
 
-#: ../libpurple/plugin.c:482
+#: ../libpurple/plugin.c:477
 msgid "Plugin does not implement all required functions"
 msgstr "El connector no implementa totes les funcions requerides"
 
-#: ../libpurple/plugin.c:547
+#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -2408,28 +2815,24 @@ msgstr ""
 "No s'ha pogut trobar el connector requerit %s. InstalÂ·leu aquest connector i "
 "intenteu-ho de nou."
 
-#: ../libpurple/plugin.c:552
+#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "No s'ha pogut carregar el connector"
 
-#: ../libpurple/plugin.c:574
+#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "No s'ha pogut carregar el connector requerit %s."
 
-#: ../libpurple/plugin.c:578
+#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "No s'ha pogut carregar el connector"
 
-#: ../libpurple/plugin.c:677
+#: ../libpurple/plugin.c:663
 #, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "No s'ha pogut carregar el connector requerit %s."
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s requereix %s, perÃ² no s'ha pogut carregar."
 
-#: ../libpurple/plugin.c:681
-msgid "There were errors unloading the plugin."
-msgstr "S'han produÃ¯t errors en descarregar el connector."
-
 #: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Accepta automÃ ticament"
@@ -2469,11 +2872,12 @@ msgstr "De_sa"
 #: ../libpurple/protocols/oscar/oscar.c:1451
 #: ../libpurple/protocols/oscar/oscar.c:2243
 #: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5836
-#: ../libpurple/protocols/oscar/oscar.c:5891
-#: ../libpurple/protocols/oscar/oscar.c:6117
-#: ../libpurple/protocols/oscar/oscar.c:6187 ../libpurple/request.h:1387
-#: ../libpurple/request.h:1397
+#: ../libpurple/protocols/oscar/oscar.c:5936
+#: ../libpurple/protocols/oscar/oscar.c:5991
+#: ../libpurple/protocols/oscar/oscar.c:6217
+#: ../libpurple/protocols/oscar/oscar.c:6287 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841 ../libpurple/request.h:1854
+#: ../libpurple/request.h:1867 ../pidgin/gtkblist.c:546
 msgid "_Cancel"
 msgstr "_CancelÂ·la"
 
@@ -2516,8 +2920,10 @@ msgstr ""
 "s'hagi transferit completament (nomÃ©s quan no hi ha conversa amb qui\n"
 "l'envia)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1838
+#: ../libpurple/protocols/msnp9/msn.c:1661
+#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Notes"
 msgstr "Notes"
 
@@ -2537,18 +2943,18 @@ msgstr "Edita les notes..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Notes quant a l'amic"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Emmagatzema notes sobre un amic en particular."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "Afegeix l'opciÃ³ d'emmagatzemar notes per a amics a la llista d'amics."
 
@@ -2742,110 +3148,118 @@ msgstr ""
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
+#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1577
+#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "L'usuari no estÃ  connectat."
 
-#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Resposta automÃ tica enviada:"
 
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/log_reader.c:1570
+#: ../libpurple/plugins/log_reader.c:1573
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s s'ha desconnectat."
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Pot ser que no s'hagin pogut trametre un o mÃ©s missatges."
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Heu estat desconnectat del servidor."
 
-#: ../libpurple/plugins/log_reader.c:1628
+#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr "Esteu desconnectat. No rebreu missatges a no ser que us connecteu."
 
-#: ../libpurple/plugins/log_reader.c:1643
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "El missatge no s'ha pogut enviar perquÃ¨ s'ha superat la mida mÃ xima."
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "No s'ha pogut enviar el missatge."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2699
+#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
+#: ../libpurple/plugins/log_reader.c:2712
+#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2724
+#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
+#: ../libpurple/plugins/log_reader.c:2738
+#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
+#: ../libpurple/plugins/log_reader.c:2750
+#: ../libpurple/plugins/log_reader.c:2853
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
+#: ../libpurple/plugins/log_reader.c:2762
+#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2774
+#: ../libpurple/plugins/log_reader.c:2861
+msgid "aMSN"
+msgstr "aMSN"
+
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
+#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "ConfiguraciÃ³ general de la lectura de registres"
 
-#: ../libpurple/plugins/log_reader.c:2458
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "CÃ lculs de mida rÃ pids"
 
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "Utilitza heurÃstiques de noms"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "Directori dels registres"
 
@@ -2855,20 +3269,20 @@ msgstr "Directori dels registres"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "Lector del registre"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
+#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "Inclou registres d'altres clients de MI en el visualitzador de registres."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
+#: ../libpurple/plugins/log_reader.c:2898
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2936,7 +3350,7 @@ msgstr ""
 "La resta de missatges es desaran com a un avÃs. Podeu editar o suprimir "
 "l'avÃs des del diÃ leg Â«Avisos per a amicsÂ»."
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -2945,43 +3359,49 @@ msgstr ""
 "Â«%sÂ» es troba actualment fora de lÃnia. Voleu desar la resta de missatges en "
 "un avÃs i enviar-los-hi automÃ ticament quan es torni a connectar com a Â«%sÂ»?"
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Missatge de fora de lÃnia"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "Podeu editar o suprimir l'avÃs des del diÃ leg Â«Avisos per a amicsÂ»"
 
-#: ../libpurple/plugins/offlinemsg.c:161
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/plugins/offlinemsg.c:165
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:133
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1928
 #: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:318
 msgid "Yes"
 msgstr "SÃ"
 
-#: ../libpurple/plugins/offlinemsg.c:162
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/plugins/offlinemsg.c:166
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:134
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:319
 msgid "No"
 msgstr "No"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Desa els missatges fora de lÃnia en un avÃs"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "No ho demanis, desa-ho sempre en un avÃs."
 
@@ -3044,7 +3464,7 @@ msgstr "Eleva les converses psÃquiques"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
+#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "ComprovaciÃ³ de senyals"
 
@@ -3052,8 +3472,8 @@ msgstr "ComprovaciÃ³ de senyals"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
+#: ../libpurple/plugins/signals-test.c:756
+#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "Prova per veure si tots els senyals funcionen correctament."
 
@@ -3075,24 +3495,30 @@ msgstr "Proves per veure si la majoria d
 msgid "Tests to see that most things are working."
 msgstr "Proves per veure si la majoria de coses funcionen."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
+msgid "X.509 Certificates"
+msgstr "Certificats X.509"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
+msgid "GNUTLS"
+msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr ""
-"Proporciona una interfÃcie per a les biblioteques que permeten l'Ãºs d'SSL."
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
+msgid "Provides SSL support through GNUTLS."
+msgstr "Proporciona suport per a SSL a travÃ©s de la biblioteca GNUTLS."
 
 #. *< type
 #. *< ui_requirement
@@ -3100,18 +3526,18 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
-msgid "GNUTLS"
-msgstr "GNUTLS"
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
+msgid "NSS"
+msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
-msgid "Provides SSL support through GNUTLS."
-msgstr "Proporciona suport per a SSL a travÃ©s de la biblioteca GNUTLS."
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Proporciona suport per a SSL a travÃ©s de la biblioteca NSS de Mozilla."
 
 #. *< type
 #. *< ui_requirement
@@ -3119,18 +3545,18 @@ msgstr "Proporciona suport per a SSL a t
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
-msgid "NSS"
-msgstr "NSS"
+#: ../libpurple/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Proporciona suport per a SSL a travÃ©s de la biblioteca NSS de Mozilla."
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr ""
+"Proporciona una interfÃcie per a les biblioteques que permeten l'Ãºs d'SSL."
 
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
@@ -3194,15 +3620,15 @@ msgstr "Notifica en la finestra de conve
 "idle."
 msgstr "Notifica en la finestra de conversa quan un amic canviÃ¯ d'estat."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Carregador de connectors en Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Proporciona suport per carregar els connectors en Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
+#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3210,12 +3636,21 @@ msgstr ""
 "No s'ha pogut detectar la instalÂ·laciÃ³ d'ActiveTCL. Si voleu emprar "
 "connectors TCL, instalÂ·leu l'ActiveTCL de http://www.activestate.com\n"
 
-#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+#: ../libpurple/protocols/bonjour/bonjour.c:108
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
+"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
+"LocalMessaging for more information."
+msgstr ""
+"No s'ha pogut trobar el joc d'eines per a Windows de l'Apple Bonjour, "
+"consulteu les preguntes mÃ©s freqÃ¼ents a http://developer.pidgin.im/wiki/Using"
+"%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging per a mÃ©s informaciÃ³."
+
+#: ../libpurple/protocols/bonjour/bonjour.c:127
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "No es poden escoltar connexions entrants de MI\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
+#: ../libpurple/protocols/bonjour/bonjour.c:154
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
@@ -3223,40 +3658,40 @@ msgstr ""
 "executant?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/bonjour/bonjour.c:614
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
+#: ../libpurple/protocols/bonjour/bonjour.c:370
+#: ../libpurple/protocols/bonjour/bonjour.c:675
+#: ../libpurple/protocols/gg/gg.c:633
+#: ../libpurple/protocols/jabber/jabber.c:969
 msgid "First name"
 msgstr "Nom"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/bonjour/bonjour.c:617
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
+#: ../libpurple/protocols/bonjour/bonjour.c:372
+#: ../libpurple/protocols/bonjour/bonjour.c:678
+#: ../libpurple/protocols/gg/gg.c:628
+#: ../libpurple/protocols/jabber/jabber.c:974
 msgid "Last name"
 msgstr "Cognoms"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:350
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/bonjour/bonjour.c:376
+#: ../libpurple/protocols/jabber/buddy.c:295
+#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:1335
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "Correu electrÃ²nic"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:623
+#: ../libpurple/protocols/bonjour/bonjour.c:379
+#: ../libpurple/protocols/bonjour/bonjour.c:684
 msgid "AIM Account"
 msgstr "Compte AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:356
-#: ../libpurple/protocols/bonjour/bonjour.c:626
+#: ../libpurple/protocols/bonjour/bonjour.c:382
+#: ../libpurple/protocols/bonjour/bonjour.c:687
 msgid "XMPP Account"
 msgstr "Compte XMPP"
 
@@ -3270,30 +3705,21 @@ msgstr "Compte XMPP"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:460
-#: ../libpurple/protocols/bonjour/bonjour.c:462
+#: ../libpurple/protocols/bonjour/bonjour.c:486
+#: ../libpurple/protocols/bonjour/bonjour.c:488
 msgid "Bonjour Protocol Plugin"
 msgstr "Connector per al protocol Bonjour"
 
 # FIXME
-#: ../libpurple/protocols/bonjour/bonjour.c:505
-#: ../libpurple/protocols/bonjour/bonjour.c:512
-#: ../libpurple/protocols/bonjour/bonjour.c:561
+#: ../libpurple/protocols/bonjour/bonjour.c:629
 msgid "Purple Person"
 msgstr "Persona porpa"
 
-#. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:610
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
-msgid "Hostname"
-msgstr "Ordinador"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:620
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/bonjour/bonjour.c:681
+#: ../libpurple/protocols/gg/gg.c:478
+#: ../libpurple/protocols/jabber/jabber.c:959
+#: ../libpurple/protocols/silc/silc.c:913
+#: ../libpurple/protocols/silc/silc.c:1154
 #: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
@@ -3303,38 +3729,38 @@ msgstr "Bonjour"
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:383
+#: ../libpurple/protocols/bonjour/jabber.c:395
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s ha finalitzat la conversa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:435
-#: ../libpurple/protocols/bonjour/jabber.c:658
-#: ../libpurple/protocols/bonjour/jabber.c:676
+#: ../libpurple/protocols/bonjour/jabber.c:453
+#: ../libpurple/protocols/bonjour/jabber.c:686
+#: ../libpurple/protocols/bonjour/jabber.c:704
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "No s'ha pogut enviar el missatge, no s'ha pogut iniciar la conversa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:581
+#: ../libpurple/protocols/bonjour/jabber.c:603
 msgid "Cannot open socket"
 msgstr "No s'ha pogut obrir el sÃ²col"
 
-#: ../libpurple/protocols/bonjour/jabber.c:589
+#: ../libpurple/protocols/bonjour/jabber.c:613
 msgid "Error setting socket options"
 msgstr "S'ha produÃ¯t un error en establir les opcions del sÃ²col"
 
-#: ../libpurple/protocols/bonjour/jabber.c:613
+#: ../libpurple/protocols/bonjour/jabber.c:639
 msgid "Could not bind socket to port"
 msgstr "No s'ha pogut vincular el sÃ²col al port"
 
-#: ../libpurple/protocols/bonjour/jabber.c:621
+#: ../libpurple/protocols/bonjour/jabber.c:649
 msgid "Could not listen on socket"
 msgstr "No s'ha pogut escoltar al sÃ²col"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "Opcions del servidor intermediari invÃ lides"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3352,39 +3778,41 @@ msgstr "No s'ha pogut obtenir el testimo
 msgid "Unable to fetch the token.\n"
 msgstr "No s'ha pogut obtenir el testimoni.\n"
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:267 ../libpurple/protocols/gg/gg.c:274
+#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "Desa la llista d'amics..."
 
-#: ../libpurple/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "La vostra llista d'amics Ã©s buida, no s'ha escrit res al fitxer."
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
-msgid "Couldn't open file"
-msgstr "No s'ha pogut obrir el fitxer"
-
-#: ../libpurple/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "S'ha desat la llista d'amics."
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:278
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "No s'ha pogut escriure la llista d'amics de %s a %s"
+
+#: ../libpurple/protocols/gg/gg.c:303 ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "No s'ha pogut carregar la llista d'amics"
 
-#: ../libpurple/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "Carrega una llista d'amics..."
 
-#: ../libpurple/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "S'ha carregat la llista d'amics."
 
-#: ../libpurple/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "Desa la llista d'amics..."
 
-#: ../libpurple/protocols/gg/gg.c:384
+#: ../libpurple/protocols/gg/gg.c:382
 msgid "Fill in the registration fields."
 msgstr "Empleneu els camps de registre."
 
@@ -3392,304 +3820,312 @@ msgstr "Les contrasenyes no coincideixen
 msgid "Passwords do not match."
 msgstr "Les contrasenyes no coincideixen."
 
-#: ../libpurple/protocols/gg/gg.c:398
+#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "No s'ha pogut registrar el nou compte. S'ha produÃ¯t un error.\n"
 
-#: ../libpurple/protocols/gg/gg.c:411
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "New Gadu-Gadu Account Registered"
 msgstr "S'ha registrat el nou compte Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:412
+#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "S'ha registrat amb Ã¨xit."
 
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
+#: ../libpurple/protocols/jabber/jabber.c:940
+#: ../libpurple/protocols/jabber/jabber.c:943
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Password"
 msgstr "Contrasenya"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:488 ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "Contrasenya (torneu-la a escriure)"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "IntroduÃ¯u el testimoni actual"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "Testimoni actual"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:503 ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registra un compte Gadu-Gadu nou"
 
-#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "Empleneu els camps segÃ¼ents"
 
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3759
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
+#: ../libpurple/protocols/gg/gg.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Ciutat"
 
-#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "Any de naixement"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/myspace/myspace.c:1953
-#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msnp9/msn.c:1590
+#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
+#: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Sexe"
 
-#: ../libpurple/protocols/gg/gg.c:646
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "Home o dona"
 
-#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
+#: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "Home"
 
-#: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/gg/gg.c:654
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "Dona"
 
-#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "NomÃ©s en lÃnia"
 
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "Cerca amics"
 
 # FIXME: uh, s'ha de millorar... (josep)
-#: ../libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "IntroduÃ¯u el criteri de cerca"
 
-#: ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "Empleneu els camps."
 
-#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "La contrasenya actual Ã©s diferent de la que heu introduÃ¯t."
 
-#: ../libpurple/protocols/gg/gg.c:722
+#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "No s'ha pogut canviar la contrasenya. S'ha produÃ¯t un error.\n"
 
-#: ../libpurple/protocols/gg/gg.c:731
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Canvia la contrasenya per al compte Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:732
+#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "S'ha canviat la contrasenya."
 
-#: ../libpurple/protocols/gg/gg.c:765
+#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "Contrasenya actual"
 
-#: ../libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "IntroduÃ¯u la contrasenya actual, i la nova per a UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:800 ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "Canvia la contrasenya per al Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Seleccioneu un xat per a l'amic: %s"
 
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:881 ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "Afegeix al xat..."
 
-#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1466
-#: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3077 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3084 ../pidgin/gtkblist.c:3421
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
+#: ../libpurple/protocols/gg/gg.c:1010
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2845
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:5654
+#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/qq/qq.c:293
+#: ../libpurple/protocols/yahoo/yahoo.c:3110 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3338 ../pidgin/gtkblist.c:3676
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Fora de lÃnia"
 
-#: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../libpurple/protocols/gg/gg.c:1013
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3079 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
+#: ../libpurple/protocols/msnp9/state.c:29
+#: ../libpurple/protocols/msnp9/state.c:30
+#: ../libpurple/protocols/msnp9/state.c:37
+#: ../libpurple/protocols/msnp9/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/qq/qq.c:281
+#: ../libpurple/protocols/yahoo/yahoo.c:3112 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Disponible"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:537
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4506
-#: ../libpurple/protocols/oscar/oscar.c:5582
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3631
-#: ../libpurple/protocols/yahoo/yahoo.c:3705 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1934
-#: ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2836
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
+#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc10/buddy.c:1479
+#: ../libpurple/protocols/yahoo/yahoo.c:3664
+#: ../libpurple/protocols/yahoo/yahoo.c:3738 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2040
+#: ../pidgin/gtkstatusbox.c:1058
+#, c-format
 msgid "Away"
 msgstr "Absent"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2669
-#: ../libpurple/protocols/oscar/oscar.c:3669
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
+#: ../libpurple/protocols/oscar/oscar.c:2709
+#: ../libpurple/protocols/oscar/oscar.c:3709
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
-#: ../libpurple/protocols/jabber/buddy.c:1623
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3680
+#: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2399
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nom"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
+#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "Any de naixement"
 
-#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3881
+#: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
+#: ../libpurple/protocols/oscar/oscar.c:3921
 msgid "Unable to display the search results."
 msgstr "No s'han pogut mostrar els resultats de la cerca."
 
-#: ../libpurple/protocols/gg/gg.c:1166
+#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directori pÃºblic del Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "Resultats de la cerca"
 
-#: ../libpurple/protocols/gg/gg.c:1210
+#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "No s'ha trobat cap usuari que coincideixi"
 
-#: ../libpurple/protocols/gg/gg.c:1211
+#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr "No hi ha usuaris que coincideixin amb el vostre criteri de cerca."
 
-#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
+#: ../libpurple/protocols/gg/gg.c:1314 ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "No s'ha pogut llegir el sÃ²col"
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "S'ha baixat la llista d'amics"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr "S'ha descarregat la vostra llista d'amics del servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1398
+#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr "S'ha pujat la llista d'amics"
 
-#: ../libpurple/protocols/gg/gg.c:1399
+#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr "S'ha desat la vostra llista d'amics al servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
+#: ../libpurple/protocols/gg/gg.c:1517 ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "Ha fallat la connexiÃ³."
 
-#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/msn/msn.c:664
+#: ../libpurple/protocols/msnp9/msn.c:563
 msgid "Blocked"
 msgstr "Blocat"
 
-#: ../libpurple/protocols/gg/gg.c:1639
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "Afegeix al xat"
 
-#: ../libpurple/protocols/gg/gg.c:1648
+#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "Desbloca"
 
-#: ../libpurple/protocols/gg/gg.c:1652
+#: ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "Bloca"
 
-#: ../libpurple/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "_Nom del xat:"
 
-#: ../libpurple/protocols/gg/gg.c:1909
+#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "Error en el xat"
 
-#: ../libpurple/protocols/gg/gg.c:1910
+#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "Aquest nom de xat ja existeix"
 
-#: ../libpurple/protocols/gg/gg.c:1993
+#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "No esteu connectat al servidor."
 
-#: ../libpurple/protocols/gg/gg.c:2016
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "Cerca amics..."
 
-#: ../libpurple/protocols/gg/gg.c:2022
+#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "Canvia la contrasenya..."
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "Puja la llista d'amics al servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "Baixa la llista d'amics del servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "Suprimeix la llista d'amics del servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2040
+#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "Desa la llista d'amics a un fitxer..."
 
-#: ../libpurple/protocols/gg/gg.c:2044
+#: ../libpurple/protocols/gg/gg.c:2070
 msgid "Load buddylist from file..."
 msgstr "Carrega la llista d'amics d'un fitxer..."
 
@@ -3704,38 +4140,38 @@ msgstr "Carrega la llista d'amics d'un f
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2148
+#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Connector per al protocol Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2149
+#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "Popular MI polonesa"
 
-#: ../libpurple/protocols/gg/gg.c:2203
+#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Usuari Gadu-Gadu"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
-#: ../libpurple/protocols/silc10/silc.c:1566
+#: ../libpurple/protocols/silc/silc.c:1780
+#: ../libpurple/protocols/silc10/silc.c:1569
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ordre desconeguda: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
-#: ../libpurple/protocols/silc10/silc.c:1274
+#: ../libpurple/protocols/silc/silc.c:1488
+#: ../libpurple/protocols/silc10/silc.c:1277
 #, c-format
 msgid "current topic is: %s"
 msgstr "el tema actual Ã©s: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../libpurple/protocols/silc10/silc.c:1278
+#: ../libpurple/protocols/silc/silc.c:1492
+#: ../libpurple/protocols/silc10/silc.c:1281
 msgid "No topic is set"
 msgstr "No hi ha cap tema establert"
 
@@ -3743,7 +4179,7 @@ msgstr "No hi ha cap tema establert"
 #: ../libpurple/protocols/irc/dcc_send.c:337
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
 msgid "File Transfer Failed"
 msgstr "Ha fallat la transferÃ¨ncia del fitxer"
 
@@ -3769,96 +4205,84 @@ msgstr "Frase del dia per a %s"
 msgid "MOTD for %s"
 msgstr "Frase del dia per a %s"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
-#: ../libpurple/protocols/myspace/myspace.c:3484
+#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
+#: ../libpurple/protocols/irc/irc.c:625 ../libpurple/protocols/irc/irc.c:654
+#: ../libpurple/protocols/myspace/myspace.c:2378
 msgid "Server has disconnected"
 msgstr "El servidor ha desconnectat"
 
-#: ../libpurple/protocols/irc/irc.c:249
+#: ../libpurple/protocols/irc/irc.c:253
 msgid "View MOTD"
 msgstr "Mostra la frase del dia"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:265 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Canal:"
 
-#: ../libpurple/protocols/irc/irc.c:267
+#: ../libpurple/protocols/irc/irc.c:271
 #: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
-#: ../libpurple/protocols/irc/irc.c:298
+#: ../libpurple/protocols/irc/irc.c:304
 msgid "IRC nicks may not contain whitespace"
 msgstr "Els sobrenoms d'IRC no poden contenir espais en blanc"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:637
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1285
+#: ../libpurple/protocols/irc/irc.c:325
+#: ../libpurple/protocols/jabber/jabber.c:1311
+#: ../libpurple/protocols/msn/session.c:402
+#: ../libpurple/protocols/msnp9/session.c:355
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2198
+#: ../libpurple/protocols/oscar/oscar.c:1290
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1676
-#: ../libpurple/protocols/yahoo/yahoo.c:2922
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
+#: ../libpurple/protocols/sametime/sametime.c:3768
+#: ../libpurple/protocols/simple/simple.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2948
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "S'estÃ  connectant"
 
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/irc/irc.c:335
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:1126
 msgid "SSL support unavailable"
 msgstr "El suport per a SSL no estÃ  disponible"
 
-#. TODO: try other ports if in auto mode, then save
-#. * working port and try that first next time.
-#: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:653
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1591
+#: ../libpurple/protocols/irc/irc.c:348
+#: ../libpurple/protocols/myspace/myspace.c:320
+#: ../libpurple/protocols/simple/simple.c:469
+#: ../libpurple/protocols/simple/simple.c:1803
 msgid "Couldn't create socket"
 msgstr "No s'ha pogut crear el sÃ²col"
 
-#: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/myspace/myspace.c:3597
-#: ../libpurple/protocols/oscar/oscar.c:1281
+#: ../libpurple/protocols/irc/irc.c:430
+#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
 msgstr "No s'ha pogut connectar a l'ordinador"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "Ha fallat la connexiÃ³"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "Ha fallat la negociaciÃ³ de la connexiÃ³ SSL"
-
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
-#: ../libpurple/protocols/myspace/myspace.c:3480
+#: ../libpurple/protocols/irc/irc.c:620 ../libpurple/protocols/irc/irc.c:649
+#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: ../libpurple/protocols/irc/irc.c:775
-#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/irc/irc.c:790
+#: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1402
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Usuaris"
 
-#: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1415
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/irc/irc.c:793
+#: ../libpurple/protocols/sametime/sametime.c:3416
+#: ../libpurple/protocols/silc/chat.c:1401
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1411
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Tema"
 
@@ -3870,54 +4294,57 @@ msgstr "Tema"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:931
 msgid "IRC Protocol Plugin"
 msgstr "Connector per al protocol d'IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:932
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "El connector per al protocol d'IRC que Ã©s menys dolent"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6621
-#: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/irc/irc.c:957 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2335
+#: ../libpurple/protocols/msnp9/msn.c:2186
+#: ../libpurple/protocols/oscar/oscar.c:6721
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5773
 #: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:2083
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6624
-#: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
-#: ../libpurple/protocols/silc10/silc.c:1861
+#: ../libpurple/protocols/irc/irc.c:960 ../libpurple/protocols/msn/msn.c:2340
+#: ../libpurple/protocols/msnp9/msn.c:2191
+#: ../libpurple/protocols/oscar/oscar.c:6724
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5778
+#: ../libpurple/protocols/silc/silc.c:2061
+#: ../libpurple/protocols/silc10/silc.c:1864
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:963
 msgid "Encodings"
 msgstr "Codificacions"
 
-#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
-#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/irc/irc.c:966 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:931
+#: ../libpurple/protocols/jabber/jabber.c:934
+#: ../libpurple/protocols/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1336
+#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc10/buddy.c:1542
 #: ../libpurple/protocols/silc10/ops.c:1191
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
@@ -3926,8 +4353,8 @@ msgstr "Nom d'usuari"
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/irc/irc.c:969 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1152
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Nom real"
@@ -3936,7 +4363,7 @@ msgstr "Nom real"
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:977
 msgid "Use SSL"
 msgstr "Utilitza SSL"
 
@@ -3967,8 +4394,8 @@ msgstr "<i>(identificat)</i>"
 msgstr "<i>(identificat)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3670
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Sobrenom"
@@ -4066,28 +4493,28 @@ msgstr "NomÃ©s amb invitaciÃ³"
 msgid "Invitation only"
 msgstr "NomÃ©s amb invitaciÃ³"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:798
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s us ha fet fora: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:803 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s us ha fet fora (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:826
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) per %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:911 ../libpurple/protocols/irc/msgs.c:912
 msgid "Invalid nickname"
 msgstr "El sobrenom no Ã©s vÃ lid"
 
-#: ../libpurple/protocols/irc/msgs.c:910
+#: ../libpurple/protocols/irc/msgs.c:913
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4095,7 +4522,7 @@ msgstr ""
 "El servidor ha rebutjat el sobrenom que heu triat. Possiblement contÃ© "
 "carÃ cters invÃ lids."
 
-#: ../libpurple/protocols/irc/msgs.c:915
+#: ../libpurple/protocols/irc/msgs.c:918
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4103,44 +4530,44 @@ msgstr ""
 "El servidor ha rebutjat el nom del compte que heu triat. Possiblement contÃ© "
 "carÃ cters invÃ lids."
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Cannot change nick"
 msgstr "No es pot canviar el sobrenom"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Could not change nick"
 msgstr "No s'ha pogut canviar el sobrenom"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:978
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Heu sortit del canal%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1020
 msgid "Error: invalid PONG from server"
 msgstr "Error: PONG invÃ lid del servidor"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1022
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Resposta al PING -- Retard: %lu segons"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1113
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "No s'ha pogut entrar a %s: cal registrar-se."
 
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1114
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "No es pot entrar al canal"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
+#: ../libpurple/protocols/irc/msgs.c:1148
 msgid "Nick or channel is temporarily unavailable."
 msgstr "El sobrenom o el canal no estan disponibles, temporalment."
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1160
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
@@ -4248,7 +4675,7 @@ msgstr "names [canal]:  llista els usuar
 msgstr "names [canal]:  llista els usuaris connectats al canal."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1830
+#: ../libpurple/protocols/jabber/jabber.c:2321
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;sobrenom nou&gt;:  canvia el vostre sobrenom."
 
@@ -4358,38 +4785,54 @@ msgstr ""
 "whowas &lt;sobrenom&gt;:  obtÃ© informaciÃ³ sobre un usuari que ja s'ha "
 "desconnectat."
 
-#: ../libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Temps de resposta de %s: %lu segons"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr "Resposta de CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:633
+#: ../libpurple/protocols/irc/parse.c:640 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Desconnectat."
 
-#: ../libpurple/protocols/jabber/auth.c:52
+#: ../libpurple/protocols/jabber/adhoccommands.c:143
+#: ../libpurple/protocols/jabber/jabber.c:698
+#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:1901
+msgid "Unknown Error"
+msgstr "Error desconegut"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:145
+#: ../libpurple/protocols/jabber/adhoccommands.c:146
+msgid "Ad-Hoc Command Failed"
+msgstr "Ha fallat l'ordre Â«Ad-HocÂ»"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:182
+msgid "execute"
+msgstr "executa"
+
+#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "El servidor requereix TLS/SSL per entrar. No s'ha trobat suport per a TLS/"
 "SSL."
 
-#: ../libpurple/protocols/jabber/auth.c:115
+#: ../libpurple/protocols/jabber/auth.c:120
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "El servidor requereix autenticaciÃ³ de text sobre un flux no xifrat"
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:323
+#: ../libpurple/protocols/jabber/auth.c:518
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4398,33 +4841,32 @@ msgstr ""
 "%s requereix autenticaciÃ³ de text sobre un flux no xifrat. Voleu permetre-ho "
 "i continuar amb l'autenticaciÃ³?"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:325
+#: ../libpurple/protocols/jabber/auth.c:326
+#: ../libpurple/protocols/jabber/auth.c:520
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:614
+#: ../libpurple/protocols/jabber/auth.c:615
 msgid "Plaintext Authentication"
 msgstr "AutenticaciÃ³ de text"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:340
+#: ../libpurple/protocols/jabber/auth.c:534
+#: ../libpurple/protocols/jabber/auth.c:627
 msgid "Server does not use any supported authentication method"
 msgstr "No hi ha cap mÃ¨tode d'autenticaciÃ³ compatible amb aquest servidor"
 
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
-#: ../libpurple/protocols/jabber/jabber.c:115
+#: ../libpurple/protocols/jabber/auth.c:472
+#: ../libpurple/protocols/jabber/auth.c:576
+#: ../libpurple/protocols/jabber/auth.c:795
+#: ../libpurple/protocols/jabber/auth.c:944
+#: ../libpurple/protocols/jabber/auth.c:971
+#: ../libpurple/protocols/jabber/auth.c:993
+#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "La resposta del servidor no Ã©s vÃ lida."
 
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:616
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4432,113 +4874,115 @@ msgstr ""
 "Aquest servidor requereix autenticaciÃ³ de text sobre un flux no xifrat. "
 "Voleu permetre aixÃ² i continuar amb l'autenticaciÃ³?"
 
-#: ../libpurple/protocols/jabber/auth.c:769
-#: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:818
+#: ../libpurple/protocols/jabber/auth.c:843
 msgid "Invalid challenge from server"
 msgstr "Repte del servidor invÃ lid"
 
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:917
 msgid "SASL error"
 msgstr "Error en el SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:1219
+#: ../libpurple/protocols/sametime/sametime.c:4174
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nom"
 
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:1231
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Cognoms"
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:842
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "Nom comÃº"
 
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/jabber.c:1004
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "AdreÃ§a"
 
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:890
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "AdreÃ§a (cont.)"
 
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:898
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "UbicaciÃ³"
 
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "ProvÃncia"
 
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:906
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "Codi postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/buddy.c:293
+#: ../libpurple/protocols/jabber/buddy.c:1295
+#: ../libpurple/protocols/silc/silc.c:1158
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "PaÃs"
 
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "TelÃ¨fon"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:963
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "Nom de l'organitzaciÃ³"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:967
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "SecciÃ³ de l'organitzaciÃ³"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:976
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "Rol"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/jabber/buddy.c:300
+#: ../libpurple/protocols/jabber/buddy.c:1250
+#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Birthday"
 msgstr "Data de naixement"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3095
-#: ../pidgin/gtkprefs.c:738
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3350
+#: ../pidgin/gtkprefs.c:740
 msgid "Description"
 msgstr "DescripciÃ³"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "Edita la vCard de l'XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4546,116 +4990,398 @@ msgstr ""
 "Les dades segÃ¼ents sÃ³n opcionals. IntroduÃ¯u nomÃ©s la informaciÃ³ que us "
 "sembli."
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:659
-#: ../libpurple/protocols/jabber/buddy.c:700
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "Sistema operatiu"
 
-#: ../libpurple/protocols/jabber/buddy.c:669
-#: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../libpurple/protocols/jabber/si.c:853
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr "Darrera activitat"
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+msgid "Service Discovery Info"
+msgstr "InformaciÃ³ del servei de descoberta"
+
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
+msgid "Service Discovery Items"
+msgstr "Elements del servei de descoberta"
+
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
+#, fuzzy
+msgid "Extended Stanza Addressing"
+msgstr "AdreÃ§a (cont.)"
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+msgid "Multi-User Chat"
+msgstr "Xat multi-usuari"
+
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
+#, fuzzy
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "L'usuari no tÃ© informaciÃ³ al directori."
+
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
+msgid "In-Band Bytestreams"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
+msgid "Ad-Hoc Commands"
+msgstr "Ordres Ad-Hoc"
+
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
+msgid "PubSub Service"
+msgstr "Servei PubSub"
+
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
+msgid "SOCKS5 Bytestreams"
+msgstr "Flux de bits SOCK5"
+
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
+msgid "Out of Band Data"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+#, fuzzy
+msgid "In-Band Registration"
+msgstr "Error en el registre"
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+msgid "User Location"
+msgstr "UbicaciÃ³ de l'usuari"
+
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
+msgid "User Avatar"
+msgstr "Avatar de l'usuari"
+
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
+msgid "Chat State Notifications"
+msgstr "Notificacions de l'estat del xat"
+
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+msgid "Software Version"
+msgstr "VersiÃ³ del programari"
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+msgid "Stream Initiation"
+msgstr "IniciaciÃ³ del flux"
+
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/sametime/sametime.c:3277
+msgid "File Transfer"
+msgstr "TransferÃ¨ncia de fitxers"
+
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+msgid "User Mood"
+msgstr "Estat d'Ã nim de l'usuari"
+
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
+msgid "User Activity"
+msgstr "Activitat de l'usuari"
+
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
+msgid "Entity Capabilities"
+msgstr "Capacitats de l'entitat"
+
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
+msgid "Encrypted Session Negotiations"
+msgstr "Negociacions de la sessiÃ³ xifrada"
+
+# Pot ser tambÃ© mÃºsica, canÃ§Ã³... (josep)
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
+#, fuzzy
+msgid "User Tune"
+msgstr "Melodia de l'usuari"
+
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
+#, fuzzy
+msgid "Roster Item Exchange"
+msgstr "MI amb intercanvi de clau"
+
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
+#, fuzzy
+msgid "Reachability Address"
+msgstr "AdreÃ§a de correu"
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+msgid "User Profile"
+msgstr "Perfil de l'usuari"
+
+# Nota: Jingle Ã©s una extensiÃ³ d'XMPP i ho considerem nom propi (josep)
+# http://www.xmpp.org/extensions/xep-0166.html
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+msgid "Jingle"
+msgstr "Jingle"
+
+# FIXME
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "Jingle Audio"
+msgstr "Ã€udio amb Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+msgid "User Nickname"
+msgstr "Sobrenom de l'usuari"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Jingle ICE UDP"
+msgstr "Jingle ICE UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Jingle ICE TCP"
+msgstr "Jingle ICE TCP"
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+msgid "Jingle Raw UDP"
+msgstr "Jingle Raw UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
+msgid "Jingle Video"
+msgstr "VÃdeo amb Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "Jingle DTMF"
+msgstr "Jingle DTMF"
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+msgid "Message Receipts"
+msgstr "RecepciÃ³ de missatges"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+msgid "Public Key Publishing"
+msgstr "PublicaciÃ³ de claus pÃºbliques"
+
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+msgid "User Chatting"
+msgstr "Converses d'usuari"
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+msgid "User Browsing"
+msgstr "NavegaciÃ³ d'usuaris"
+
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+msgid "User Gaming"
+msgstr "Jocs d'usuari"
+
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+msgid "User Viewing"
+msgstr "VisualitzaciÃ³ d'usuaris"
+
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/silc/ops.c:1600
+#: ../libpurple/protocols/silc/ops.c:1605
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+msgid "Stanza Encryption"
+msgstr "Xifratge de parÃ grafs"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Entity Time"
+msgstr "Hora de l'entitat"
+
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "Delayed Delivery"
+msgstr "Lliurament endarrerit"
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Collaborative Data Objects"
+msgstr "Objectes de dades colÂ·laboratius"
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "File Repository and Sharing"
+msgstr "DipÃ²sit de fitxers i comparticiÃ³"
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "STUN Service Discovery for Jingle"
+msgstr "Servei de descoberta STUN per al Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Simplified Encrypted Session Negotiation"
+msgstr "NegociaciÃ³ simple del xifratge de la sessiÃ³"
+
+# Mireu l'RFC (josep)
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Hop Check"
+msgstr "ComprovaciÃ³ dels salts"
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/oscar/oscar.c:2916
+msgid "Capabilities"
+msgstr "Capacitats"
+
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:209
+#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Recurs"
 
-#: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1625
 msgid "Priority"
 msgstr "Prioritat"
 
-#: ../libpurple/protocols/jabber/buddy.c:846
+# FIXME
+#: ../libpurple/protocols/jabber/buddy.c:1237
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Primer cognom"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3758
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:979
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "AdreÃ§a"
 
-#: ../libpurple/protocols/jabber/buddy.c:886
+#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "Apartat de correus"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "Logotip"
 
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "No m'amaguis de"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "Amaga-me'n temporalment"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "CancelÂ·la la notificaciÃ³ de presÃ¨ncia"
 
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "Torna a demanar l'autoritzaciÃ³"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1437
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "CancelÂ·la la subscripciÃ³"
 
-#: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/buddy.c:1988
+msgid "Log In"
+msgstr "Connecta"
+
+#: ../libpurple/protocols/jabber/buddy.c:1992
+msgid "Log Out"
+msgstr "Desconnecta"
+
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Chatty"
 msgstr "Xerraire"
 
-#: ../libpurple/protocols/jabber/buddy.c:1474
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "Absent des de fa una bona estona"
 
-#: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5758
-#: ../libpurple/protocols/sametime/sametime.c:3297
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/jabber/jabber.c:1624
+#: ../libpurple/protocols/oscar/oscar.c:727
+#: ../libpurple/protocols/oscar/oscar.c:5858
+#: ../libpurple/protocols/sametime/sametime.c:3339
+#, c-format
 msgid "Do Not Disturb"
 msgstr "No molesteu"
 
-#: ../libpurple/protocols/jabber/buddy.c:1621
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1625
-#: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3681
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:3721
 msgid "Last Name"
 msgstr "Cognoms"
 
-#: ../libpurple/protocols/jabber/buddy.c:1657
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "El que segueix sÃ³n els resultats de la vostra cerca"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1732
+#: ../libpurple/protocols/jabber/buddy.c:2332
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4663,70 +5389,70 @@ msgstr ""
 "Trobeu un contacte introduint els criteris de la cerca en els camps "
 "indicats. Nota: cada camp permet carÃ cters que actuen de comodÃ (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1752
+#: ../libpurple/protocols/jabber/buddy.c:2352
 msgid "Directory Query Failed"
 msgstr "Ha fallat la consulta al directori"
 
-#: ../libpurple/protocols/jabber/buddy.c:1753
+#: ../libpurple/protocols/jabber/buddy.c:2353
 msgid "Could not query the directory server."
 msgstr "No s'ha pogut consultar el servidor de directori."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:2387
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instruccions del servidor: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:2394
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "IntroduÃ¯u un o mÃ©s camps per cercar usuaris de XMPP que hi coincideixin."
 
-#: ../libpurple/protocols/jabber/buddy.c:1814
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3684
-#: ../libpurple/protocols/oscar/oscar.c:3693
+#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/novell/novell.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3733
 msgid "E-Mail Address"
 msgstr "AdreÃ§a de correu electrÃ²nic"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:2423
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search for XMPP users"
 msgstr "Cerca usuarus XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1825
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5611
+#: ../libpurple/protocols/sametime/sametime.c:5657
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Cerca"
 
-#: ../libpurple/protocols/jabber/buddy.c:1840
+#: ../libpurple/protocols/jabber/buddy.c:2440
 msgid "Invalid Directory"
 msgstr "Directori invÃ lid"
 
-#: ../libpurple/protocols/jabber/buddy.c:1857
+#: ../libpurple/protocols/jabber/buddy.c:2457
 msgid "Enter a User Directory"
 msgstr "IntroduÃ¯u un directori d'usuari"
 
-#: ../libpurple/protocols/jabber/buddy.c:1858
+#: ../libpurple/protocols/jabber/buddy.c:2458
 msgid "Select a user directory to search"
 msgstr "Seleccioneu quin directori d'usuari cercar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1861
+#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Search Directory"
 msgstr "Directori de cerca"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5244
-#: ../libpurple/protocols/yahoo/yahoochat.c:963
+#: ../libpurple/protocols/oscar/oscar.c:5342
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "Sa_la:"
 
@@ -4795,7 +5521,7 @@ msgstr "El canvi de sobrenom no estÃ  pe
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "S'ha produÃ¯t un error en obtenir la llista de sales"
@@ -4816,25 +5542,25 @@ msgstr "Cerca sales"
 msgid "Find Rooms"
 msgstr "Cerca sales"
 
-#: ../libpurple/protocols/jabber/jabber.c:84
-msgid "Error initializing session"
-msgstr "S'ha produÃ¯t un error en inicialitzar la sessiÃ³"
+#: ../libpurple/protocols/jabber/jabber.c:151
+msgid "You require encryption, but it is not available on this server."
+msgstr "Requeriu xifatge, perÃ² no estÃ  disponible en aquest servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:269
+#: ../libpurple/protocols/jabber/jabber.c:324
+#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "Error d'escriptura"
 
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:424
+#: ../libpurple/protocols/jabber/jabber.c:463
 msgid "Read Error"
 msgstr "Error de lectura"
 
-#: ../libpurple/protocols/jabber/jabber.c:467
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2541
-#: ../libpurple/protocols/yahoo/yahoo.c:2573
+#: ../libpurple/protocols/jabber/jabber.c:500
+#: ../libpurple/protocols/oscar/flap_connection.c:398
+#: ../libpurple/protocols/yahoo/yahoo.c:2562
+#: ../libpurple/protocols/yahoo/yahoo.c:2594
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4843,435 +5569,603 @@ msgstr ""
 "No s'ha pogut establir una connexiÃ³ amb al servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:550
 msgid "Unable to create socket"
 msgstr "No s'ha pogut crear el sÃ²col"
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:598
+#: ../libpurple/protocols/jabber/jabber.c:1092
 msgid "Invalid XMPP ID"
 msgstr "ID de l'XMPP invÃ lid"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:605
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "L'ID de l'XMPP no Ã©s vÃ lid. Cal especificar un domini."
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:683
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "S'ha registrat %s a %s amb Ã¨xit"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:689
+#, c-format
+msgid "Registration to %s successful"
+msgstr "S'ha registrat a %s amb Ã¨xit"
+
+#: ../libpurple/protocols/jabber/jabber.c:691
+#: ../libpurple/protocols/jabber/jabber.c:692
 msgid "Registration Successful"
 msgstr "S'ha registrat amb Ã¨xit"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Unknown Error"
-msgstr "Error desconegut"
-
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:700
+#: ../libpurple/protocols/jabber/jabber.c:701
 msgid "Registration Failed"
 msgstr "Ha fallat el registre"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:719
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "S'ha suprimit el registre de %s amb Ã¨xit"
+
+#: ../libpurple/protocols/jabber/jabber.c:721
+#: ../libpurple/protocols/jabber/jabber.c:722
+msgid "Unregistration Successful"
+msgstr "S'ha cancelÂ·lat el registre amb Ã¨xit"
+
+#: ../libpurple/protocols/jabber/jabber.c:730
+#: ../libpurple/protocols/jabber/jabber.c:731
+msgid "Unregistration Failed"
+msgstr "No s'ha pogut cancelÂ·lar el registre"
+
+#: ../libpurple/protocols/jabber/jabber.c:891
+#: ../libpurple/protocols/jabber/jabber.c:892
 msgid "Already Registered"
 msgstr "Ja esteu registrat"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3760
-#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/jabber/jabber.c:989
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "State"
 msgstr "Estat"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:994
 msgid "Postal code"
 msgstr "Codi postal"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:999
 #: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/ops.c:1069
 #: ../libpurple/protocols/silc10/silc.c:683
 #: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "TelÃ¨fon"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:1009
 msgid "Date"
 msgstr "Data"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:1014
+msgid "Unregister"
+msgstr "CancelÂ·la el registre"
+
+#: ../libpurple/protocols/jabber/jabber.c:1021
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr "Empleneu els camps segÃ¼ents per canviar el registre del compte."
+
+#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "Please fill out the information below to register your new account."
 msgstr "Empleneu els camps segÃ¼ents per registrar un compte nou."
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:1032
+#: ../libpurple/protocols/jabber/jabber.c:1033
 msgid "Register New XMPP Account"
 msgstr "Registra un compte XMPP nou"
 
-#: ../libpurple/protocols/jabber/jabber.c:881
+#: ../libpurple/protocols/jabber/jabber.c:1034
+#: ../libpurple/protocols/jabber/jabber.c:1043
 msgid "Register"
 msgstr "Registra"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1039
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "Canvia el resgitre del compte a %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1040
+#, c-format
+msgid "Register New Account at %s"
+msgstr "Registra un compte nou a %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1043
+msgid "Change Registration"
+msgstr "Canvia el registre"
+
+#: ../libpurple/protocols/jabber/jabber.c:1151
+#: ../libpurple/protocols/jabber/jabber.c:1152
+msgid "Error unregistering account"
+msgstr "S'ha produÃ¯t un error en cancelÂ·lar el registre"
+
+#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1158
+msgid "Account successfully unregistered"
+msgstr "S'ha cancelÂ·lat el registre del compte correctament"
+
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Initializing Stream"
 msgstr "S'estÃ  inicialitzant el flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/jabber/jabber.c:1320
+msgid "Initializing SSL/TLS"
+msgstr "S'estÃ  inicialitzant SSL/TLS"
+
+#: ../libpurple/protocols/jabber/jabber.c:1324
+#: ../libpurple/protocols/msn/session.c:408
+#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Authenticating"
 msgstr "S'estÃ  autenticant"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1333
 msgid "Re-initializing Stream"
 msgstr "S'estÃ  reinicialitzant el flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/jabber/jabber.c:1427
+#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1960
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:5652
 msgid "Not Authorized"
 msgstr "No autoritzat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Both"
 msgstr "AmbdÃ³s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "From (To pending)"
 msgstr "De (a pendent)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "From"
 msgstr "De"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "To"
 msgstr "A"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "None (To pending)"
 msgstr "Cap (a pendent)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1486
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Cap"
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Subscription"
 msgstr "SubscripciÃ³"
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1560
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "Estat d'Ã nim"
+
+#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/msn/msn.c:647
+msgid "Current media"
+msgstr "Suport actual"
+
+#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1628
+#, fuzzy
+msgid "Mood Text"
+msgstr "Text sobre l'estat d'Ã nim"
+
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1616
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Allow Buzz"
+msgstr "Permet el xiuxiueig"
+
+#: ../libpurple/protocols/jabber/jabber.c:1648
+msgid "Tune Artist"
+msgstr "Artista de la melodia"
+
+#: ../libpurple/protocols/jabber/jabber.c:1649
+msgid "Tune Title"
+msgstr "TÃtol de la melodia"
+
+#: ../libpurple/protocols/jabber/jabber.c:1650
+msgid "Tune Album"
+msgstr "Ã€lbum de la melodia"
+
+#: ../libpurple/protocols/jabber/jabber.c:1651
+msgid "Tune Genre"
+msgstr "GÃ¨nere de la melodia"
+
+#: ../libpurple/protocols/jabber/jabber.c:1652
+msgid "Tune Comment"
+msgstr "Comentari sobre la melodia"
+
+#: ../libpurple/protocols/jabber/jabber.c:1653
+msgid "Tune Track"
+msgstr "NÃºmero de pista de la melodia"
+
+#: ../libpurple/protocols/jabber/jabber.c:1654
+msgid "Tune Time"
+msgstr "Durada de la melodia"
+
+#: ../libpurple/protocols/jabber/jabber.c:1655
+msgid "Tune Year"
+msgstr "Any de la melodia"
+
+#: ../libpurple/protocols/jabber/jabber.c:1656
+msgid "Tune URL"
+msgstr "URL de la melodia"
+
+#: ../libpurple/protocols/jabber/jabber.c:1672
 msgid "Password Changed"
 msgstr "S'ha canviat la contrasenya"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1673
 msgid "Your password has been changed."
 msgstr "La vostra contrasenya s'ha canviat."
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1679
+#: ../libpurple/protocols/jabber/jabber.c:1680
 msgid "Error changing password"
 msgstr "S'ha produÃ¯t un error en canviar la contrasenya"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1737
 msgid "Password (again)"
 msgstr "Contrasenya (repetiu-la)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1743
+#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Change XMPP Password"
 msgstr "Canvia la contrasenya de l'XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Please enter your new password"
 msgstr "IntroduÃ¯u la nova contrasenya"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6338
-#: ../libpurple/protocols/silc/silc.c:1093
-#: ../libpurple/protocols/silc10/silc.c:1004
+#: ../libpurple/protocols/jabber/jabber.c:1758
+#: ../libpurple/protocols/oscar/oscar.c:6438
+#: ../libpurple/protocols/silc/silc.c:1236
+#: ../libpurple/protocols/silc10/silc.c:1007
 msgid "Set User Info..."
 msgstr "Estableix informaciÃ³ d'usuari..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6349
-#: ../libpurple/protocols/silc/silc.c:1089
-#: ../libpurple/protocols/silc10/silc.c:1000
+#: ../libpurple/protocols/jabber/jabber.c:1763
+#: ../libpurple/protocols/oscar/oscar.c:6449
+#: ../libpurple/protocols/silc/silc.c:1232
+#: ../libpurple/protocols/silc10/silc.c:1003
 msgid "Change Password..."
 msgstr "Canvia la contrasenya..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1768
 msgid "Search for Users..."
 msgstr "Cerca usuaris..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Bad Request"
 msgstr "SolÂ·licitud incorrecta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Conflict"
 msgstr "Conflicte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Feature Not Implemented"
 msgstr "La caracterÃstica no estÃ  implementada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Forbidden"
 msgstr "Prohibit"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Gone"
 msgstr "Desaparegut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Internal Server Error"
 msgstr "Error intern del servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Item Not Found"
 msgstr "No s'ha trobat l'element"
 
 # FIX
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Malformed XMPP ID"
 msgstr "l'ID de l'XMPP estÃ  malmÃ¨s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Not Acceptable"
 msgstr "No acceptable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Not Allowed"
 msgstr "No permÃ¨s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Payment Required"
 msgstr "De pagament"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Recipient Unavailable"
 msgstr "El destinatari no estÃ  disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1887
 msgid "Registration Required"
 msgstr "Cal registre"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1889
 msgid "Remote Server Not Found"
 msgstr "No s'ha trobat el servidor remot"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1891
 msgid "Remote Server Timeout"
 msgstr "El servidor remot ha excedit el temps d'espera"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Server Overloaded"
 msgstr "El servidor estÃ  sobrecarregat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1895
 msgid "Service Unavailable"
 msgstr "El servei no estÃ  disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Subscription Required"
 msgstr "Cal subscripciÃ³"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Unexpected Request"
 msgstr "SolÂ·licitud inesperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authorization Aborted"
 msgstr "S'ha avortat l'autoritzaciÃ³"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1909
 msgid "Incorrect encoding in authorization"
 msgstr "La codificaciÃ³ de l'autoritzaciÃ³ no Ã©s correcta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Invalid authzid"
 msgstr "Authzid invÃ lid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Invalid Authorization Mechanism"
 msgstr "El mecanisme d'autoritzaciÃ³ no Ã©s vÃ lid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Authorization mechanism too weak"
 msgstr "El mecanisme d'autoritzaciÃ³ Ã©s massa feble"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Temporary Authentication Failure"
 msgstr "Ha fallat temporalment l'autenticaciÃ³"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1927
 msgid "Authentication Failure"
 msgstr "S'ha produÃ¯t un error en l'autenticaciÃ³"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Bad Format"
 msgstr "Format incorrecte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Bad Namespace Prefix"
 msgstr "Prefix d'espai de noms incorrecte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Resource Conflict"
 msgstr "Conflicte de recurs"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/jabber/jabber.c:1942
+#: ../libpurple/protocols/silc/silc.c:350
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "La connexiÃ³ ha excedit el temps d'espera"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Host Gone"
 msgstr "L'ordinador ha desaparegut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Host Unknown"
 msgstr "Servidor desconegut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Improper Addressing"
 msgstr "AdreÃ§ament incorrecte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid ID"
 msgstr "ID invÃ lid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Namespace"
 msgstr "Espai de noms invÃ lid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "Invalid XML"
 msgstr "XML invÃ lid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Non-matching Hosts"
 msgstr "Ordinadors no coincidents"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Policy Violation"
 msgstr "ViolaciÃ³ de la polÃtica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1964
 msgid "Remote Connection Failed"
 msgstr "Ha fallat la connexiÃ³ remota"
 
 # Mirar com es traduÃ¯a 'Constraint variables'
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1966
 msgid "Resource Constraint"
 msgstr "Restriccions del recurs"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Restricted XML"
 msgstr "XML restringit"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1970
 msgid "See Other Host"
 msgstr "Veu altres ordinadors"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1972
 msgid "System Shutdown"
 msgstr "Apagada del Sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1974
 msgid "Undefined Condition"
 msgstr "CondiciÃ³ no definida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Unsupported Encoding"
 msgstr "La codificaciÃ³ no estÃ  implementada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Unsupported Stanza Type"
 msgstr "El tipus de permanÃ¨ncia no estÃ  implementada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1980
 msgid "Unsupported Version"
 msgstr "Aquesta versiÃ³ no estÃ  implementada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1982
 msgid "XML Not Well Formed"
 msgstr "XML mal format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1984
 msgid "Stream Error"
 msgstr "Error de flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:2069
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "No s'ha pogut bandejar l'usuari %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "AfiliaciÃ³ desconeguda: Â«%sÂ»"
 
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "No s'ha pogut afiliar l'usuari %s com a Â«%sÂ»"
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:2113
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol desconegut: Â«%sÂ»"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:2118
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "No s'ha pogut establir el rol Â«%sÂ» a l'usuari: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/jabber/jabber.c:2171
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "No s'ha pogut fer fora l'usuari %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:2202
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "No s'ha pogut fer ping a l'usuari %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:2220
+#: ../libpurple/protocols/jabber/jabber.c:2231
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr "No s'ha pogut xiuxiuejar perquÃ¨ no es coneix res de l'usuari %s."
+
+#: ../libpurple/protocols/jabber/jabber.c:2226
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr ""
+"No s'ha pogut xiuxiuejar possiblement perquÃ¨ l'usuari %s estigui "
+"desconnectat."
+
+#: ../libpurple/protocols/jabber/jabber.c:2257
+#, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr "No s'ha pogut xiuxiuejar perquÃ¨ l'usuari %s no ho permet."
+
+#: ../libpurple/protocols/jabber/jabber.c:2279
+#: ../libpurple/protocols/yahoo/yahoo.c:4130
+msgid "Buzz"
+msgstr "Buzz"
+
+#: ../libpurple/protocols/jabber/jabber.c:2280
+#: ../libpurple/protocols/jabber/message.c:308
+#: ../libpurple/protocols/yahoo/yahoo.c:4131
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s us ha xiuxiuejat!"
+
+#: ../libpurple/protocols/jabber/jabber.c:2281
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
+#, c-format
+msgid "Buzzing %s..."
+msgstr "S'estÃ  xiuxiuejant a %s..."
+
+#: ../libpurple/protocols/jabber/jabber.c:2313
 msgid "config:  Configure a chat room."
 msgstr "config:  configura la sala de xat."
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:2317
 msgid "configure:  Configure a chat room."
 msgstr "configure:  configura la sala de xat."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:2326
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  surt de la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:2331
 msgid "register:  Register with a chat room."
 msgstr "register:  registra a una sala de xat."
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:2337
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [tema nou]:  mostra o canvia el tema."
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:2343
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr "ban &lt;user&gt; [sala]:  bandeja un usuari de la sala."
+msgstr "ban &lt;user&gt; [sala]:  bandeja de la sala un usuari."
 
-#: ../libpurple/protocols/jabber/jabber.c:1858
+#: ../libpurple/protocols/jabber/jabber.c:2349
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5279,7 +6173,7 @@ msgstr ""
 "afilia &lt;usuari&gt; &lt;owner|admin|member|outcast|none&gt;: Estableix "
 "l'afiliaciÃ³ de l'usuari a la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1864
+#: ../libpurple/protocols/jabber/jabber.c:2355
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5287,25 +6181,34 @@ msgstr ""
 "role &lt;usuari&gt; &lt;moderator|participant|visitor|none&gt;: estableix el "
 "rol d'un usuari en una sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:2361
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuari&gt; [sala]:  Convida un usuari a la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:2367
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;sala&gt; [servidor]:  Entra en un xat d'aquest servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:1882
+#: ../libpurple/protocols/jabber/jabber.c:2373
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuari&gt; [sala]:  Fa fora de la sala un usuari."
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:2378
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;usuari&gt; &lt;missatge&gt;:  Envia un missatge privat a un altre "
 "usuari."
 
+#: ../libpurple/protocols/jabber/jabber.c:2384
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr "ping &lt;jid&gt;:\tFa ping a un usuari/component/servidor."
+
+#: ../libpurple/protocols/jabber/jabber.c:2389
+#: ../libpurple/protocols/yahoo/yahoo.c:4156
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: fa sonar un soroll a un usuari per tal de que us pari atenciÃ³"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5316,88 +6219,92 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:169
-#: ../libpurple/protocols/jabber/libxmpp.c:171
+#: ../libpurple/protocols/jabber/libxmpp.c:170
+#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
 msgstr "Connector per al protocol XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:509
+#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:509
 msgid "Domain"
 msgstr "Domini"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:213
+msgid "Require SSL/TLS"
+msgstr "Requereix SSL/TLS"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "ForÃ§a l'antic port SSL (5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permet autoritzaciÃ³ de text sobre fluxos sense xifrar"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/myspace/myspace.c:4414
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3305
+#: ../libpurple/protocols/simple/simple.c:2089
 msgid "Connect port"
 msgstr "Port de connexiÃ³"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:220
-#: ../libpurple/protocols/myspace/myspace.c:4411
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:838
+#: ../libpurple/protocols/jabber/libxmpp.c:231
+#: ../libpurple/protocols/myspace/myspace.c:3302
+#: ../libpurple/protocols/silc/silc.c:2057
+#: ../libpurple/protocols/silc10/silc.c:1860 ../pidgin/gtkaccount.c:840
 msgid "Connect server"
 msgstr "Servidor on connectar-se"
 
-#: ../libpurple/protocols/jabber/message.c:102
+#: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s ha deixat la conversa."
 
-#: ../libpurple/protocols/jabber/message.c:153
+#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "Missatge de %s"
 
-#: ../libpurple/protocols/jabber/message.c:217
+#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ha canviat el tema a: %s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "El tema Ã©s: %s"
 
-#: ../libpurple/protocols/jabber/message.c:267
+#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "No s'ha pogut fer arribar el missatge a %s: %s"
 
-#: ../libpurple/protocols/jabber/message.c:270
+#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "Missatge d'error de l'XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:359
+#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
 msgid " (Code %s)"
 msgstr " (Codi %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "Error en l'anÃ lisi de l'XML"
 
-#: ../libpurple/protocols/jabber/presence.c:292
+#: ../libpurple/protocols/jabber/presence.c:435
 msgid "Unknown Error in presence"
 msgstr "Error desconegut en la presÃ¨ncia"
 
-#: ../libpurple/protocols/jabber/presence.c:366
-#: ../libpurple/protocols/jabber/presence.c:367
+#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "Create New Room"
 msgstr "Crea una nova sala"
 
-#: ../libpurple/protocols/jabber/presence.c:368
+#: ../libpurple/protocols/jabber/presence.c:518
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5405,70 +6312,122 @@ msgstr ""
 "Ara es crearÃ  una nova sala. Voleu configurar-la o acceptar els valors "
 "predeterminats?"
 
-#: ../libpurple/protocols/jabber/presence.c:374
+#: ../libpurple/protocols/jabber/presence.c:524
 msgid "_Configure Room"
 msgstr "_Configura la sala"
 
-#: ../libpurple/protocols/jabber/presence.c:375
+#: ../libpurple/protocols/jabber/presence.c:525
 msgid "_Accept Defaults"
 msgstr "_Accepta els valors predeterminats"
 
-#: ../libpurple/protocols/jabber/presence.c:417
+#: ../libpurple/protocols/jabber/presence.c:567
 #, c-format
 msgid "Error in chat %s"
 msgstr "S'ha produÃ¯t un error en el xat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:421
+#: ../libpurple/protocols/jabber/presence.c:571
 #, c-format
 msgid "Error joining chat %s"
 msgstr "S'ha produÃ¯t un error en entrar al xat %s"
 
-#: ../libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "No s'ha pogut enviar el fitxer a %s, atÃ¨s que l'usuari no permet la "
 "transferÃ¨ncia de fitxers"
 
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Ha fallat la transferÃ¨ncia del fitxer"
 
-#: ../libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "No s'ha pogut enviar el fitxer a %s, el JID no Ã©s vÃ lid"
 
-#: ../libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "No s'ha pogut enviar el fitxer a %s, l'usuari no estÃ  connectat"
 
 # FIXME: uh?
-#: ../libpurple/protocols/jabber/si.c:836
+#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "No s'ha pogut enviar el fitxer a %s, no esteu subscrit a la presÃ¨ncia de "
 "l'usuari"
 
-#: ../libpurple/protocols/jabber/si.c:851
+#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
 msgstr "Escolliu a quin recurs de %s voleu enviar aquest fitxer"
 
-#: ../libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr "Seleccioneu un recurs"
 
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
+msgid "Edit User Mood"
+msgstr "Edita l'estat d'Ã nim"
+
+#: ../libpurple/protocols/jabber/usermood.c:199
+msgid "Please select your mood from the list."
+msgstr "Seleccioneu l'estat d'Ã nim de la llista."
+
+#: ../libpurple/protocols/jabber/usermood.c:201
+#: ../libpurple/protocols/jabber/usernick.c:78
+msgid "Set"
+msgstr "Estableix"
+
+#: ../libpurple/protocols/jabber/usermood.c:209
+msgid "Set Mood..."
+msgstr "Estableix l'estat d'Ã nim..."
+
+#: ../libpurple/protocols/jabber/usernick.c:76
+msgid "Set User Nickname"
+msgstr "Estableix el sobrenom de l'usuari"
+
+#: ../libpurple/protocols/jabber/usernick.c:76
+msgid "Please specify a new nickname for you."
+msgstr "IntroduÃ¯u el nou sobrenom."
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+"Aquesta informaciÃ³ la poden veure tots els contactes de la vostra llista "
+"d'amics, escolliu quelcom apropiat."
+
+#: ../libpurple/protocols/jabber/usernick.c:100
+msgid "Set Nickname..."
+msgstr "Estableix el sobrenom..."
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+msgid "Actions"
+msgstr "Accions"
+
+#: ../libpurple/protocols/jabber/xdata.c:380
+msgid "Select an action"
+msgstr "Seleccioneu una acciÃ³"
+
+#: ../libpurple/protocols/msn/contact.c:712
+msgid "Unable to retrieve MSN Address Book"
+msgstr "No s'ha pogut obtenir la llibreta d'adreces MSN"
+
+#: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problema de sincronitzaciÃ³ de la llista d'amics a %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msnp9/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -5477,7 +6436,8 @@ msgstr ""
 "%s de la llista local estÃ  dins el grup Â«%sÂ», perÃ² no a la llista del "
 "servidor. Voleu afegir aquest amic?"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msnp9/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -5486,268 +6446,388 @@ msgstr ""
 "%s Ã©s a la llista local perÃ² no a la del servidor. Voleu afegir aquest amic?"
 
 #: ../libpurple/protocols/msn/error.c:36
+#: ../libpurple/protocols/msnp9/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "No s'ha pogut analitzar el missatge"
 
 #: ../libpurple/protocols/msn/error.c:41
+#: ../libpurple/protocols/msnp9/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Error de sintaxi (probablement errada del client)"
 
 #: ../libpurple/protocols/msn/error.c:46
+#: ../libpurple/protocols/msnp9/error.c:46
+#, c-format
 msgid "Invalid e-mail address"
 msgstr "L'adreÃ§a de correu no Ã©s vÃ lida"
 
 #: ../libpurple/protocols/msn/error.c:49
+#: ../libpurple/protocols/msnp9/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "L'usuari no existeix."
 
 #: ../libpurple/protocols/msn/error.c:53
+#: ../libpurple/protocols/msnp9/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Manca un nom de domini totalment qualificat"
 
 #: ../libpurple/protocols/msn/error.c:56
+#: ../libpurple/protocols/msnp9/error.c:56
+#, c-format
 msgid "Already logged in"
 msgstr "Ja esteu connectat"
 
 #: ../libpurple/protocols/msn/error.c:59
+#: ../libpurple/protocols/msnp9/error.c:59
+#, c-format
 msgid "Invalid screen name"
 msgstr "El nom d'usuari no Ã©s vÃ lid"
 
 #: ../libpurple/protocols/msn/error.c:62
+#: ../libpurple/protocols/msnp9/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr "El nom amistÃ³s no Ã©s vÃ lid"
 
 #: ../libpurple/protocols/msn/error.c:65
+#: ../libpurple/protocols/msnp9/error.c:65
+#, c-format
 msgid "List full"
 msgstr "Llista plena"
 
 #: ../libpurple/protocols/msn/error.c:68
+#: ../libpurple/protocols/msnp9/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "Ja hi Ã©s"
 
 #: ../libpurple/protocols/msn/error.c:72
+#: ../libpurple/protocols/msnp9/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "No Ã©s a la llista"
 
 #: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/msnp9/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
+#, c-format
 msgid "User is offline"
 msgstr "L'usuari estÃ  fora de lÃnia"
 
 #: ../libpurple/protocols/msn/error.c:78
+#: ../libpurple/protocols/msnp9/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "Ja esteu en aquest mode"
 
 #: ../libpurple/protocols/msn/error.c:82
+#: ../libpurple/protocols/msnp9/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "Ja Ã©s a la llista contrÃ ria"
 
 #: ../libpurple/protocols/msn/error.c:86
+#: ../libpurple/protocols/msnp9/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "Massa grups"
 
 #: ../libpurple/protocols/msn/error.c:89
+#: ../libpurple/protocols/msnp9/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "El nom del grup no Ã©s vÃ lid"
 
 #: ../libpurple/protocols/msn/error.c:92
+#: ../libpurple/protocols/msnp9/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "L'usuari no Ã©s al grup"
 
 #: ../libpurple/protocols/msn/error.c:95
+#: ../libpurple/protocols/msnp9/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "El nom del grup Ã©s massa llarg"
 
 #: ../libpurple/protocols/msn/error.c:98
+#: ../libpurple/protocols/msnp9/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "No es pot suprimir el grup zero"
 
 #: ../libpurple/protocols/msn/error.c:103
+#: ../libpurple/protocols/msnp9/error.c:103
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "S'ha intentat afegir un usuari a un grup que no existeix"
 
 #: ../libpurple/protocols/msn/error.c:107
+#: ../libpurple/protocols/msnp9/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "Ha fallat el Switchboard"
 
 #: ../libpurple/protocols/msn/error.c:111
+#: ../libpurple/protocols/msnp9/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr "Ha fallat la transferÃ¨ncia de la notificaciÃ³"
 
 #: ../libpurple/protocols/msn/error.c:116
+#: ../libpurple/protocols/msnp9/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "Falten camps obligatoris"
 
 #: ../libpurple/protocols/msn/error.c:120
+#: ../libpurple/protocols/msnp9/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Massa coincidÃ¨ncies per un FND"
 
 #: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/msnp9/error.c:124
+#: ../libpurple/protocols/oscar/oscar.c:120
+#, c-format
 msgid "Not logged in"
 msgstr "No estÃ  connectat"
 
 #: ../libpurple/protocols/msn/error.c:128
+#: ../libpurple/protocols/msnp9/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "El servei estÃ  temporalment fora de servei"
 
 #: ../libpurple/protocols/msn/error.c:131
+#: ../libpurple/protocols/msnp9/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "Error del servidor de bases de dades"
 
 #: ../libpurple/protocols/msn/error.c:135
+#: ../libpurple/protocols/msnp9/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "S'ha inhabilitat l'ordre"
 
 #: ../libpurple/protocols/msn/error.c:139
+#: ../libpurple/protocols/msnp9/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "S'ha produÃ¯t un error en una operaciÃ³ de fitxer"
 
 #: ../libpurple/protocols/msn/error.c:143
+#: ../libpurple/protocols/msnp9/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "S'ha produÃ¯t un error en reservar memÃ²ria"
 
 #: ../libpurple/protocols/msn/error.c:147
+#: ../libpurple/protocols/msnp9/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "S'ha enviat un valor de CHL incorrecte al servidor"
 
 #: ../libpurple/protocols/msn/error.c:152
+#: ../libpurple/protocols/msnp9/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "El servidor estÃ  ocupat"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
+#: ../libpurple/protocols/msnp9/error.c:155
+#: ../libpurple/protocols/msnp9/error.c:170
+#: ../libpurple/protocols/msnp9/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "El servidor no estÃ  disponible"
 
 #: ../libpurple/protocols/msn/error.c:158
+#: ../libpurple/protocols/msnp9/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr "El servidor de notificacions d'igual a igual estÃ  aturat"
 
 #: ../libpurple/protocols/msn/error.c:162
+#: ../libpurple/protocols/msnp9/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "S'ha produÃ¯t un error en la connexiÃ³ a la base de dades"
 
 #: ../libpurple/protocols/msn/error.c:167
+#: ../libpurple/protocols/msnp9/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "El servidor passarÃ  a no estar disponible (abandoneu el vaixell)"
 
 #: ../libpurple/protocols/msn/error.c:174
+#: ../libpurple/protocols/msnp9/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "S'ha produÃ¯t un error en crear la connexiÃ³"
 
 #: ../libpurple/protocols/msn/error.c:179
+#: ../libpurple/protocols/msnp9/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Els parÃ metres de CVR sÃ³n o bÃ© desconeguts o bÃ© no permesos"
 
 #: ../libpurple/protocols/msn/error.c:183
+#: ../libpurple/protocols/msnp9/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "No Ã©s possible escriure"
 
 #: ../libpurple/protocols/msn/error.c:186
+#: ../libpurple/protocols/msnp9/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "La sessiÃ³ estÃ  sobrecarregada"
 
 #: ../libpurple/protocols/msn/error.c:190
+#: ../libpurple/protocols/msnp9/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "L'usuari estÃ  massa actiu"
 
 #: ../libpurple/protocols/msn/error.c:193
+#: ../libpurple/protocols/msnp9/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "Massa sessions"
 
 #: ../libpurple/protocols/msn/error.c:196
+#: ../libpurple/protocols/msnp9/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "El passaport no estÃ  verificat"
 
 #: ../libpurple/protocols/msn/error.c:199
+#: ../libpurple/protocols/msnp9/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "Fitxer d'amics incorrecte"
 
 #: ../libpurple/protocols/msn/error.c:203
+#: ../libpurple/protocols/msnp9/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "Inesperat"
 
 #: ../libpurple/protocols/msn/error.c:209
+#: ../libpurple/protocols/msnp9/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "El nom amistÃ³s canvia massa de pressa"
 
 #: ../libpurple/protocols/msn/error.c:218
+#: ../libpurple/protocols/msnp9/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "El servidor estÃ  massa ocupat"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1378
-#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/msnp9/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/silc/silc.c:338
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
+#, c-format
 msgid "Authentication failed"
 msgstr "Ha fallat l'autenticaciÃ³"
 
 #: ../libpurple/protocols/msn/error.c:225
+#: ../libpurple/protocols/msnp9/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "No estÃ  permÃ¨s mentre estigueu fora de lÃnia"
 
 #: ../libpurple/protocols/msn/error.c:233
+#: ../libpurple/protocols/msnp9/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "No s'accepten usuaris nous"
 
 #: ../libpurple/protocols/msn/error.c:237
+#: ../libpurple/protocols/msnp9/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passaport per als nens sense consentiment patern"
 
 #: ../libpurple/protocols/msn/error.c:241
+#: ../libpurple/protocols/msnp9/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "El compte de passaport encara no estÃ  verificat"
 
 #: ../libpurple/protocols/msn/error.c:244
+#: ../libpurple/protocols/msnp9/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "Tiquet incorrecte"
 
 #: ../libpurple/protocols/msn/error.c:249
+#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Codi d'error desconegut %d"
 
 #: ../libpurple/protocols/msn/error.c:263
+#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Error d'MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
-msgid "You have just sent a Nudge!"
-msgstr "Acabeu d'enviar un cop de colze!"
+#: ../libpurple/protocols/msn/msn.c:130 ../libpurple/protocols/msnp9/msn.c:130
+msgid "Nudge"
+msgstr "Donar un cop de colze"
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:131 ../libpurple/protocols/msnp9/msn.c:131
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s us ha donat un cop de colze!"
+
+#: ../libpurple/protocols/msn/msn.c:132 ../libpurple/protocols/msnp9/msn.c:132
+#, c-format
+msgid "Nudging %s..."
+msgstr "S'estÃ  donant un cop de colze a %s..."
+
+#: ../libpurple/protocols/msn/msn.c:174 ../libpurple/protocols/msnp9/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "El vostre nom amistÃ³s nou d'MSN Ã©s massa llarg."
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msnp9/msn.c:282
 msgid "Set your friendly name."
 msgstr "Establiu el vostre nom amistÃ³s."
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msnp9/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Aquest Ã©s el nom amb el que els amics de l'MSN us veuran."
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:305 ../libpurple/protocols/msnp9/msn.c:301
 msgid "Set your home phone number."
 msgstr "Estableix el nÃºmero de telÃ¨fon de casa."
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:322 ../libpurple/protocols/msnp9/msn.c:318
 msgid "Set your work phone number."
 msgstr "Estableix el nÃºmero de telÃ¨fon de la feina."
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:339 ../libpurple/protocols/msnp9/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Estableix el nÃºmero de telÃ¨fon del mÃ²bil."
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:354 ../libpurple/protocols/msnp9/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Voleu permetre pÃ gines de mÃ²bil d'MSN?"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:355 ../libpurple/protocols/msnp9/msn.c:351
 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?"
@@ -5755,322 +6835,391 @@ msgstr ""
 "Voleu permetre a les persones de la llista d'amics enviar-vos pÃ gines de "
 "mÃ²bil d'MSN al vostre telÃ¨fon mÃ²bil o a algun altre dispositiu mÃ²bil?"
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msnp9/msn.c:357
 msgid "Allow"
 msgstr "Permet"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:362 ../libpurple/protocols/msnp9/msn.c:358
 msgid "Disallow"
 msgstr "Denega"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:378 ../libpurple/protocols/msnp9/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "Pot ser que aquest compte Hotmail no sigui actiu."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:404 ../libpurple/protocols/msnp9/msn.c:400
 msgid "Send a mobile message."
 msgstr "Envia un missatge de mÃ²bil."
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:406 ../libpurple/protocols/msnp9/msn.c:402
 msgid "Page"
 msgstr "PÃ gina"
 
-#: ../libpurple/protocols/msn/msn.c:521
-msgid "Has you"
-msgstr "Us tÃ©"
-
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
-#: ../libpurple/protocols/yahoo/yahoo.c:3739
+#: ../libpurple/protocols/msn/msn.c:688 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:583
+#: ../libpurple/protocols/msnp9/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Be Right Back"
 msgstr "Torno de seguida"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/msn/msn.c:694 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:587
+#: ../libpurple/protocols/msnp9/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2839
+#: ../libpurple/protocols/novell/novell.c:2969
+#: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3057
-#: ../libpurple/protocols/yahoo/yahoo.c:3742
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Busy"
 msgstr "Ocupat"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:3065
-#: ../libpurple/protocols/yahoo/yahoo.c:3754
+#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msnp9/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "On the Phone"
 msgstr "Al telÃ¨fon"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:3069
-#: ../libpurple/protocols/yahoo/yahoo.c:3760
+#: ../libpurple/protocols/msn/msn.c:704 ../libpurple/protocols/msnp9/msn.c:595
+#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3793
 msgid "Out to Lunch"
 msgstr "A fora dinant"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:723
+msgid "Artist"
+msgstr "Artista"
+
+#: ../libpurple/protocols/msn/msn.c:724
+msgid "Album"
+msgstr "Ã€lbum"
+
+#: ../libpurple/protocols/msn/msn.c:742 ../libpurple/protocols/msnp9/msn.c:623
 msgid "Set Friendly Name..."
 msgstr "Estableix el nom amistÃ³s..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:747 ../libpurple/protocols/msnp9/msn.c:628
 msgid "Set Home Phone Number..."
 msgstr "Estableix el nÃºmero de telÃ¨fon de casa..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:751 ../libpurple/protocols/msnp9/msn.c:632
 msgid "Set Work Phone Number..."
 msgstr "Estableix el nÃºmero de telÃ¨fon de la feina..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:636
 msgid "Set Mobile Phone Number..."
 msgstr "Estableix el nÃºmero del telÃ¨fon mÃ²bil..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:761 ../libpurple/protocols/msnp9/msn.c:642
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Habilita/inhabilita dispositius mÃ²bils..."
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:766 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permet/denega pÃ gines de mÃ²bil..."
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Open Hotmail Inbox"
 msgstr "Obre la safata d'entrada de Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:801 ../libpurple/protocols/msnp9/msn.c:682
 msgid "Send to Mobile"
 msgstr "Envia a un mÃ²bil"
 
-#: ../libpurple/protocols/msn/msn.c:660
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:811 ../libpurple/protocols/msnp9/msn.c:692
+#: ../libpurple/protocols/novell/novell.c:3425
 msgid "Initiate _Chat"
 msgstr "Inicia un _xat"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:849 ../libpurple/protocols/msnp9/msn.c:731
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "L'MSN necessita SSL, instalÂ·leu alguna biblioteca d'SSL permesa."
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:879 ../libpurple/protocols/msnp9/msn.c:761
 msgid "Failed to connect to server."
 msgstr "No s'ha pogut connectar al servidor."
 
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msn/msn.c:1663 ../libpurple/protocols/msn/msn.c:2006
+#: ../libpurple/protocols/msnp9/msn.c:1516
+#: ../libpurple/protocols/msnp9/msn.c:1859
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "S'ha produÃ¯t un error en recuperar el perfil"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1582 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "General"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/myspace/myspace.c:1948
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1589
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/qq/qq.c:222
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Edat"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msnp9/msn.c:1591
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "OcupaciÃ³"
 
-#: ../libpurple/protocols/msn/msn.c:1560
-#: ../libpurple/protocols/myspace/myspace.c:1957
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1739
+#: ../libpurple/protocols/msnp9/msn.c:1592
+#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/novell/novell.c:1487
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "UbicaciÃ³"
 
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1744 ../libpurple/protocols/msn/msn.c:1936
+#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
+#: ../libpurple/protocols/msnp9/msn.c:1597
+#: ../libpurple/protocols/msnp9/msn.c:1789
+#: ../libpurple/protocols/msnp9/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1802
 msgid "Hobbies and Interests"
 msgstr "Aficions i interessos"
 
-#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1750 ../libpurple/protocols/msn/msn.c:1870
+#: ../libpurple/protocols/msn/msn.c:1876 ../libpurple/protocols/msn/msn.c:1883
+#: ../libpurple/protocols/msn/msn.c:1891 ../libpurple/protocols/msn/msn.c:1898
+#: ../libpurple/protocols/msnp9/msn.c:1603
+#: ../libpurple/protocols/msnp9/msn.c:1723
+#: ../libpurple/protocols/msnp9/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1744
+#: ../libpurple/protocols/msnp9/msn.c:1751
 msgid "A Little About Me"
 msgstr "Una mica sobre mi"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msnp9/msn.c:1620
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msnp9/msn.c:1622
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Estat civil"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msnp9/msn.c:1623
 msgid "Interests"
 msgstr "Interessos"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msnp9/msn.c:1624
 msgid "Pets"
 msgstr "Mascotes"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msnp9/msn.c:1625
 msgid "Hometown"
 msgstr "Poble natal"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1626
 msgid "Places Lived"
 msgstr "Llocs on heu viscut"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1774
+#: ../libpurple/protocols/msnp9/msn.c:1627
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msnp9/msn.c:1628
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1776
+#: ../libpurple/protocols/msnp9/msn.c:1629
 msgid "Music"
 msgstr "MÃºsica"
 
-#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1777 ../libpurple/protocols/msn/msn.c:1958
+#: ../libpurple/protocols/msn/msn.c:1964
+#: ../libpurple/protocols/msnp9/msn.c:1630
+#: ../libpurple/protocols/msnp9/msn.c:1811
+#: ../libpurple/protocols/msnp9/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Cita textual preferida"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msnp9/msn.c:1647
 msgid "Contact Info"
 msgstr "InformaciÃ³ del contacte"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1648
 msgid "Personal"
 msgstr "Personal"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msnp9/msn.c:1651
 msgid "Significant Other"
 msgstr "Altres coses significatives"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msnp9/msn.c:1652
 msgid "Home Phone"
 msgstr "PÃ gina personal"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/protocols/msnp9/msn.c:1653
 msgid "Home Phone 2"
 msgstr "PÃ gina personal 2"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3763
+#: ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msnp9/msn.c:1654
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Home Address"
 msgstr "AdreÃ§a de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msnp9/msn.c:1655
 msgid "Personal Mobile"
 msgstr "MÃ²bil personal"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msnp9/msn.c:1656
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Personal E-Mail"
 msgstr "Correu electrÃ²nic personal"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal IM"
 msgstr "MI personal"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msnp9/msn.c:1660
 msgid "Anniversary"
 msgstr "Aniversari"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1823
+#: ../libpurple/protocols/msnp9/msn.c:1676
 msgid "Work"
 msgstr "Feina"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1825
+#: ../libpurple/protocols/msnp9/msn.c:1678
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "TÃtol de la feina"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/msn/msn.c:1826
+#: ../libpurple/protocols/msnp9/msn.c:1679
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Company"
 msgstr "Empresa"
 
-#: ../libpurple/protocols/msn/msn.c:1648
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msnp9/msn.c:1680
+#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Departament"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msnp9/msn.c:1681
 msgid "Profession"
 msgstr "ProfessiÃ³"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msnp9/msn.c:1682
 msgid "Work Phone"
 msgstr "TelÃ¨fon de la feina"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1830
+#: ../libpurple/protocols/msnp9/msn.c:1683
 msgid "Work Phone 2"
 msgstr "TelÃ¨fon de la feina 2"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/msn/msn.c:1831
+#: ../libpurple/protocols/msnp9/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Work Address"
 msgstr "AdreÃ§a de la feina"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msnp9/msn.c:1685
 msgid "Work Mobile"
 msgstr "MÃ²bil de la feina"
 
 # pager -> cercapersones (termcat)
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work Pager"
 msgstr "Cercapersones de la feina"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work Fax"
 msgstr "Fax de la feina"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msnp9/msn.c:1688
 msgid "Work E-Mail"
 msgstr "Correu electrÃ²nic de la feina"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1836
+#: ../libpurple/protocols/msnp9/msn.c:1689
 msgid "Work IM"
 msgstr "MI de la feina"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1837
+#: ../libpurple/protocols/msnp9/msn.c:1690
 msgid "Start Date"
 msgstr "Data d'inici"
 
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1907 ../libpurple/protocols/msn/msn.c:1913
+#: ../libpurple/protocols/msn/msn.c:1920 ../libpurple/protocols/msn/msn.c:1927
+#: ../libpurple/protocols/msnp9/msn.c:1760
+#: ../libpurple/protocols/msnp9/msn.c:1766
+#: ../libpurple/protocols/msnp9/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1780
 msgid "Favorite Things"
 msgstr "Coses preferides"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1972
+#: ../libpurple/protocols/msnp9/msn.c:1825
 msgid "Last Updated"
 msgstr "Darrera actualitzaciÃ³"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1983
+#: ../libpurple/protocols/msnp9/msn.c:1836
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "PÃ gina web"
 
-#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:2007
+#: ../libpurple/protocols/msnp9/msn.c:1860
 msgid "The user has not created a public profile."
 msgstr "L'usuari no ha creat cap perfil pÃºblic."
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:2008
+#: ../libpurple/protocols/msnp9/msn.c:1861
 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 "
@@ -6079,7 +7228,8 @@ msgstr ""
 "L'MSN no ha pogut trobar el perfil de l'usuari. AixÃ² pot voler dir que o bÃ© "
 "l'usuari no existeix, o que existeix perÃ² el seu perfil no Ã©s pÃºblic."
 
-#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:2012
+#: ../libpurple/protocols/msnp9/msn.c:1865
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -6087,7 +7237,8 @@ msgstr ""
 "No s'ha pogut trobar informaciÃ³ del perfil de l'usuari. El mÃ©s segur Ã©s que "
 "l'usuari no existeixi."
 
-#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:2020
+#: ../libpurple/protocols/msnp9/msn.c:1873
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL del perfil"
@@ -6102,96 +7253,130 @@ msgstr "URL del perfil"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
-msgid "MSN Protocol Plugin"
-msgstr "Connector per al protocol MSN"
+#: ../libpurple/protocols/msn/msn.c:2307 ../libpurple/protocols/msn/msn.c:2309
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Connector per al protocol del Windows Live Messenger"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2344
+#: ../libpurple/protocols/msnp9/msn.c:2195
 msgid "Use HTTP Method"
 msgstr "Empra el mÃ¨tode HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2349
+#: ../libpurple/protocols/msnp9/msn.c:2200
+msgid "HTTP Method Server"
+msgstr "MÃ¨tode HTTP del servidor"
+
+#: ../libpurple/protocols/msn/msn.c:2354
+#: ../libpurple/protocols/msnp9/msn.c:2205
 msgid "Show custom smileys"
 msgstr "Mostra emoticones personalitzades"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msnp9/msn.c:2213
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: doneu un cop de colze a un usuari perquÃ¨ us pari atenciÃ³"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:133
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1321
-#: ../libpurple/protocols/yahoo/yahoochat.c:1347
-msgid "Unable to connect"
-msgstr "No s'ha pogut connectar"
+#: ../libpurple/protocols/msn/nexus.c:70
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "AutenticaciÃ³ amb el Windows Live ID: no s'ha pogut connectar"
 
-#: ../libpurple/protocols/msn/notification.c:178
+#. we must have failed!
+#: ../libpurple/protocols/msn/nexus.c:126
+msgid ""
+"Windows Live ID authentication: cannot find authenticate token in server "
+"response"
+msgstr ""
+"AutenticaciÃ³ amb el Windows Live ID: no s'ha pogut trobar el testimoni "
+"d'autenticaciÃ³ al servidor"
+
+#: ../libpurple/protocols/msn/nexus.c:172
+msgid "Windows Live ID authentication Failed"
+msgstr "No s'ha pogut autenticar amb el Windows Live ID"
+
+#: ../libpurple/protocols/msn/notification.c:185
+#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s no Ã©s un nom de grup vÃ lid"
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msnp9/notification.c:184
+#: ../libpurple/protocols/msnp9/notification.c:532
+#: ../libpurple/protocols/msnp9/session.c:340
 msgid "Unknown error."
 msgstr "Error desconegut."
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:194
+#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s a %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:509
 #, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s us ha donat un cop de colze!"
+
+#: ../libpurple/protocols/msn/notification.c:836
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Error desconegut (%d)"
+
+#: ../libpurple/protocols/msn/notification.c:837
+#: ../libpurple/protocols/sametime/sametime.c:4471
+msgid "Unable to add user"
+msgstr "No s'ha pogut afegir l'usuari"
+
+#: ../libpurple/protocols/msn/notification.c:897
+#: ../libpurple/protocols/msnp9/notification.c:498
+#, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "No s'ha pogut afegir l'usuari a %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:901
+#: ../libpurple/protocols/msnp9/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "No s'ha pogut blocar l'usuari %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:905
+#: ../libpurple/protocols/msnp9/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "No s'ha pogut permetre l'usuari %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:913
+#: ../libpurple/protocols/msnp9/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "No s'ha pogut afegir %s perquÃ¨ la llista Ã©s plena."
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:922
+#: ../libpurple/protocols/msnp9/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s no Ã©s un compte de passaport vÃ lid."
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:927
+#: ../libpurple/protocols/msnp9/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "El servei no estÃ  disponible temporalment."
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1263
+#: ../libpurple/protocols/msnp9/notification.c:851
 msgid "Unable to rename group"
 msgstr "No s'ha pogut canviar el nom del grup"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1318
+#: ../libpurple/protocols/msnp9/notification.c:906
 msgid "Unable to delete group"
 msgstr "No s'ha pogut suprimir el grup"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1931
+#: ../libpurple/protocols/msnp9/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6221,14 +7406,38 @@ msgstr[1] ""
 "DesprÃ©s que el manteniment s'hagi completat, us podreu tornar a connectar."
 
 #: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msnp9/nexus.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:324
+#: ../libpurple/protocols/qq/qq_proxy.c:369
+#: ../libpurple/protocols/qq/qq_proxy.c:402
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "No s'ha pogut connectar"
+
+#: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "Error en escriure"
 
-#: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "Error en llegir"
 
-#: ../libpurple/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/msn/servconn.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -6237,101 +7446,123 @@ msgstr ""
 "S'ha produÃ¯t un error de connexiÃ³ del servidor %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msnp9/session.c:302
 msgid "Our protocol is not supported by the server."
 msgstr "El servidor no implementa el nostre protocol."
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msnp9/session.c:307
 msgid "Error parsing HTTP."
 msgstr "S'ha produÃ¯t un error en analitzar HTTP."
 
-#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/msn/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:311
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "Us heu connectat des d'un altre lloc."
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msnp9/session.c:317
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Els servidors MSN estan temporalment no disponibles. Espereu i proveu-ho mÃ©s "
 "tard."
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:370
+#: ../libpurple/protocols/msnp9/session.c:323
 msgid "The MSN servers are going down temporarily."
 msgstr "Els servidors MSN no seran accessibles temporalment."
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:375
+#: ../libpurple/protocols/msnp9/session.c:328
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "No s'ha pogut autenticar: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
+#: ../libpurple/protocols/msn/session.c:381
+#: ../libpurple/protocols/msnp9/session.c:334
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "La llista d'amics MSN estÃ  temporalment no disponible. Espereu i proveu-ho "
 "mÃ©s tard."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:403
+#: ../libpurple/protocols/msn/session.c:405
+#: ../libpurple/protocols/msnp9/session.c:356
+#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Handshaking"
 msgstr "S'estÃ  comprovant la conformitat de connexiÃ³"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:406
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Starting authentication"
 msgstr "S'estÃ  iniciant l'autenticaciÃ³"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:407
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Getting cookie"
 msgstr "S'estÃ  obtenint la galeta"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:409
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Sending cookie"
 msgstr "S'estÃ  enviant la galeta"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:410
+#: ../libpurple/protocols/msnp9/session.c:363
 msgid "Retrieving buddy list"
 msgstr "S'estÃ  recuperant la llista d'amics"
 
 #: ../libpurple/protocols/msn/state.c:34
+#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "Lluny de l'ordinador"
 
 #: ../libpurple/protocols/msn/state.c:35
+#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "Al telÃ¨fon"
 
 #: ../libpurple/protocols/msn/state.c:36
+#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "Fora esmorzant"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:398
+#: ../libpurple/protocols/msnp9/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
 "Ã‰s possible que no s'hagi pogut enviar el missatge perquÃ¨ el temps ha "
 "expirat:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:406
+#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "No s'ha pogut enviar el missatge, no estÃ  permÃ¨s mentre esteu invisible:"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:410
+#: ../libpurple/protocols/msnp9/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "El missatge no s'ha pogut enviar perquÃ¨ l'usuari estÃ  fora de lÃnia:"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:414
+#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 "No s'ha pogut enviar el missatge perquÃ¨ s'ha produÃ¯t un error en la connexiÃ³:"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:418
+#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr ""
 "El missatge no s'ha pogut enviar perquÃ¨ s'estÃ  enviant massa de pressa:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:422
+#: ../libpurple/protocols/msnp9/switchboard.c:424
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
@@ -6340,51 +7571,74 @@ msgstr ""
 "amb el servior. El mÃ©s probable Ã©s que hi hagi algun problema al servidor, "
 "intenteu-ho d'aquÃ a una estona:"
 
-#: ../libpurple/protocols/msn/switchboard.c:431
+#: ../libpurple/protocols/msn/switchboard.c:429
+#: ../libpurple/protocols/msnp9/switchboard.c:431
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "No s'ha pogut enviar el missatge perquÃ¨ s'ha produÃ¯t un error en la "
 "centraleta:"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:437
+#: ../libpurple/protocols/msnp9/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "No s'ha pogut enviar el missatge perquÃ¨ s'ha produÃ¯t un error desconegut:"
 
-#: ../libpurple/protocols/msn/switchboard.c:963
+#: ../libpurple/protocols/msn/userlist.c:243
+#: ../libpurple/protocols/msnp9/userlist.c:252
 #, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s us ha donat un cop de colze!"
-
-#: ../libpurple/protocols/msn/userlist.c:252
-#, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s us ha afegit a la seva llista d'amics."
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
+#: ../libpurple/protocols/msnp9/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s us ha suprimit de la seva llista d'amics."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
+#: ../libpurple/protocols/msnp9/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "No s'ha pogut afegir Â«%sÂ»."
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msnp9/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "El nom d'usuari especificat no Ã©s vÃ lid."
 
-#: ../libpurple/protocols/myspace/myspace.c:232
+#: ../libpurple/protocols/msnp9/msn.c:549
+msgid "Has you"
+msgstr "Us tÃ©"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/msnp9/msn.c:2159
+#: ../libpurple/protocols/msnp9/msn.c:2161
+msgid "MSN Protocol Plugin"
+msgstr "Connector per al protocol MSN"
+
+#: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
 msgstr "Manca el mÃ¨tode de xifratge"
 
-#: ../libpurple/protocols/myspace/myspace.c:233
+#: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
 msgstr "No s'ha pogut trobar el mÃ¨tode de xifratge RC4"
 
-#: ../libpurple/protocols/myspace/myspace.c:234
+#: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
@@ -6392,146 +7646,7 @@ msgstr ""
 "Actualitzeu a una versiÃ³ (>=2.0.1) del libpurple que permeti l'RC4. No es "
 "carregarÃ  el connector del MySpaceIM."
 
-#. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/myspace.c:303
-msgid "zap"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:303
-#: ../libpurple/protocols/myspace/myspace.c:1696
-msgid "zapped"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:303
-msgid "Zapping"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:304
-msgid "whack"
-msgstr "bufetejar"
-
-#: ../libpurple/protocols/myspace/myspace.c:304
-#: ../libpurple/protocols/myspace/myspace.c:1697
-msgid "whacked"
-msgstr "bufetejat"
-
-#: ../libpurple/protocols/myspace/myspace.c:304
-msgid "Whacking"
-msgstr "Bufetejant"
-
-#: ../libpurple/protocols/myspace/myspace.c:305
-msgid "torch"
-msgstr "encendre"
-
-#: ../libpurple/protocols/myspace/myspace.c:305
-#: ../libpurple/protocols/myspace/myspace.c:1698
-msgid "torched"
-msgstr "encÃ¨s"
-
-#: ../libpurple/protocols/myspace/myspace.c:305
-msgid "Torching"
-msgstr "Encenent"
-
-#: ../libpurple/protocols/myspace/myspace.c:306
-msgid "smooch"
-msgstr "fer un petÃ³"
-
-#: ../libpurple/protocols/myspace/myspace.c:306
-#: ../libpurple/protocols/myspace/myspace.c:1699
-msgid "smooched"
-msgstr "fet un petÃ³"
-
-#: ../libpurple/protocols/myspace/myspace.c:306
-msgid "Smooching"
-msgstr "Fent un petÃ³"
-
-#: ../libpurple/protocols/myspace/myspace.c:307
-msgid "hug"
-msgstr "abraÃ§ar"
-
-#: ../libpurple/protocols/myspace/myspace.c:307
-#: ../libpurple/protocols/myspace/myspace.c:1700
-msgid "hugged"
-msgstr "abraÃ§at"
-
-#: ../libpurple/protocols/myspace/myspace.c:307
-msgid "Hugging"
-msgstr "AbraÃ§ant"
-
-#: ../libpurple/protocols/myspace/myspace.c:308
-msgid "bslap"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:308
-#: ../libpurple/protocols/myspace/myspace.c:1701
-msgid "bslapped"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:308
-msgid "Bslapping"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:309
-#, fuzzy
-msgid "goose"
-msgstr "pessigar el cul"
-
-#: ../libpurple/protocols/myspace/myspace.c:309
-#: ../libpurple/protocols/myspace/myspace.c:1702
-#, fuzzy
-msgid "goosed"
-msgstr "pessigat al cul"
-
-#: ../libpurple/protocols/myspace/myspace.c:309
-#, fuzzy
-msgid "Goosing"
-msgstr "Pessigant el cul"
-
-#: ../libpurple/protocols/myspace/myspace.c:310
-msgid "hi-five"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:310
-#: ../libpurple/protocols/myspace/myspace.c:1703
-msgid "hi-fived"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:310
-msgid "Hi-fiving"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:311
-msgid "punk"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:311
-#: ../libpurple/protocols/myspace/myspace.c:1704
-msgid "punk'd"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:311
-#, fuzzy
-msgid "Punking"
-msgstr "Ping"
-
-#: ../libpurple/protocols/myspace/myspace.c:312
-msgid "raspberry"
-msgstr "morrejar"
-
-#: ../libpurple/protocols/myspace/myspace.c:312
-#: ../libpurple/protocols/myspace/myspace.c:1705
-msgid "raspberried"
-msgstr "morrejat"
-
-#: ../libpurple/protocols/myspace/myspace.c:312
-msgid "Raspberry'ing"
-msgstr "Morregant"
-
-#: ../libpurple/protocols/myspace/myspace.c:469
-msgid "Zap"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:622
+#: ../libpurple/protocols/myspace/myspace.c:286
 #, c-format
 msgid ""
 "Sorry, passwords over %d characters in length (yours is %d) are not "
@@ -6541,227 +7656,410 @@ msgstr ""
 "tÃ© %d."
 
 #. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:628
-#: ../libpurple/protocols/myspace/myspace.c:2939
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1820
 msgid "MySpaceIM Error"
 msgstr "S'ha produÃ¯tun error en el MySpaceIM"
 
 # FIXME
-#: ../libpurple/protocols/myspace/myspace.c:684
+#: ../libpurple/protocols/myspace/myspace.c:352
 msgid "Reading challenge"
 msgstr "Repte de lectura"
 
-#: ../libpurple/protocols/myspace/myspace.c:690
+#: ../libpurple/protocols/myspace/myspace.c:360
 msgid "Unexpected challenge length from server"
 msgstr "El repte del servidor tÃ© una mida inesperada"
 
-#: ../libpurple/protocols/myspace/myspace.c:694
+#: ../libpurple/protocols/myspace/myspace.c:364
 msgid "Logging in"
 msgstr "S'estÃ  entrant"
 
-# FIXME: this is not going to translate well at all (josep)
-#: ../libpurple/protocols/myspace/myspace.c:1725
+#: ../libpurple/protocols/myspace/myspace.c:1296
 #, c-format
-msgid "*** You have been %s! ***"
-msgstr "*** Se us ha %s! ***"
-
-#: ../libpurple/protocols/myspace/myspace.c:1933
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "Usuari"
-
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/myspace.c:1940
-#: ../libpurple/protocols/oscar/oscar.c:2934
-msgid "Profile"
-msgstr "Perfil"
-
-#: ../libpurple/protocols/myspace/myspace.c:1962
-msgid "Headline"
-msgstr "Titular"
-
-#: ../libpurple/protocols/myspace/myspace.c:1967
-msgid "Song"
-msgstr "CanÃ§Ã³"
-
-#: ../libpurple/protocols/myspace/myspace.c:1972
-msgid "Total Friends"
-msgstr "Nombre d'amics"
-
-#: ../libpurple/protocols/myspace/myspace.c:1983
-#: ../libpurple/protocols/myspace/myspace.c:1986
-#: ../libpurple/protocols/myspace/myspace.c:1989
-msgid "Client Version"
-msgstr "VersiÃ³ del client"
-
-#: ../libpurple/protocols/myspace/myspace.c:2353
-#, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr ""
 "S'ha perdut la connexiÃ³ al servidor (fa %d segons que no s'hi reben dades)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:2396
+#: ../libpurple/protocols/myspace/myspace.c:1339
 msgid "New mail messages"
 msgstr "Missatges de correu nous"
 
-#: ../libpurple/protocols/myspace/myspace.c:2397
+#: ../libpurple/protocols/myspace/myspace.c:1340
 msgid "New blog comments"
 msgstr "Comentaris al bloc nous"
 
-#: ../libpurple/protocols/myspace/myspace.c:2398
+#: ../libpurple/protocols/myspace/myspace.c:1341
 msgid "New profile comments"
 msgstr "Comentaris al perfil nous"
 
-#: ../libpurple/protocols/myspace/myspace.c:2399
+#: ../libpurple/protocols/myspace/myspace.c:1342
 msgid "New friend requests!"
-msgstr ""
+msgstr "SolÂ·licituds d'amics noves."
 
-#: ../libpurple/protocols/myspace/myspace.c:2400
+#: ../libpurple/protocols/myspace/myspace.c:1343
 msgid "New picture comments"
-msgstr ""
+msgstr "Comentaris de fotos nous"
 
-#: ../libpurple/protocols/myspace/myspace.c:2430
+#: ../libpurple/protocols/myspace/myspace.c:1371
 msgid "MySpace"
 msgstr "MySpace"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:2522
-#: ../libpurple/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "Connectat"
 
-#: ../libpurple/protocols/myspace/myspace.c:2931
+#: ../libpurple/protocols/myspace/myspace.c:1565
+#: ../libpurple/protocols/myspace/myspace.c:1568
+msgid "No username set"
+msgstr "No s'ha establer cap nom d'usuari"
+
+#: ../libpurple/protocols/myspace/myspace.c:1566
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+"Aneu a http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"escolliu un nom d'usuari i torneu a provar d'entrar."
+
+#: ../libpurple/protocols/myspace/myspace.c:1794
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "S'ha produÃ¯t un error en el protocol amb codi %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:3099
-#: ../libpurple/protocols/myspace/myspace.c:3133
+#: ../libpurple/protocols/myspace/myspace.c:1990
+#: ../libpurple/protocols/myspace/myspace.c:2024
 msgid "Failed to add buddy"
 msgstr "No s'ha pogut afegir l'amic"
 
-#: ../libpurple/protocols/myspace/myspace.c:3099
+#: ../libpurple/protocols/myspace/myspace.c:1990
 msgid "'addbuddy' command failed."
 msgstr "Ha fallat l'ordre Â«addbuddyÂ»."
 
-#: ../libpurple/protocols/myspace/myspace.c:3133
-#: ../libpurple/protocols/myspace/myspace.c:3375
+#: ../libpurple/protocols/myspace/myspace.c:2024
+#: ../libpurple/protocols/myspace/myspace.c:2261
 msgid "persist command failed"
 msgstr "Ha fallat l'ordre Â«persistÂ»"
 
-#: ../libpurple/protocols/myspace/myspace.c:3243
+#: ../libpurple/protocols/myspace/myspace.c:2129
 #, c-format
 msgid "No such user: %s"
 msgstr "Aquest usuari no existeix: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:3244
+#: ../libpurple/protocols/myspace/myspace.c:2130
 msgid "User lookup"
 msgstr "Cerca d'usuaris"
 
-#: ../libpurple/protocols/myspace/myspace.c:3356
-#: ../libpurple/protocols/myspace/myspace.c:3375
-#: ../libpurple/protocols/myspace/myspace.c:3397
+#: ../libpurple/protocols/myspace/myspace.c:2242
+#: ../libpurple/protocols/myspace/myspace.c:2261
+#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "Failed to remove buddy"
 msgstr "No s'ha pogut suprimir l'amic"
 
-#: ../libpurple/protocols/myspace/myspace.c:3356
+#: ../libpurple/protocols/myspace/myspace.c:2242
 msgid "'delbuddy' command failed"
 msgstr "Ha fallat l'ordre Â«delbuddyÂ»"
 
-#: ../libpurple/protocols/myspace/myspace.c:3397
+#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "blocklist command failed"
 msgstr "Ha fallat l'ordre Â«blocklistÂ»"
 
-#: ../libpurple/protocols/myspace/myspace.c:3443
+#: ../libpurple/protocols/myspace/myspace.c:2331
 msgid "Invalid input condition"
 msgstr "La condiciÃ³ d'entrada no Ã©s vÃ lida"
 
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:3461
-#: ../libpurple/protocols/myspace/myspace.c:3492
+#: ../libpurple/protocols/myspace/myspace.c:2351
+#: ../libpurple/protocols/myspace/myspace.c:2388
 msgid "Read buffer full"
 msgstr "La memÃ²ria intermÃ¨dia de lectura Ã©s plena"
 
-#: ../libpurple/protocols/myspace/myspace.c:3530
+#: ../libpurple/protocols/myspace/myspace.c:2430
 msgid "Unparseable message"
 msgstr "No es pot analitzar el missatge"
 
-#: ../libpurple/protocols/myspace/myspace.c:3599
+#: ../libpurple/protocols/myspace/myspace.c:2499
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "No s'ha pogut connectar a l'ordinador: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3942
+#: ../libpurple/protocols/myspace/myspace.c:2670
 msgid "IM Friends"
 msgstr "Amics de MI"
 
-#: ../libpurple/protocols/myspace/myspace.c:4039
+#: ../libpurple/protocols/myspace/myspace.c:2769
 #, c-format
-msgid "%d buddies were added or updated"
-msgstr "S'han afegit o actualitzat %d amics"
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr ""
+"S'han afegit o actualitzat %d amics al servidor (incloent els amics que ja "
+"sÃ³n a la llista del servidor)"
 
 # Nota: tÃtol de finestra (josep)
-#: ../libpurple/protocols/myspace/myspace.c:4041
+#: ../libpurple/protocols/myspace/myspace.c:2770
 msgid "Add contacts from server"
 msgstr "AddicÃ³ de contactes del servidor"
 
-#: ../libpurple/protocols/myspace/myspace.c:4066
-#: ../libpurple/protocols/myspace/myspace.c:4141
+#: ../libpurple/protocols/myspace/myspace.c:2822
+#: ../libpurple/protocols/myspace/myspace.c:2887
 msgid "Add friends from MySpace.com"
 msgstr "Afegeox amics de MySpace.com"
 
 # Heh,tinc amics d'importaciÃ³
-#: ../libpurple/protocols/myspace/myspace.c:4067
+#: ../libpurple/protocols/myspace/myspace.c:2823
 msgid "Importing friends failed"
 msgstr "Ha fallat la importaciÃ³ d'amics"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:4133
+#: ../libpurple/protocols/myspace/myspace.c:2879
 msgid "Find people..."
 msgstr "Cerca persones..."
 
-#: ../libpurple/protocols/myspace/myspace.c:4136
+#: ../libpurple/protocols/myspace/myspace.c:2882
 msgid "Change IM name..."
 msgstr "Canvia el nom de MI..."
 
+#: ../libpurple/protocols/myspace/myspace.c:3184
+msgid "myim URL handler"
+msgstr "Gestor d'URL myim"
+
+#: ../libpurple/protocols/myspace/myspace.c:3185
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+"No s'ha pogut trobar cap compte adequat a MySpaceIM per poder obrir aquest "
+"URL myim."
+
+#: ../libpurple/protocols/myspace/myspace.c:3186
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "Habiliteu el compte MySpaceIM adequat i proveu-ho de nou."
+
 # FIXME: display name
-#: ../libpurple/protocols/myspace/myspace.c:4418
+#: ../libpurple/protocols/myspace/myspace.c:3309
 msgid "Show display name in status text"
 msgstr "Mostra el nom d'usuari a la barra d'estat"
 
 # FIXME: headline
-#: ../libpurple/protocols/myspace/myspace.c:4421
+#: ../libpurple/protocols/myspace/myspace.c:3312
 msgid "Show headline in status text"
 msgstr "Mostra el tÃtol a la barra d'estat"
 
-#: ../libpurple/protocols/myspace/myspace.c:4426
+#: ../libpurple/protocols/myspace/myspace.c:3317
 msgid "Send emoticons"
 msgstr "Envia emoticones"
 
-#: ../libpurple/protocols/myspace/myspace.c:4431
+#: ../libpurple/protocols/myspace/myspace.c:3322
 msgid "Screen resolution (dots per inch)"
 msgstr "ResoluciÃ³ de la pantalla (punts per polzada)"
 
 # FIXME: base... (josep)
-#: ../libpurple/protocols/myspace/myspace.c:4434
+#: ../libpurple/protocols/myspace/myspace.c:3325
 msgid "Base font size (points)"
 msgstr "Mida del tipus de lletra base (punts)"
 
-#. cmd
-#. args - accept a single word
-#. priority
-#. flags
-#. prpl_id
-#. func
-#: ../libpurple/protocols/myspace/myspace.c:4450
+#: ../libpurple/protocols/myspace/user.c:95
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "Usuari"
+
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/oscar/oscar.c:2974
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../libpurple/protocols/myspace/user.c:128
+msgid "Headline"
+msgstr "Titular"
+
+#: ../libpurple/protocols/myspace/user.c:133
+msgid "Song"
+msgstr "CanÃ§Ã³"
+
+#: ../libpurple/protocols/myspace/user.c:141
+msgid "Total Friends"
+msgstr "Nombre d'amics"
+
+#: ../libpurple/protocols/myspace/user.c:159
+msgid "Client Version"
+msgstr "VersiÃ³ del client"
+
+#. TODO: icons for each zap
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:214
+msgid "Zap"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, fuzzy, c-format
+msgid "%s has zapped you!"
+msgstr "%s us ha afegit [%s]"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, fuzzy, c-format
+msgid "Zapping %s..."
+msgstr "S'estÃ  trucant a %s"
+
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:54
 #, fuzzy
-msgid "zap: zap a user to get their attention"
-msgstr "zap: fa sonar un soroll a un usuari per tal de que us pari atenciÃ³"
+msgid "Whack"
+msgstr "bufetejar"
 
+#: ../libpurple/protocols/myspace/zap.c:54
+#, fuzzy, c-format
+msgid "%s has whacked you!"
+msgstr "%s us ha afegit [%s]"
+
+#: ../libpurple/protocols/myspace/zap.c:54
+#, fuzzy, c-format
+msgid "Whacking %s..."
+msgstr "Bufetejant"
+
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+#: ../libpurple/protocols/myspace/zap.c:59
+msgid "Torch"
+msgstr "Cala foc"
+
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
+msgid "%s has torched you!"
+msgstr "%s us ha calat foc!"
+
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
+msgid "Torching %s..."
+msgstr "S'estÃ  calant foc a %s..."
+
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
+msgid "Smooch"
+msgstr "Morreja"
+
+# SÃ, sembla que siguem a l'Ã¨poca victoriana... (josep)
+#: ../libpurple/protocols/myspace/zap.c:62
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s us ha morrejat!"
+
+#: ../libpurple/protocols/myspace/zap.c:62
+#, c-format
+msgid "Smooching %s..."
+msgstr "S'estÃ  morrejant a %s..."
+
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:65
+msgid "Hug"
+msgstr "AbraÃ§a"
+
+#: ../libpurple/protocols/myspace/zap.c:65
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s us ha abraÃ§at!"
+
+#: ../libpurple/protocols/myspace/zap.c:65
+#, c-format
+msgid "Hugging %s..."
+msgstr "S'estÃ  abraÃ§ant a %s..."
+
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:68
+msgid "Slap"
+msgstr "Bufeteja"
+
+#: ../libpurple/protocols/myspace/zap.c:68
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s us ha bufetejat!"
+
+#: ../libpurple/protocols/myspace/zap.c:68
+#, c-format
+msgid "Slapping %s..."
+msgstr "S'estÃ  bufetejant a %s..."
+
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:71
+msgid "Goose"
+msgstr "Pessiga el cul"
+
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s us ha pessigat el cul!"
+
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
+msgid "Goosing %s..."
+msgstr "S'estÃ  pessigant el cul de %s..."
+
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+#: ../libpurple/protocols/myspace/zap.c:76
+#, fuzzy
+msgid "High-five"
+msgstr "Xoca'n cinc"
+
+#: ../libpurple/protocols/myspace/zap.c:76
+#, fuzzy, c-format
+msgid "%s has high-fived you!"
+msgstr "%s us n'ha xocat cinc!"
+
+#: ../libpurple/protocols/myspace/zap.c:76
+#, fuzzy, c-format
+msgid "High-fiving %s..."
+msgstr "S'estÃ  xocant-ne cinc amb %s..."
+
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+#: ../libpurple/protocols/myspace/zap.c:81
+#, fuzzy
+msgid "Punk"
+msgstr "Ping"
+
+#: ../libpurple/protocols/myspace/zap.c:81
+#, fuzzy, c-format
+msgid "%s has punk'd you!"
+msgstr "%s s'ha connectat."
+
+#: ../libpurple/protocols/myspace/zap.c:81
+#, fuzzy, c-format
+msgid "Punking %s..."
+msgstr "Ping"
+
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+#: ../libpurple/protocols/myspace/zap.c:90
+#, fuzzy
+msgid "Raspberry"
+msgstr "Llengoteja"
+
+#: ../libpurple/protocols/myspace/zap.c:90
+#, fuzzy, c-format
+msgid "%s has raspberried you!"
+msgstr "%s s'ha connectat."
+
+#: ../libpurple/protocols/myspace/zap.c:90
+#, fuzzy, c-format
+msgid "Raspberrying %s..."
+msgstr "Morregant"
+
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "No s'han passat tots els parÃ metres requerits"
@@ -6896,44 +8194,44 @@ msgstr "Ha fallat l'entrada (%s)."
 msgid "Login failed (%s)."
 msgstr "Ha fallat l'entrada (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "No s'ha pogut enviar el missatge. No s'han pogut obtenir detalls de l'usuari "
 "(%s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "No s'ha pogut afegir %s a la vostra llista d'amics (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "No s'ha pogut enviar el missatge (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:501
+#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "No s'ha pogut convidar l'usuari (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "No s'ha pogut enviar el missatge a %s. No s'ha pogut crear la conferÃ¨ncia (%"
 "s)."
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 "No s'ha pogut enviar el missatge. No s'ha pogut crear la conferÃ¨ncia (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -6942,7 +8240,7 @@ msgstr ""
 "No s'ha pogut moure l'usuari %s a la carpeta %s a la part del servidor. S'ha "
 "produÃ¯t un error en crear la carpeta (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -6951,66 +8249,66 @@ msgstr ""
 "No s'ha pogut afegir %s a la vostra llista d'amics. S'ha produÃ¯t un error en "
 "crear la carpeta a la part del servidor (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "No s'han pogut obtenir detalls de l'usuari %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:759
+#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "No s'ha pogut afegir l'usuari a la llista de privadesa (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "No s'ha pogut afegir %s a la llista de denegats (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "No s'ha pogut afegir %s a la llista de permesos (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "No s'ha pogut suprimir %s de la llista de privadesa (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:950
+#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 "No s'han pogut canviar els parÃ metres de privadesa en la part del servidor (%"
 "s)."
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "No s'ha pogut crear la conferÃ¨ncia (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1131
+#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr ""
 "S'ha produÃ¯t un error en la comunicaciÃ³ amb el servidor. S'estÃ  tancant la "
 "connexiÃ³."
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "NÃºmero de telÃ¨fon"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "TÃtol personal"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "Oficina de correu electrÃ²nic"
 
-#: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: ../libpurple/protocols/novell/novell.c:1511
+#: ../libpurple/protocols/sametime/sametime.c:4168
 msgid "User ID"
 msgstr "ID de l'usuari"
 
@@ -7020,41 +8318,37 @@ msgstr "ID de l'usuari"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "Nom complet"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "ConferÃ¨ncia GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
-msgid "Unable to make SSL connection to server."
-msgstr "No s'ha pogut fer una connexiÃ³ SSL al servidor."
-
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "S'estÃ  autenticant..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "No s'ha pogut connectar al servidor."
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "S'estÃ  esperant una resposta..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "S'ha convidat %s a aquesta conversa."
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "InvitaciÃ³ a la conversa"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7065,18 +8359,17 @@ msgstr ""
 "\n"
 "Ha enviat: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "Voleu afegir-vos a la conversa?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2027
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Se us ha desconnectat perquÃ¨ heu entrat a travÃ©s d'una altra estaciÃ³ de "
 "treball."
 
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2084
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7084,11 +8377,7 @@ msgstr ""
 "Ã‰s possible que %s no estigui en lÃnia, i no hagi rebut el missatge que li "
 "acabeu d'enviar."
 
-#. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2184
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7096,11 +8385,12 @@ msgstr ""
 "No s'ha pogut connectar al servidor. IntroduÃ¯u l'adreÃ§a del servidor al qual "
 "us vulgueu connectar."
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2213
 msgid "Error. SSL support is not installed."
 msgstr "Error. No hi ha instalÂ·lades les bibliotques per a SSL."
 
-#: ../libpurple/protocols/novell/novell.c:2504
+#: ../libpurple/protocols/novell/novell.c:2521
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "S'ha tancat aquesta conferÃ¨ncia. No s'hi poden enviar mÃ©s missatges."
 
@@ -7114,33 +8404,33 @@ msgstr "S'ha tancat aquesta conferÃ¨ncia
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3537
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Connector per al protocol Novel GroupWise Messenger"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "AdreÃ§a del servidor"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "Port en el servidor"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2452
-#: ../libpurple/protocols/yahoo/yahoo.c:2619
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2473
+#: ../libpurple/protocols/yahoo/yahoo.c:2641
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
+#: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
+#: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
 msgstr "El servidor ha tancat la connexiÃ³."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2446
-#: ../libpurple/protocols/yahoo/yahoo.c:2613 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
+#: ../libpurple/protocols/oscar/flap_connection.c:393
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2634 ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -7149,10 +8439,10 @@ msgstr ""
 "S'ha perdut la connexiÃ³ amb el servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
-#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
-#: ../libpurple/proxy.c:1461
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/proxy.c:1158 ../libpurple/proxy.c:1263
+#: ../libpurple/proxy.c:1362 ../libpurple/proxy.c:1434
+#: ../libpurple/proxy.c:1491
 msgid "Received invalid data on connection with server."
 msgstr "S'han rebut dades invÃ lides a la connexiÃ³ amb el servidor."
 
@@ -7187,139 +8477,149 @@ msgstr "Connector per al protocol ICQ"
 msgstr "Connector per al protocol ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4357
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "CodificaciÃ³"
 
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "L'usuari remot ha tancat la connexiÃ³."
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "L'usuari remot ha declinat la vostra solÂ·licitud."
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "S'ha perdut la connexiÃ³ amb l'usuari remot:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "S'han rebut dades invÃ lides a la connexiÃ³ amb l'usuari remot."
 
-#: ../libpurple/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "No s'ha pogut establir una connexiÃ³ amb l'usuari remot."
 
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "S'ha establert una connexiÃ³ directa de MI"
 
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+"%s us ha intentat enviar un fitxer %s, perÃ² ara mateix nomÃ©s permetem enviar "
+"fitxers de fins a %s a travÃ©s de MI directa. Proveu-ho fent servir la "
+"transferÃ¨ncia de fitxers.\n"
+
 # FIXME
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "El fitxer %s Ã©s %s, que Ã©s mÃ©s gran que la mida mÃ xima de %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:115
+#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid error"
 msgstr "Error invÃ lid"
 
-#: ../libpurple/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid SNAC"
 msgstr "SNAC invÃ lid"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to host"
 msgstr "RÃ tio a l'ordinador"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to client"
 msgstr "RÃ tio al client"
 
-#: ../libpurple/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service unavailable"
 msgstr "Servei no disponible"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service not defined"
 msgstr "Servei no definit"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Obsolete SNAC"
 msgstr "SNAC obsolet"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by host"
 msgstr "El servidor no ho permet"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by client"
 msgstr "El client no ho permet"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Refused by client"
 msgstr "Rebutjat pel client"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Reply too big"
 msgstr "Resposta massa gran"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Responses lost"
 msgstr "S'han perdut respostes"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Request denied"
 msgstr "PeticiÃ³ denegada"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Busted SNAC payload"
 msgstr "CÃ rrega SNAC malmesa"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Insufficient rights"
 msgstr "Drets insuficients"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "In local permit/deny"
 msgstr "En la llista de permÃ¨s/denegat local"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (sender)"
 msgstr "Massa malvat (remitent)"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "Too evil (receiver)"
 msgstr "Massa malvat (receptor)"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "User temporarily unavailable"
 msgstr "Usuari no disponible temporalment"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "No match"
 msgstr "Cap coincidÃ¨ncia"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "List overflow"
 msgstr "Sobreeiximent de la llista"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Request ambiguous"
 msgstr "PeticiÃ³ ambigua"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Queue full"
 msgstr "Cua plena"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
+#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Not while on AOL"
 msgstr "No es pot fer mentre estigui a AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:347
+#: ../libpurple/protocols/oscar/oscar.c:348
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -7331,7 +8631,7 @@ msgstr ""
 "codificaciÃ³ que fa servir, podeu especificar-la a les opcions avanÃ§ades del "
 "compte AIM/ICQ.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:456
+#: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -7342,147 +8642,153 @@ msgstr ""
 "defectuÃ³s)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
-#: ../pidgin/gtkutils.c:2416
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2392
+#: ../pidgin/gtkutils.c:2422
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Icona de l'amic"
 
-#: ../libpurple/protocols/oscar/oscar.c:641
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "Veu"
 
-#: ../libpurple/protocols/oscar/oscar.c:644
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "MI AIM directes"
 
-#: ../libpurple/protocols/oscar/oscar.c:647
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/util.c:559
 #: ../libpurple/protocols/silc10/silc.c:679
 #: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Xat"
 
-#: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:5960
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:6060
 msgid "Get File"
 msgstr "Aconsegueix el fitxer"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Jocs"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "Afegits"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Envia la llista d'amics"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "ConnexiÃ³ directa a ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "Usuari AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "Servidor repetidor d'ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:681
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "Antic ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:684
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr "Xifrat Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:687
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:690
+#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:693
+#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "Seguretat habilitada"
 
-#: ../libpurple/protocols/oscar/oscar.c:696
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "Xat de vÃdeo"
 
-#: ../libpurple/protocols/oscar/oscar.c:700
+#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:703
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "VÃdeo en directe"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "CÃ mera"
 
-#: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5730
+#: ../libpurple/protocols/oscar/oscar.c:725
+#: ../libpurple/protocols/oscar/oscar.c:5830
+#, c-format
 msgid "Free For Chat"
 msgstr "Lliure per parlar"
 
-#: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5765
+#: ../libpurple/protocols/oscar/oscar.c:729
+#: ../libpurple/protocols/oscar/oscar.c:5865
+#, c-format
 msgid "Not Available"
 msgstr "No disponible"
 
-#: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5751
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5851
+#, c-format
 msgid "Occupied"
 msgstr "Ocupat"
 
-#: ../libpurple/protocols/oscar/oscar.c:734
+#: ../libpurple/protocols/oscar/oscar.c:735
+#, c-format
 msgid "Web Aware"
 msgstr "Conscient de la web"
 
-#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3073 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/qq/qq.c:289
+#: ../libpurple/protocols/yahoo/yahoo.c:3106 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
+#, c-format
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/oscar/oscar.c:738
+#: ../libpurple/protocols/oscar/oscar.c:739
+#, c-format
 msgid "Online"
 msgstr "En lÃnia"
 
-#: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3677
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1123
+#: ../libpurple/protocols/oscar/oscar.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1156
 msgid "IP Address"
 msgstr "AdreÃ§a IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:845
+#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Warning Level"
 msgstr "Nivell d'avÃs"
 
-#: ../libpurple/protocols/oscar/oscar.c:854
+#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Comentari de l'amic"
 
-#: ../libpurple/protocols/oscar/oscar.c:994
+#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -7491,7 +8797,7 @@ msgstr ""
 "No s'ha pogut connectar al servidor d'autenticaciÃ³:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1002
+#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -7500,20 +8806,20 @@ msgstr ""
 "No s'ha pogut connectar al servidor BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1042
+#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "S'ha enviat el nom d'usuari"
 
-#: ../libpurple/protocols/oscar/oscar.c:1047
+#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "ConnexiÃ³ establerta, s'estÃ  enviant el secret"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1076
+#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "S'estÃ  finalitzant la connexiÃ³"
 
-#: ../libpurple/protocols/oscar/oscar.c:1258
+#: ../libpurple/protocols/oscar/oscar.c:1262
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7525,30 +8831,34 @@ msgstr ""
 "comenÃ§ar amb una lletra i contenir nomÃ©s lletres, nombres o espais, o nomÃ©s "
 "nombres."
 
-#: ../libpurple/protocols/oscar/oscar.c:1343
-#: ../libpurple/protocols/yahoo/yahoo.c:2088
+#. Unregistered screen name
+#: ../libpurple/protocols/oscar/oscar.c:1347
+#: ../libpurple/protocols/yahoo/yahoo.c:2108
 msgid "Invalid screen name."
 msgstr "El nom d'usuari no Ã©s vÃ lid."
 
-#: ../libpurple/protocols/oscar/oscar.c:1350
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:2109
+#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1112
+#: ../libpurple/protocols/yahoo/yahoo.c:2130
 msgid "Incorrect password."
 msgstr "La contrasenya no Ã©s correcta."
 
-#: ../libpurple/protocols/oscar/oscar.c:1355
+#. Suspended account
+#: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
 msgstr "El vostre compte estÃ  actualment suspÃ¨s."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1359
+#: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servei de missatges instantanis d'AOL no estÃ  disponible temporalment."
 
-#: ../libpurple/protocols/oscar/oscar.c:1364
-#: ../libpurple/protocols/oscar/oscar.c:1375
+#. screen name connecting too frequently
+#. IP address connecting too frequently
+#: ../libpurple/protocols/oscar/oscar.c:1365
+#: ../libpurple/protocols/oscar/oscar.c:1374
 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."
@@ -7557,16 +8867,17 @@ msgstr ""
 "deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
 "encara mÃ©s temps."
 
+#. client too old
 #: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "La versiÃ³ del client que useu Ã©s massa antiga, actualitzeu-la a %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1408
+#: ../libpurple/protocols/oscar/oscar.c:1407
 msgid "Could Not Connect"
 msgstr "No s'ha pogut connectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1412
+#: ../libpurple/protocols/oscar/oscar.c:1411
 msgid "Received authorization"
 msgstr "S'ha rebut l'autoritzaciÃ³"
 
@@ -7584,12 +8895,20 @@ msgstr "IntroduÃ¯u el nombre de 6 dÃgit
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
+#.
 #: ../libpurple/protocols/oscar/oscar.c:1450
 #: ../libpurple/protocols/oscar/oscar.c:2242
 #: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5835
-#: ../libpurple/protocols/oscar/oscar.c:6116 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:5935
+#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841
 msgid "_OK"
 msgstr "_D'acord"
 
@@ -7620,15 +8939,15 @@ msgstr "No s'ha pogut obtenir un hash d'
 msgid "Unable to get a valid login hash."
 msgstr "No s'ha pogut obtenir un hash d'entrada vÃ lid."
 
-#: ../libpurple/protocols/oscar/oscar.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:1653
 msgid "Password sent"
 msgstr "S'ha enviat la contrasenya"
 
-#: ../libpurple/protocols/oscar/oscar.c:1708
+#: ../libpurple/protocols/oscar/oscar.c:1709
 msgid "Unable to initialize connection"
 msgstr "No s'ha pogut inicialitzar la connexiÃ³"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autoritzeu-me perquÃ¨ us pugui afegir a la meva llista d'amics."
 
@@ -7643,8 +8962,8 @@ msgstr "Autoritzeu-me, si us plau."
 #: ../libpurple/protocols/oscar/oscar.c:2282
 #: ../libpurple/protocols/oscar/oscar.c:2290
 #: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5213
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:5311
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "No s'ha indicat cap motiu."
 
@@ -7721,7 +9040,7 @@ msgstr "Voleu afegir aquest amic a la vo
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Voleu afegir aquest amic a la vostra llista d'amics?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:318
 msgid "_Add"
 msgstr "_Afegeix"
 
@@ -7729,21 +9048,21 @@ msgstr "_Rebutja"
 msgid "_Decline"
 msgstr "_Rebutja"
 
-#: ../libpurple/protocols/oscar/oscar.c:2566
+#: ../libpurple/protocols/oscar/oscar.c:2606
 #, 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] "S'ha perdut %hu missatge de %s perquÃ¨ no era vÃ lid."
 msgstr[1] "S'han perdut %hu missatges de %s perquÃ¨ no eren vÃ lids."
 
-#: ../libpurple/protocols/oscar/oscar.c:2575
+#: ../libpurple/protocols/oscar/oscar.c:2615
 #, 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] "S'ha perdut %hu missatge de %s perquÃ¨ era massa llarg."
 msgstr[1] "S'han perdut %hu missatges de %s perquÃ¨ eren massa llargs."
 
-#: ../libpurple/protocols/oscar/oscar.c:2584
+#: ../libpurple/protocols/oscar/oscar.c:2624
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7752,7 +9071,7 @@ msgstr[1] "S'han perdut %hu missatges de
 msgstr[0] "S'ha perdut %hu missatge de %s perquÃ¨ no era vÃ lid."
 msgstr[1] "S'han perdut %hu missatges de %s perquÃ¨ no eren vÃ lids."
 
-#: ../libpurple/protocols/oscar/oscar.c:2593
+#: ../libpurple/protocols/oscar/oscar.c:2633
 #, 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."
@@ -7760,14 +9079,14 @@ msgstr[1] ""
 msgstr[1] ""
 "S'han perdut %hu missatges de %s perquÃ¨ ell/ella era massa dolent/a."
 
-#: ../libpurple/protocols/oscar/oscar.c:2602
+#: ../libpurple/protocols/oscar/oscar.c:2642
 #, 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] "S'ha perdut %hu missatge de %s perquÃ¨ sou massa dolent."
 msgstr[1] "S'han perdut %hu missatges de %s perquÃ¨ sou massa dolent."
 
-#: ../libpurple/protocols/oscar/oscar.c:2611
+#: ../libpurple/protocols/oscar/oscar.c:2651
 #, 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."
@@ -7775,51 +9094,47 @@ msgstr[1] "S'han perdut %hu missatges de
 msgstr[1] "S'han perdut %hu missatges de %s per motius desconeguts."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2766
-#: ../libpurple/protocols/oscar/oscar.c:2771
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2875
 msgid "Unknown reason."
 msgstr "Motiu desconegut."
 
-#: ../libpurple/protocols/oscar/oscar.c:2769
-#: ../libpurple/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2809
+#: ../libpurple/protocols/sametime/sametime.c:2451
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "No s'ha pogut enviar el missatge a %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2875
 #, c-format
 msgid "User information not available: %s"
 msgstr "La informaciÃ³ de l'usuari no estÃ  disponible: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Online Since"
 msgstr "En lÃnia des de"
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2911
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Membre des de"
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
-msgid "Capabilities"
-msgstr "Capacitats"
-
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2946
 msgid "Available Message"
 msgstr "Missatge de disponibilitat"
 
-#: ../libpurple/protocols/oscar/oscar.c:3014
+#: ../libpurple/protocols/oscar/oscar.c:3054
 msgid "Your AIM connection may be lost."
 msgstr "La vostra connexiÃ³ d'AIM es pot perdre."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3202
+#: ../libpurple/protocols/oscar/oscar.c:3242
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7827,7 +9142,7 @@ msgstr ""
 "[No s'ha pogut mostrar el missatge d'aquest usuari perquÃ¨ contenia carÃ cters "
 "invÃ lids.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3366
+#: ../libpurple/protocols/oscar/oscar.c:3406
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7835,82 +9150,83 @@ msgstr ""
 "No s'ha pogut realitzar la darrera acciÃ³ que havÃeu intentat perquÃ¨ esteu "
 "per sobre del lÃmit. Espereu 10 segons i torneu-ho a provar."
 
-#: ../libpurple/protocols/oscar/oscar.c:3449
+#: ../libpurple/protocols/oscar/oscar.c:3489
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Se us ha desconnectat de la conversa %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3699
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "TelÃ¨fon mÃ²bil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3769
 msgid "Personal Web Page"
 msgstr "PÃ gina web personal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3753
+#: ../libpurple/protocols/oscar/oscar.c:3793
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "InformaciÃ³ addicional"
 
-#: ../libpurple/protocols/oscar/oscar.c:3761
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Zip Code"
 msgstr "Codi postal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Division"
 msgstr "DivisiÃ³"
 
-#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Position"
 msgstr "PosiciÃ³"
 
-#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Web Page"
 msgstr "PÃ gina web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Work Information"
 msgstr "InformaciÃ³ de la feina"
 
-#: ../libpurple/protocols/oscar/oscar.c:3847
+#: ../libpurple/protocols/oscar/oscar.c:3887
 msgid "Pop-Up Message"
 msgstr "Missatge emergent"
 
-#: ../libpurple/protocols/oscar/oscar.c:3887
+#: ../libpurple/protocols/oscar/oscar.c:3927
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "El segÃ¼ent noms d'usuari estÃ  associats amb %s"
 msgstr[1] "Els segÃ¼ents noms d'usuari estan associats amb %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3932
 msgid "Screen name"
 msgstr "Nom d'usuari"
 
-#: ../libpurple/protocols/oscar/oscar.c:3918
+#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "No s'han obtingut resultats per a l'adreÃ§a de correu %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3939
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "HaurÃeu de rebre un correu demanant-vos confirmar %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3941
+#: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
 msgstr "S'ha solÂ·licitat la confirmaciÃ³ del compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:3972
+#: ../libpurple/protocols/oscar/oscar.c:4012
+#, c-format
 msgid "Error Changing Account Info"
 msgstr "S'ha produÃ¯t un error en canviar la informaciÃ³ del compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:3975
+#: ../libpurple/protocols/oscar/oscar.c:4015
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7919,13 +9235,13 @@ msgstr ""
 "Error 0x%04x: no s'ha pogut formatar el nom d'usuari perquÃ¨ el demanat "
 "difereix de l'original."
 
-#: ../libpurple/protocols/oscar/oscar.c:3978
+#: ../libpurple/protocols/oscar/oscar.c:4018
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Error 0x%04x: No s'ha pogut formatar el nom d'usuari perquÃ¨ no Ã©s vÃ lid."
 
-#: ../libpurple/protocols/oscar/oscar.c:3981
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7934,7 +9250,7 @@ msgstr ""
 "Error 0x%04x: no s'ha pogut formatar el nom d'usuari perquÃ¨ el demanat Ã©s "
 "massa llarg."
 
-#: ../libpurple/protocols/oscar/oscar.c:3984
+#: ../libpurple/protocols/oscar/oscar.c:4024
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7943,7 +9259,7 @@ msgstr ""
 "Error 0x%04x: no s'ha pogut canviar l'adreÃ§a de correu electrÃ²nic perquÃ¨ ja "
 "hi ha una peticiÃ³ pendent per a aquest nom d'usuari."
 
-#: ../libpurple/protocols/oscar/oscar.c:3987
+#: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7952,7 +9268,7 @@ msgstr ""
 "Error 0x%04x: no s'ha pogut canviar l'adreÃ§a de correu electrÃ²nic perquÃ¨ "
 "l'adreÃ§a donada ja tÃ© massa noms d'usuari associats."
 
-#: ../libpurple/protocols/oscar/oscar.c:3990
+#: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7961,32 +9277,32 @@ msgstr ""
 "Error 0x%04x: No s'ha pogut canviar l'adreÃ§a de correu perquÃ¨ l'adreÃ§a "
 "indicada no Ã©s vÃ lida."
 
-#: ../libpurple/protocols/oscar/oscar.c:3993
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: error desconegut."
 
-#: ../libpurple/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "L'adreÃ§a de correu per a %s Ã©s %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
 msgstr "InformaciÃ³ del compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:4177
+#: ../libpurple/protocols/oscar/oscar.c:4228
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "No s'ha enviat la imatge de MI. Heu d'estar directament connectat per poder "
 "enviar imatges de MI."
 
-#: ../libpurple/protocols/oscar/oscar.c:4448
+#: ../libpurple/protocols/oscar/oscar.c:4499
 msgid "Unable to set AIM profile."
 msgstr "No s'ha pogut establir el perfil d'AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4449
+#: ../libpurple/protocols/oscar/oscar.c:4500
 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 "
@@ -7996,7 +9312,7 @@ msgstr ""
 "procÃ©s de connexiÃ³. El vostre perfil segueix sense estar establert; intenteu "
 "establir-lo de nou quan el procÃ©s de connexiÃ³ hagi finalitzat."
 
-#: ../libpurple/protocols/oscar/oscar.c:4463
+#: ../libpurple/protocols/oscar/oscar.c:4514
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -8011,11 +9327,11 @@ msgstr[1] ""
 "S'ha excedit el lÃmit mÃ xim de la mida del perfil, que Ã©s de %d octets. S'ha "
 "retallat."
 
-#: ../libpurple/protocols/oscar/oscar.c:4468
+#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Profile too long."
 msgstr "Perfil massa llarg."
 
-#: ../libpurple/protocols/oscar/oscar.c:4513
+#: ../libpurple/protocols/oscar/oscar.c:4564
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -8028,11 +9344,11 @@ msgstr[1] ""
 msgstr[1] ""
 "S'ha superat el lÃmit de %d octets per al missatge d'absÃ¨ncia. S'ha retallat."
 
-#: ../libpurple/protocols/oscar/oscar.c:4518
+#: ../libpurple/protocols/oscar/oscar.c:4569
 msgid "Away message too long."
 msgstr "El missatge d'absÃ¨ncia Ã©s massa llarg."
 
-#: ../libpurple/protocols/oscar/oscar.c:4587
+#: ../libpurple/protocols/oscar/oscar.c:4642
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8043,33 +9359,33 @@ msgstr ""
 "d'usuari han de ser adreces de correu vÃ lides, o comenÃ§ar amb una lletra i "
 "contenir nomÃ©s lletres, nombres i espais, o nomÃ©s nombres."
 
-#: ../libpurple/protocols/oscar/oscar.c:4589
-#: ../libpurple/protocols/oscar/oscar.c:5022
-#: ../libpurple/protocols/oscar/oscar.c:5037
+#: ../libpurple/protocols/oscar/oscar.c:4644
+#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:5112
 msgid "Unable To Add"
 msgstr "No s'ha pogut afegir"
 
-#: ../libpurple/protocols/oscar/oscar.c:4698
+#: ../libpurple/protocols/oscar/oscar.c:4763
 msgid "Unable To Retrieve Buddy List"
 msgstr "No s'ha pogut obtenir la llista d'amics"
 
-#: ../libpurple/protocols/oscar/oscar.c:4699
+#: ../libpurple/protocols/oscar/oscar.c:4764
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few hours."
+"list is not lost, and will probably become available in a few minutes."
 msgstr ""
 "Els servidors d'AIM no han pogut enviar-vos la llista d'amics. No s'ha "
-"perdut, i probablement tornarÃ  a estar disponible d'aquÃ a poques hores."
+"perdut, i probablement tornarÃ  a estar disponible d'aquÃ a uns minuts."
 
-#: ../libpurple/protocols/oscar/oscar.c:4881
-#: ../libpurple/protocols/oscar/oscar.c:4883
-#: ../libpurple/protocols/oscar/oscar.c:5091
-#: ../libpurple/protocols/oscar/oscar.c:5092
-#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:4947
+#: ../libpurple/protocols/oscar/oscar.c:4949
+#: ../libpurple/protocols/oscar/oscar.c:5177
+#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5183
 msgid "Orphans"
 msgstr "Orfes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5020
+#: ../libpurple/protocols/oscar/oscar.c:5095
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8078,17 +9394,17 @@ msgstr ""
 "No s'ha pogut afegir l'amic %s perquÃ¨ hi ha massa entrades a la llista "
 "d'amics. Suprimiu-ne algun i torneu-ho a intentar."
 
-#: ../libpurple/protocols/oscar/oscar.c:5020
-#: ../libpurple/protocols/oscar/oscar.c:5035
+#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5110
 msgid "(no name)"
 msgstr "(sense nom)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5034
+#: ../libpurple/protocols/oscar/oscar.c:5109
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Per motius desconeguts no s'ha pogut afegir l'amic %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5128
+#: ../libpurple/protocols/oscar/oscar.c:5226
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8097,22 +9413,22 @@ msgstr ""
 "L'usuari %s us ha donat permÃs per afegir-vos a la seva llista d'amics. "
 "Voleu afegir-lo a la vostra?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5136
+#: ../libpurple/protocols/oscar/oscar.c:5234
 msgid "Authorization Given"
 msgstr "S'ha donat l'autoritzaciÃ³"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5209
+#: ../libpurple/protocols/oscar/oscar.c:5307
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "L'usuari %s us ha permÃ¨s afegir-lo a la vostra llista d'amics."
 
-#: ../libpurple/protocols/oscar/oscar.c:5210
+#: ../libpurple/protocols/oscar/oscar.c:5308
 msgid "Authorization Granted"
 msgstr "S'ha concedit l'autoritzaciÃ³"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5213
+#: ../libpurple/protocols/oscar/oscar.c:5311
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8123,52 +9439,52 @@ msgstr ""
 "pels motius segÃ¼ents:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5214
+#: ../libpurple/protocols/oscar/oscar.c:5312
 msgid "Authorization Denied"
 msgstr "S'ha denegat l'autoritzaciÃ³"
 
-#: ../libpurple/protocols/oscar/oscar.c:5250
+#: ../libpurple/protocols/oscar/oscar.c:5348
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "Int_ercanvi:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5290
+#: ../libpurple/protocols/oscar/oscar.c:5388
 msgid "Invalid chat name specified."
 msgstr "S'ha especificat un nom de xat invÃ lid."
 
-#: ../libpurple/protocols/oscar/oscar.c:5359
+#: ../libpurple/protocols/oscar/oscar.c:5457
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "La vostra imatge MI no s'ha enviat. No podeu enviar imatges MI en xats AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5519
-#: ../libpurple/protocols/oscar/oscar.c:5524
+#: ../libpurple/protocols/oscar/oscar.c:5619
+#: ../libpurple/protocols/oscar/oscar.c:5624
 msgid "Away Message"
 msgstr "Missatge d'absÃ¨ncia"
 
-#: ../libpurple/protocols/oscar/oscar.c:5524
+#: ../libpurple/protocols/oscar/oscar.c:5624
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(s'estÃ  recuperant)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:5824
 msgid "iTunes Music Store Link"
 msgstr "EnllaÃ§ al magatzem de mÃºsica iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5832
+#: ../libpurple/protocols/oscar/oscar.c:5932
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentari sobre l'amic %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5833
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Buddy Comment:"
 msgstr "Comentari sobre l'amic:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5880
+#: ../libpurple/protocols/oscar/oscar.c:5980
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Heu triat obrir una connexiÃ³ directa de MI amb %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5884
+#: ../libpurple/protocols/oscar/oscar.c:5984
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -8176,66 +9492,66 @@ msgstr ""
 "AtÃ¨s que aixÃ² revela la vostra adreÃ§a IP, es podria considerar com un risc "
 "de seguretat. Voleu continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5890
-#: ../libpurple/protocols/oscar/peer.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:5990
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "C_onnecta"
 
-#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "Get AIM Info"
 msgstr "ObtÃ©n informaciÃ³ de AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5931
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Edit Buddy Comment"
 msgstr "Edita el comentari sobre l'amic"
 
-#: ../libpurple/protocols/oscar/oscar.c:5939
+#: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "Get Status Msg"
 msgstr "Aconsegueix el missatge d'estat"
 
-#: ../libpurple/protocols/oscar/oscar.c:5952
+#: ../libpurple/protocols/oscar/oscar.c:6052
 msgid "Direct IM"
 msgstr "MI directa"
 
-#: ../libpurple/protocols/oscar/oscar.c:5974
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Re-request Authorization"
 msgstr "Torna a demanar l'autoritzaciÃ³"
 
-#: ../libpurple/protocols/oscar/oscar.c:6033
+#: ../libpurple/protocols/oscar/oscar.c:6133
 msgid "Require authorization"
 msgstr "Requereix autoritzaciÃ³"
 
-#: ../libpurple/protocols/oscar/oscar.c:6036
+#: ../libpurple/protocols/oscar/oscar.c:6136
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Atent al web (si ho habiliteu, farÃ  que comenceu a rebre'n brossa)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6041
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "ICQ Privacy Options"
 msgstr "Opcions de privadesa d'ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6060
+#: ../libpurple/protocols/oscar/oscar.c:6160
 msgid "The new formatting is invalid."
 msgstr "El format nou no Ã©s vÃ lid."
 
-#: ../libpurple/protocols/oscar/oscar.c:6061
+#: ../libpurple/protocols/oscar/oscar.c:6161
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "El format del nom d'usuari nomÃ©s pot canviar majÃºscules i minÃºscules, i "
 "espais en blanc."
 
-#: ../libpurple/protocols/oscar/oscar.c:6114
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "Change Address To:"
 msgstr "Canvia l'adreÃ§a per:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6160
+#: ../libpurple/protocols/oscar/oscar.c:6260
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>no esteu esperant cap autoritzaciÃ³</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6163
+#: ../libpurple/protocols/oscar/oscar.c:6263
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Esteu esperant l'autoritzaciÃ³ dels segÃ¼ents amics"
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6264
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8243,73 +9559,73 @@ msgstr ""
 "Podeu tornar a demanar l'autoritzaciÃ³ d'aquests amics fent-hi clic a sobre "
 "amb el botÃ³ dret del ratolÃ, i seleccionant Â«Torna a demanar l'autoritzaciÃ³Â»."
 
-#: ../libpurple/protocols/oscar/oscar.c:6181
+#: ../libpurple/protocols/oscar/oscar.c:6281
 msgid "Find Buddy by E-Mail"
 msgstr "Troba un amic per l'adreÃ§a de correu"
 
-#: ../libpurple/protocols/oscar/oscar.c:6182
+#: ../libpurple/protocols/oscar/oscar.c:6282
 msgid "Search for a buddy by e-mail address"
 msgstr "Cerca un amic per l'adreÃ§a de correu"
 
-#: ../libpurple/protocols/oscar/oscar.c:6183
+#: ../libpurple/protocols/oscar/oscar.c:6283
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Escriviu l'adreÃ§a de correu de l'amic que estigueu cercant."
 
-#: ../libpurple/protocols/oscar/oscar.c:6186
+#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "_Search"
 msgstr "C_erca"
 
-#: ../libpurple/protocols/oscar/oscar.c:6344
+#: ../libpurple/protocols/oscar/oscar.c:6444
 msgid "Set User Info (URL)..."
 msgstr "Estableix informaciÃ³ d'usuari (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6355
+#: ../libpurple/protocols/oscar/oscar.c:6455
 msgid "Change Password (URL)"
 msgstr "Canvia la contrasenya (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6359
+#: ../libpurple/protocols/oscar/oscar.c:6459
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configura el reenviament de MI (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6369
+#: ../libpurple/protocols/oscar/oscar.c:6469
 msgid "Set Privacy Options..."
 msgstr "Estableix les opcions de privadesa..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6376
+#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Confirm Account"
 msgstr "Confirma el compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:6380
+#: ../libpurple/protocols/oscar/oscar.c:6480
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostra l'adreÃ§a actualment registrada"
 
-#: ../libpurple/protocols/oscar/oscar.c:6384
+#: ../libpurple/protocols/oscar/oscar.c:6484
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Canvia l'adreÃ§a actualment registrada..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6391
+#: ../libpurple/protocols/oscar/oscar.c:6491
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostra els amics pendents d'autoritzaciÃ³"
 
-#: ../libpurple/protocols/oscar/oscar.c:6397
+#: ../libpurple/protocols/oscar/oscar.c:6497
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Cerca un amic per l'adreÃ§a de correu..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6402
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Search for Buddy by Information"
 msgstr "Cerca un amic per la informaciÃ³"
 
-#: ../libpurple/protocols/oscar/oscar.c:6470
+#: ../libpurple/protocols/oscar/oscar.c:6570
 msgid "Use recent buddies group"
 msgstr "Utilitza el grup d'amics recent"
 
-#: ../libpurple/protocols/oscar/oscar.c:6473
+#: ../libpurple/protocols/oscar/oscar.c:6573
 msgid "Show how long you have been idle"
 msgstr "Mostra quant de temps heu estat inactiu"
 
-#: ../libpurple/protocols/oscar/oscar.c:6628
+#: ../libpurple/protocols/oscar/oscar.c:6728
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -8318,27 +9634,28 @@ msgstr ""
 "per a la transferÃ¨ncia de fitxers\n"
 "(Ã©s mÃ©s lent, perÃ² acostuma a funcionar)"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 "S'estÃ  demanant a %s que es connecti amb vÃ³s a %s:%hu per a MI directa."
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "S'estÃ  intentant connectar amb %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:858
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "S'estÃ  intentant connectar a travÃ©s d'un servidor intermediari."
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s demana connectar-se directament a %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1039
 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 "
@@ -8500,20 +9817,20 @@ msgstr "Altres"
 msgid "Other"
 msgstr "Altres"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:522
+#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Modifica la meva informaciÃ³"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Actualitza la meva informaciÃ³"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "S'ha actualitzat la vostra informaciÃ³"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
+#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
@@ -8522,8 +9839,8 @@ msgstr ""
 "De moment no es permet establir cares personalitzades. Trieu una imatge de %"
 "s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
+#: ../libpurple/protocols/qq/buddy_info.c:618
+#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "El nom de la cara QQ no Ã©s vÃ lida"
 
@@ -8547,14 +9864,6 @@ msgstr "Em sap greu, no sou el meu tipus
 msgid "Sorry, you are not my type..."
 msgstr "Em sap greu, no sou el meu tipus..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
-msgid "Reject"
-msgstr "Rebutja"
-
 #: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr "Ha fallat la solÂ·licitut per afegir un amic amb autoritzaciÃ³"
@@ -8796,7 +10105,7 @@ msgstr "No s'ha pogut enviar la MI."
 msgid "Failed to send IM."
 msgstr "No s'ha pogut enviar la MI."
 
-#: ../libpurple/protocols/qq/keep_alive.c:87
+#: ../libpurple/protocols/qq/keep_alive.c:88
 msgid "Keep alive error"
 msgstr "Error de permanÃ¨ncia"
 
@@ -8804,100 +10113,100 @@ msgstr "S'ha produÃ¯t un error en solÂ·l
 msgid "Error requesting login token"
 msgstr "S'ha produÃ¯t un error en solÂ·licitar un testimoni d'entrada"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:489
 msgid "Unable to login, check debug log"
 msgstr "No s'ha pogut connectar, comproveu el registre de depuraciÃ³"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:549
+#: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "No s'ha pogut connectar."
 
-#: ../libpurple/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:187
 #, c-format
 msgid "Unknown-%d"
 msgstr "Desconegut-%d"
 
-#: ../libpurple/protocols/qq/qq.c:211
+#: ../libpurple/protocols/qq/qq.c:212
 msgid "TCP Address"
 msgstr "AdreÃ§a TCP"
 
-#: ../libpurple/protocols/qq/qq.c:213
+#: ../libpurple/protocols/qq/qq.c:214
 msgid "UDP Address"
 msgstr "AdreÃ§a UDP"
 
-#: ../libpurple/protocols/qq/qq.c:242
+#: ../libpurple/protocols/qq/qq.c:243
 msgid "Level"
 msgstr "Nivell"
 
-#: ../libpurple/protocols/qq/qq.c:373
+#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "QQ: El nom d'usuari no Ã©s vÃ lid"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>En lÃnia ara</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:440
+#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Actualitzat per darrer cop</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Mode de connexiÃ³</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>ID del servidor:</b> %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
+#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>La meva IP pÃºblica:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Temps de connexiÃ³</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Darrera IP de connexiÃ³</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
+#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Darrer temps de connexiÃ³</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "InformaciÃ³ de la connexiÃ³"
 
-#: ../libpurple/protocols/qq/qq.c:533
+#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
 msgstr "Estableix la meva informaciÃ³"
 
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Canvia la contrasenya"
 
-#: ../libpurple/protocols/qq/qq.c:539
+#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "Mostra informaciÃ³ de la connexiÃ³"
 
-#: ../libpurple/protocols/qq/qq.c:560
+#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "Surt d'aquest Qun QQ"
 
-#: ../libpurple/protocols/qq/qq.c:584
+#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "Bloca aquest usuari"
 
@@ -8911,19 +10220,19 @@ msgstr "Bloca aquest usuari"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
+#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "Connector per al protocol QQ"
 
-#: ../libpurple/protocols/qq/qq.c:752
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
 msgstr "Connecta amb TCP"
 
-#: ../libpurple/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/recv_core.c:310
 msgid "Socket error"
 msgstr "Error del sÃ²col"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:321
 msgid "Unable to read from socket"
 msgstr "No s'ha pogut llegir el sÃ²col"
 
@@ -8942,12 +10251,11 @@ msgstr "%d ha cancelÂ·lat la transferÃ¨n
 msgid "%d canceled the transfer of %s"
 msgstr "%d ha cancelÂ·lat la transferÃ¨ncia de %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
+#: ../libpurple/protocols/qq/sendqueue.c:124
 msgid "Connection lost"
 msgstr "S'ha perdut la connexiÃ³"
 
-#. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
+#: ../libpurple/protocols/qq/sendqueue.c:133
 msgid "Login failed, no reply"
 msgstr "Ha fallat l'entrada, no s'ha obtingut resposta"
 
@@ -8997,144 +10305,140 @@ msgstr "%s no Ã©s a la vostra llista d'a
 msgid "%s is not in your buddy list"
 msgstr "%s no Ã©s a la vostra llista d'amics"
 
-#: ../libpurple/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:419
 msgid "Connection closed (writing)"
 msgstr "S'ha tancat la connexiÃ³ (escrivint)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1292
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>TÃtol del grup:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>ID del grup Notes:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "Info for Group %s"
 msgstr "InformaciÃ³ del grup %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1297
 msgid "Notes Address Book Information"
 msgstr "InformaciÃ³ de la llibreta d'adreces del Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
 msgstr "Convida el grup a una conferÃ¨ncia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1339
 msgid "Get Notes Address Book Info"
 msgstr "ObtÃ©n informaciÃ³ de la llibreta d'adreces del Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
 msgstr "S'estÃ  enviant la conformitat de connexiÃ³"
 
-#: ../libpurple/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "S'estÃ  esperant el reconeixement de la conformitat de connexiÃ³"
 
-#: ../libpurple/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 "S'ha rebut el reconeixement de la conformitat de connexiÃ³. S'estÃ  enviant el "
 "nom d'usuari"
 
-#: ../libpurple/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
 msgstr "S'estÃ  esperant el reconeixement de l'entrada"
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
 msgstr "S'ha redireccionat l'entrada"
 
-#: ../libpurple/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
 msgstr "S'estÃ  forÃ§ant l'entrada"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
 msgstr "S'ha confirmat l'entrada"
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
 msgstr "S'estan iniciant els serveis"
 
-#: ../libpurple/protocols/sametime/sametime.c:1645
+#: ../libpurple/protocols/sametime/sametime.c:1678
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Un administrador de Sametime ha enviat aquest anunci en el servidor %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1650
+#: ../libpurple/protocols/sametime/sametime.c:1683
 msgid "Sametime Administrator Announcement"
 msgstr "Anunci de l'administrador de Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1734
 msgid "Connection reset"
 msgstr "S'ha reiniciat la connexiÃ³"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1746
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "S'ha produÃ¯t un error en llegir del sÃ²col: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
+#: ../libpurple/protocols/sametime/sametime.c:1771
+#: ../libpurple/protocols/sametime/sametime.c:3772
 msgid "Unable to connect to host"
 msgstr "No s'ha pogut connectar a l'ordinador"
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1812
 #, c-format
 msgid "Announcement from %s"
 msgstr "AvÃs de %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1986
 msgid "Conference Closed"
 msgstr "ConferÃ¨ncia tancada"
 
-#: ../libpurple/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2445
 msgid "Unable to send message: "
 msgstr "No s'ha pogut enviar el missatge: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2959
+#: ../libpurple/protocols/sametime/sametime.c:3001
 msgid "Place Closed"
 msgstr "Lloc tancat"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
+#: ../libpurple/protocols/sametime/sametime.c:3271
 msgid "Microphone"
 msgstr "MicrÃ²fon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3272
 msgid "Speakers"
 msgstr "Altaveus"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3273
 msgid "Video Camera"
 msgstr "CÃ mera de vÃdeo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3235
-msgid "File Transfer"
-msgstr "TransferÃ¨ncia de fitxers"
-
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3311
+#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Supports"
 msgstr "Permet"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
+#: ../libpurple/protocols/sametime/sametime.c:3316
+#: ../libpurple/protocols/sametime/sametime.c:4165
 msgid "External User"
 msgstr "Usuari extern"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: ../libpurple/protocols/sametime/sametime.c:3422
 msgid "Create conference with user"
 msgstr "Crea una conferÃ¨ncia amb un usuari"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3423
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -9142,27 +10446,27 @@ msgstr ""
 msgstr ""
 "IntroduÃ¯u el tema de la nova conferÃ¨ncia, i un missatge d'invitaciÃ³ per a %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
+#: ../libpurple/protocols/sametime/sametime.c:3427
 msgid "New Conference"
 msgstr "Nova conferÃ¨ncia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
+#: ../libpurple/protocols/sametime/sametime.c:3429
 msgid "Create"
 msgstr "Crea"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
+#: ../libpurple/protocols/sametime/sametime.c:3494
 msgid "Available Conferences"
 msgstr "ConferÃ¨ncies disponibles"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
+#: ../libpurple/protocols/sametime/sametime.c:3500
 msgid "Create New Conference..."
 msgstr "Crea noves conferÃ¨ncies..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
+#: ../libpurple/protocols/sametime/sametime.c:3507
 msgid "Invite user to a conference"
 msgstr "Convideu un usuari a una conferÃ¨ncia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3508
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -9173,27 +10477,27 @@ msgstr ""
 "%s. Seleccioneu Â«Crea una nova conferÃ¨nciaÂ» si voleu crear-ne una de nova on "
 "convidar-hi l'usuari."
 
-#: ../libpurple/protocols/sametime/sametime.c:3471
+#: ../libpurple/protocols/sametime/sametime.c:3513
 msgid "Invite to Conference"
 msgstr "Convida a la conferÃ¨ncia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
+#: ../libpurple/protocols/sametime/sametime.c:3604
 msgid "Invite to Conference..."
 msgstr "Convida a la conferÃ¨ncia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
+#: ../libpurple/protocols/sametime/sametime.c:3609
 msgid "Send TEST Announcement"
 msgstr "Envia un anunci TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4299
+#: ../libpurple/protocols/sametime/sametime.c:3628 ../pidgin/gtkconv.c:4437
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libpurple/protocols/sametime/sametime.c:3656
 msgid "No Sametime Community Server specified"
 msgstr "No s'ha especificat cap servidor de Sametime Community"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
+#: ../libpurple/protocols/sametime/sametime.c:3681
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -9202,42 +10506,42 @@ msgstr ""
 "No s'ha configurat cap ordinador o adreÃ§a IP per al compte Meanwhile %s. "
 "IntroduÃ¯u-ne un aquÃ sota per poder-vos connectar."
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3686
 msgid "Meanwhile Connection Setup"
 msgstr "ConfiguraciÃ³ de la connexiÃ³ Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3687
 msgid "No Sametime Community Server Specified"
 msgstr "No s'ha especificat cap servidor de Sametime Community"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4026
+#: ../libpurple/protocols/sametime/sametime.c:3689
 msgid "Connect"
 msgstr "Connecta"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
+#: ../libpurple/protocols/sametime/sametime.c:4181
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Desconegut (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
+#: ../libpurple/protocols/sametime/sametime.c:4183
 msgid "Last Known Client"
 msgstr "Darrer client conegut"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
+#: ../libpurple/protocols/sametime/sametime.c:4347
+#: ../libpurple/protocols/sametime/sametime.c:5552
 msgid "User Name"
 msgstr "Nom d'usuari"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libpurple/protocols/sametime/sametime.c:4350
+#: ../libpurple/protocols/sametime/sametime.c:5555
 msgid "Sametime ID"
 msgstr "ID de Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4374
 msgid "An ambiguous user ID was entered"
 msgstr "S'ha entrat un ID d'usuari ambigu"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4375
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -9247,15 +10551,15 @@ msgstr ""
 "usuaris. De la llista de sota, seleccioneu-ne l'usuari a afegir a la vostra "
 "llista d'amics."
 
-#: ../libpurple/protocols/sametime/sametime.c:4334
+#: ../libpurple/protocols/sametime/sametime.c:4380
 msgid "Select User"
 msgstr "Seleccioneu un usuari"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#: ../libpurple/protocols/sametime/sametime.c:4464
 msgid "Unable to add user: user not found"
 msgstr "No s'ha pogut afegir l'usuari: no s'ha trobat l'usuari"
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
+#: ../libpurple/protocols/sametime/sametime.c:4466
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -9264,11 +10568,7 @@ msgstr ""
 "L'identificador Â«%sÂ» no coincideix amb cap usuari de la vostra comunitat "
 "Sametime. S'ha suprimit aquesta entrada de la vostra llista d'amics."
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "No s'ha pogut afegir l'usuari"
-
-#: ../libpurple/protocols/sametime/sametime.c:5011
+#: ../libpurple/protocols/sametime/sametime.c:5057
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -9277,63 +10577,63 @@ msgstr ""
 "S'ha produÃ¯t un error en llegir el fitxer %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
+#: ../libpurple/protocols/sametime/sametime.c:5192
 msgid "Remotely Stored Buddy List"
 msgstr "Llista d'amics emmagatzemada a un lloc remot"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
+#: ../libpurple/protocols/sametime/sametime.c:5197
 msgid "Buddy List Storage Mode"
 msgstr "Mode d'emmagatzematge de la llista d'amics"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
+#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Local Buddy List Only"
 msgstr "NomÃ©s llista d'amics local"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
+#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Merge List from Server"
 msgstr "Fusiona la llista d'amics del servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
+#: ../libpurple/protocols/sametime/sametime.c:5204
 msgid "Merge and Save List to Server"
 msgstr "Fusiona i desa la llista d'amics del servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
+#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Synchronize List with Server"
 msgstr "Sincronitza la llista amb el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5261
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importa la llista Sametime del compte %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
+#: ../libpurple/protocols/sametime/sametime.c:5301
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exporta la llista Sametime del compte %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: ../libpurple/protocols/sametime/sametime.c:5355
 msgid "Unable to add group: group exists"
 msgstr "No s'ha pogut afegir el grup: ja existeix"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5356
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Ja existeix un grup anomenat Â«%sÂ» a la vostra llista d'amics."
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5359
+#: ../libpurple/protocols/sametime/sametime.c:5489
 msgid "Unable to add group"
 msgstr "No s'ha pogut agefir el grup"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
+#: ../libpurple/protocols/sametime/sametime.c:5418
 msgid "Possible Matches"
 msgstr "CoincidÃ¨ncies possibles"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5434
 msgid "Notes Address Book group results"
 msgstr "Resultats de grups de llibretes d'adreces Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5435
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -9344,15 +10644,15 @@ msgstr ""
 "d'adreces Notes segÃ¼ents. Seleccioneu el grup correcte de la llista d'aquÃ "
 "sota, a afegir a la llista d'amics."
 
-#: ../libpurple/protocols/sametime/sametime.c:5394
+#: ../libpurple/protocols/sametime/sametime.c:5440
 msgid "Select Notes Address Book"
 msgstr "Seleccioneu la llibreta d'adreces Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5483
 msgid "Unable to add group: group not found"
 msgstr "No s'ha pogut afegir el grup: no s'ha trobat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
+#: ../libpurple/protocols/sametime/sametime.c:5485
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -9361,11 +10661,11 @@ msgstr ""
 "L'identificador Â«%sÂ» no coincideix amb cap dels grups de llibretes d'adreces "
 "Notes de la vostra comunitat Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/sametime/sametime.c:5526
 msgid "Notes Address Book Group"
 msgstr "Grup de la llibreta d'adreces Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5527
 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."
@@ -9374,12 +10674,12 @@ msgstr ""
 "que vulgueu afegir, juntament amb els seus membres, a la vostra llista "
 "d'amics."
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
+#: ../libpurple/protocols/sametime/sametime.c:5576
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultats de la cerca de Â«%sÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5577
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -9390,30 +10690,30 @@ msgstr ""
 "usuaris. Podeu afegir aquests usuaris a la vostra llista d'adreces, o enviar-"
 "los missatges amb els botons d'acciÃ³ de sota."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
+#: ../libpurple/protocols/sametime/sametime.c:5584 ../pidgin/gtknotify.c:763
 msgid "Search Results"
 msgstr "Resultats de la cerca"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "No matches"
 msgstr "Cap coincidÃ¨ncia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5610
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "L'identificador Â«%sÂ» no coincideix amb cap dels usuaris de la vostra "
 "comunitat Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
+#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "No Matches"
 msgstr "Cap coincidÃ¨ncia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5651
 msgid "Search for a user"
 msgstr "Cerca un usuari"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5652
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -9421,32 +10721,32 @@ msgstr ""
 "IntroduÃ¯u al camp d'aquÃ sota, el nom o un identificador parcial per cercar "
 "usuaris de la vostra comunitat Sametime que hi coincideixin."
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5655
 msgid "User Search"
 msgstr "Cerca d'usuaris"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5668
 msgid "Import Sametime List..."
 msgstr "Importa una llista Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
+#: ../libpurple/protocols/sametime/sametime.c:5672
 msgid "Export Sametime List..."
 msgstr "Exporta la llista Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
+#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Add Notes Address Book Group..."
 msgstr "Afegeix un grup a la llibreta d'adreces Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "User Search..."
 msgstr "Cerca d'usuaris..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5786
 msgid "Force login (ignore server redirects)"
 msgstr "ForÃ§a l'entrada (ignora la redirecciÃ³ del servidor)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Hide client identity"
 msgstr "Amaga la identitat del client"
 
@@ -9575,8 +10875,8 @@ msgstr "Especifica la contrasenya de MI"
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc/ops.c:1503
+#: ../libpurple/protocols/silc/ops.c:1514
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -9585,8 +10885,8 @@ msgstr "Aconsegueix la clau pÃºblica"
 msgstr "Aconsegueix la clau pÃºblica"
 
 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc/ops.c:1504
+#: ../libpurple/protocols/silc/ops.c:1515
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -9594,17 +10894,17 @@ msgstr "No s'ha pogut obtenir la clau pÃ
 msgstr "No s'ha pogut obtenir la clau pÃºblica"
 
 #: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc/buddy.c:1658
 #: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
+#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "Mostra la clau pÃºblica"
 
 #: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/chat.c:239
 #: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "No s'ha pogut carregar la clau pÃºblica"
@@ -9612,9 +10912,9 @@ msgstr "No s'ha pogut carregar la clau p
 #: ../libpurple/protocols/silc/buddy.c:701
 #: ../libpurple/protocols/silc/ops.c:1053
 #: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc/ops.c:1290
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1309
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -9626,7 +10926,7 @@ msgstr "InformaciÃ³ de l'usuari"
 
 #: ../libpurple/protocols/silc/buddy.c:702
 #: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc/ops.c:1310
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -9650,19 +10950,19 @@ msgstr ""
 "la."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1062
+#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Obre..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "L'amic %s no estÃ  present a la xarxa"
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -9670,18 +10970,18 @@ msgstr ""
 "Per afegir un amic heu d'importar la seva clau pÃºblica. Feu clic a Importa "
 "per importar la clau pÃºblica."
 
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "_Importa..."
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1186
+#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Seleccioneu l'usuari correcte"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1186
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -9689,8 +10989,8 @@ msgstr ""
 "S'ha trobat mÃ©s d'un usuari amb la mateixa clau pÃºblica. Seleccioneu "
 "l'usuari correcte de la llista per afegir-lo a la llista d'amics."
 
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc10/buddy.c:1188
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -9698,215 +10998,208 @@ msgstr ""
 "S'ha trobat mÃ©s d'un usuari amb el mateix nom. Seleccioneu l'usuari correcte "
 "per afegir a la llista d'amics."
 
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
+#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "Separat"
 
-#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/buddy.c:1481
 #: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/buddy.c:1481
 #: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indisposat"
 
-#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/buddy.c:1485
 #: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/buddy.c:1485
 #: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Desperta'm"
 
-#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/buddy.c:1487
 #: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/buddy.c:1487
 #: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperactiu"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/silc.c:886
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1496
 #: ../libpurple/protocols/silc10/silc.c:654
 #: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Content"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/silc.c:888
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:656
 #: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Trist"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/silc.c:890
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:658
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Enfadat"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/silc.c:892
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "GelÃ³s"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/silc.c:894
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Avergonyit"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:896
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1506
 #: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Invencible"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1508
 #: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Enamorat"
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/silc.c:900
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1510
 #: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Endormiscat"
 
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/silc.c:902
+#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc10/buddy.c:1512
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Avorrit"
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/silc.c:904
+#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc10/buddy.c:1514
 #: ../libpurple/protocols/silc10/silc.c:672
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Excitat"
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/silc.c:906
+#: ../libpurple/protocols/silc/util.c:542
+#: ../libpurple/protocols/silc10/buddy.c:1516
 #: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "AnsiÃ³s"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/buddy.c:1548
 #: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/buddy.c:1548
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Modes d'usuari"
 
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr "Estat d'Ã nim"
-
-#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/buddy.c:1565
 #: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Contacte preferit"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/buddy.c:1570
 #: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/buddy.c:1570
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Idioma preferit"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/buddy.c:1575
 #: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/buddy.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Dispositiu"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/buddy.c:1580
 #: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:722
 #: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Fus horari"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/buddy.c:1585
 #: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "UbicaciÃ³ geogrÃ fica"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1641
+#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "Reinicia la clau de MI"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1646
+#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "MI amb intercanvi de clau"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1651
+#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "MI amb contrasenya"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1664
+#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Aconsegueix la clau pÃºblica..."
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc/buddy.c:1671
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Mata l'usuari"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc/buddy.c:1681
+#: ../libpurple/protocols/silc/chat.c:997
+#: ../libpurple/protocols/silc10/buddy.c:1680
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Dibuixa a la pissarra"
@@ -9923,7 +11216,7 @@ msgstr "No existeix el canal %s a la xar
 msgstr "No existeix el canal %s a la xarxa"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc/chat.c:177
 #: ../libpurple/protocols/silc10/chat.c:81
 #: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
@@ -9973,44 +11266,46 @@ msgstr "<br><b>Tema del canal:</b><br>%s
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modes del canal:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
 #: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Empremta de la clau del fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc/chat.c:168
 #: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Empremta babble de la clau del fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:238
 #: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Afegeix clau pÃºblica del canal"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc/chat.c:306
 #: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Obre una clau pÃºblica..."
 
-#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Contrasenya del canal"
 
-#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc/chat.c:432
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Llista de les claus pÃºbliques del canal"
 
-#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -10024,11 +11319,11 @@ msgstr ""
 "claus pÃºbliques del canal, nomÃ©s els usuaris que tinguin les seves claus "
 "pÃºbliques llistades al canal hi podran entrar."
 
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:483
+#: ../libpurple/protocols/silc/chat.c:484
+#: ../libpurple/protocols/silc/chat.c:931
 #: ../libpurple/protocols/silc10/chat.c:422
 #: ../libpurple/protocols/silc10/chat.c:423
 #: ../libpurple/protocols/silc10/chat.c:461
@@ -10037,111 +11332,111 @@ msgstr "AutenticaciÃ³ del canal"
 msgid "Channel Authentication"
 msgstr "AutenticaciÃ³ del canal"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc/chat.c:448
+#: ../libpurple/protocols/silc/chat.c:485
 #: ../libpurple/protocols/silc10/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Afegeix / Suprimeix"
 
-#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc/chat.c:601
 #: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Nom del grup"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc/chat.c:605
+#: ../libpurple/protocols/silc/ops.c:1817
+#: ../libpurple/protocols/silc/silc.c:1163
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1901
 #: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Contrasenya"
 
-#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc/chat.c:616
 #: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "IntroduÃ¯u el nom del grup privat i la frase clau per al canal %s."
 
-#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc/chat.c:618
 #: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Afegeix un grup privat al canal"
 
-#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc/chat.c:746
 #: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "LÃmit d'usuaris"
 
-#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc/chat.c:747
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Estableix el lÃmit d'usuaris del canal. Poseu-lo a zero per reiniciar el "
 "lÃmit."
 
-#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc/chat.c:911
 #: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Llista de convidats"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:916
 #: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Llista de bandejats"
 
-#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc/chat.c:924
 #: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Afegeix un grup privat"
 
-#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc/chat.c:937
 #: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "ReiniciaciÃ³ permanent"
 
-#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc/chat.c:942
 #: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Estableix a permanent"
 
-#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc/chat.c:950
 #: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Estableix el lÃmit d'usuaris"
 
-#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc/chat.c:956
 #: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Reinicia la restricciÃ³ del tema"
 
-#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc/chat.c:961
 #: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Estableix restricciÃ³ del tema"
 
-#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc/chat.c:968
 #: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Reinicia el canal privat"
 
-#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc/chat.c:973
 #: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Estableix canal privat"
 
-#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc/chat.c:980
 #: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Reinicia canal secret"
 
-#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc/chat.c:985
 #: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Estableix canal secret"
 
-#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc/chat.c:1046
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
@@ -10149,34 +11444,34 @@ msgstr ""
 msgstr ""
 "Primer heu d'entrar al canal %s per desprÃ©s poder entrar al grup privat"
 
-#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc/chat.c:1048
 #: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Entra al grup privat"
 
-#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc/chat.c:1049
 #: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "No s'ha pogut entrar al grup privat"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Call Command"
 msgstr "Ordre de trucada"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Cannot call command"
 msgstr "No s'ha pogut cridar l'ordre"
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc/chat.c:1246
+#: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
+#: ../libpurple/protocols/silc10/silc.c:1141
 msgid "Unknown command"
 msgstr "Ordre desconeguda"
 
@@ -10334,7 +11629,7 @@ msgstr "Rol a la feina"
 msgstr "Rol a la feina"
 
 #: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
@@ -10368,7 +11663,7 @@ msgstr "El fundador de <I>%s</I> Ã©s <I>
 msgstr "El fundador de <I>%s</I> Ã©s <I>%s</I>"
 
 #: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc/ops.c:1328
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
@@ -10380,90 +11675,90 @@ msgstr "Text d'estat"
 msgid "Status Text"
 msgstr "Text d'estat"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1354
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Empremta de la clau pÃºblica"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/ops.c:1281
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Empremta babble de la clau pÃºblica"
 
-#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc/ops.c:1294
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_MÃ©s..."
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
+#: ../libpurple/protocols/silc10/silc.c:991
 msgid "Detach From Server"
 msgstr "Separa del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "No s'ha pogut separar"
 
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "No s'ha pogut establir el tema"
 
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "No s'ha pogut canviar el sobrenom"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Llista de sales"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "No s'ha pogut obtenir la llista de sales"
 
-#: ../libpurple/protocols/silc/ops.c:1468
+#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
 msgstr "La xarxa Ã©s buida"
 
-#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc/ops.c:1516
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "No s'ha rebut cap clau pÃºblica"
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc/ops.c:1528
+#: ../libpurple/protocols/silc/ops.c:1541
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "InformaciÃ³ del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "No s'ha pogut obtenir informaciÃ³ del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc/ops.c:1552
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "EstadÃstiques del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1553
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "No s'han pogut obtenir estadÃstiques del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc/ops.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -10499,61 +11794,54 @@ msgstr ""
 "Total d'operadors del servidor: %d\n"
 "Total d'operadors de l'encaminador: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc/ops.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "EstadÃstiques de xarxa"
 
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping"
-msgstr "Ping"
-
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ha fallat el ping"
 
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "S'ha rebut la resposta al ping del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "No s'ha pogut matar l'usuari"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr "VIGILA"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
 msgstr "No es pot vigilar l'usuari"
 
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc/ops.c:1728
+#: ../libpurple/protocols/silc/ops.c:1779
+#: ../libpurple/protocols/silc/silc.c:385
 #: ../libpurple/protocols/silc10/ops.c:1811
 #: ../libpurple/protocols/silc10/ops.c:1858
 #: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "S'estÃ  reprenent la sessiÃ³"
 
-#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc/ops.c:1730
 #: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "S'estÃ  autenticant la connexiÃ³"
 
-#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc/ops.c:1781
 #: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "S'estÃ  verificant la clau pÃºblica del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc/ops.c:1818
 #: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Cal contrasenya"
@@ -10599,22 +11887,22 @@ msgstr "El tipus de la clau pÃºblica no 
 msgid "Unsupported public key type"
 msgstr "El tipus de la clau pÃºblica no estÃ  suportat"
 
-#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc/silc.c:319
 #: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "El servidor us ha desconnectat"
 
-#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc/silc.c:327
 #: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "S'ha produÃ¯t un error en connectar al servidor SILC"
 
-#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc/silc.c:333
 #: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "Ha fallat l'intercanvi de claus"
 
-#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc/silc.c:343
 #: ../libpurple/protocols/silc10/ops.c:1714
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
@@ -10622,62 +11910,63 @@ msgstr ""
 "No s'ha pogut restablir la sessiÃ³ anteriorment separada. Premeu Â«Torna a "
 "connectarÂ» per crear una nova connexiÃ³."
 
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc/silc.c:373
+#: ../libpurple/protocols/silc/silc.c:420
 #: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Ha fallat la connexiÃ³"
 
-#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc/silc.c:388
 #: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "S'estan intercanviant les claus"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc/silc.c:445
 #: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr "S'estÃ  connectant al servidor SILC"
 
-#: ../libpurple/protocols/silc/silc.c:352
+#: ../libpurple/protocols/silc/silc.c:455
 msgid "Could not load SILC key pair"
 msgstr "No s'ha pogut carregar el parell de claus SILC"
 
-#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc/silc.c:469
 #: ../libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr "No s'ha pogut crear la connexiÃ³"
 
-#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc/silc.c:499
 #: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Sense memÃ²ria"
 
-#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc/silc.c:550
 #: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "No s'ha pogut inicialitzar el protocol SILC"
 
-#: ../libpurple/protocols/silc/silc.c:445
+#: ../libpurple/protocols/silc/silc.c:559
 msgid "Error loading SILC key pair"
 msgstr "S'ha produÃ¯t un error en carregar el parell de claus claus SILC"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:882
 #: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "El vostre estat d'Ã nim actual"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1638
+#: ../libpurple/protocols/silc/silc.c:884
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1741
+#, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc/silc.c:898
 #: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Enamorat"
 
-#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc/silc.c:909
 #: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
@@ -10686,62 +11975,62 @@ msgstr ""
 "\n"
 "El vostre mÃ¨tode de contacte preferit"
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/util.c:569
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc/silc.c:921
 #: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "VideoconferÃ¨ncia"
 
-#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc/silc.c:926
 #: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "El vostre estat actual"
 
-#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc/silc.c:933
 #: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Serveis en lÃnia"
 
-#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc/silc.c:936
 #: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Permet que els altres vegin quins serveis feu servir"
 
-#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc/silc.c:942
 #: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Permet que els altres vegin quin ordinador feu servir"
 
-#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc/silc.c:949
 #: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "El fitxer de la vostra VCard"
 
-#: ../libpurple/protocols/silc/silc.c:812
+#: ../libpurple/protocols/silc/silc.c:955
 msgid "Timezone (UTC)"
 msgstr "Fus horari (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc/silc.c:959
+#: ../libpurple/protocols/silc/silc.c:960
 #: ../libpurple/protocols/silc10/silc.c:729
 #: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Atributs de l'estat de l'usuari en lÃnia"
 
-#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc/silc.c:961
 #: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
@@ -10752,31 +12041,31 @@ msgstr ""
 "lÃnia, aixÃ com informaciÃ³ personal. Empleneu la informaciÃ³ que vulgueu que "
 "altres usuaris puguin veure."
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc/silc.c:1002
+#: ../libpurple/protocols/silc/silc.c:1008
+#: ../libpurple/protocols/silc/silc.c:1629
 #: ../libpurple/protocols/silc10/silc.c:772
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+#: ../libpurple/protocols/silc10/silc.c:1418
 msgid "Message of the Day"
 msgstr "Frase del dia"
 
-#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:1002
 #: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "No es disposa de frase del dia"
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1624
 #: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
+#: ../libpurple/protocols/silc10/silc.c:1413
 msgid "There is no Message of the Day associated with this connection"
 msgstr "No hi ha cap frase del dia associada amb aquesta connexiÃ³"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc/silc.c:1054
+#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc/silc.c:1171
+#: ../libpurple/protocols/silc/silc.c:1172
 #: ../libpurple/protocols/silc10/silc.c:824
 #: ../libpurple/protocols/silc10/silc.c:868
 #: ../libpurple/protocols/silc10/silc.c:939
@@ -10784,185 +12073,185 @@ msgstr "Crea una nova parella de claus S
 msgid "Create New SILC Key Pair"
 msgstr "Crea una nova parella de claus SILC"
 
-#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:1054
 #: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Les contrasenyes no coincideixen"
 
-#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1100
 #: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Ha fallat la generaciÃ³ del parell de claus"
 
-#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1139
 #: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Longitud de la clau"
 
-#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:1141
 #: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Fitxer de la clau pÃºblica"
 
-#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc/silc.c:1143
 #: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Fitxer de la clau privada"
 
-#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc/silc.c:1166
 #: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Contrasenya (torneu-la a escriure)"
 
-#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc/silc.c:1173
 #: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Genera la parella de claus"
 
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
+#: ../libpurple/protocols/silc/silc.c:1216
+#: ../libpurple/protocols/silc10/silc.c:987
 msgid "Online Status"
 msgstr "Estat en lÃnia"
 
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:1224
+#: ../libpurple/protocols/silc10/silc.c:995
 msgid "View Message of the Day"
 msgstr "Mostra la frase del dia"
 
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1228
+#: ../libpurple/protocols/silc10/silc.c:999
 msgid "Create SILC Key Pair..."
 msgstr "Crea una parella de claus SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1177
-#: ../libpurple/protocols/silc10/silc.c:1095
+#: ../libpurple/protocols/silc/silc.c:1320
+#: ../libpurple/protocols/silc10/silc.c:1098
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "L'usuari <I>%s</I> no estÃ  present a la xarxa"
 
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
+#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc10/silc.c:1289
 msgid "Topic too long"
 msgstr "El tema Ã©s massa llarg"
 
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
+#: ../libpurple/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/silc10/silc.c:1370
 msgid "You must specify a nick"
 msgstr "Heu d'indicar un sobrenom"
 
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
+#: ../libpurple/protocols/silc/silc.c:1683
+#: ../libpurple/protocols/silc10/silc.c:1472
 #, c-format
 msgid "channel %s not found"
 msgstr "No s'ha trobat el canal %s"
 
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
+#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc10/silc.c:1477
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "Els modes del canal %s sÃ³n: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1479
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no s'ha especificat cap mode per a %s"
 
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc10/silc.c:1492
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Ha fallat en posar modes per a %s"
 
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
+#: ../libpurple/protocols/silc/silc.c:1733
+#: ../libpurple/protocols/silc10/silc.c:1522
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Ordre desconeguda: %s, (pot ser un error del client)"
 
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
+#: ../libpurple/protocols/silc/silc.c:1796
+#: ../libpurple/protocols/silc10/silc.c:1585
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]: surt del xat"
 
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
+#: ../libpurple/protocols/silc/silc.c:1800
+#: ../libpurple/protocols/silc10/silc.c:1589
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]: surt del xat"
 
-#: ../libpurple/protocols/silc/silc.c:1661
-#: ../libpurple/protocols/silc10/silc.c:1590
+#: ../libpurple/protocols/silc/silc.c:1804
+#: ../libpurple/protocols/silc10/silc.c:1593
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;tema nou&gt;]: mostra o canvia el tema"
 
-#: ../libpurple/protocols/silc/silc.c:1666
-#: ../libpurple/protocols/silc10/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1809
+#: ../libpurple/protocols/silc10/silc.c:1598
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;canal&gt; [&lt;contrasenya&gt;]: entra en un xat d'aquesta xarxa"
 
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1813
+#: ../libpurple/protocols/silc10/silc.c:1602
 msgid "list:  List channels on this network"
 msgstr "list:  Llista els canals en aquesta xarxa"
 
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
+#: ../libpurple/protocols/silc/silc.c:1817
+#: ../libpurple/protocols/silc10/silc.c:1606
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;sobrenom&gt;: mostra informaciÃ³ sobre el sobrenom"
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/silc/silc.c:1821
+#: ../libpurple/protocols/silc10/silc.c:1610
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;sobrenom&gt; &lt;missatge&gt;: envia un missatge privat a l'usuari "
 "indicat"
 
-#: ../libpurple/protocols/silc/silc.c:1682
-#: ../libpurple/protocols/silc10/silc.c:1611
+#: ../libpurple/protocols/silc/silc.c:1825
+#: ../libpurple/protocols/silc10/silc.c:1614
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;sobrenom&gt; [&lt;missatge&gt;]: envia un missatge privat a "
 "l'usuari"
 
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
+#: ../libpurple/protocols/silc/silc.c:1829
+#: ../libpurple/protocols/silc10/silc.c:1618
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: mostra la frase del dia del servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
+#: ../libpurple/protocols/silc/silc.c:1833
+#: ../libpurple/protocols/silc10/silc.c:1622
 msgid "detach:  Detach this session"
 msgstr "detach: separa aquesta sessiÃ³"
 
-#: ../libpurple/protocols/silc/silc.c:1694
-#: ../libpurple/protocols/silc10/silc.c:1623
+#: ../libpurple/protocols/silc/silc.c:1837
+#: ../libpurple/protocols/silc10/silc.c:1626
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [missatge]: desconnecta del servidor, amb un missatge opcional"
 
-#: ../libpurple/protocols/silc/silc.c:1698
-#: ../libpurple/protocols/silc10/silc.c:1627
+#: ../libpurple/protocols/silc/silc.c:1841
+#: ../libpurple/protocols/silc10/silc.c:1630
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;ordre&gt;: crida una ordre del client slic"
 
-#: ../libpurple/protocols/silc/silc.c:1704
-#: ../libpurple/protocols/silc10/silc.c:1633
+#: ../libpurple/protocols/silc/silc.c:1847
+#: ../libpurple/protocols/silc10/silc.c:1636
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;sobrenom&gt; [-pubkey|&lt;motiu&gt;]: mata un sobrenom"
 
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
+#: ../libpurple/protocols/silc/silc.c:1851
+#: ../libpurple/protocols/silc10/silc.c:1640
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;sobrenom nou&gt;: canvia de sobrenom"
 
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
+#: ../libpurple/protocols/silc/silc.c:1855
+#: ../libpurple/protocols/silc10/silc.c:1644
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;sobrenom&gt;: mostra informaciÃ³ sobre el sobrenom"
 
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:1645
+#: ../libpurple/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc10/silc.c:1648
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -10970,8 +12259,8 @@ msgstr ""
 "cmode &lt;canal&gt; [+|-&lt;modes&gt;] [arguments]: canvia o mostra els "
 "modes del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
+#: ../libpurple/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc10/silc.c:1652
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10979,18 +12268,18 @@ msgstr ""
 "cumode &lt;canal&gt; +|-&lt;modes&gt; &lt;sobrenom&gt;: canvia el mode del "
 "canal per al sobrenom"
 
-#: ../libpurple/protocols/silc/silc.c:1724
-#: ../libpurple/protocols/silc10/silc.c:1653
+#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc10/silc.c:1656
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modes d'usuari&gt;: canvia el vostre mode a la xarxa"
 
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:1657
+#: ../libpurple/protocols/silc/silc.c:1871
+#: ../libpurple/protocols/silc10/silc.c:1660
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;sobrenom&gt; [-pubkey]: dÃ³na privilegis d'operador"
 
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1664
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10998,45 +12287,45 @@ msgstr ""
 "invite &lt;canal&gt; [-|+]&lt;sobrenom&gt;: convida el sobrenom o afegeix/"
 "suprimeix de la llista de convidats al canal"
 
-#: ../libpurple/protocols/silc/silc.c:1736
-#: ../libpurple/protocols/silc10/silc.c:1665
+#: ../libpurple/protocols/silc/silc.c:1879
+#: ../libpurple/protocols/silc10/silc.c:1668
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canal&gt; &lt;sobrenom&gt; [comentari]: fa fora del canal el client"
 
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
+#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc10/silc.c:1672
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]: mostra detalls administratius del servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1744
-#: ../libpurple/protocols/silc10/silc.c:1673
+#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc10/silc.c:1676
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canal&gt; +|-&lt;sobrenom&gt;]: bandeja un client del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1748
-#: ../libpurple/protocols/silc10/silc.c:1677
+#: ../libpurple/protocols/silc/silc.c:1891
+#: ../libpurple/protocols/silc10/silc.c:1680
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;sobrenom|servidor&gt;: obtÃ© la clau pÃºblica del client o servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
+#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc10/silc.c:1684
 msgid "stats:  View server and network statistics"
 msgstr "stats: mostra estadÃstiques de xarxa del servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
+#: ../libpurple/protocols/silc/silc.c:1899
+#: ../libpurple/protocols/silc10/silc.c:1688
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: envia un PING al servidor on esteu connectat"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc10/silc.c:1693
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;canal&gt;: llista els usuaris d'un canal"
 
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1908
+#: ../libpurple/protocols/silc10/silc.c:1697
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11053,141 +12342,141 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:2019
+#: ../libpurple/protocols/silc10/silc.c:1822
 msgid "SILC Protocol Plugin"
 msgstr "Connector per al protocol SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
+#: ../libpurple/protocols/silc/silc.c:2021
+#: ../libpurple/protocols/silc10/silc.c:1824
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocol per a conferÃ¨ncies en viu segures per Internet (SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2031
+#: ../libpurple/protocols/silc/silc.c:2053
+#: ../libpurple/protocols/silc10/silc.c:1856 ../pidgin/gtkprefs.c:2138
 msgid "Network"
 msgstr "Xarxa"
 
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc/silc.c:2064
+#: ../libpurple/protocols/silc10/silc.c:1867
 msgid "Public Key file"
 msgstr "Fitxer de la clau pÃºblica"
 
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
+#: ../libpurple/protocols/silc/silc.c:2068
+#: ../libpurple/protocols/silc10/silc.c:1871
 msgid "Private Key file"
 msgstr "Fitxer de la clau privada"
 
 # FIXME
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
+#: ../libpurple/protocols/silc/silc.c:2078
+#: ../libpurple/protocols/silc10/silc.c:1881
 msgid "Cipher"
 msgstr "Codi"
 
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
+#: ../libpurple/protocols/silc/silc.c:2088
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1948
+#: ../libpurple/protocols/silc/silc.c:2091
 msgid "Use Perfect Forward Secrecy"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libpurple/protocols/silc/silc.c:2095
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Public key authentication"
 msgstr "AutenticaciÃ³ per clau pÃºblica"
 
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: ../libpurple/protocols/silc/silc.c:2098
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block IMs without Key Exchange"
 msgstr "Bloca la MI sense intercanvi de claus"
 
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:2101
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block messages to whiteboard"
 msgstr "Bloca els misstges a la pissarra"
 
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:2104
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Automatically open whiteboard"
 msgstr "Obre la pissarra automÃ ticament"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc/silc.c:2107
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Digitally sign and verify all messages"
 msgstr "Signa i verifica digitalment tots els missatges"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc/util.c:250
 #: ../libpurple/protocols/silc10/util.c:207
 #: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "S'estÃ  creant el parell de claus SILC..."
 
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
+#: ../libpurple/protocols/silc/util.c:216
+#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
 msgstr "No s'ha pogut crear el parell de claus SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nom real: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nom d'usuari: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "Correu electrÃ²nic: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc/util.c:370
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Ordinador: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:372
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "OrganitzaciÃ³: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "PaÃs: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:375
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritme: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:376
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Longitud de la clau: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:372
+#: ../libpurple/protocols/silc/util.c:378
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "VersiÃ³: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:380
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -11199,7 +12488,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:381
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -11209,51 +12498,51 @@ msgstr ""
 "Empremta babble de la clau pÃºblica:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc/util.c:385
+#: ../libpurple/protocols/silc/util.c:386
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "InformaciÃ³ de la clau pÃºblica"
 
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Radiomissatgeria"
 
-#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc/util.c:571
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "VideoconferÃ¨ncia"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:589
 #: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Ordinador"
 
-#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:593
 #: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc/util.c:595
 #: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s ha enviat un missatge a la pissarra. Voleu obrir-la?"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr "%s ha enviat un missatge a la pissarra del canal %s. Voleu obrir-la?"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Pissarra"
 
@@ -11262,6 +12551,7 @@ msgstr "No hi ha estadÃstiques del serv
 msgstr "No hi ha estadÃstiques del servidor disponibles"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Error: les versions no coincideixen, actualitzeu el client"
 
@@ -11269,40 +12559,49 @@ msgstr "Error: les versions no coincidei
 # un usuari no pot controlar directament perÃ² al qual es pot connectar a
 # distÃ nciaÂ».
 #: ../libpurple/protocols/silc10/ops.c:1934
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Error: el remot no es fia de la vostra clau pÃºblica, o no pot emprar-la"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Error: el remot no implementa el grup KE proposat"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Error: el remot no implementa el mÃ¨tode de xifratge proposat"
 
 #: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Error: el remot no implementa la PKCS proposada"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 "Error: el remot no implementa la funciÃ³ de suma de comprovaciÃ³ proposada"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fallida: el remot no implementa l'HMAC proposada"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Error: la signatura no Ã©s correcta"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Error: la galeta no Ã©s vÃ lida"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Error: ha fallat l'autenticaciÃ³"
 
@@ -11323,32 +12622,35 @@ msgstr "No s'ha pogut carregar la parell
 msgid "Could not load SILC key pair: %s"
 msgstr "No s'ha pogut carregar la parella de claus SILC: %s"
 
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "No s'ha pogut escriure"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1489
+#: ../libpurple/protocols/simple/simple.c:443
+#: ../libpurple/protocols/simple/simple.c:1691
 msgid "Could not connect"
 msgstr "No s'ha pogut connectar"
 
-#: ../libpurple/protocols/simple/simple.c:1523
-#: ../libpurple/protocols/simple/simple.c:1565
-#: ../libpurple/protocols/simple/simple.c:1578
-#: ../libpurple/protocols/simple/simple.c:1629
+#: ../libpurple/protocols/simple/simple.c:1127
+msgid "Unknown server response."
+msgstr "Resposta desconeguda del servidor."
+
+#: ../libpurple/protocols/simple/simple.c:1727
+#: ../libpurple/protocols/simple/simple.c:1773
+#: ../libpurple/protocols/simple/simple.c:1788
+#: ../libpurple/protocols/simple/simple.c:1843
 msgid "Could not create listen socket"
 msgstr "No s'ha pogut crear el sÃ²col per a escoltar"
 
-#: ../libpurple/protocols/simple/simple.c:1546
+#: ../libpurple/protocols/simple/simple.c:1752
 msgid "Couldn't resolve host"
 msgstr "No s'ha pogut obtenir l'adreÃ§a de l'ordinador"
 
-#: ../libpurple/protocols/simple/simple.c:1637
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Could not resolve hostname"
 msgstr "No s'ha pogut resoltre el nom de l'ordinador"
 
-#: ../libpurple/protocols/simple/simple.c:1654
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "Els noms d'usuari SIP no poden contenir espais en blanc ni @"
 
@@ -11360,36 +12662,36 @@ msgstr "Els noms d'usuari SIP no poden c
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1829
+#: ../libpurple/protocols/simple/simple.c:2057
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Connector per al protocol SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1830
+#: ../libpurple/protocols/simple/simple.c:2058
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "El connector per al protocol SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/simple/simple.c:2086
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publica l'estat (nota: tothom us pot estar observant)"
 
-#: ../libpurple/protocols/simple/simple.c:1864
+#: ../libpurple/protocols/simple/simple.c:2092
 msgid "Use UDP"
 msgstr "Utilitza UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1866
+#: ../libpurple/protocols/simple/simple.c:2094
 msgid "Use proxy"
 msgstr "Utilitza un servidor intermediari"
 
-#: ../libpurple/protocols/simple/simple.c:1868
+#: ../libpurple/protocols/simple/simple.c:2096
 msgid "Proxy"
 msgstr "Servidor intermediari"
 
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:2098
 msgid "Auth User"
 msgstr "Usuari Auth"
 
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:2100
 msgid "Auth Domain"
 msgstr "Domini Auth"
 
@@ -11434,6 +12736,7 @@ msgstr "AvÃs de %s no permÃ¨s."
 msgstr "AvÃs de %s no permÃ¨s."
 
 #: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "S'ha ignorat un missatge. Esteu excedint el lÃmit de velocitat del servidor."
@@ -11460,39 +12763,48 @@ msgstr ""
 "Heu perdut un missatge instantani de %s perquÃ¨ s'ha enviat massa de pressa."
 
 #: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "Fallada."
 
 #: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "Massa coincidÃ¨ncies."
 
 #: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr "Es necessiten mÃ©s qualificadors."
 
 #: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Servei de directori no disponible temporalment."
 
 #: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "E-mail lookup restricted."
 msgstr "Recerca per adreÃ§a de correu electrÃ²nic restringida."
 
 #: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "S'ha ignorat la paraula clau."
 
 #: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "No hi ha paraules clau."
 
 #: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "L'usuari no tÃ© informaciÃ³ al directori."
 
 # FIXME
 #: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "Aquest paÃs no estÃ  disponible."
 
@@ -11502,18 +12814,22 @@ msgstr "Fallada desconeguda: %s."
 msgstr "Fallada desconeguda: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
+#, c-format
 msgid "Incorrect screen name or password."
 msgstr "El nom d'usuari o la contrasenya sÃ³n incorrectes."
 
 #: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "El servei estÃ  temporalment no disponible."
 
 #: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "El vostre nivell d'avisos Ã©s massa alt per a connectar-se."
 
 #: ../libpurple/protocols/toc/toc.c:558
+#, c-format
 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."
@@ -11552,8 +12868,8 @@ msgstr "S'ha canviat la contrasenya amb 
 msgid "Password Change Successful"
 msgstr "S'ha canviat la contrasenya amb Ã¨xit"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5532
-#: ../pidgin/gtkblist.c:5885
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6270
+#: ../pidgin/gtkblist.c:6628
 msgid "_Group:"
 msgstr "_Grup:"
 
@@ -11615,32 +12931,27 @@ msgstr "Connector per al protocol TOC"
 msgid "TOC Protocol Plugin"
 msgstr "Connector per al protocol TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 "%s us ha enviat una invitaciÃ³ a la seva cÃ mera web, perÃ² aixÃ² encara no estÃ  "
 "implementat."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "No s'ha pogut enviar el vostre missatge de Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:910
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
-msgid "%s just sent you a Buzz!"
-msgstr "%s us ha donat un cop de colze!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:957
-#, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Missatge del sistema de yahoo! per a %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "Missatge de denegaciÃ³ de l'autoritzaciÃ³:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11650,17 +12961,17 @@ msgstr ""
 "pel segÃ¼ent motiu:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s us ha denegat (retroactivament) la peticiÃ³ d'afegir-lo a la vostra llista."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "S'ha rebutjat afegir l'amic"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1977
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11671,11 +12982,11 @@ msgstr ""
 "reconegut. Probablement no us podreu connectar al Yahoo. Comproveu si hi ha "
 "actualitzacions a %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1980
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Ha fallat l'autenticaciÃ³ amb Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2046
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11684,52 +12995,52 @@ msgstr ""
 "Heu intentat ignorar a %s, perÃ² l'usuari no Ã©s a la vostra llista d'amics. "
 "Fent clic a Â«SÃÂ» se suprimirÃ  i s'ignorarÃ  l'amic."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2049
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "Voleu ignorar l'amic?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2112
+#: ../libpurple/protocols/yahoo/yahoo.c:2133
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "El vostre compte estÃ  blocat, entreu al web de Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2115
+#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "S'ha produÃ¯t un error desconegut, nÃºmero %d. AixÃ² es pot solucionar entrant "
 "al web de Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2169
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No s'ha pogut afegir l'amic %s al grup %s a la llista del servidor del "
 "compte %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2172
+#: ../libpurple/protocols/yahoo/yahoo.c:2192
 msgid "Could not add buddy to server list"
 msgstr "No s'ha pogut afegir l'amic a la llista del servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2291
+#: ../libpurple/protocols/yahoo/yahoo.c:2311
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2634
+#: ../libpurple/protocols/yahoo/yahoo.c:2657
 msgid "Received unexpected HTTP response from server."
 msgstr "S'ha rebut una resposta HTTP inesperada del servidor."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2658
-#: ../libpurple/protocols/yahoo/yahoo.c:2844
-#: ../libpurple/protocols/yahoo/yahoo.c:2947
-#: ../libpurple/protocols/yahoo/yahoo.c:2957
-#: ../libpurple/protocols/yahoo/yahoochat.c:1419
-#: ../libpurple/protocols/yahoo/yahoochat.c:1489
-#: ../libpurple/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/yahoo.c:2682
+#: ../libpurple/protocols/yahoo/yahoo.c:2870
+#: ../libpurple/protocols/yahoo/yahoo.c:2974
+#: ../libpurple/protocols/yahoo/yahoo.c:2985
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Hi ha un problema de connexiÃ³"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2684
+#: ../libpurple/protocols/yahoo/yahoo.c:2708
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11738,7 +13049,7 @@ msgstr ""
 "S'ha perdut la connexiÃ³ amb %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2709
+#: ../libpurple/protocols/yahoo/yahoo.c:2733
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11747,111 +13058,103 @@ msgstr ""
 "No s'ha pogut establir la connexiÃ³ amb %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3059
-#: ../libpurple/protocols/yahoo/yahoo.c:3745
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "Not at Home"
 msgstr "Fora de casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3061
-#: ../libpurple/protocols/yahoo/yahoo.c:3748
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "Not at Desk"
 msgstr "Fora de l'escriptori"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3063
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Not in Office"
 msgstr "Fora de l'oficina"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3067
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/yahoo/yahoo.c:3100
+#: ../libpurple/protocols/yahoo/yahoo.c:3790
 msgid "On Vacation"
 msgstr "De vacances"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3071
-#: ../libpurple/protocols/yahoo/yahoo.c:3763
+#: ../libpurple/protocols/yahoo/yahoo.c:3104
+#: ../libpurple/protocols/yahoo/yahoo.c:3796
 msgid "Stepped Out"
 msgstr "Ha marxat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3164
-#: ../libpurple/protocols/yahoo/yahoo.c:3194
+#: ../libpurple/protocols/yahoo/yahoo.c:3197
+#: ../libpurple/protocols/yahoo/yahoo.c:3227
 msgid "Not on server list"
 msgstr "No Ã©s a la llista del servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3211
-#: ../libpurple/protocols/yahoo/yahoo.c:3269
+#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3302
 msgid "Appear Online"
 msgstr "Simula estar en lÃnia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3214
-#: ../libpurple/protocols/yahoo/yahoo.c:3290
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3323
 msgid "Appear Permanently Offline"
 msgstr "Simula estar permanentment fora de lÃnia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
+#: ../libpurple/protocols/yahoo/yahoo.c:3265
 msgid "Presence"
 msgstr "PresÃ¨ncia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3275
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Appear Offline"
 msgstr "Simula estar fora de lÃnia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3284
+#: ../libpurple/protocols/yahoo/yahoo.c:3317
 msgid "Don't Appear Permanently Offline"
 msgstr "No simulis estar permanentment fora de lÃnia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3332
+#: ../libpurple/protocols/yahoo/yahoo.c:3365
 msgid "Join in Chat"
 msgstr "Entra a un xat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3338
+#: ../libpurple/protocols/yahoo/yahoo.c:3371
 msgid "Initiate Conference"
 msgstr "Inicia una conferÃ¨ncia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3366
+#: ../libpurple/protocols/yahoo/yahoo.c:3399
 msgid "Presence Settings"
 msgstr "ParÃ metres de la presÃ¨ncia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3372
+#: ../libpurple/protocols/yahoo/yahoo.c:3405
 msgid "Start Doodling"
 msgstr "ComenÃ§a a dibuixar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3473
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Activate which ID?"
 msgstr "Quin ID voleu activar?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3484
+#: ../libpurple/protocols/yahoo/yahoo.c:3517
 msgid "Join who in chat?"
-msgstr "A qui us voleu unir al xat?"
+msgstr "A qui us voleu unir-vos al xat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3496
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Activate ID..."
 msgstr "Activa l'ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3533
 msgid "Join User in Chat..."
 msgstr "Entra a un xat d'un usuari..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3505
+#: ../libpurple/protocols/yahoo/yahoo.c:3538
 msgid "Open Inbox"
 msgstr "Obre la safata d'entrada"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4025
-msgid "You have just sent a Buzz!"
-msgstr "Acabeu d'enviar un cop de colze!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4084
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;sala&gt;:  entra en una sala de xat de la xarxa Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4089
+#: ../libpurple/protocols/yahoo/yahoo.c:4152
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  llista les sales de la xarxa Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4093
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: fa sonar un soroll a un usuari per tal de que us pari atenciÃ³"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4097
+#: ../libpurple/protocols/yahoo/yahoo.c:4160
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: fa una peticiÃ³ a l'usuari per iniciar una sessiÃ³ Doodle"
 
@@ -11865,133 +13168,61 @@ msgstr "doodle: fa una peticiÃ³ a l'usua
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4305
-#: ../libpurple/protocols/yahoo/yahoo.c:4307
+#: ../libpurple/protocols/yahoo/yahoo.c:4369
+#: ../libpurple/protocols/yahoo/yahoo.c:4371
 msgid "Yahoo Protocol Plugin"
 msgstr "Connector per al protocol Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4330
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Yahoo Japan"
 msgstr "Yahoo JapÃ³"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4333
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "Pager server"
 msgstr "Servidor de cercapersones"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4336
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan Pager server"
 msgstr "Servidor de cercapersones del JapÃ³"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4339
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Pager port"
 msgstr "Port per al cercapersones"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4342
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "File transfer server"
 msgstr "Servidor de transferÃ¨ncia de fitxers"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4345
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Japan file transfer server"
 msgstr "Servidor de transferÃ¨ncia de fitxers del JapÃ³"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4348
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "File transfer port"
 msgstr "Port per transferÃ¨ncia de fitxers"
 
 # FIXME: no poso localitzaciÃ³ perquÃ¨ l'usuari ho podria
 #        confondre amb "ubicaciÃ³" (josep)
-#: ../libpurple/protocols/yahoo/yahoo.c:4351
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room locale"
 msgstr "CaracterÃstiques locals de la sala de xat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4354
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Ignore conference and chatroom invitations"
 msgstr "Bloca invitacions a conferÃ¨ncies i sales de xat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4362
+#: ../libpurple/protocols/yahoo/yahoo.c:4426
 msgid "Chat room list URL"
 msgstr "URL de la llista de sales de xat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4365
+#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Yahoo Chat server"
 msgstr "Servidor de xat de Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4368
+#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Yahoo Chat port"
 msgstr "Port del xat de Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:205
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s no ha acceptat la vostra invitaciÃ³ d'entrar a la sala Â«%sÂ» perquÃ¨ Â«%sÂ»."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:207
-msgid "Invitation Rejected"
-msgstr "S'ha rebutjat la invitaciÃ³"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:363
-msgid "Failed to join chat"
-msgstr "No s'ha pogut unir al xat"
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:366
-msgid "Unknown room"
-msgstr "Sala desconeguda"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:369
-msgid "Maybe the room is full"
-msgstr "Pot ser que la sala estigui plena"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:372
-msgid "Not available"
-msgstr "No disponible"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:376
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"S'ha produÃ¯t un error desconegut. Potser caldrÃ  que sortiu i espereu uns "
-"cinc minuts abans d'intentar tornar a entrar a la sala de xat"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:454
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Esteu fent un xat a %s."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
-msgid "Failed to join buddy in chat"
-msgstr "No s'ha pogut entrar al xat de l'amic."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:630
-msgid "Maybe they're not in a chat?"
-msgstr "Potser no sÃ³n en cap xat?"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1321
-#: ../libpurple/protocols/yahoo/yahoochat.c:1347
-msgid "Fetching the room list failed."
-msgstr "No s'ha pogut obtenir la llista de sales."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1405
-msgid "Voices"
-msgstr "Veus"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1408
-msgid "Webcams"
-msgstr "CÃ meres web"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1419
-#: ../libpurple/protocols/yahoo/yahoochat.c:1489
-msgid "Unable to fetch room list."
-msgstr "No s'ha pogut obtenir la llista de sales."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1482
-msgid "User Rooms"
-msgstr "Sales d'usuari"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -12001,11 +13232,10 @@ msgstr "Envia la solÂ·licitud d'un dibui
 
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
 msgid "Unable to establish file descriptor."
 msgstr "No s'ha pogut establir un descriptor de fitxer."
 
-#. TODO: what to do here - do we really have to disconnect?
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Error d'escriptura"
@@ -12104,11 +13334,83 @@ msgstr "El perfil d'usuari estÃ  buit."
 msgid "The user's profile is empty."
 msgstr "El perfil d'usuari estÃ  buit."
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+"%s no ha acceptat la vostra invitaciÃ³ d'entrar a la sala Â«%sÂ» perquÃ¨ Â«%sÂ»."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
+msgid "Invitation Rejected"
+msgstr "S'ha rebutjat la invitaciÃ³"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr "No s'ha pogut unir al xat"
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr "Sala desconeguda"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr "Pot ser que la sala estigui plena"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr "No disponible"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"S'ha produÃ¯t un error desconegut. Potser caldrÃ  que sortiu i espereu uns "
+"cinc minuts abans d'intentar tornar a entrar a la sala de xat"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Esteu fent un xat a %s."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr "No s'ha pogut entrar al xat de l'amic."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr "Potser no sÃ³n en cap xat?"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Fetching the room list failed."
+msgstr "No s'ha pogut obtenir la llista de sales."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+msgid "Voices"
+msgstr "Veus"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr "CÃ meres web"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr "No s'ha pogut obtenir la llista de sales."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr "Sales d'usuari"
+
+#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "Problema de connexiÃ³ amb el servidor YCHT."
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -12285,8 +13587,8 @@ msgstr "ExposiciÃ³"
 msgid "Exposure"
 msgstr "ExposiciÃ³"
 
-#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1600
+#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
+#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -12295,84 +13597,93 @@ msgstr ""
 "No s'ha pogut crear el sÃ²col:\n"
 "%s"
 
-#: ../libpurple/proxy.c:658
+#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr ""
 "No s'ha pogut analitzar la resposta del servidor intermediari d'HTTP: %s\n"
 
-#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
-#: ../libpurple/proxy.c:782
+#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
+#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Error en la connexiÃ³ al servidor intermediari d'HTTP %d"
 
-#: ../libpurple/proxy.c:778
+#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 "S'ha denegat l'accÃ©s: el servidor intermediari d'HTTP prohibeix la "
 "tunelitzaciÃ³ del port %d"
 
-#: ../libpurple/proxy.c:995
+#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "S'ha produÃ¯t un error en resoldre %s"
 
-#: ../libpurple/proxy.c:1697
+#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "No s'ha pogut resoldre el nom de l'ordinador"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1377
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @deprecated Please use purple_request_yes_no_with_hint instead.
+#.
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_Yes"
 msgstr "_SÃ"
 
-#: ../libpurple/request.h:1377
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_No"
 msgstr "_No"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1397
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
+#.
+#: ../libpurple/request.h:1854 ../libpurple/request.h:1867
 msgid "_Accept"
 msgstr "_Accepta"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:47
+#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "Ara mateix no sÃ³c aquÃ"
 
-#: ../libpurple/savedstatuses.c:534
+#: ../libpurple/savedstatuses.c:535
 msgid "saved statuses"
 msgstr "estats desats"
 
-#: ../libpurple/server.c:233
+#: ../libpurple/server.c:234
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ara es fa dir %s\n"
 
-# FIXME: not going to look well (josep)
-#: ../libpurple/server.c:289
+#: ../libpurple/server.c:302
 #, c-format
-msgid "Attention! You have been %s."
-msgstr "Alerta! Se us ha %s."
+msgid "Requesting %s's attention..."
+msgstr "S'estÃ  cridant l'atenciÃ³ de %s..."
 
-#: ../libpurple/server.c:291 ../libpurple/server.c:298
-msgid "Attention!"
-msgstr "Alerta!"
-
-#: ../libpurple/server.c:296
+#: ../libpurple/server.c:347
 #, c-format
-msgid "Attention! %s %s."
-msgstr "Alerta! %s %s."
+msgid "%s has requested your attention!"
+msgstr "%s us ha cridat l'atenciÃ³!"
 
-#: ../libpurple/server.c:749
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -12381,77 +13692,114 @@ msgstr ""
 "%s ha convidat a %s a la sala de xat %s:\n"
 "%s"
 
-#: ../libpurple/server.c:754
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ha convidat a %s a la sala de xat %s\n"
 
-#: ../libpurple/server.c:758
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
-msgstr "Voleu acceptar la invitaciÃ³ del xat?"
+msgstr "Voleu acceptar la invitaciÃ³ al xat?"
 
-#: ../libpurple/status.c:152
+#: ../libpurple/sslconn.c:164
+msgid "SSL Connection Failed"
+msgstr "No s'ha pogut connectar amb SSL"
+
+#: ../libpurple/sslconn.c:166
+msgid "SSL Handshake Failed"
+msgstr "Ha fallat la negociaciÃ³ de la connexiÃ³ SSL"
+
+#: ../libpurple/sslconn.c:168
+msgid "SSL peer presented an invalid certificate"
+msgstr ""
+
+#: ../libpurple/sslconn.c:171
+msgid "Unknown SSL error"
+msgstr "Error desconegutde l'SSL"
+
+#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Sense especificar"
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "No molesteu"
 
-#: ../libpurple/status.c:158
+#: ../libpurple/status.c:159
 msgid "Extended away"
 msgstr "Absent durant una bona estona"
 
-#: ../libpurple/status.c:159
+#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "MÃ²bil"
 
-#: ../libpurple/status.c:608
+# Ã‰s un estat, com "fora de lÃnia", etc. (josep)
+#: ../libpurple/status.c:161
+msgid "Listening to music"
+msgstr "Escoltant mÃºsica"
+
+#: ../libpurple/status.c:610
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s ha canviat l'estat de %s a %s"
 
-#: ../libpurple/status.c:618
+#: ../libpurple/status.c:613
 #, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) ha canviat l'estat de %s a %s"
+
+#: ../libpurple/status.c:624
+#, c-format
 msgid "%s is now %s"
 msgstr "%s ara es fa dir %s"
 
-#: ../libpurple/status.c:623
+#: ../libpurple/status.c:626
 #, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) ara es fa dir %s"
+
+#: ../libpurple/status.c:632
+#, c-format
 msgid "%s is no longer %s"
 msgstr "%s ja no estÃ  %s"
 
-#: ../libpurple/status.c:1233
+#: ../libpurple/status.c:634
 #, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) ja no estÃ  %s"
+
+#: ../libpurple/status.c:1247
+#, c-format
 msgid "%s became idle"
 msgstr "%s ha passat a inactiu"
 
-#: ../libpurple/status.c:1250
+#: ../libpurple/status.c:1264
 #, c-format
 msgid "%s became unidle"
 msgstr "%s ja no estÃ  inactiu"
 
-#: ../libpurple/status.c:1313
+#: ../libpurple/status.c:1327
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s ha passat a inactiu"
 
-#: ../libpurple/status.c:1315
+#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s ja no estÃ  inactiu"
 
-#: ../libpurple/util.c:717
+#: ../libpurple/util.c:721
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2702
+#: ../libpurple/util.c:2783
 #, c-format
 msgid "Error Reading %s"
 msgstr "S'ha produÃ¯t un error en llegir %s"
 
-#: ../libpurple/util.c:2703
+#: ../libpurple/util.c:2784
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12460,67 +13808,67 @@ msgstr ""
 "S'ha produÃ¯t un error en llegir el vostre %s. No s'han carregat, i s'ha "
 "canviat el nom del fitxer per %s~."
 
-#: ../libpurple/util.c:3203
+#: ../libpurple/util.c:3281
 msgid "Calculating..."
 msgstr "S'estÃ  calculant..."
 
-#: ../libpurple/util.c:3206
+#: ../libpurple/util.c:3284
 msgid "Unknown."
 msgstr "Desconegut."
 
-#: ../libpurple/util.c:3232
+#: ../libpurple/util.c:3310
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segon"
 msgstr[1] "%d segons"
 
-#: ../libpurple/util.c:3244
+#: ../libpurple/util.c:3322
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dies"
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3330
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d hores"
 
-#: ../libpurple/util.c:3258
+#: ../libpurple/util.c:3336
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d hores"
 
-#: ../libpurple/util.c:3266
+#: ../libpurple/util.c:3344
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minut"
 msgstr[1] "%s, %d minuts"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3350
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuts"
 
-#: ../libpurple/util.c:3532
+#: ../libpurple/util.c:3610
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "No s'ha pogut obrir %s: s'ha redirigit massa vegades"
 
-#: ../libpurple/util.c:3569 ../libpurple/util.c:3864
+#: ../libpurple/util.c:3647 ../libpurple/util.c:3943
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "No s'ha pogut connectar a %s"
 
-#: ../libpurple/util.c:3692
+#: ../libpurple/util.c:3770
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -12529,17 +13877,17 @@ msgstr ""
 "No s'ha pogut ubicar prou memÃ²ria per posar-hi el contingut de %s. Ã‰s "
 "possible que el servidor web intenti fer alguna malesa."
 
-#: ../libpurple/util.c:3727
+#: ../libpurple/util.c:3805
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "S'ha produÃ¯t un error en llegir de %s: %s"
 
-#: ../libpurple/util.c:3758
+#: ../libpurple/util.c:3836
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "S'ha produÃ¯t un error en escriure a %s: %s."
 
-#: ../libpurple/util.c:3783
+#: ../libpurple/util.c:3861
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "No s'ha pogut conectar a %s: %s"
@@ -12556,11 +13904,11 @@ msgstr "Envieu missatges instantanis en 
 msgid "Send instant messages over multiple protocols"
 msgstr "Envieu missatges instantanis en mÃºltiples protocols"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "OrientaciÃ³"
 
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "OrientaciÃ³ de l'Ã rea de notificaciÃ³."
 
@@ -12600,36 +13948,36 @@ msgstr "Utilitza aquesta _icona d'amic p
 msgstr "Utilitza aquesta _icona d'amic per a aquest compte:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:732
+#: ../pidgin/gtkaccount.c:734
 #, c-format
 msgid "%s Options"
 msgstr "Opcions de %s"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:939
 msgid "Use GNOME Proxy Settings"
 msgstr "Empra la configuraciÃ³ del servidor intermediari del Gnome"
 
-#: ../pidgin/gtkaccount.c:938
+#: ../pidgin/gtkaccount.c:940
 msgid "Use Global Proxy Settings"
 msgstr "Empra les opcions globals per al servidor intermediari"
 
-#: ../pidgin/gtkaccount.c:944
+#: ../pidgin/gtkaccount.c:946
 msgid "No Proxy"
 msgstr "Sense servidor intermediari"
 
-#: ../pidgin/gtkaccount.c:950
+#: ../pidgin/gtkaccount.c:952
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:956
+#: ../pidgin/gtkaccount.c:958
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:962
+#: ../pidgin/gtkaccount.c:964
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:968 ../pidgin/gtkprefs.c:1208
+#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1283
 msgid "Use Environmental Settings"
 msgstr "Empra les opcions de l'entorn"
 
@@ -12638,64 +13986,72 @@ msgstr "Empra les opcions de l'entorn"
 #. 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.
-#: ../pidgin/gtkaccount.c:1007
+#: ../pidgin/gtkaccount.c:1009
 msgid "If you look real closely"
 msgstr "Si mireu de ben a prop"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1010
+#: ../pidgin/gtkaccount.c:1012
 msgid "you can see the butterflies mating"
 msgstr "podreu veure les papallones aparellant-se"
 
-#: ../pidgin/gtkaccount.c:1031
+#: ../pidgin/gtkaccount.c:1033
 msgid "Proxy Options"
 msgstr "Opcions del servidor intermediari"
 
-#: ../pidgin/gtkaccount.c:1045 ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1277
 msgid "Proxy _type:"
 msgstr "_Tipus de servidor intermediari"
 
-#: ../pidgin/gtkaccount.c:1054 ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1298
 msgid "_Host:"
 msgstr "_Ordinador:"
 
-#: ../pidgin/gtkaccount.c:1058 ../pidgin/gtkprefs.c:1241
+#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1316
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1066
+#: ../pidgin/gtkaccount.c:1068
 msgid "_Username:"
 msgstr "_Nom d'usuari:"
 
-#: ../pidgin/gtkaccount.c:1073 ../pidgin/gtkprefs.c:1278
+#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1353
 msgid "Pa_ssword:"
 msgstr "_Contrasenya:"
 
-#: ../pidgin/gtkaccount.c:1468
+#: ../pidgin/gtkaccount.c:1199
+msgid "Unable to save new account"
+msgstr "No s'ha pogut desar el compte nou"
+
+#: ../pidgin/gtkaccount.c:1200
+msgid "An account already exists with the specified criteria."
+msgstr "Ja existeix un altre compte amb aquests criteris."
+
+#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr "Afegeix un compte"
 
-#: ../pidgin/gtkaccount.c:1487
+#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
 msgstr "_BÃ sic"
 
-#: ../pidgin/gtkaccount.c:1494
+#: ../pidgin/gtkaccount.c:1504
 msgid "Create this new account on the server"
 msgstr "Crea aquest compte nou al servidor"
 
-#: ../pidgin/gtkaccount.c:1510
+#: ../pidgin/gtkaccount.c:1520
 msgid "_Advanced"
 msgstr "_AvanÃ§at"
 
-#: ../pidgin/gtkaccount.c:1968 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:595
 msgid "Enabled"
 msgstr "Habilitat"
 
-#: ../pidgin/gtkaccount.c:1996
+#: ../pidgin/gtkaccount.c:2006
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../pidgin/gtkaccount.c:2196
+#: ../pidgin/gtkaccount.c:2207
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12719,232 +14075,274 @@ msgstr ""
 "partir del menÃº <b>Comptes->Afegeix/Edita</b> de la finestra de la llista "
 "d'amics."
 
-#: ../pidgin/gtkblist.c:760
-msgid "Join a Chat"
-msgstr "Entra a un xat"
+#: ../pidgin/gtkblist.c:543
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "Teniu %d contacte anomenat %s. Voleu fusionar-los?"
+msgstr[1] "Teniu %d contacte anomenat %s. Voleu fusionar-los?"
 
-#: ../pidgin/gtkblist.c:781
+# Voleu dir que Ã©s possible que %d == 1???? (josep)
+#: ../pidgin/gtkblist.c:544
 msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:546
+msgid "_Merge"
+msgstr "_Fusiona:"
+
+#: ../pidgin/gtkblist.c:961
+msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 "IntroduÃ¯u la informaciÃ³ necessÃ ria sobre el xat al qual vulgueu entrar.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:792 ../pidgin/gtkblist.c:5480
-#: ../pidgin/gtkblist.c:5846 ../pidgin/gtkpounce.c:538
-#: ../pidgin/gtkroomlist.c:395
+#: ../pidgin/gtkblist.c:972 ../pidgin/gtkblist.c:6589
+#: ../pidgin/gtkpounce.c:554 ../pidgin/gtkroomlist.c:709
 msgid "_Account:"
 msgstr "_Compte:"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkprivacy.c:602
-#: ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkprivacy.c:605
+#: ../pidgin/gtkprivacy.c:619
 msgid "_Block"
 msgstr "_Bloca"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1261
 msgid "Un_block"
 msgstr "Des_bloca"
 
+#: ../pidgin/gtkblist.c:1304
+msgid "Move to"
+msgstr "Mou a"
+
 # AixÃ² Ã©s el botÃ³, alerta l'amplada!
-#: ../pidgin/gtkblist.c:1132
+#: ../pidgin/gtkblist.c:1344
 msgid "Get _Info"
 msgstr "_InformaciÃ³"
 
-#: ../pidgin/gtkblist.c:1135 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1347 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1141
-msgid "_Send File"
-msgstr "_Envia un fitxer"
+#: ../pidgin/gtkblist.c:1353
+msgid "_Send File..."
+msgstr "_Envia un fitxer..."
 
-#: ../pidgin/gtkblist.c:1148
-msgid "Add Buddy _Pounce"
-msgstr "Afegeix un avÃs _per a l'amic"
+#: ../pidgin/gtkblist.c:1360
+msgid "Add Buddy _Pounce..."
+msgstr "Afegeix un a:vÃs per a l'amic..."
 
-#: ../pidgin/gtkblist.c:1153 ../pidgin/gtkblist.c:1157
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1365 ../pidgin/gtkblist.c:1369
+#: ../pidgin/gtkblist.c:1484 ../pidgin/gtkblist.c:1507
 msgid "View _Log"
-msgstr "Visua_litza el registre"
+msgstr "_Visualitza el registre"
 
-#: ../pidgin/gtkblist.c:1170 ../pidgin/gtkblist.c:1179
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1375
+msgid "Hide when offline"
+msgstr "Amaga quan estigui fora de lÃnia"
+
+#: ../pidgin/gtkblist.c:1375
+msgid "Show when offline"
+msgstr "Mostra quan estigui fora de lÃnia"
+
+#: ../pidgin/gtkblist.c:1389 ../pidgin/gtkblist.c:1398
+#: ../pidgin/gtkblist.c:1492 ../pidgin/gtkblist.c:1513
 msgid "_Alias..."
 msgstr "Ã€_lies..."
 
-#: ../pidgin/gtkblist.c:1173 ../pidgin/gtkblist.c:1181
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1392 ../pidgin/gtkblist.c:1400
+#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
 msgid "_Remove"
 msgstr "Sup_rimeix"
 
-#: ../pidgin/gtkblist.c:1231
-msgid "Add a _Buddy"
-msgstr "_Afegeix un amic"
+#: ../pidgin/gtkblist.c:1450
+msgid "Add _Buddy..."
+msgstr "Afegeix un _amic..."
 
-#: ../pidgin/gtkblist.c:1234
-msgid "Add a C_hat"
-msgstr "A_fegeix un xat"
+#: ../pidgin/gtkblist.c:1453
+msgid "Add C_hat..."
+msgstr "Afegeix un _xat..."
 
-#: ../pidgin/gtkblist.c:1237
+#: ../pidgin/gtkblist.c:1456
 msgid "_Delete Group"
 msgstr "_Suprimeix el grup"
 
-#: ../pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1458
 msgid "_Rename"
 msgstr "_Canvia el nom"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkroomlist.c:316
+#: ../pidgin/gtkroomlist.c:773 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "En_tra"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1480
 msgid "Auto-Join"
 msgstr "Entra automÃ ticament"
 
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1322
+#: ../pidgin/gtkblist.c:1482
+msgid "Persistent"
+msgstr "Persistent"
+
+#: ../pidgin/gtkblist.c:1520 ../pidgin/gtkblist.c:1543
 msgid "_Collapse"
 msgstr "_Redueix"
 
-#: ../pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1548
 msgid "_Expand"
 msgstr "_Amplia"
 
-#: ../pidgin/gtkblist.c:1572 ../pidgin/gtkblist.c:1584
-#: ../pidgin/gtkblist.c:4574 ../pidgin/gtkblist.c:4584
+#: ../pidgin/gtkblist.c:1799 ../pidgin/gtkblist.c:1811
+#: ../pidgin/gtkblist.c:5254 ../pidgin/gtkblist.c:5267
 msgid "/Tools/Mute Sounds"
 msgstr "/Eines/Inhabilita els sons"
 
-#: ../pidgin/gtkblist.c:2044 ../pidgin/gtkconv.c:4701
-#: ../pidgin/gtkpounce.c:429
+#: ../pidgin/gtkblist.c:2271 ../pidgin/gtkconv.c:4922
+#: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "No esteu connectat amb cap protocol que permeti afegir aquest amic."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:3103
 msgid "/_Buddies"
 msgstr "/_Amics"
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:3104
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amics/_Missatge instantani nou..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:3105
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amics/_Entra a un xat..."
 
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:3106
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amics/Aconsegueix informaciÃ³ de l'_usuari..."
 
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:3107
 msgid "/Buddies/View User _Log..."
 msgstr "/Amics/_Visualitza el registre de l'usuari..."
 
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Amics/Mostra els amics des_connectats"
+#: ../pidgin/gtkblist.c:3109
+msgid "/Buddies/Sh_ow"
+msgstr "/Amics/M_ostra"
 
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Amics/Mostra els grups _buits"
+#: ../pidgin/gtkblist.c:3110
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Amics/Mostra/Amics des_connectats"
 
-#: ../pidgin/gtkblist.c:2860
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Amics/Mostra els _detalls dels amics"
+#: ../pidgin/gtkblist.c:3111
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Amics/Mostra/Grups _buits"
 
-#: ../pidgin/gtkblist.c:2861
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Amics/Mostra el _temps d'inactivitat"
+#: ../pidgin/gtkblist.c:3112
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Amics/Mostra/_Detalls dels amics"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:3113
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Amics/Mostra/_Temps d'inactivitat"
+
+#: ../pidgin/gtkblist.c:3114
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Amics/Mostra/Icones dels _protocols"
+
+#: ../pidgin/gtkblist.c:3115
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amics/_Ordena els amics"
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:3117
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amics/Afegeix un _amic..."
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:3118
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amics/Afegeix un _xat..."
 
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:3119
 msgid "/Buddies/Add _Group..."
 msgstr "/Amics/Afegeix un _grup..."
 
-#: ../pidgin/gtkblist.c:2868
+#: ../pidgin/gtkblist.c:3121
 msgid "/Buddies/_Quit"
 msgstr "/Amics/_Surt"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3124
 msgid "/_Accounts"
 msgstr "/_Comptes"
 
-#: ../pidgin/gtkblist.c:2872 ../pidgin/gtkblist.c:6544
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Comptes/Afegeix\\/Edita"
+#: ../pidgin/gtkblist.c:3125 ../pidgin/gtkblist.c:7291
+msgid "/Accounts/Manage"
+msgstr "/Comptes/GestiÃ³"
 
 # Accelerador a la "n" com en la resta de programes
 #. Tools
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:3128
 msgid "/_Tools"
 msgstr "/Ei_nes"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:3129
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Eines/_AvÃs per a amics"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:3130
+msgid "/Tools/_Certificates"
+msgstr "/Eines/C_ertificats"
+
+#: ../pidgin/gtkblist.c:3131
 msgid "/Tools/Plu_gins"
 msgstr "/Eines/_Connectors"
 
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:3132
 msgid "/Tools/Pr_eferences"
 msgstr "/Eines/Pr_eferÃ¨ncies"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:3133
 msgid "/Tools/Pr_ivacy"
 msgstr "/Eines/_Privadesa"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:3135
 msgid "/Tools/_File Transfers"
 msgstr "/Eines/TransferÃ¨ncia de _fitxers"
 
-#: ../pidgin/gtkblist.c:2882
+#: ../pidgin/gtkblist.c:3136
 msgid "/Tools/R_oom List"
 msgstr "/Eines/_Llista de sales"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3137
 msgid "/Tools/System _Log"
 msgstr "/Eines/_Registre del sistema"
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3139
 msgid "/Tools/Mute _Sounds"
 msgstr "/Eines/Inhabilita els _sons"
 
 #. Help
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3141
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: ../pidgin/gtkblist.c:2888
+#: ../pidgin/gtkblist.c:3142
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/A_juda en lÃnia"
 
-#: ../pidgin/gtkblist.c:2889
+#: ../pidgin/gtkblist.c:3143
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Finestra de _depuraciÃ³"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:2893
+#: ../pidgin/gtkblist.c:3145 ../pidgin/gtkblist.c:3147
 msgid "/Help/_About"
 msgstr "/Ajuda/_Quant a"
 
-#: ../pidgin/gtkblist.c:2922
+#: ../pidgin/gtkblist.c:3176
 #, c-format
 msgid ""
 "\n"
@@ -12953,167 +14351,187 @@ msgstr ""
 "\n"
 "<b>Compte:</b> %s"
 
-#: ../pidgin/gtkblist.c:3000
+#: ../pidgin/gtkblist.c:3254
 msgid "Buddy Alias"
 msgstr "Ã€lies de l'amic"
 
-#: ../pidgin/gtkblist.c:3029
+#: ../pidgin/gtkblist.c:3283
 msgid "Logged In"
 msgstr "Connectat"
 
-#: ../pidgin/gtkblist.c:3075
+#: ../pidgin/gtkblist.c:3329
 msgid "Last Seen"
 msgstr "Vist per darrer cop"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3350
 msgid "Spooky"
 msgstr "EsfereÃ¯dor"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3352
 msgid "Awesome"
 msgstr "FantÃ stic"
 
-#: ../pidgin/gtkblist.c:3099
+#: ../pidgin/gtkblist.c:3354
 msgid "Rockin'"
 msgstr "Xalant"
 
-#: ../pidgin/gtkblist.c:3438
+#: ../pidgin/gtkblist.c:3693
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inactiu %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3440
+#: ../pidgin/gtkblist.c:3695
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactiu %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3442
+#: ../pidgin/gtkblist.c:3697
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactiu %dm"
 
-#: ../pidgin/gtkblist.c:3587
+#: ../pidgin/gtkblist.c:3851
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amics/Missatge instantani nou..."
 
-#: ../pidgin/gtkblist.c:3588 ../pidgin/gtkblist.c:3621
+#: ../pidgin/gtkblist.c:3852 ../pidgin/gtkblist.c:3885
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amics/Entra a un xat..."
 
-#: ../pidgin/gtkblist.c:3589
+#: ../pidgin/gtkblist.c:3853
 msgid "/Buddies/Get User Info..."
 msgstr "/Amics/Aconsegueix informaciÃ³ de l'usuari..."
 
-#: ../pidgin/gtkblist.c:3590
+#: ../pidgin/gtkblist.c:3854
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amics/Afegeix un amic..."
 
-#: ../pidgin/gtkblist.c:3591 ../pidgin/gtkblist.c:3624
+#: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
 msgid "/Buddies/Add Chat..."
 msgstr "/Amics/Afegeix un xat..."
 
-#: ../pidgin/gtkblist.c:3592
+#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Add Group..."
 msgstr "/Amics/Afegeix un grup..."
 
-#: ../pidgin/gtkblist.c:3627
+#: ../pidgin/gtkblist.c:3891
 msgid "/Tools/Privacy"
 msgstr "/Eines/Privadesa"
 
-#: ../pidgin/gtkblist.c:3630
+#: ../pidgin/gtkblist.c:3894
 msgid "/Tools/Room List"
 msgstr "/Eines/Llista de sales"
 
-#: ../pidgin/gtkblist.c:3727 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:4026 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d missatge per llegir de %s\n"
 msgstr[1] "%d missatges per llegir de %s\n"
 
-#: ../pidgin/gtkblist.c:3807
+#: ../pidgin/gtkblist.c:4189
 msgid "Manually"
 msgstr "Manualment"
 
-#: ../pidgin/gtkblist.c:3809
-msgid "Alphabetically"
-msgstr "AlfabÃ¨ticament"
-
-#: ../pidgin/gtkblist.c:3810
+#: ../pidgin/gtkblist.c:4192
 msgid "By status"
 msgstr "Per estat"
 
-#: ../pidgin/gtkblist.c:3811
+#: ../pidgin/gtkblist.c:4193
 msgid "By log size"
 msgstr "Per la mida del registre"
 
-#: ../pidgin/gtkblist.c:4016 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4492
 #, c-format
 msgid "%s disconnected"
 msgstr "%s s'ha desconnectat"
 
-#: ../pidgin/gtkblist.c:4026
-msgid "Re-enable Account"
-msgstr "Rehabilita el compte"
+#: ../pidgin/gtkblist.c:4494
+#, c-format
+msgid "%s disabled"
+msgstr "%s inhabilitat"
 
-#: ../pidgin/gtkblist.c:4052
+#: ../pidgin/gtkblist.c:4498
+msgid "Reconnect"
+msgstr "Torna a connectar"
+
+#: ../pidgin/gtkblist.c:4498 ../pidgin/gtkblist.c:4606
+msgid "Re-enable"
+msgstr "Rehabilita"
+
+#: ../pidgin/gtkblist.c:4502 ../pidgin/gtkblist.c:4609
+#: ../pidgin/gtkconv.c:1679
+msgid "Ignore"
+msgstr "Ignora"
+
+#: ../pidgin/gtkblist.c:4633
 #, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s s'ha desconnectat: %s</span>"
+msgid "%d account was disabled because you signed on from another location."
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location."
+msgstr[0] ""
+"S'ha inhabilitat %d compte perquÃ¨ us heu connectat des d'un altre lloc."
+msgstr[1] ""
+"S'han inhabilitat %d comptes perquÃ¨ us heu connectat des d'un altre lloc."
 
-#: ../pidgin/gtkblist.c:4204
+#: ../pidgin/gtkblist.c:4860
 msgid "<b>Username:</b>"
 msgstr "<b>Nom d'usuari:</b>"
 
-#: ../pidgin/gtkblist.c:4211
+#: ../pidgin/gtkblist.c:4867
 msgid "<b>Password:</b>"
 msgstr "<b>Contrasenya:</b>"
 
-#: ../pidgin/gtkblist.c:4222
+#: ../pidgin/gtkblist.c:4878
 msgid "_Login"
 msgstr "_Nom d'usuari"
 
-#: ../pidgin/gtkblist.c:4305
+#: ../pidgin/gtkblist.c:4963
 msgid "/Accounts"
 msgstr "/Comptes"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4319
+#: ../pidgin/gtkblist.c:4977
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Benvingut al %s!</span>\n"
 "\n"
 "No teniu cap compte habilitat. Podeu habilitar comptes de MI des del menÃº "
-"<b>Comptes->Afegeix/Edita</b> de la finestra de <b>Comptes</b>. Quan ja "
-"hagueu habilitat algun compte, podreu connectar-vos, establir el vostre "
-"estat i parlar amb amics."
+"<b>Comptes->GestiÃ³</b> de la finestra de <b>Comptes</b>. Quan hagueu "
+"habilitat algun compte, podreu connectar-vos, establir el vostre estat, i "
+"parlar amb amics."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4568
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Amics/Mostra els amics desconnectats"
+#: ../pidgin/gtkblist.c:5248
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Amics/Mostra/Amics desconnectats"
 
-#: ../pidgin/gtkblist.c:4571
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Amics/Mostra els grups buits"
+#: ../pidgin/gtkblist.c:5251
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Amics/Mostra/Grups buits"
 
-#: ../pidgin/gtkblist.c:4577
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Amics/Mostra els detalls dels amics"
+#: ../pidgin/gtkblist.c:5257
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Amics/Mostra/Detalls dels amics"
 
-#: ../pidgin/gtkblist.c:4580
-msgid "/Buddies/Show Idle Times"
-msgstr "/Amics/Mostra el temps d'inactivitat"
+#: ../pidgin/gtkblist.c:5260
+msgid "/Buddies/Show/Idle Times"
+msgstr "/Amics/Mostra/Temps d'inactivitat"
 
-#: ../pidgin/gtkblist.c:5457
+#: ../pidgin/gtkblist.c:5263
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Amics/Mostra/Icones dels protocols"
+
+#: ../pidgin/gtkblist.c:6195
 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. "
@@ -13123,26 +14541,31 @@ msgstr ""
 "llista d'amics. Opcionalment podeu entrar un Ã lies, o sobrenom, per a "
 "l'amic. El sobrenom substituirÃ  el nom d'usuari allÃ  on sigui possible.\n"
 
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:6218
+msgid "A_ccount:"
+msgstr "_Compte:"
+
 #. End of account box
-#: ../pidgin/gtkblist.c:5492
+#: ../pidgin/gtkblist.c:6230
 msgid "_Screen name:"
 msgstr "_Nom d'usuari:"
 
-#: ../pidgin/gtkblist.c:5514 ../pidgin/gtkblist.c:5867
+#: ../pidgin/gtkblist.c:6252 ../pidgin/gtkblist.c:6610
 msgid "A_lias:"
 msgstr "Ã€_lies:"
 
-#: ../pidgin/gtkblist.c:5779
+#: ../pidgin/gtkblist.c:6520
 msgid "This protocol does not support chat rooms."
 msgstr "Aquest protocol no implementa sales de xat."
 
-#: ../pidgin/gtkblist.c:5795
+#: ../pidgin/gtkblist.c:6536
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "No esteu connectat amb cap protocol que permeti fer xats."
 
-#: ../pidgin/gtkblist.c:5836
+#: ../pidgin/gtkblist.c:6579
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -13150,74 +14573,74 @@ msgstr ""
 "IntroduÃ¯u un Ã lies i la informaciÃ³ adient sobre el xat que vulgueu afegir a "
 "la llista d'amics.\n"
 
-#: ../pidgin/gtkblist.c:5924
+#: ../pidgin/gtkblist.c:6638
+msgid "Autojoin when account becomes online."
+msgstr "Entra automÃ ticament quant el compte estigui connectat."
+
+#: ../pidgin/gtkblist.c:6639
+msgid "Hide chat when the window is closed."
+msgstr "Amaga quan la finestra es tanqui."
+
+#: ../pidgin/gtkblist.c:6665
 msgid "Please enter the name of the group to be added."
 msgstr "IntroduÃ¯u el nom del grup que vulgueu afegir."
 
-#: ../pidgin/gtkblist.c:6564
+#: ../pidgin/gtkblist.c:7311
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Comptes/"
 
-#: ../pidgin/gtkblist.c:6588
+#: ../pidgin/gtkblist.c:7335
 msgid "_Edit Account"
 msgstr "_Edita el compte"
 
-#: ../pidgin/gtkblist.c:6601 ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkblist.c:7348 ../pidgin/gtkconv.c:3146
 msgid "No actions available"
 msgstr "No hi ha accions disponibles"
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:7356
 msgid "_Disable"
 msgstr "_Inhabilita"
 
-#: ../pidgin/gtkblist.c:6621
+#: ../pidgin/gtkblist.c:7368
 msgid "Enable Account"
 msgstr "Habilita el compte"
 
-#: ../pidgin/gtkblist.c:6627
+#: ../pidgin/gtkblist.c:7374
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Comptes/Habilita el compte"
 
-#: ../pidgin/gtkblist.c:6676
+#: ../pidgin/gtkblist.c:7423
 msgid "/Tools"
 msgstr "/Eines"
 
-#: ../pidgin/gtkblist.c:6746
+#: ../pidgin/gtkblist.c:7493
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amics/Ordena els amics"
 
-#: ../pidgin/gtkconn.c:179
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
-"%s\n"
-"\n"
-"El %s no intentarÃ  connectar de nou aquest compte fins que no corregiu "
-"l'error i rehabiliteu el compte."
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:531
+msgid "SSL Servers"
+msgstr "Servidors SSL"
 
-#: ../pidgin/gtkconv.c:458
+#: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
 msgstr "Ordre desconeguda."
 
-#: ../pidgin/gtkconv.c:730 ../pidgin/gtkconv.c:756
+#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "L'amic no fa servir el mateix protocol que aquest xat."
 
-#: ../pidgin/gtkconv.c:750
+#: ../pidgin/gtkconv.c:816
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "No esteu connectat amb cap protocol que permeti convidar aquest amic."
 
-#: ../pidgin/gtkconv.c:803
+#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convida l'amic a una sala de xat"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:833
+#: ../pidgin/gtkconv.c:899
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -13225,202 +14648,180 @@ msgstr ""
 "IntroduÃ¯u el nom de l'usuari que vulgueu convidar, aixÃ com un missatge "
 "d'invitaciÃ³ opcional."
 
-#: ../pidgin/gtkconv.c:854
+#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr "_Amic:"
 
-#: ../pidgin/gtkconv.c:874 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1527
+#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1200
+#: ../pidgin/gtksavedstatuses.c:1536
 msgid "_Message:"
 msgstr "_Missatge:"
 
-#: ../pidgin/gtkconv.c:931 ../pidgin/gtkconv.c:2514 ../pidgin/gtkdebug.c:218
-#: ../pidgin/gtkft.c:542
-msgid "Unable to open file."
-msgstr "No s'ha pogut obrir el fitxer."
-
-#: ../pidgin/gtkconv.c:937
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversa amb %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:973
+#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "Desa la conversa"
 
-#: ../pidgin/gtkconv.c:1122 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:168 ../pidgin/gtkdebug.c:748
 msgid "Find"
 msgstr "Cerca"
 
-#: ../pidgin/gtkconv.c:1148 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:196
 msgid "_Search for:"
 msgstr "_Cerca:"
 
-#: ../pidgin/gtkconv.c:1331
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-"S'ha iniciat el registre. Es registraran els propers missatges d'aquesta "
-"conversa."
-
-#: ../pidgin/gtkconv.c:1339
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"S'ha aturat el registre. Els propers missatges d'aquesta conversa no es "
-"registraran."
-
-#: ../pidgin/gtkconv.c:1587
+#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "No ignoris"
 
-#: ../pidgin/gtkconv.c:1590
-msgid "Ignore"
-msgstr "Ignora"
-
-#: ../pidgin/gtkconv.c:1610
+#: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "Aconsegueix el missatge d'absÃ¨ncia"
 
-#: ../pidgin/gtkconv.c:1633
+#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
 msgstr "El darrer que es diguÃ©"
 
-#: ../pidgin/gtkconv.c:2522
+#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "No s'ha pogut desar el fitxer de la icona al disc."
 
-#: ../pidgin/gtkconv.c:2573
+#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "Desa la icona"
 
-#: ../pidgin/gtkconv.c:2625
+#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "Anima"
 
-#: ../pidgin/gtkconv.c:2630
+#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "Oculta la icona"
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "Anomena i desa la icona..."
 
-#: ../pidgin/gtkconv.c:2637
+#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr "Estableix una icona personalitzada..."
 
-#: ../pidgin/gtkconv.c:2650
+#: ../pidgin/gtkconv.c:2799
 msgid "Remove Custom Icon"
 msgstr "Suprimeix la icona personalitzada"
 
+#: ../pidgin/gtkconv.c:2931
+msgid "Show All"
+msgstr "Mostra-ho tot"
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2792
+#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/_Missatge instantani nou..."
 
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Cerca..."
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Visualitza el _registre"
 
-#: ../pidgin/gtkconv.c:2802
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/Anomena i _desa..."
 
 # FIXME ?
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/_Neteja la finestra"
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/Envia un _fitxer..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Afegeix un a_vÃs per a l'amic..."
 
-#: ../pidgin/gtkconv.c:2811
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Aconsegueix informaciÃ³"
 
-#: ../pidgin/gtkconv.c:2813
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/Con_vida..."
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr "/Conversa/_MÃ©s"
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversa/Ã€l_ies..."
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloca..."
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversa/_Desbloca..."
 
-#: ../pidgin/gtkconv.c:2825
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/_Afegeix..."
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/Sup_rimeix..."
 
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversa/Insereix un _enllaÃ§..."
 
-#: ../pidgin/gtkconv.c:2834
+#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Insereix una _imatge..."
 
-#: ../pidgin/gtkconv.c:2840
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Tanca"
 
 #. Options
-#: ../pidgin/gtkconv.c:2844
+#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
 msgstr "/_Opcions"
 
-#: ../pidgin/gtkconv.c:2845
+#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
 msgstr "/Opcions/Habilita el _registre"
 
-#: ../pidgin/gtkconv.c:2846
+#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "/Opcions/Habilita els _sons"
 
-#: ../pidgin/gtkconv.c:2847
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Opcions/Mostra la icona de l'amic"
-
-#: ../pidgin/gtkconv.c:2849
+#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opcions/Mos_tra les barres d'eines per al format"
 
-#: ../pidgin/gtkconv.c:2850
+#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opcions/_Mostra les marques horÃ ries"
 
-#: ../pidgin/gtkconv.c:2995
+#: ../pidgin/gtkconv.c:3134
 msgid "/Conversation/More"
 msgstr "/Conversa/MÃ©s"
 
-#: ../pidgin/gtkconv.c:3051
+#: ../pidgin/gtkconv.c:3190
 msgid "/Options"
 msgstr "/Opcions"
 
@@ -13429,648 +14830,674 @@ msgstr "/Opcions"
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3086 ../pidgin/gtkconv.c:3118
+#: ../pidgin/gtkconv.c:3225 ../pidgin/gtkconv.c:3257
 msgid "/Conversation"
 msgstr "/Conversa"
 
-#: ../pidgin/gtkconv.c:3126
+#: ../pidgin/gtkconv.c:3265
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Visualitza el registre"
 
-#: ../pidgin/gtkconv.c:3132
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Envia un fitxer..."
 
-#: ../pidgin/gtkconv.c:3136
+#: ../pidgin/gtkconv.c:3275
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Afegeix avÃs per a l'amic..."
 
-#: ../pidgin/gtkconv.c:3142
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Aconsegueix informaciÃ³"
 
-#: ../pidgin/gtkconv.c:3146
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convida..."
 
-#: ../pidgin/gtkconv.c:3152
+#: ../pidgin/gtkconv.c:3291
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Ã€lies..."
 
-#: ../pidgin/gtkconv.c:3156
+#: ../pidgin/gtkconv.c:3295
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloca"
 
-#: ../pidgin/gtkconv.c:3160
+#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Unblock..."
 msgstr "/Conversa/Desbloca..."
 
-#: ../pidgin/gtkconv.c:3164
+#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Afegeix..."
 
-#: ../pidgin/gtkconv.c:3168
+#: ../pidgin/gtkconv.c:3307
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Suprimeix..."
 
-#: ../pidgin/gtkconv.c:3174
+#: ../pidgin/gtkconv.c:3313
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversa/Insereix un enllaÃ§..."
 
-#: ../pidgin/gtkconv.c:3178
+#: ../pidgin/gtkconv.c:3317
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Insereix una imatge..."
 
-#: ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Logging"
 msgstr "/Opcions/Habilita el registre"
 
-#: ../pidgin/gtkconv.c:3187
+#: ../pidgin/gtkconv.c:3326
 msgid "/Options/Enable Sounds"
 msgstr "/Opcions/Habilita els sons"
 
-#: ../pidgin/gtkconv.c:3200
+#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opcions/Mostra les barres d'eines per al format"
 
-#: ../pidgin/gtkconv.c:3203
+#: ../pidgin/gtkconv.c:3342
 msgid "/Options/Show Timestamps"
 msgstr "/Opcions/Mostra les marques horÃ ries"
 
-#: ../pidgin/gtkconv.c:3206
-msgid "/Options/Show Buddy Icon"
-msgstr "/Options/Mostra la icona de l'amic"
-
-#: ../pidgin/gtkconv.c:3290 ../pidgin/gtkconv.c:3332
+#: ../pidgin/gtkconv.c:3419 ../pidgin/gtkconv.c:3461
 msgid "User is typing..."
 msgstr "L'usuari estÃ  escrivint..."
 
-#: ../pidgin/gtkconv.c:3335
+#: ../pidgin/gtkconv.c:3464
 msgid "User has typed something and stopped"
 msgstr "L'usuari ha escrit alguna cosa i s'ha aturat"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3518 ../pidgin/gtkconv.c:7782
-msgid "_Send To"
-msgstr "_Envia a"
+#: ../pidgin/gtkconv.c:3648 ../pidgin/gtkconv.c:8248
+msgid "S_end To"
+msgstr "Envia _a"
 
-#: ../pidgin/gtkconv.c:4231
+#: ../pidgin/gtkconv.c:4360
 msgid "_Send"
 msgstr "_Envia"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4335
+#: ../pidgin/gtkconv.c:4473
 msgid "0 people in room"
 msgstr "No hi ha ningÃº a la sala"
 
-#: ../pidgin/gtkconv.c:5603 ../pidgin/gtkconv.c:5724
+#: ../pidgin/gtkconv.c:5846 ../pidgin/gtkconv.c:5967
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona a la sala"
 msgstr[1] "%d persones a la sala"
 
-#: ../pidgin/gtkconv.c:6327 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6574 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Teclejant"
 
-#: ../pidgin/gtkconv.c:6331
+#: ../pidgin/gtkconv.c:6578
 msgid "Stopped Typing"
 msgstr "Pari d'escriure"
 
-#: ../pidgin/gtkconv.c:6334
+#: ../pidgin/gtkconv.c:6581
 msgid "Nick Said"
 msgstr "S'ha dit el sobrenom"
 
-#: ../pidgin/gtkconv.c:6337 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6584 ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "Missatges sense llegir"
 
-#: ../pidgin/gtkconv.c:6340
+#: ../pidgin/gtkconv.c:6590
 msgid "New Event"
 msgstr "Esdeveniment nou"
 
-#: ../pidgin/gtkconv.c:7332
+#: ../pidgin/gtkconv.c:7767
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Neteja la conversa."
 
-#: ../pidgin/gtkconv.c:7496
+#: ../pidgin/gtkconv.c:7930
 msgid "Confirm close"
 msgstr "Confirma en tancar"
 
-#: ../pidgin/gtkconv.c:7528
+#: ../pidgin/gtkconv.c:7962
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Teniu missatges per llegir. Esteu segur que voleu tancar la finestra?"
 
-#: ../pidgin/gtkconv.c:8114
+#: ../pidgin/gtkconv.c:8581
 msgid "Close other tabs"
 msgstr "Tanca les altres pestanyes"
 
-#: ../pidgin/gtkconv.c:8120
+#: ../pidgin/gtkconv.c:8587
 msgid "Close all tabs"
 msgstr "Tanca totes les pestanyes"
 
-#: ../pidgin/gtkconv.c:8128
+#: ../pidgin/gtkconv.c:8595
 msgid "Detach this tab"
 msgstr "Desenganxa aquesta pestanya"
 
-#: ../pidgin/gtkconv.c:8134
+#: ../pidgin/gtkconv.c:8601
 msgid "Close this tab"
 msgstr "Tanca aquesta pestanya"
 
-#: ../pidgin/gtkconv.c:8632
+#: ../pidgin/gtkconv.c:9106
 msgid "Close conversation"
 msgstr "Tanca la conversa"
 
-#: ../pidgin/gtkconv.c:9232
+#: ../pidgin/gtkconv.c:9708
 msgid "Last created window"
 msgstr "Finestra creada per darrer cop"
 
-#: ../pidgin/gtkconv.c:9234
+#: ../pidgin/gtkconv.c:9710
 msgid "Separate IM and Chat windows"
 msgstr "Separa les finestres de MI de les de xat"
 
-#: ../pidgin/gtkconv.c:9236 ../pidgin/gtkprefs.c:1412
+#: ../pidgin/gtkconv.c:9712 ../pidgin/gtkprefs.c:1510
 msgid "New window"
 msgstr "Finestra nova"
 
-#: ../pidgin/gtkconv.c:9238
+#: ../pidgin/gtkconv.c:9714
 msgid "By group"
 msgstr "Per grup"
 
-#: ../pidgin/gtkconv.c:9240
+#: ../pidgin/gtkconv.c:9716
 msgid "By account"
 msgstr "Per compte"
 
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:235
 msgid "Save Debug Log"
 msgstr "Desa el registre de depuraciÃ³"
 
-#: ../pidgin/gtkdebug.c:581
+#: ../pidgin/gtkdebug.c:583
 msgid "Invert"
 msgstr "Inverteix"
 
-#: ../pidgin/gtkdebug.c:584
+#: ../pidgin/gtkdebug.c:586
 msgid "Highlight matches"
 msgstr "Ressalta les coincidÃ¨ncies"
 
-#: ../pidgin/gtkdebug.c:651
+#: ../pidgin/gtkdebug.c:653
 msgid "_Icon Only"
 msgstr "NomÃ©s _icona"
 
-#: ../pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:654
 msgid "_Text Only"
 msgstr "NomÃ©s _text"
 
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:655
 msgid "_Both Icon & Text"
 msgstr "Ic_ones i text"
 
-#: ../pidgin/gtkdebug.c:774
+#: ../pidgin/gtkdebug.c:780
 msgid "Filter"
 msgstr "Filtre"
 
 # FIXME: Do not use "Right click", as left-handed people would use left click.
 # Instead it might be better to use "primary button" (josep)
-#: ../pidgin/gtkdebug.c:793
+#: ../pidgin/gtkdebug.c:799
 msgid "Right click for more options."
 msgstr "Feu clic amb el botÃ³ principal per a mÃ©s opcions"
 
-#: ../pidgin/gtkdebug.c:823
+#: ../pidgin/gtkdebug.c:829
 msgid "Level "
 msgstr "Nivell "
 
-#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
+#: ../pidgin/gtkdebug.c:830 ../pidgin/gtkdebug.c:836
 msgid "Select the debug filter level."
 msgstr "Seleccioneu el nivell de depuraciÃ³."
 
-#: ../pidgin/gtkdebug.c:832
+#: ../pidgin/gtkdebug.c:838
 msgid "All"
 msgstr "Tot"
 
 # FIXME
-#: ../pidgin/gtkdebug.c:833
+#: ../pidgin/gtkdebug.c:839
 msgid "Misc"
 msgstr "Altres"
 
-#: ../pidgin/gtkdebug.c:835
+#: ../pidgin/gtkdebug.c:841
 msgid "Warning"
 msgstr "AvÃs"
 
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:842
 msgid "Error "
 msgstr "Error"
 
-#: ../pidgin/gtkdebug.c:837
+#: ../pidgin/gtkdebug.c:843
 msgid "Fatal Error"
 msgstr "Error fatal"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "desenvolupador principal"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
-#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:77
-#: ../pidgin/gtkdialogs.c:78 ../pidgin/gtkdialogs.c:79
-#: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
-#: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
-#: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
-#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
 msgid "developer"
 msgstr "desenvolupador"
 
-#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:88
 msgid "support"
 msgstr "suport"
 
 # CQ -> Control de qualitat (josep)
-#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "suport/CQ"
 
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:108
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "desenvolupador i mantenidor de la pÃ gina web"
 
-#: ../pidgin/gtkdialogs.c:104
+#: ../pidgin/gtkdialogs.c:99
+msgid "Senior Contributor/QA"
+msgstr "ColÂ·laborador veterÃ /CQ"
+
+#: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
 msgstr "adaptaciÃ³ a win32"
 
-#: ../pidgin/gtkdialogs.c:105 ../pidgin/gtkdialogs.c:106
+#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "mantenidor"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:111
 msgid "libfaim maintainer"
 msgstr "mantenidor del libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker i conductor designat"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:115
 msgid "XMPP developer"
 msgstr "desenvolupador de l'XMPP"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "autor original"
 
-#: ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:133
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
 msgid "Arabic"
 msgstr "Ã€rab"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:131
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:135
+msgid "Belarusian Latin"
+msgstr "BielorÃºs (llatÃ)"
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:227
 msgid "Bulgarian"
 msgstr "BÃºlgar"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
 msgstr "BengalÃ"
 
-#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:142
 msgid "Bosnian"
 msgstr "BosniÃ "
 
-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229
 msgid "Catalan"
 msgstr "CatalÃ "
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
 msgstr "ValenciÃ -catalÃ "
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
 msgid "Czech"
 msgstr "Txec"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr "DanÃ¨s"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:231
 msgid "German"
 msgstr "Alemany"
 
 # FIXME
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
 msgid "Greek"
 msgstr "Grec"
 
-#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:156
 msgid "Australian English"
 msgstr "AnglÃ¨s d'AustrÃ lia"
 
-#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:157
 msgid "Canadian English"
 msgstr "AnglÃ¨s canadenc"
 
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:158
 msgid "British English"
 msgstr "AnglÃ¨s britÃ nic"
 
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:159
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Spanish"
 msgstr "Espanyol"
 
-#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:161
 msgid "Estonian"
-msgstr "Estoni"
+msgstr "EstoniÃ "
 
 # Ãˆuscar, millor? (josep)
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
 msgstr "Basc"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:166
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Finnish"
 msgstr "FinÃ¨s"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:229
-#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "French"
 msgstr "FrancÃ¨s"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
-#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:242
 msgid "Galician"
 msgstr "Gallec"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati Language Team"
 msgstr "Equip de traducciÃ³ del Gujarati"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:174
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
 msgid "Hungarian"
 msgstr "HongarÃ¨s"
 
-#: ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:176
 msgid "Indonesian"
 msgstr "Indonesi"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
 msgid "Italian"
 msgstr "ItaliÃ "
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
 msgid "Japanese"
 msgstr "JaponÃ¨s"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
 msgid "Georgian"
 msgstr "GeorgiÃ "
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:179
 msgid "Ubuntu Georgian Translators"
 msgstr "Traductors al georgiÃ  de l'Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada Translation team"
 msgstr "Equip de traducciÃ³ del Kannada"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:251
 msgid "Korean"
 msgstr "CoreÃ "
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
 msgstr "Kurd"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:185
+msgid "Lao"
+msgstr "LasiÃ "
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:253
 msgid "Lithuanian"
 msgstr "LituÃ "
 
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
-#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
 msgid "Macedonian"
 msgstr "Macedoni"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:256
 msgid "BokmÃ¥l Norwegian"
 msgstr "Noruec bokmÃ¥l"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:191
 msgid "Nepali"
 msgstr "NepalÃ¨s"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:192
 msgid "Dutch, Flemish"
 msgstr "HolandÃ¨s, Flamenc"
 
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:193
 msgid "Norwegian Nynorsk"
 msgstr "Noruec (Nynorsk)"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
 msgid "Polish"
 msgstr "PolonÃ¨s"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:197
 msgid "Portuguese"
 msgstr "PortuguÃ¨s"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:198
 msgid "Portuguese-Brazil"
 msgstr "PortuguÃ¨s de Brasil"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:199
 msgid "Pashto"
 msgstr "Paixto"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:200
 msgid "Romanian"
 msgstr "RomanÃ¨s"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:247
-#: ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:259
 msgid "Russian"
 msgstr "Rus"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:262
 msgid "Slovak"
 msgstr "Eslovac"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
 msgid "Slovenian"
 msgstr "EslovÃ¨"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:205
 msgid "Albanian"
 msgstr "AlbanÃ¨s"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
 msgid "Serbian"
 msgstr "Serbi"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:253
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:267
 msgid "Swedish"
 msgstr "Suec"
 
-#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:209
 msgid "Tamil"
 msgstr "TÃ mil"
 
 # FIXME
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:210
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:211
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:213
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:213
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "Equip del vietnamita del Gnome i T.M.Thanh"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
 msgid "Simplified Chinese"
 msgstr "XinÃ¨s simplificat"
 
-#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Hong Kong Chinese"
 msgstr "XinÃ¨s de Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:211
-#: ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:270
 msgid "Traditional Chinese"
 msgstr "XinÃ¨s tradicional"
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:225
 msgid "Amharic"
 msgstr "AmhÃ ric"
 
-#: ../pidgin/gtkdialogs.c:342
+#: ../pidgin/gtkdialogs.c:368
 #, c-format
 msgid "About %s"
 msgstr "Quant al %s"
 
-#: ../pidgin/gtkdialogs.c:380
+#: ../pidgin/gtkdialogs.c:411
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
-"El %s Ã©s un client de missatgeria instantÃ nia modular basat en libpurpel, "
+"El %s Ã©s un client de missatgeria instantÃ nia modular basat en libpurple, "
 "que permet utilitzar els protocols AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, "
-"SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, i "
-"QQ, tots alhora. Utilitza la biblioteca de programaciÃ³ GTK+.<BR><BR>Podeu "
-"modificar i redistribuir el programa sota els termes de la GPL (versiÃ³ 2 o "
-"posterior). Hi ha una cÃ²pia de la GPL dins del fitxer Â«COPYINGÂ» que es "
-"distribueix amb el %s. Els drets d'autor del %s pertanyen als seus "
+"SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, "
+"Gadu-Gadu, i QQ, tots alhora. Utilitza la biblioteca de programaciÃ³ GTK+."
+"<BR><BR>Podeu modificar i redistribuir el programa sota els termes de la GPL "
+"(versiÃ³ 2 o posterior). Hi ha una cÃ²pia de la GPL dins del fitxer Â«COPYINGÂ» "
+"que es distribueix amb el %s. Els drets d'autor del %s pertanyen als seus "
 "colÂ·laboradors. El fitxer Â«COPYRIGHTÂ» contÃ© una llista completa de tots els "
 "contribuÃ¯dors. No us proporcionem cap mena de garantia amb aquest programa."
 "<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:395
+#: ../pidgin/gtkdialogs.c:429
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin a irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:400
+#: ../pidgin/gtkdialogs.c:434
 msgid "Current Developers"
 msgstr "Desenvolupadors actuals"
 
-#: ../pidgin/gtkdialogs.c:415
+#: ../pidgin/gtkdialogs.c:449
 msgid "Crazy Patch Writers"
 msgstr "Esbojarrats escriptors de pedaÃ§os"
 
-#: ../pidgin/gtkdialogs.c:430
+#: ../pidgin/gtkdialogs.c:464
 msgid "Retired Developers"
 msgstr "Desenvolupadors retirats"
 
-#: ../pidgin/gtkdialogs.c:445
+#: ../pidgin/gtkdialogs.c:479
 msgid "Retired Crazy Patch Writers"
 msgstr "Escriptors de pedaÃ§os retirats"
 
-#: ../pidgin/gtkdialogs.c:460
+#: ../pidgin/gtkdialogs.c:494
 msgid "Artists"
 msgstr "Artistes"
 
-#: ../pidgin/gtkdialogs.c:475
+#: ../pidgin/gtkdialogs.c:509
 msgid "Current Translators"
 msgstr "Traductors actuals"
 
-#: ../pidgin/gtkdialogs.c:495
+#: ../pidgin/gtkdialogs.c:529
 msgid "Past Translators"
 msgstr "Antics traductors"
 
-#: ../pidgin/gtkdialogs.c:513
+#: ../pidgin/gtkdialogs.c:547
 msgid "Debugging Information"
 msgstr "InformaciÃ³ de depuraciÃ³"
 
-#: ../pidgin/gtkdialogs.c:882
+#: ../pidgin/gtkdialogs.c:764 ../pidgin/gtkdialogs.c:907
+#: ../pidgin/gtkdialogs.c:988
+msgid "_Name"
+msgstr "_Nom"
+
+#: ../pidgin/gtkdialogs.c:769
+msgid "Buddy"
+msgstr "Amic"
+
+#: ../pidgin/gtkdialogs.c:773 ../pidgin/gtkdialogs.c:912
+#: ../pidgin/gtkdialogs.c:993
+msgid "_Account"
+msgstr "_Compte"
+
+#: ../pidgin/gtkdialogs.c:920
 msgid "Get User Info"
 msgstr "Aconsegueix dades de l'usuari"
 
-#: ../pidgin/gtkdialogs.c:884
+#: ../pidgin/gtkdialogs.c:922
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -14078,11 +15505,11 @@ msgstr ""
 "IntroduÃ¯u el nom d'usuari o Ã lies de la persona de la qual vulgueu veure la "
 "informaciÃ³."
 
-#: ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:1012
 msgid "View User Log"
 msgstr "Visualitza el registre de l'usuari"
 
-#: ../pidgin/gtkdialogs.c:976
+#: ../pidgin/gtkdialogs.c:1014
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -14090,32 +15517,32 @@ msgstr ""
 "IntroduÃ¯u el nom d'usuari o l'Ã lies de la persona de la qual vulgueu veure "
 "el registre."
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1034
 msgid "Alias Contact"
 msgstr "Posa un Ã lies al contacte"
 
-#: ../pidgin/gtkdialogs.c:997
+#: ../pidgin/gtkdialogs.c:1035
 msgid "Enter an alias for this contact."
 msgstr "IntroduÃ¯u un Ã lies per a aquest contacte."
 
-#: ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "IntroduÃ¯u un Ã lies per a %s."
 
-#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1059
 msgid "Alias Buddy"
 msgstr "Posa un Ã lies a un amic"
 
-#: ../pidgin/gtkdialogs.c:1042
+#: ../pidgin/gtkdialogs.c:1080
 msgid "Alias Chat"
 msgstr "Posa un Ã lies a un xat"
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1081
 msgid "Enter an alias for this chat."
 msgstr "IntroduÃ¯u un Ã lies per a aquest xat."
 
-#: ../pidgin/gtkdialogs.c:1082
+#: ../pidgin/gtkdialogs.c:1120
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -14130,15 +15557,15 @@ msgstr[1] ""
 "Ara se suprimirÃ  el contacte que contÃ© %s i %d altres amics de la llista "
 "d'amics. Voleu continuar?"
 
-#: ../pidgin/gtkdialogs.c:1090
+#: ../pidgin/gtkdialogs.c:1128
 msgid "Remove Contact"
 msgstr "Suprimeix el contacte"
 
-#: ../pidgin/gtkdialogs.c:1093
+#: ../pidgin/gtkdialogs.c:1131
 msgid "_Remove Contact"
 msgstr "_Suprimeix el contacte"
 
-#: ../pidgin/gtkdialogs.c:1124
+#: ../pidgin/gtkdialogs.c:1162
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -14146,15 +15573,15 @@ msgstr ""
 msgstr ""
 "Ara es fusionarÃ  el grup %s dins del grup anomenat %s. Voleu continuar?"
 
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1169
 msgid "Merge Groups"
 msgstr "Fusiona els grups"
 
-#: ../pidgin/gtkdialogs.c:1134
+#: ../pidgin/gtkdialogs.c:1172
 msgid "_Merge Groups"
 msgstr "_Fusiona els grups"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1222
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -14163,156 +15590,156 @@ msgstr ""
 "Ara se suprimirÃ  el grup %s i tots els seus membres de la llista d'amics. "
 "Voleu continuar?"
 
-#: ../pidgin/gtkdialogs.c:1187
+#: ../pidgin/gtkdialogs.c:1225
 msgid "Remove Group"
 msgstr "Suprimeix el grup"
 
-#: ../pidgin/gtkdialogs.c:1190
+#: ../pidgin/gtkdialogs.c:1228
 msgid "_Remove Group"
 msgstr "_Suprimeix el grup"
 
-#: ../pidgin/gtkdialogs.c:1223
+#: ../pidgin/gtkdialogs.c:1261
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Esteu segur que voleu suprimir %s de la llista d'amics?"
 
-#: ../pidgin/gtkdialogs.c:1226
+#: ../pidgin/gtkdialogs.c:1264
 msgid "Remove Buddy"
 msgstr "Suprimeix l'amic"
 
-#: ../pidgin/gtkdialogs.c:1229
+#: ../pidgin/gtkdialogs.c:1267
 msgid "_Remove Buddy"
 msgstr "Sup_rimeix un amic"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1288
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Esteu segur que voleu suprimir el xat %s de la llista d'amics?"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1291
 msgid "Remove Chat"
 msgstr "Suprimeix el Xat"
 
-#: ../pidgin/gtkdialogs.c:1256
+#: ../pidgin/gtkdialogs.c:1294
 msgid "_Remove Chat"
 msgstr "_Suprimeix el Xat"
 
 # FIXME: Do not use "Right click", as left-handed people would use left click.
 # Instead it might be better to use "primary button" (josep)
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Feu clic amb el botÃ³ principal per a mÃ©s missatges per llegir...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "Canvia d'estat"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
 msgstr "Mostra la llista d'amics"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "Missatge nou..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
 msgstr "Inhabilita els sons"
 
-#: ../pidgin/gtkdocklet.c:535
-msgid "Blink on new message"
+#: ../pidgin/gtkdocklet.c:728
+msgid "Blink on New Message"
 msgstr "Parpelleja si hi ha missatges nous"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "Surt"
 
-#: ../pidgin/gtkft.c:153
+#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "No s'ha iniciat"
 
-#: ../pidgin/gtkft.c:273
+#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>S'estÃ  rebent com a:</b>"
 
-#: ../pidgin/gtkft.c:275
+#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>S'estÃ  rebent de:</b>"
 
-#: ../pidgin/gtkft.c:279
+#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>S'estÃ  enviant a:</b>"
 
-#: ../pidgin/gtkft.c:281
+#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>S'estÃ  enviant com a:</b>"
 
-#: ../pidgin/gtkft.c:497
+#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
 msgstr "No hi ha cap aplicaciÃ³ configurada per obrir aquest fitxer."
 
-#: ../pidgin/gtkft.c:502
+#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "S'ha produÃ¯t un error en obrir el fitxer."
 
-#: ../pidgin/gtkft.c:539
+#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "S'ha produÃ¯t un error en executar %s: %s"
 
-#: ../pidgin/gtkft.c:548
+#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "S'ha produÃ¯t un error en executar %s"
 
-#: ../pidgin/gtkft.c:549
+#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "El procÃ©s ha tornat el codi d'error %d"
 
-#: ../pidgin/gtkft.c:696
+#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: ../pidgin/gtkft.c:697
+#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "Fitxer local:"
 
-#: ../pidgin/gtkft.c:699
+#: ../pidgin/gtkft.c:700
 msgid "Speed:"
 msgstr "Velocitat:"
 
-#: ../pidgin/gtkft.c:700
+#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "Temps transcorregut:"
 
-#: ../pidgin/gtkft.c:701
+#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Temps restant:"
 
-#: ../pidgin/gtkft.c:783
+#: ../pidgin/gtkft.c:784
 msgid "Close this window when all transfers _finish"
 msgstr "Tanca aquesta finestra quan totes les transferÃ¨ncies hagin _finalitzat"
 
-#: ../pidgin/gtkft.c:793
+#: ../pidgin/gtkft.c:794
 msgid "C_lear finished transfers"
 msgstr "_Neteja les transferÃ¨ncies acabades"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:802
+#: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
 msgstr "_Detalls de la transferÃ¨ncia de fitxers"
 
 #. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pausa"
 
 #. Resume button
-#: ../pidgin/gtkft.c:842
+#: ../pidgin/gtkft.c:843
 msgid "_Resume"
 msgstr "_Continua"
 
@@ -14320,41 +15747,41 @@ msgstr "Enganxa com a _text"
 msgid "Paste as Plain _Text"
 msgstr "Enganxa com a _text"
 
-#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1138
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1199
 msgid "_Reset formatting"
 msgstr "_Restableix el format"
 
-#: ../pidgin/gtkimhtml.c:1372
+#: ../pidgin/gtkimhtml.c:1359
 msgid "Hyperlink color"
 msgstr "Color dels enllaÃ§os"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1360
 msgid "Color to draw hyperlinks."
 msgstr "El color amb quÃ¨ pintar els enllaÃ§os."
 
 # FIXME: prelight? (josep)
-#: ../pidgin/gtkimhtml.c:1376
+#: ../pidgin/gtkimhtml.c:1363
 msgid "Hyperlink prelight color"
 msgstr "Color dels enllaÃ§os"
 
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1364
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 "El color amb quÃ¨ es pintaran els enllaÃ§os quan el ratolÃ hi estigui a sobre."
 
-#: ../pidgin/gtkimhtml.c:1597
+#: ../pidgin/gtkimhtml.c:1581
 msgid "_Copy E-Mail Address"
 msgstr "_Copia l'adreÃ§a de correu"
 
-#: ../pidgin/gtkimhtml.c:1609
+#: ../pidgin/gtkimhtml.c:1593
 msgid "_Open Link in Browser"
 msgstr "_Obre l'enllaÃ§ en el navegador"
 
-#: ../pidgin/gtkimhtml.c:1619
+#: ../pidgin/gtkimhtml.c:1603
 msgid "_Copy Link Location"
 msgstr "_Copia la ubicaciÃ³ de l'enllaÃ§"
 
-#: ../pidgin/gtkimhtml.c:3365
+#: ../pidgin/gtkimhtml.c:3353
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -14365,7 +15792,7 @@ msgstr ""
 "\n"
 "Es farÃ  servir PNG per defecte."
 
-#: ../pidgin/gtkimhtml.c:3368
+#: ../pidgin/gtkimhtml.c:3356
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -14375,7 +15802,7 @@ msgstr ""
 "\n"
 "Per defecte es farÃ  servir PNG."
 
-#: ../pidgin/gtkimhtml.c:3397
+#: ../pidgin/gtkimhtml.c:3385
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -14387,7 +15814,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3400
+#: ../pidgin/gtkimhtml.c:3388
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -14398,35 +15825,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
+#: ../pidgin/gtkimhtml.c:3466 ../pidgin/gtkimhtml.c:3478
 msgid "Save Image"
 msgstr "Desa imatge"
 
-#: ../pidgin/gtkimhtml.c:3518
+#: ../pidgin/gtkimhtml.c:3506
+#, c-format
 msgid "_Save Image..."
 msgstr "_Desa la imatge..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:163
 msgid "Select Font"
 msgstr "Selecciona el tipus de lletra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "Selecciona el color del text"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:323
 msgid "Select Background Color"
 msgstr "Selecciona el color de fons"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "_DescripciÃ³"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:423
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -14434,61 +15862,122 @@ msgstr ""
 "IntroduÃ¯u l'URL i la descripciÃ³ de l'enllaÃ§ que vulgueu inserir. La "
 "descripciÃ³ Ã©s opcional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "IntroduÃ¯u l'URL i la descripciÃ³ de l'enllaÃ§ que vulgueu inserir."
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:432 ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Link"
 msgstr "Insereix un enllaÃ§"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1207
+#: ../pidgin/gtkimhtmltoolbar.c:436 ../pidgin/gtkimhtmltoolbar.c:1267
 msgid "_Insert"
 msgstr "_Insereix"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:516
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "No s'ha pogut emmagatzemar la imatge: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:542 ../pidgin/gtkimhtmltoolbar.c:552
 msgid "Insert Image"
 msgstr "Insereix una imatge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:765
 msgid "This theme has no available smileys."
 msgstr "Aquest tema no disposa d'emoticones."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:782
 msgid "Smile!"
 msgstr "Somrieu!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:820 ../pidgin/gtkimhtmltoolbar.c:1164
+#: ../pidgin/gtkimhtmltoolbar.c:850 ../pidgin/gtkimhtmltoolbar.c:1224
 msgid "_Font"
 msgstr "_Tipus de lletra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1124
+#: ../pidgin/gtkimhtmltoolbar.c:1058
+msgid "Group Items"
+msgstr "Agrupa els elements"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1058
+msgid "Ungroup Items"
+msgstr "Desagrupa els elements"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Negreta"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Cursiva"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Subratllat"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1095
+msgid "Strikethrough"
+msgstr "Ratlla"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1097
+msgid "Increase Font Size"
+msgstr "Augmenta mida de la lletra"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1098
+msgid "Decrease Font Size"
+msgstr "Disminueix la mida de la lletra"
+
+# FIXME?
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Font Face"
+msgstr "Tipus de lletra"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1101
+msgid "Background Color"
+msgstr "Color de fons"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1102
+msgid "Foreground Color"
+msgstr "Color del text"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1104
+msgid "Reset Formatting"
+msgstr "Restableix el format"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1107
+msgid "Insert IM Image"
+msgstr "Insereix una imatge de MI"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1108
+msgid "Insert Smiley"
+msgstr "Insereix una emoticona"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negreta</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1125
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<i>_Italic</i>"
 msgstr " <i>_Cursiva</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1126
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<u>_Underline</u>"
 msgstr "<u>_Subratllat</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1127
+#: ../pidgin/gtkimhtmltoolbar.c:1187
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span size='larger'>Ratlla</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>MÃ©s _gran</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1129
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Normal"
 msgstr "N_ormal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1131
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>MÃ©s _petita</span>"
 
@@ -14496,31 +15985,35 @@ msgstr "<span size='smaller'>MÃ©s _petit
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1135
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "_Font face"
 msgstr "_Tipus de lletra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1136
+#: ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "Foreground _color"
 msgstr "Color del te_xt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1137
+#: ../pidgin/gtkimhtmltoolbar.c:1198
 msgid "Bac_kground color"
 msgstr "Color de _fons"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1215
-msgid "_Smiley"
-msgstr "_Emoticona"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1221
+#: ../pidgin/gtkimhtmltoolbar.c:1275
 msgid "_Image"
 msgstr "_Imatge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1227
+#: ../pidgin/gtkimhtmltoolbar.c:1281
 msgid "_Link"
 msgstr "E_nllaÃ§"
 
-#: ../pidgin/gtklog.c:292
+#: ../pidgin/gtkimhtmltoolbar.c:1287
+msgid "_Horizontal rule"
+msgstr "LÃnia _horitzontal"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1309
+msgid "_Smile!"
+msgstr "_Somrieu!"
+
+#: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -14529,7 +16022,7 @@ msgstr ""
 "Esteu segur que voleu suprimir el registre de la conversa amb %s iniciada a "
 "les %s?"
 
-#: ../pidgin/gtklog.c:303
+#: ../pidgin/gtklog.c:304
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -14538,7 +16031,7 @@ msgstr ""
 "Esteu segur que voleu suprimir el registre de la conversa a %s iniciada a "
 "les %s?"
 
-#: ../pidgin/gtklog.c:308
+#: ../pidgin/gtklog.c:309
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -14547,23 +16040,23 @@ msgstr ""
 "Esteu segur que voleu suprimir permanentment el registre del sistema iniciat "
 "a les %s?"
 
-#: ../pidgin/gtklog.c:452
+#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversa a %s el %s</span>"
 
-#: ../pidgin/gtklog.c:455
+#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversa amb %s a %s</span>"
 
 # %B: mes, %Y: any 
-#: ../pidgin/gtklog.c:502
+#: ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%B de %Y"
 
 # FIXME
-#: ../pidgin/gtklog.c:549
+#: ../pidgin/gtklog.c:550
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -14571,7 +16064,7 @@ msgstr ""
 "Els esdeveniments del sistema nomÃ©s es registraran si s'habilita la "
 "preferÃ¨ncia Â«Registra tots els canvis d'estat al registre del sistemaÂ»."
 
-#: ../pidgin/gtklog.c:553
+#: ../pidgin/gtklog.c:554
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -14579,46 +16072,46 @@ msgstr ""
 "Els missatges instantanis nomÃ©s es registraran si s'habilita la preferÃ¨ncia "
 "Â«Registra tots els missatges instantanisÂ»."
 
-#: ../pidgin/gtklog.c:556
+#: ../pidgin/gtklog.c:557
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Els xats nomÃ©s es registraran si s'habilita preferÃ¨ncia Â«Registra tots els "
 "xatsÂ»."
 
-#: ../pidgin/gtklog.c:560
+#: ../pidgin/gtklog.c:561
 msgid "No logs were found"
 msgstr "No s'ha trobat cap registre"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:575
+#: ../pidgin/gtklog.c:576
 msgid "_Browse logs folder"
 msgstr "_Navega la carpeta dels registres"
 
-#: ../pidgin/gtklog.c:639
+#: ../pidgin/gtklog.c:640
 msgid "Total log size:"
 msgstr "Mida total del registre:"
 
-#: ../pidgin/gtklog.c:708
+#: ../pidgin/gtklog.c:714
 #, c-format
 msgid "Conversations in %s"
 msgstr "Converses a %s"
 
-#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
+#: ../pidgin/gtklog.c:722 ../pidgin/gtklog.c:793
 #, c-format
 msgid "Conversations with %s"
 msgstr "Converses amb %s"
 
-#: ../pidgin/gtklog.c:803
+#: ../pidgin/gtklog.c:823
 msgid "System Log"
 msgstr "Registre del sistema"
 
-#: ../pidgin/gtkmain.c:386
+#: ../pidgin/gtkmain.c:398
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Proveu Â«%s -hÂ» per a mÃ©s informaciÃ³.\n"
 
-#: ../pidgin/gtkmain.c:388
+#: ../pidgin/gtkmain.c:400
 #, c-format
 msgid ""
 "%s %s\n"
@@ -14631,6 +16124,7 @@ msgid ""
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
+"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -14643,13 +16137,14 @@ msgstr ""
 "  -n, --nologin       no entra automÃ ticament\n"
 "  -l, --login[=NOM]   entra automÃ ticament (l'argument opcional NOM indica\n"
 "                      els comptes a fer servir, separats per comes)\n"
+"  --display=PANTALLA  pantalla X a utilitzar\n"
 "  -v, --version       mostra la versiÃ³ actual i surt\n"
 
 # FIXME: backtrace -> traÃ§a (bug-buddy) ?
-#: ../pidgin/gtkmain.c:512
+#: ../pidgin/gtkmain.c:528
 #, c-format
 msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -14667,87 +16162,99 @@ msgstr ""
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
 msgstr ""
-"El %s ha produÃ¯t un error de segment i s'ha intentat bolcar un\n"
+"El %s %s ha produÃ¯t un error de segment i s'ha intentat bolcar un\n"
 "fitxer core. AixÃ² Ã©s un error de programaciÃ³ del qual no teniu cap\n"
 "culpa.\n"
 "\n"
-"Si podeu reproduir aquest error, feu-ho saber als desenvolupadors\n"
-"del Pidgin, enviant-los un error de programaciÃ³ a:\n"
+"Si podeu reproduir aquest error, feu-ho saber als desenvolupadors,\n"
+"enviant-los un error de programaciÃ³ a:\n"
 "%ssimpleticket\n"
 "\n"
-"Assegureu-vos que indiqueu el que estÃ veu fent, i envieu una traÃ§a\n"
+"Assegureu-vos que indiqueu el que estaveu fent, i envieu una traÃ§a\n"
 "(backtrace) del fitxer core. Si no sabeu com obtenir una traÃ§a,\n"
 "llegiu les instruccions que hi ha a:\n"
 "%swiki/GetABacktrace\n"
 "\n"
 "Si necessiteu ajuda, envieu un missatge instantani a SeanEgn o\n"
-"bÃ© LSchiere (per AIM). La informaciÃ³ per a contactar en Sean o en\n"
-"Luke a travÃ©s d'altres protocols Ã©s aquÃ:\n"
+"bÃ© a LSchiere (per AIM). La informaciÃ³ per a contactar en Sean o\n"
+"en Luke a travÃ©s d'altres protocols Ã©s aquÃ:\n"
 "%swiki/DeveloperPages\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
+#: ../pidgin/gtkmain.c:718 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:348
+#: ../pidgin/gtknotify.c:350
 msgid "Open All Messages"
 msgstr "Obre els _missatges"
 
-#: ../pidgin/gtknotify.c:401
+#: ../pidgin/gtknotify.c:403
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Teniu correu electrÃ²nic.</span>"
 
-#: ../pidgin/gtknotify.c:521
+#: ../pidgin/gtknotify.c:546
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s tÃ© %d missatge nou."
 msgstr[1] "%s tÃ© %d missatges nous."
 
-#: ../pidgin/gtknotify.c:532
+#: ../pidgin/gtknotify.c:570
 #, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>Teniu %d correu electrÃ²nic nou.</b>"
-msgstr[1] "<b>Teniu %d correus electrÃ²nics nous.</b>"
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
+msgstr[0] "<b>Teniu %d correu electrÃ²nic.</b>"
+msgstr[1] "<b>Teniu %d correus electrÃ²nics.</b>"
 
-#: ../pidgin/gtknotify.c:957
+#: ../pidgin/gtknotify.c:998
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "L'ordre Â«%sÂ» per al navegador no Ã©s vÃ lida."
 
-#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
-#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
+#: ../pidgin/gtknotify.c:1000 ../pidgin/gtknotify.c:1012
+#: ../pidgin/gtknotify.c:1025 ../pidgin/gtknotify.c:1153
 msgid "Unable to open URL"
 msgstr "No s'ha pogut obrir l'URL"
 
-#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
+#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1023
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "S'ha produÃ¯t un error en executar Â«%sÂ»: %s"
 
-#: ../pidgin/gtknotify.c:1113
+#: ../pidgin/gtknotify.c:1154
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "S'ha triat l'ordre per al navegador 'manualment', perÃ² no se n'ha indicat "
 "cap."
 
-#: ../pidgin/gtkplugin.c:264
+#: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
 msgstr "Es descarregaran els connectors segÃ¼ents."
 
-#: ../pidgin/gtkplugin.c:283
+#: ../pidgin/gtkplugin.c:284
 msgid "Multiple plugins will be unloaded."
 msgstr "Es descarregaran diversos connectors."
 
-#: ../pidgin/gtkplugin.c:287
+#: ../pidgin/gtkplugin.c:288
 msgid "Unload Plugins"
 msgstr "Descarrega connectors"
 
-#: ../pidgin/gtkplugin.c:399
+#: ../pidgin/gtkplugin.c:308
+msgid "Could not unload plugin"
+msgstr "No s'ha pogut descarregar el connector"
+
+#: ../pidgin/gtkplugin.c:309
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+"Ara mateix no s'ha pogut descarregar el connector, perÃ² quan torneu a "
+"iniciar ja estarÃ  inhabilitat."
+
+#: ../pidgin/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -14758,7 +16265,7 @@ msgstr ""
 "<span weight=\"bold\">Lloc web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nom del fitxer:</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:409
+#: ../pidgin/gtkplugin.c:427
 #, c-format
 msgid ""
 "%s\n"
@@ -14769,126 +16276,126 @@ msgstr ""
 "<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
 "Comproveu si hi ha actualitzacions a la pÃ gina del connector.</span>"
 
-#: ../pidgin/gtkplugin.c:535
+#: ../pidgin/gtkplugin.c:562
 msgid "Configure Pl_ugin"
 msgstr "Config_ura el connector"
 
-#: ../pidgin/gtkplugin.c:598
+#: ../pidgin/gtkplugin.c:625
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalls del connector</b>"
 
-#: ../pidgin/gtkpounce.c:156
+#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Seleccioneu un fitxer"
 
 # FIXME
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:531
+#: ../pidgin/gtkpounce.c:547
 msgid "Pounce on Whom"
 msgstr "Avisa dels Whom"
 
-#: ../pidgin/gtkpounce.c:558
+#: ../pidgin/gtkpounce.c:574
 msgid "_Buddy name:"
 msgstr "Nom de l'_amic:"
 
-#: ../pidgin/gtkpounce.c:592
+#: ../pidgin/gtkpounce.c:608
 msgid "Si_gns on"
 msgstr "Es _connecti"
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:610
 msgid "Signs o_ff"
 msgstr "Es _desconnecti"
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:612
 msgid "Goes a_way"
 msgstr "Passi a _absent"
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:614
 msgid "Ret_urns from away"
 msgstr "To_rni a estar present"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:616
 msgid "Becomes _idle"
 msgstr "Passi a _inactiu"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:618
 msgid "Is no longer i_dle"
 msgstr "Ja no estigui i_nactiu"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:620
 msgid "Starts _typing"
 msgstr "Comenci a _escriure"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:622
 msgid "P_auses while typing"
 msgstr "S'_aturi mentre tecleja"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:624
 msgid "Stops t_yping"
 msgstr "Pari d'e_scriure"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:626
 msgid "Sends a _message"
 msgstr "EnviÃ¯ un _missatge"
 
-#: ../pidgin/gtkpounce.c:653
+#: ../pidgin/gtkpounce.c:669
 msgid "Ope_n an IM window"
 msgstr "Obre u_na finestra de MI"
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:671
 msgid "_Pop up a notification"
 msgstr "Mostra una _notificaciÃ³ emergent"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:673
 msgid "Send a _message"
 msgstr "Envia un _missatge"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:675
 msgid "E_xecute a command"
 msgstr "E_xecuta una ordre"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:677
 msgid "P_lay a sound"
 msgstr "Reproduei_x un so"
 
-#: ../pidgin/gtkpounce.c:667
+#: ../pidgin/gtkpounce.c:683
 msgid "Brows_e..."
 msgstr "Nav_ega..."
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:685
 msgid "Br_owse..."
 msgstr "Na_vega..."
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:686
 msgid "Pre_view"
 msgstr "Pre_visualitza"
 
-#: ../pidgin/gtkpounce.c:797
+#: ../pidgin/gtkpounce.c:818
 msgid "P_ounce only when my status is not Available"
 msgstr "Avisa n_omÃ©s quan el meu estat sigui no disponible"
 
-#: ../pidgin/gtkpounce.c:802
+#: ../pidgin/gtkpounce.c:823
 msgid "_Recurring"
 msgstr "_Recurrent"
 
-#: ../pidgin/gtkpounce.c:1245
+#: ../pidgin/gtkpounce.c:1266
 msgid "Pounce Target"
 msgstr "Objectiu de l'avÃs"
 
-#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/gtkprefs.c:386
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Predeterminat"
 
-#: ../pidgin/gtkprefs.c:516
+#: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
 msgstr "No s'ha pogut desempaquetar el tema d'emoticones."
 
-#: ../pidgin/gtkprefs.c:643
+#: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
 msgstr "InstalÂ·la el tema"
 
-#: ../pidgin/gtkprefs.c:696
+#: ../pidgin/gtkprefs.c:698
 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."
@@ -14896,133 +16403,137 @@ msgstr ""
 "Seleccioneu un tema d'emoticones de la llista segÃ¼ent. Es poden instalÂ·lar "
 "temes nous arrossegant-los i deixant-los anar a la llista de temes."
 
-#: ../pidgin/gtkprefs.c:731
+#: ../pidgin/gtkprefs.c:733
 msgid "Icon"
 msgstr "Icona"
 
-#: ../pidgin/gtkprefs.c:893
+#: ../pidgin/gtkprefs.c:895
 msgid "System Tray Icon"
 msgstr "Icona d'estat"
 
-#: ../pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:896
 msgid "_Show system tray icon:"
 msgstr "Mostra la icona d'estat:"
 
-#: ../pidgin/gtkprefs.c:898
+#: ../pidgin/gtkprefs.c:899
 msgid "On unread messages"
 msgstr "Si hi ha missatges sense llegir"
 
 # REVIEW
-#: ../pidgin/gtkprefs.c:903
+#: ../pidgin/gtkprefs.c:905
 msgid "Conversation Window Hiding"
 msgstr "OcultaciÃ³ de les finestres"
 
-#: ../pidgin/gtkprefs.c:904
+#: ../pidgin/gtkprefs.c:906
 msgid "_Hide new IM conversations:"
 msgstr "_Amaga noves converses de MI:"
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1939
+#: ../pidgin/gtkprefs.c:909 ../pidgin/gtkprefs.c:2045
 msgid "When away"
 msgstr "En estar absent"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:917
 msgid "Tabs"
 msgstr "Pestanyes"
 
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:919
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostra MI i xats en finestres amb _pestanyes"
 
-#: ../pidgin/gtkprefs.c:931
+#: ../pidgin/gtkprefs.c:933
 msgid "Show close b_utton on tabs"
 msgstr "Mosta el b_otÃ³ de tancar a les pestanyes"
 
-#: ../pidgin/gtkprefs.c:934
+#: ../pidgin/gtkprefs.c:936
 msgid "_Placement:"
 msgstr "_Posicionament:"
 
-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:938
 msgid "Top"
 msgstr "A dalt"
 
-#: ../pidgin/gtkprefs.c:937
+#: ../pidgin/gtkprefs.c:939
 msgid "Bottom"
 msgstr "A baix"
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:940
 msgid "Left"
 msgstr "A la dreta"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:941
 msgid "Right"
 msgstr "A l'esquerra"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:943
 msgid "Left Vertical"
 msgstr "Vertical esquerre"
 
-#: ../pidgin/gtkprefs.c:942
+#: ../pidgin/gtkprefs.c:944
 msgid "Right Vertical"
 msgstr "Vertical dret"
 
-#: ../pidgin/gtkprefs.c:949
+#: ../pidgin/gtkprefs.c:951
 msgid "N_ew conversations:"
 msgstr "Converses noves:"
 
-#: ../pidgin/gtkprefs.c:994
+#: ../pidgin/gtkprefs.c:997
 msgid "Show _formatting on incoming messages"
 msgstr "Mostra el format dels missatges entrants"
 
-#: ../pidgin/gtkprefs.c:997
+#: ../pidgin/gtkprefs.c:999
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Tanca la missatgeria quan es tanqui la pestanya"
+
+#: ../pidgin/gtkprefs.c:1002
 msgid "Show _detailed information"
 msgstr "Mostra informaciÃ³ _detallada"
 
-#: ../pidgin/gtkprefs.c:999
+#: ../pidgin/gtkprefs.c:1004
 msgid "Enable buddy ic_on animation"
 msgstr "Habilita l'_animaciÃ³ de les icones dels amics"
 
-#: ../pidgin/gtkprefs.c:1006
+#: ../pidgin/gtkprefs.c:1011
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notifica als amics quan els escrigui"
 
-#: ../pidgin/gtkprefs.c:1009
+#: ../pidgin/gtkprefs.c:1014
 msgid "Highlight _misspelled words"
 msgstr "Ressalta les paraules _mal escrites"
 
-#: ../pidgin/gtkprefs.c:1013
+#: ../pidgin/gtkprefs.c:1018
 msgid "Use smooth-scrolling"
 msgstr "Utilitza el desplaÃ§ament suau"
 
-#: ../pidgin/gtkprefs.c:1016
+#: ../pidgin/gtkprefs.c:1021
 msgid "F_lash window when IMs are received"
 msgstr "_Fes que la finestra faci un flaix quan hi arribin missatges"
 
-#: ../pidgin/gtkprefs.c:1018
+#: ../pidgin/gtkprefs.c:1023
 msgid "Minimi_ze new conversation windows"
 msgstr "_Minimitza les finestres de conversa noves"
 
-#: ../pidgin/gtkprefs.c:1022
+#: ../pidgin/gtkprefs.c:1027
 msgid "Font"
 msgstr "Tipus de lletra"
 
-#: ../pidgin/gtkprefs.c:1024
+#: ../pidgin/gtkprefs.c:1029
 msgid "Use document font from _theme"
 msgstr "Empra el tipus de lletra del document del _tema"
 
-#: ../pidgin/gtkprefs.c:1026
+#: ../pidgin/gtkprefs.c:1031
 msgid "Use font from _theme"
 msgstr "Empra el tipus de lletra del _tema"
 
-#: ../pidgin/gtkprefs.c:1028
+#: ../pidgin/gtkprefs.c:1033
 msgid "Conversation _font:"
 msgstr "_Tipus de lletra de la conversa:"
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1047
 msgid "Default Formatting"
 msgstr "Format per defecte"
 
-#: ../pidgin/gtkprefs.c:1059
+#: ../pidgin/gtkprefs.c:1066
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -15030,119 +16541,158 @@ msgstr ""
 "AixÃ Ã©s com els missatges de text sortints apareixeran quan feu servir "
 "protocols que implementin el text formatat."
 
-#: ../pidgin/gtkprefs.c:1125
+#: ../pidgin/gtkprefs.c:1126
+msgid "Cannot start proxy configuration program."
+msgstr ""
+"No s'ha pogut iniciar el programa de configuraciÃ³ del servidor intermediari."
+
+#: ../pidgin/gtkprefs.c:1138
+msgid "Cannot start browser configuration program."
+msgstr "No s'ha pogut iniciar el programa de configuraciÃ³ del navegador."
+
+#: ../pidgin/gtkprefs.c:1158
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkprefs.c:1170
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemple: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1141
+#: ../pidgin/gtkprefs.c:1174
 msgid "_Autodetect IP address"
 msgstr "Detecta l'_adreÃ§a IP automÃ ticament"
 
-#: ../pidgin/gtkprefs.c:1150
+#: ../pidgin/gtkprefs.c:1183
 msgid "Public _IP:"
 msgstr "_IP pÃºblica:"
 
-#: ../pidgin/gtkprefs.c:1179
+#: ../pidgin/gtkprefs.c:1214
 msgid "Ports"
 msgstr "Ports"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1217
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especifica _manualment el rang de ports on escoltar"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1220
 msgid "_Start port:"
 msgstr "Port _inicial:"
 
-#: ../pidgin/gtkprefs.c:1192
+#: ../pidgin/gtkprefs.c:1227
 msgid "_End port:"
 msgstr "Port _final:"
 
-#: ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkprefs.c:1235
+msgid "Proxy Server &amp; Browser"
+msgstr "Servidor intermediari i navegador"
+
+#: ../pidgin/gtkprefs.c:1243
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+"<b>No s'ha pogut trobar el programa de configuraciÃ³ del servidor "
+"intermediari.</b>"
+
+#: ../pidgin/gtkprefs.c:1251
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>No s'ha pogut trobar el programa de configuraciÃ³ del navegador.</b>"
+
+#: ../pidgin/gtkprefs.c:1256
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+"Les preferÃ¨ncies del servidor intermediari i\n"
+"del navegador les gestiona el GNOME"
+
+#: ../pidgin/gtkprefs.c:1263
+msgid "Configure _Proxy"
+msgstr "Configura el _servidor intermediari"
+
+#: ../pidgin/gtkprefs.c:1268
+msgid "Configure _Browser"
+msgstr "Configura el _navegador"
+
+#: ../pidgin/gtkprefs.c:1274
 msgid "Proxy Server"
 msgstr "Servidor intermediari"
 
-#: ../pidgin/gtkprefs.c:1204
+#: ../pidgin/gtkprefs.c:1279
 msgid "No proxy"
 msgstr "Sense servidor intermediari"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1335
 msgid "_User:"
 msgstr "_Usuari:"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1423
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1424
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1425
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1426
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1427
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1428
 msgid "GNOME Default"
 msgstr "Predeterminat del GNOME"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1429
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1430
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1431
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1432
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1343
+#: ../pidgin/gtkprefs.c:1441
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1396
+#: ../pidgin/gtkprefs.c:1494
 msgid "Browser Selection"
 msgstr "SelecciÃ³ del navegador"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1498
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1506
 msgid "_Open link in:"
 msgstr "_Obre la ubicaciÃ³ de l'enllaÃ§ a:"
 
-#: ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkprefs.c:1508
 msgid "Browser default"
 msgstr "Predeterminat del navegador"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1509
 msgid "Existing window"
 msgstr "Finestra existent"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1511
 msgid "New tab"
 msgstr "Nova pestanya"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1525
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -15151,63 +16701,69 @@ msgstr ""
 "_Manual:\n"
 "(%s per a l'URL)"
 
-#: ../pidgin/gtkprefs.c:1467
+#: ../pidgin/gtkprefs.c:1566
 msgid "Log _format:"
 msgstr "_Format del registre:"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1571
 msgid "Log all _instant messages"
 msgstr "_Registra tots els missatges instantanis"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1573
 msgid "Log all c_hats"
 msgstr "Registra tots els _xats"
 
-#: ../pidgin/gtkprefs.c:1476
+#: ../pidgin/gtkprefs.c:1575
 msgid "Log all _status changes to system log"
 msgstr "Regi_stra tots els canvis d'estat al registre del sistema"
 
-#: ../pidgin/gtkprefs.c:1622
+#: ../pidgin/gtkprefs.c:1725
 msgid "Sound Selection"
 msgstr "SelecciÃ³ de sons"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1735
+#, c-format
 msgid "Quietest"
 msgstr "El mÃ©s silenciÃ³s"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1737
+#, c-format
 msgid "Quieter"
 msgstr "MÃ©s silenciÃ³s"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1739
+#, c-format
 msgid "Quiet"
 msgstr "SilenciÃ³s"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1743
+#, c-format
 msgid "Loud"
 msgstr "Alt"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1745
+#, c-format
 msgid "Louder"
 msgstr "MÃ©s alt"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1747
+#, c-format
 msgid "Loudest"
 msgstr "El mÃ©s alt"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1813
 msgid "_Method:"
 msgstr "_MÃ¨tode:"
 
-#: ../pidgin/gtkprefs.c:1710
+#: ../pidgin/gtkprefs.c:1815
 msgid "Console beep"
 msgstr "AvÃs sonor del terminal"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1822
 msgid "No sounds"
 msgstr "Sense sons"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1830
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -15216,268 +16772,276 @@ msgstr ""
 "Ordre per al so\n"
 "(%s per al nom de fitxer)"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1857
 msgid "Sounds when conversation has _focus"
 msgstr "Sons quan la conversa tingui el _focus"
 
-#: ../pidgin/gtkprefs.c:1754
+#: ../pidgin/gtkprefs.c:1859
 msgid "Enable sounds:"
 msgstr "Habilita els sons:"
 
-#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/gtkprefs.c:1870
 msgid "Volume:"
 msgstr "Volum:"
 
-#: ../pidgin/gtkprefs.c:1845
+#: ../pidgin/gtkprefs.c:1950
 msgid "Play"
 msgstr "Reprodueix"
 
-#: ../pidgin/gtkprefs.c:1922
+#: ../pidgin/gtkprefs.c:2028
 msgid "_Report idle time:"
 msgstr "Informa del _temps d'inactivitat:"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:2033
 msgid "Based on keyboard or mouse use"
 msgstr "Basat en l'Ãºs del teclat o el ratolÃ"
 
-#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkprefs.c:2042
 msgid "_Auto-reply:"
 msgstr "Resposta _automÃ tica:"
 
-#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/gtkprefs.c:2046
 msgid "When both away and idle"
 msgstr "En estar absent i inactiu alhora"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:2052
 msgid "Auto-away"
 msgstr "Auto-absÃ¨ncia"
 
-#: ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:2054
 msgid "Change status when _idle"
 msgstr "Canvia l'estat quan estigui _inactiu"
 
-#: ../pidgin/gtkprefs.c:1952
+#: ../pidgin/gtkprefs.c:2058
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuts abans de passar a inactiu:"
 
-#: ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkprefs.c:2066
 msgid "Change _status to:"
 msgstr "Canvia l'e_stat a:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:2087
 msgid "Status at Startup"
 msgstr "L'estat en iniciar"
 
-#: ../pidgin/gtkprefs.c:1983
+#: ../pidgin/gtkprefs.c:2089
 msgid "Use status from last _exit at startup"
 msgstr "_En iniciar, empra el mateix estat que en sortir per darrer cop"
 
-#: ../pidgin/gtkprefs.c:1989
+#: ../pidgin/gtkprefs.c:2095
 msgid "Status to a_pply at startup:"
 msgstr "Es_tatus a utilitzar en iniciar:"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2134
 msgid "Interface"
 msgstr "InterfÃcie"
 
-#: ../pidgin/gtkprefs.c:2029
+#: ../pidgin/gtkprefs.c:2136
 msgid "Smiley Themes"
 msgstr "Temes d'emoticones"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2143
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:2040
+#: ../pidgin/gtkprefs.c:2147
 msgid "Status / Idle"
 msgstr "Estat / Inactiu"
 
-#: ../pidgin/gtkprivacy.c:79
+#: ../pidgin/gtkprivacy.c:80
 msgid "Allow all users to contact me"
 msgstr "Permet a tots els usuaris contactar amb mi"
 
-#: ../pidgin/gtkprivacy.c:80
+#: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users on my buddy list"
 msgstr "NomÃ©s permet els usuaris de la llista d'amics"
 
-#: ../pidgin/gtkprivacy.c:81
+#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users below"
 msgstr "NomÃ©s permet els usuaris indicats aquÃ sota"
 
-#: ../pidgin/gtkprivacy.c:82
+#: ../pidgin/gtkprivacy.c:83
 msgid "Block all users"
 msgstr "Bloca tots els usuaris"
 
-#: ../pidgin/gtkprivacy.c:83
+#: ../pidgin/gtkprivacy.c:84
 msgid "Block only the users below"
 msgstr "Bloca els usuaris indicats aquÃ sota"
 
-#: ../pidgin/gtkprivacy.c:369
+#: ../pidgin/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Privadesa"
 
-#: ../pidgin/gtkprivacy.c:381
+#: ../pidgin/gtkprivacy.c:384
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Els canvis en les opcions de privadesa es realitzen immediatament."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:393
+#: ../pidgin/gtkprivacy.c:396
 msgid "Set privacy for:"
 msgstr "Estableix la privadesa de:"
 
-#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:559 ../pidgin/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "Permet l'usuari"
 
-#: ../pidgin/gtkprivacy.c:557
+#: ../pidgin/gtkprivacy.c:560
 msgid "Type a user you permit to contact you."
 msgstr "Escriviu quin usuari permeteu que us contacti."
 
-#: ../pidgin/gtkprivacy.c:558
+#: ../pidgin/gtkprivacy.c:561
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "IntroduÃ¯u el nom de l'usuari que vulgueu que us pugui contactar."
 
-#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:564 ../pidgin/gtkprivacy.c:580
 msgid "_Permit"
 msgstr "_Permet"
 
-#: ../pidgin/gtkprivacy.c:567
+#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Voleu permetre que %s us pugui contactar?"
 
-#: ../pidgin/gtkprivacy.c:569
+#: ../pidgin/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Esteu segur que voleu permetre que %s us pugui contactar?"
 
-#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:601 ../pidgin/gtkprivacy.c:615
 msgid "Block User"
 msgstr "Bloca un usuari"
 
-#: ../pidgin/gtkprivacy.c:599
+#: ../pidgin/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "Escriviu l'usuari que vulgueu blocar."
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
 msgstr "IntroduÃ¯u el nom de l'usuari que vulgueu blocar."
 
-#: ../pidgin/gtkprivacy.c:608
+#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Block %s?"
 msgstr "Voleu blocar %s?"
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:613
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Esteu segur que voleu blocar %s?"
 
-#: ../pidgin/gtkrequest.c:271
+#: ../pidgin/gtkrequest.c:322
 msgid "Apply"
 msgstr "Aplica"
 
-#: ../pidgin/gtkrequest.c:1504
+#: ../pidgin/gtkrequest.c:1651
 msgid "That file already exists"
 msgstr "Aquest fitxer ja existeix"
 
-#: ../pidgin/gtkrequest.c:1505
+#: ../pidgin/gtkrequest.c:1652
 msgid "Would you like to overwrite it?"
 msgstr "El voleu sobreescriure?"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1655
 msgid "Overwrite"
 msgstr "Sobreescriu"
 
-#: ../pidgin/gtkrequest.c:1509
+#: ../pidgin/gtkrequest.c:1656
 msgid "Choose New Name"
 msgstr "Trieu un nom nou"
 
-#: ../pidgin/gtkrequest.c:1647 ../pidgin/gtkrequest.c:1661
+#: ../pidgin/gtkrequest.c:1797 ../pidgin/gtkrequest.c:1811
 msgid "Select Folder..."
 msgstr "Selecciona una carpeta..."
 
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:374
+#: ../pidgin/gtkroomlist.c:518 ../pidgin/gtkroomlist.c:688
 msgid "Room List"
 msgstr "Llista de sales"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:442
+#: ../pidgin/gtkroomlist.c:756
 msgid "_Get List"
 msgstr "_Aconsegueix la llista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:450
+#: ../pidgin/gtkroomlist.c:764
 msgid "_Add Chat"
 msgstr "_Afegeix el xat"
 
 # He omÃ¨s "saved", que sembla que no hi cal (josep)
-#: ../pidgin/gtksavedstatuses.c:336
+#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Esteu segur que voleu suprimir els estats seleccionats?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1273
 msgid "_Use"
 msgstr "_Utilitza"
 
-#: ../pidgin/gtksavedstatuses.c:779
+#: ../pidgin/gtksavedstatuses.c:780
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Ja s'utilitza aquest tÃtol. Heu de triar un tÃtol Ãºnic."
 
-#: ../pidgin/gtksavedstatuses.c:969
+#: ../pidgin/gtksavedstatuses.c:976
 msgid "Different"
 msgstr "Diferent"
 
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1165
 msgid "_Title:"
 msgstr "_TÃtol:"
 
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
+#: ../pidgin/gtksavedstatuses.c:1184 ../pidgin/gtksavedstatuses.c:1505
 msgid "_Status:"
 msgstr "E_stat:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1209
+#: ../pidgin/gtksavedstatuses.c:1217
 msgid "Use a _different status for some accounts"
 msgstr "Utilitza un estat _diferent per a determinats comptes"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1273
+#: ../pidgin/gtksavedstatuses.c:1281
 msgid "Sa_ve & Use"
 msgstr "Desa i _fes servir"
 
-#: ../pidgin/gtksavedstatuses.c:1479
+#: ../pidgin/gtksavedstatuses.c:1488
 #, c-format
 msgid "Status for %s"
 msgstr "Estat per a %s"
 
-#: ../pidgin/gtkstatusbox.c:663
+#: ../pidgin/gtkstatusbox.c:664
 msgid "Waiting for network connection"
 msgstr "S'estÃ  esperant la connexiÃ³ de xarxa"
 
-#: ../pidgin/gtkutils.c:631
+#: ../pidgin/gtkstatusbox.c:1072
+msgid "New status..."
+msgstr "Estat nou..."
+
+#: ../pidgin/gtkstatusbox.c:1073
+msgid "Saved statuses..."
+msgstr "Estats desats..."
+
+#: ../pidgin/gtkutils.c:634
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1424
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "S'ha produÃ¯t el segÃ¼ent error en carregar %s: %s"
 
-#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
+#: ../pidgin/gtkutils.c:1404 ../pidgin/gtkutils.c:1426
 msgid "Failed to load image"
 msgstr "No s'ha pogut carregar la imatge"
 
-#: ../pidgin/gtkutils.c:1497
+#: ../pidgin/gtkutils.c:1500
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "No s'ha pogut enviar la carpeta %s."
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1501
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -15486,12 +17050,12 @@ msgstr ""
 "El %s no pot transferir una carpeta. Haureu d'enviar per separat cada un "
 "dels fitxers."
 
-#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
-#: ../pidgin/gtkutils.c:1549
+#: ../pidgin/gtkutils.c:1535 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1554
 msgid "You have dragged an image"
 msgstr "Heu arrossegat una imatge"
 
-#: ../pidgin/gtkutils.c:1531
+#: ../pidgin/gtkutils.c:1536
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -15499,23 +17063,23 @@ msgstr ""
 "Podeu enviar aquesta imatge com una transferÃ¨ncia de fitxer, incrustar-la en "
 "el missatge, o emprar-la com a icona d'amic per a aquest usuari."
 
-#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
+#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
 msgid "Set as buddy icon"
 msgstr "Estableix com a icona de l'amic"
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1563
 msgid "Send image file"
 msgstr "Envia un fitxer d'imatge"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1544 ../pidgin/gtkutils.c:1563
 msgid "Insert in message"
 msgstr "Insereix en el missatge"
 
-#: ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1548
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Voleu establir-la com la icona per a aquest amic?"
 
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1555
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -15523,7 +17087,7 @@ msgstr ""
 "Podeu enviar aquesta imatge com una transferÃ¨ncia de fitxer, o emprar-la com "
 "a icona d'amic per a aquest usuari."
 
-#: ../pidgin/gtkutils.c:1551
+#: ../pidgin/gtkutils.c:1556
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -15536,11 +17100,11 @@ msgstr ""
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1609
+#: ../pidgin/gtkutils.c:1615
 msgid "Cannot send launcher"
 msgstr "No es pot enviar el llanÃ§ador"
 
-#: ../pidgin/gtkutils.c:1609
+#: ../pidgin/gtkutils.c:1615
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -15548,7 +17112,7 @@ msgstr ""
 "Heu arrossegat un llanÃ§ador de l'escriptori. Segurament voleu enviar allÃ² a "
 "quÃ¨ aquest llanÃ§ador apunta i no pas el llanÃ§ador."
 
-#: ../pidgin/gtkutils.c:2344
+#: ../pidgin/gtkutils.c:2350
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -15559,27 +17123,27 @@ msgstr ""
 "<b>Mida del fitxer:</b> %s\n"
 "<b>Mida de la imatge:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2640
+#: ../pidgin/gtkutils.c:2646
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 "El fitxer Â«%sÂ» Ã©s massa gran per a %s. Intenteu-ho amb una imatge mÃ©s "
 "petita.\n"
 
-#: ../pidgin/gtkutils.c:2642
+#: ../pidgin/gtkutils.c:2648
 msgid "Icon Error"
 msgstr "Error en la icona"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2649
 msgid "Could not set icon"
 msgstr "No s'ha pogut establir la icona"
 
-#: ../pidgin/gtkutils.c:2743
+#: ../pidgin/gtkutils.c:2749
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "No s'ha pogut obrir el fitxer Â«%sÂ»: %s"
 
-#: ../pidgin/gtkutils.c:2792
+#: ../pidgin/gtkutils.c:2798
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -15595,27 +17159,27 @@ msgstr "Seleccioneu un color"
 msgid "Select color"
 msgstr "Seleccioneu un color"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "Ã€_lies"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "Tanca les _pestanyes"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "_Aconsegueix informaciÃ³"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "Conv_ida"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "_Modifica"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_Obre el correu"
 
@@ -15637,36 +17201,36 @@ msgstr "cap"
 msgid "none"
 msgstr "cap"
 
-#: ../pidgin/plugins/cap/cap.c:450
+#: ../pidgin/plugins/cap/cap.c:451
 msgid "Display Statistics"
 msgstr "Mostra les estadÃstiques"
 
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
+#: ../pidgin/plugins/cap/cap.c:464 ../pidgin/plugins/cap/cap.c:467
 msgid "Response Probability:"
 msgstr "Probabilitat de resposta:"
 
-#: ../pidgin/plugins/cap/cap.c:811
+#: ../pidgin/plugins/cap/cap.c:813
 msgid "Statistics Configuration"
 msgstr "ConfiguraciÃ³ de les estadÃstiques"
 
 # He hagut de ser una mica flexible per mantenir-ho "curt"
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
+#: ../pidgin/plugins/cap/cap.c:816
 msgid "Maximum response timeout:"
 msgstr "Temps d'espera mÃ xim de resposta:"
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:819 ../pidgin/plugins/cap/cap.c:826
+#: ../pidgin/plugins/cap/cap.c:833 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minuts"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
+#: ../pidgin/plugins/cap/cap.c:823
 msgid "Maximum last-seen difference:"
 msgstr "DiferÃ¨ncia mÃ xima de vist per darrer cop:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
+#: ../pidgin/plugins/cap/cap.c:830
 msgid "Threshold:"
 msgstr "Llindar:"
 
@@ -15676,18 +17240,18 @@ msgstr "Llindar:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction"
 msgstr "PredicciÃ³ de la disponibilitat de contactes"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:940
 msgid "Contact Availability Prediction plugin."
 msgstr "Connector de predicciÃ³ de disponibilitat de contactes."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
+#: ../pidgin/plugins/cap/cap.c:941
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -15743,21 +17307,21 @@ msgstr "PuntuaciÃ³ a utilitzar per al co
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Prioritat de contacte"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
+#: ../pidgin/plugins/contact_priority.c:191
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Us permet canviar els valors associats als diferents estats dels amics."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
+#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -15793,23 +17357,11 @@ msgstr "Missatges rebuts"
 msgid "Received Messages"
 msgstr "Missatges rebuts"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "Selecciona el color per a %s"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Negreta"
-
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Cursiva"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Subratllat"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Ignora el formatat rebut"
@@ -15937,20 +17489,20 @@ msgstr ""
 "una de nova."
 
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
 msgid "Group:"
 msgstr "Grup:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
 msgid "New Person"
 msgstr "Nova persona"
 
 # FIXME: seleccioneu un amic?
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 msgid "Select Buddy"
 msgstr "Seleccioneu un amic"
 
@@ -16026,44 +17578,35 @@ msgstr "Proporciona la integraciÃ³ amb l
 msgid "Provides integration with Evolution."
 msgstr "Proporciona la integraciÃ³ amb l'Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
 msgstr "IntroduÃ¯u la informaciÃ³ de la persona aquÃ sota."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "IntroduÃ¯u el nom d'usuari i el tipus de compte aquÃ sota."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
 msgstr "Tipus de compte:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
 msgstr "InformaciÃ³ opcional:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
 msgstr "Nom:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
 msgstr "Cognoms:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 msgid "E-mail:"
 msgstr "Correu electrÃ²nic:"
 
-#: ../pidgin/plugins/gtkbuddynote.c:34
-#, c-format
-msgid ""
-"\n"
-"<b>Buddy Note</b>: %s"
-msgstr ""
-"\n"
-"<b>Nota sobre l'amic:</b> %s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -16085,7 +17628,16 @@ msgstr ""
 "Prova per veure si tots els senyals de la interfÃcie d'usuari funcionen "
 "correctament."
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/gtkbuddynote.c:36
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Nota sobre l'amic:</b> %s"
+
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "Historial"
 
@@ -16131,11 +17683,11 @@ msgstr "Dibuixa la lÃnia de marca a "
 msgid "Draw Markerline in "
 msgstr "Dibuixa la lÃnia de marca a "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "Finestres de M_I"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "Finestres de _xat"
 
@@ -16151,32 +17703,32 @@ msgstr "S'ha confirmat la sessiÃ³ de mis
 msgid "Music messaging session confirmed."
 msgstr "S'ha confirmat la sessiÃ³ de missatgeria de mÃºsica."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Missatgeria de mÃºsica"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "Hi ha hagut un conflicte en executar l'ordre:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "S'ha produÃ¯t un error en executar l'editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "S'ha produÃ¯t el segÃ¼ent error:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "ConfiguraciÃ³ dels missatges de mÃºsica"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "CamÃ de l'editor de partitures"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "_Aplica"
 
@@ -16188,12 +17740,12 @@ msgstr "_Aplica"
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Connector de missatgeria de mÃºsica per a composar conjuntament."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -16203,74 +17755,74 @@ msgstr ""
 "temps real."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Notifica per a"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\tN_omÃ©s quan algÃº digui el vostre sobrenom"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Finestres actives"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "MÃ¨todes de notificaciÃ³"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Po_sa aquesta cadena davant del tÃtol de la finestra:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insereix el _nombre de missatges nous al tÃtol de la finestra"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Insereix el compte de missatges nous a la propietat _X"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Aplica l'opciÃ³ Â«_URGENTÂ» del gestor de finestres"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "_AlÃ§a la finestra de conversa"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "SupressiÃ³ de notificacions"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Suprimeix quan la finestra de la conversa esti_gui activada"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Suprimeix quan es faci clic a la finestra de la conve_rsa"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Suprimeix quan s'escrigui a la fines_tra de la conversa"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Suprimeix quan s'enviÃ¯ un _missatge"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Suprimeix en canviar a la _pestanya de la conversa"
 
@@ -16280,7 +17832,7 @@ msgstr "Suprimeix en canviar a la _pesta
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "NotificaciÃ³ de missatges"
 
@@ -16288,7 +17840,7 @@ msgstr "NotificaciÃ³ de missatges"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Us proporciona diferents maneres de notificar-vos la presÃ¨ncia de missatges "
@@ -16340,44 +17892,37 @@ msgstr "SeparaciÃ³ horitzontal del GtkTr
 msgid "GtkTreeView Horizontal Separation"
 msgstr "SeparaciÃ³ horitzontal del GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "Entrada de la conversa"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "HistÃ²ric de converses"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Visualitzador del registre"
-
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "DiÃ leg de solÂ·licitud"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "DiÃ leg de notificaciÃ³"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "Selecciona el color per a %s"
 
-#: ../pidgin/plugins/pidginrc.c:300
+#: ../pidgin/plugins/pidginrc.c:294
+#, c-format
 msgid "Select Interface Font"
 msgstr "Selecciona el tipus de lletra de la interfÃcie"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "Selecciona el tipus de lletra per a %s"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "Tipus de lletra de la interfÃcie GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de la drecera de text de GTK+"
 
@@ -16401,36 +17946,36 @@ msgstr "Tema de la drecera de text de GT
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "Colors de la interfÃcie"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Mides del giny"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "Tipus de lletra"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
 msgstr "Eines de fitxer Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:502
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Escriu els parÃ metres a %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "Torna a llegir els fitxers gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:543
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Control de temes GTK+ del Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:545 ../pidgin/plugins/pidginrc.c:546
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Proporciona accÃ©s a parÃ metres del gtkrc utilitzats habitualment."
 
@@ -16552,11 +18097,11 @@ msgstr "Habilita la substituciÃ³ de la d
 msgid "Enable replacement of last word on send"
 msgstr "Habilita la substituciÃ³ de la darrera paraula en enviar"
 
-#: ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2372
 msgid "Text replacement"
 msgstr "SubstituciÃ³ de text"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2374 ../pidgin/plugins/spellchk.c:2375
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Substitueix el text dels missatges que s'envien emprant les regles que hÃ giu "
@@ -16569,7 +18114,7 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Indicador d'amics"
 
@@ -16577,7 +18122,7 @@ msgstr "Indicador d'amics"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Una versiÃ³ horitzontal de la llista d'amics."
 
@@ -16612,6 +18157,7 @@ msgstr "Opcions del format de les marque
 msgstr "Opcions del format de les marques horÃ ries"
 
 #: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_ForÃ§a el format de 24 hores"
 
@@ -16663,44 +18209,44 @@ msgstr ""
 "Aquest connector permet a l'usuari personalitzar els formats de les marques "
 "horÃ ries de les converses i dels registres."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:597
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:644
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Opacitat:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:561
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Finestres de MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "TransparÃ¨ncia de les finestres de M_I"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:576
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "_Mostra la barra d'ajustament a la finestra de MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:583
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Treu la transparÃ¨ncia de les finestres de MI en obtenir el focus"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:586
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:634
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Sempre per sobre"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:618
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Finestra de la llista d'amics"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "_TransparÃ¨ncia de la finestra de la llista d'amics"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:632
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr ""
 "Treu la transparÃ¨ncia de la finestra de la llista d'amics en obtenir el focus"
@@ -16711,19 +18257,19 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:692
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "TransparÃ¨ncia"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:695
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "TransparÃ¨ncia variable per a converses i la llista d'amics."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:697
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -16782,7 +18328,7 @@ msgstr ""
 "Proporciona opcions especÃfiques per a la versiÃ³ Windows del Pidgin, com ara "
 "l'acoblament de la llista d'amics."
 
-#: ../pidgin/plugins/xmppconsole.c:667
+#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Desconnectat.</font>"
 
@@ -16792,44 +18338,150 @@ msgstr "<font color='#777777'>Desconnect
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "Consola XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "Compte: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>No esteu connectat a XMPP</font>"
 
 # FIXME: stanza -> estrofa (literal) (Josep)
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "Insereix una estrofa <iq/>"
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Insereix una estrofa <presence/>"
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Insereix una estrofa <message/>"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Envia i rep estrofes XMPP en brut."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Aquest connector Ã©s Ãºtil per a depurar servidors i clients XMPP."
 
+#~ msgid "There were errors unloading the plugin."
+#~ msgstr "S'han produÃ¯t errors en descarregar el connector."
+
+#~ msgid "Couldn't open file"
+#~ msgstr "No s'ha pogut obrir el fitxer"
+
+#~ msgid "Error initializing session"
+#~ msgstr "S'ha produÃ¯t un error en inicialitzar la sessiÃ³"
+
+#~ msgid "Unable to make SSL connection to server."
+#~ msgstr "No s'ha pogut fer una connexiÃ³ SSL al servidor."
+
+#~ msgid "<span color=\"red\">%s disconnected: %s</span>"
+#~ msgstr "<span color=\"red\">%s s'ha desconnectat: %s</span>"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "%s will not attempt to reconnect the account until you correct the error "
+#~ "and re-enable the account."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "El %s no intentarÃ  connectar de nou aquest compte fins que no corregiu "
+#~ "l'error i rehabiliteu el compte."
+
+#~ msgid "Sort by status"
+#~ msgstr "Ordena per estat"
+
+#~ msgid "Sort alphabetically"
+#~ msgstr "Ordena alfabÃ¨ticament"
+
+#~ msgid "Sort by log size"
+#~ msgstr "Ordena per la mida del registre"
+
+#~ msgid "You have just sent a Nudge!"
+#~ msgstr "Acabeu d'enviar un cop de colze!"
+
+#~ msgid "whacked"
+#~ msgstr "bufetejat"
+
+#~ msgid "torched"
+#~ msgstr "encÃ¨s"
+
+#~ msgid "smooched"
+#~ msgstr "fet un petÃ³"
+
+#~ msgid "hugged"
+#~ msgstr "abraÃ§at"
+
+#~ msgid "raspberried"
+#~ msgstr "morrejat"
+
+# FIXME: this is not going to translate well at all (josep)
+#~ msgid "*** You have been %s! ***"
+#~ msgstr "*** Se us ha %s! ***"
+
+#~ msgid "%d buddies were added or updated"
+#~ msgstr "S'han afegit o actualitzat %d amics"
+
+#~ msgid "%s just sent you a Buzz!"
+#~ msgstr "%s us ha donat un cop de colze!"
+
+#~ msgid "You have just sent a Buzz!"
+#~ msgstr "Acabeu d'enviar un cop de colze!"
+
+# FIXME: not going to look well (josep)
+#~ msgid "Attention! You have been %s."
+#~ msgstr "Alerta! Se us ha %s."
+
+#~ msgid "Attention!"
+#~ msgstr "Alerta!"
+
+#~ msgid "Attention! %s %s."
+#~ msgstr "Alerta! %s %s."
+
+#~ msgid "Add Buddy _Pounce"
+#~ msgstr "Afegeix un avÃs _per a l'amic"
+
+#~ msgid "Add a _Buddy"
+#~ msgstr "_Afegeix un amic"
+
+#~ msgid "Add a C_hat"
+#~ msgstr "A_fegeix un xat"
+
+#~ msgid "/Accounts/Add\\/Edit"
+#~ msgstr "/Comptes/Afegeix\\/Edita"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/Opcions/Mostra la icona de l'amic"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/Options/Mostra la icona de l'amic"
+
+#~ msgid "_Send To"
+#~ msgstr "_Envia a"
+
+#~ msgid "_Smiley"
+#~ msgstr "_Emoticona"
+
+#~ msgid "Conversation History"
+#~ msgstr "HistÃ²ric de converses"
+
+#~ msgid "Log Viewer"
+#~ msgstr "Visualitzador del registre"
+
 #~ msgid "Toggle offline buddies"
 #~ msgstr "Commuta els amics desconnectats"
 
@@ -17028,9 +18680,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "Would like to add him?"
 #~ msgstr "Voleu afegir-lo?"
 
-#~ msgid "%s has added you [%s]"
-#~ msgstr "%s us ha afegit [%s]"
-
 #~ msgid "Reject watching by other users"
 #~ msgstr "No permetis ser observat per altres usuaris"
 
@@ -17066,18 +18715,12 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "Smaller font size"
 #~ msgstr "Tipus de lletra mÃ©s petit"
 
-#~ msgid "Reset formatting"
-#~ msgstr "Restableix el format"
-
 #~ msgid "Insert link"
 #~ msgstr "Insereix un enllaÃ§"
 
 #~ msgid "Insert image"
 #~ msgstr "Insereix una imatge"
 
-#~ msgid "Insert smiley"
-#~ msgstr "Insereix una emoticona"
-
 #~ msgid "Show buddy _icons"
 #~ msgstr "Mostra les _icones dels amics"
 
@@ -17153,12 +18796,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "TOC has sent a PAUSE command."
 #~ msgstr "TOC ha enviat l'ordre PAUSE."
 
-#~ msgid "Buzz!!"
-#~ msgstr "Buzz!!"
-
-#~ msgid "Normal authentication failed!"
-#~ msgstr "Ha fallat l'autenticaciÃ³ normal"
-
 #~ msgid "Tag"
 #~ msgstr "Etiqueta"
 
@@ -17365,9 +19002,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "Wrong password!"
 #~ msgstr "La contrasenya no Ã©s correcta."
 
-#~ msgid "Selection"
-#~ msgstr "SelecciÃ³"
-
 #~ msgid "Faces"
 #~ msgstr "Cares"
 
@@ -17454,9 +19088,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "Feature Calibration"
 #~ msgstr "Calibratge de caracterÃstiques"
 
-#~ msgid "Disabled"
-#~ msgstr "Inhabilitat"
-
 #~ msgid "%s"
 #~ msgstr "%s"
 
@@ -17478,10 +19109,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "libdbi driver path:"
 #~ msgstr "CamÃ de libdbi:"
 
-#~ msgid "Contact Availability Prediction configuration error."
-#~ msgstr ""
-#~ "Error de configuraciÃ³ de la predicciÃ³ de disponibilitat de contactes."
-
 #~ msgid "Host:"
 #~ msgstr "Ordinador:"
 
@@ -17510,9 +19137,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "Use TLS if available"
 #~ msgstr "Empra TLS si estÃ  disponible"
 
-#~ msgid "Require TLS"
-#~ msgstr "Requereix TLS"
-
 #~ msgid "Lost connection with server for an unknown reason."
 #~ msgstr "S'ha perdut la connexiÃ³ amb el servidor, perÃ² no se'n sap el motiu."
 
@@ -17537,11 +19161,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "Get the user's information"
 #~ msgstr "Aconsegueix informaciÃ³ de l'usuari"
 
-#~ msgid "Unable to play sound because the chosen file (%s) does not exist."
-#~ msgstr ""
-#~ "No s'ha pogut reproduir el so perquÃ¨ el fitxer seleccionat (%s) no "
-#~ "existeix."
-
 #~ msgid ""
 #~ "Unable to play sound because the 'Command' sound method has been chosen, "
 #~ "but no command has been set."
@@ -17565,18 +19184,12 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ "No s'ha pogut llegir el missatge del servidor: %s. L'ordre Ã©s %hd, la "
 #~ "longitud Ã©s %hd."
 
-#~ msgid "Unknown server error."
-#~ msgstr "Error desconegut del servidor."
-
 #~ msgid "users: %s, files: %s, size: %sGB"
 #~ msgstr "usuaris: %s, fitxers: %s, mida: %sGB"
 
 #~ msgid "Unable to add \"%s\" to your Napster hotlist"
 #~ msgstr "No s'ha pogut afegir Â«%sÂ» a la vostra llista Napster"
 
-#~ msgid "%s requested your information"
-#~ msgstr "%s ha solÂ·licitat les vostres dades"
-
 #~ msgid "%s requested a PING"
 #~ msgstr "%s ha solÂ·licitat un PING"
 
@@ -17659,9 +19272,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "Realname"
 #~ msgstr "Nom real"
 
-#~ msgid "Email Address"
-#~ msgstr "AdreÃ§a de correu"
-
 #~ msgid "Direct IM with %s closed"
 #~ msgstr "S'ha tancat la conversa de MI amb %s"
 
@@ -17687,9 +19297,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ "fitxer a\n"
 #~ "Comptes->%s->Edita el compte->AvanÃ§at."
 
-#~ msgid "Unable to create new connection."
-#~ msgstr "No s'ha pogut crear una nova connexiÃ³."
-
 #~ msgid "Unable to log into file transfer proxy."
 #~ msgstr ""
 #~ "No s'ha pogut entrar al servidor intermediari per a la transferÃ¨ncia de "
@@ -17719,9 +19326,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "Call ended."
 #~ msgstr "Ha finalitzat la trucada."
 
-#~ msgid "Calling %s"
-#~ msgstr "S'estÃ  trucant a %s"
-
 #~ msgid "End Call"
 #~ msgstr "Finalitza la trucada"
 
@@ -17745,12 +19349,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ "Utilitza un servidor intermediari AIM/ICQ (mÃ©s lent, perÃ² acostuma a "
 #~ "funcionar)"
 
-#~ msgid "New Status..."
-#~ msgstr "Nou estat..."
-
-#~ msgid "Saved Status..."
-#~ msgstr "Estat desat..."
-
 #~ msgid "Conversation in %s on %s"
 #~ msgstr "Converses a %s a %s"
 
@@ -17775,9 +19373,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "Idle time _reporting:"
 #~ msgstr "Info_rmaciÃ³ del _temps d'inactivitat:"
 
-#~ msgid "Account usage"
-#~ msgstr "UtilitzaciÃ³ dels comptes"
-
 #~ msgid "Mouse movement"
 #~ msgstr "Moviment del ratolÃ"
 
@@ -17838,9 +19433,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ "el que acostumava a ser l'ordre preestablert: actiu, inactiu, absent,\n"
 #~ "desconnectat."
 
-#~ msgid "Join A Chat..."
-#~ msgstr "Entra a un xat..."
-
 #~ msgid ""
 #~ "When a new conversation is opened this plugin will insert the last "
 #~ "conversation into the current conversation.\n"
@@ -17984,12 +19576,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "/Tools/Pl_ugin Actions"
 #~ msgstr "/Eines/Acci_ons del connector"
 
-#~ msgid "/Tools/_Statuses"
-#~ msgstr "/Eines/_Estats"
-
-#~ msgid "Reconnect"
-#~ msgstr "Torna a connectar"
-
 #~ msgid "Reason Unknown."
 #~ msgstr "No se'n coneix el motiu."
 
@@ -18091,9 +19677,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "ICQ UIN"
 #~ msgstr "ICQ UIN"
 
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
 #~ msgid "Yahoo"
 #~ msgstr "Yahoo"
 
@@ -18103,9 +19686,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "Set your Trepia profile data."
 #~ msgstr "Establiu les dades del vostre perfil de Trepia"
 
-#~ msgid "Set Profile"
-#~ msgstr "Estableix perfil"
-
 #~ msgid "Visit Homepage"
 #~ msgstr "Visita la pÃ gina inicial"
 
@@ -18368,9 +19948,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "Ignore font _faces"
 #~ msgstr "Ignora _tipus de lletra"
 
-#~ msgid "Ignore font si_zes"
-#~ msgstr "Ignora la _mida de la lletra"
-
 #~ msgid "_Send default formatting with outgoing messages"
 #~ msgstr "_Envia el format per defecte per als missatges sortints"
 
@@ -18500,9 +20077,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "Sex"
 #~ msgstr "Sexe"
 
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "No s'ha pogut importar la llista d'amics del servidor"
-
 #~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
 #~ msgstr ""
 #~ "S'ha enviat satisfactÃ²riament la llista d'amics al servidor Gadu-Gadu"
@@ -18693,9 +20267,6 @@ msgstr "Aquest connector Ã©s Ãºtil per a
 #~ msgid "SILC Private Key"
 #~ msgstr "Clau privada SILC"
 
-#~ msgid "Log Out"
-#~ msgstr "Desconnecta"
-
 #~ msgid ""
 #~ "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
 #~ "greater than 9999 chars\n"
