propagate from branch 'im.pidgin.pidgin.2.2.2' (head 4529d7c0d260f9abe588d713deac48d3f2ca6293)

            to branch 'im.pidgin.pidgin' (head 7337a9ed6a79a50a16a362001962d6a4846dfd53)

11 files changed, 8073 insertions, 9702 deletions

diff --git a/ChangeLog b/ChangeLog
index f0973f8298..d8710f181b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,12 @@ version 2.2.2:
 	* Plugin actions are now available from the docklet context menu
 	  in addition to the Tool menu of the buddy list.
 
+version 2.2.2 (10/23/2007): 
+		NOTE: Due to the backporting that has happened for the actual
+			  release, it is possible that bugs marked as fixed in
+			  2.2.1 or 2.2.2 will not be fixed until the next release
+			  from the im.pidgin.pidgin branch.
+
 version 2.2.1 (09/29/2007):
 	http://developer.pidgin.im/query?status=closed&milestone=2.2.1
 		NOTE: Due to the backporting that happened for the actual
diff --git a/ChangeLog.win32 b/ChangeLog.win32
index 66f0d6083e..d177174bc2 100644
--- a/ChangeLog.win32
+++ b/ChangeLog.win32
@@ -1,4 +1,4 @@
-version 2.2.2 (??/??/????):
+version 2.2.2 (10/23/2007):
 	* Updated gtkspell to include a patch to share Aspell dictionaries
 	  among all the input fields to avoid excessive memory usage.
 	* Update libxml2 to 2.6.30
diff --git a/NEWS b/NEWS
index a20aa4f540..a6a63a6c7e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+2.2.2 (10/23/2007):
+	Luke: Because the main branch of pidgin development is still not
+	ready for public consumption, I have taken some time to try to
+	pull the many bug fixes that have happened since then into a
+	separate branch.  This release is the result of that effort.
+
 2.2.1 (9/28/2007):
 	Richard: We have some new code in the pipeline, but it's not quite
 	ready for a general release.  Instead, this is basically a bug fix
diff --git a/libpurple/protocols/myspace/user.c b/libpurple/protocols/myspace/user.c
index 6ebced044c..2fa2fff596 100644
--- a/libpurple/protocols/myspace/user.c
+++ b/libpurple/protocols/myspace/user.c
@@ -203,6 +203,14 @@ msim_store_user_info_each(const gchar *key_str, gchar *value_str, MsimUser *user
 		/* Ignore because PurpleBuddy knows this already */
 		g_free(value_str);
 	} else if (g_str_equal(key_str, "ImageURL") || g_str_equal(key_str, "AvatarURL")) {
+		if (user->temporary_user) {
+			/* This user will be destroyed soon; don't try to look up its image or avatar, 
+			 * since that won't return immediately and we will end up accessing freed data.
+			 */
+			g_free(value_str);
+			return;
+		}
+		
 		const gchar *previous_url;
 
 		if (user->temporary_user) {
diff --git a/libpurple/util.c b/libpurple/util.c
index 42fb104c98..a3f760e910 100644
--- a/libpurple/util.c
+++ b/libpurple/util.c
@@ -1549,7 +1549,7 @@ purple_markup_html_to_xhtml(const char *html, char **xhtml_out,
 					pt->dest_tag = "a";
 					tags = g_list_prepend(tags, pt);
 					if(xhtml)
-						g_string_append_printf(xhtml, "<a href='%s'>", g_strstrip(url->str));
+						g_string_append_printf(xhtml, "<a href='%s'>", url ? g_strstrip(url->str) : "");
 					continue;
 				}
 				if(!g_ascii_strncasecmp(c, "<font", 5) && (*(c+5) == '>' || *(c+5) == ' ')) {
diff --git a/po/ChangeLog b/po/ChangeLog
index d7b611ffac..9bc938ac49 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,7 +1,10 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.2.2
-	* German translation updated (Bjoern Voigt)
+	* Catalan translation updated (Josep Puigdemont)
+	* Chinese (Simplified) translation updated (Funda Wang)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
+	* German translation updated (Jochen Kemnade,Bjoern Voigt)
 	* Korean translation updated (Sushizang)
 	* Slovak translation updated (loptosko)
 
diff --git a/po/ca.po b/po/ca.po
index 72441915f8..7944552879 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -33,8 +33,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2007-04-13 23:16+0200\n"
+"POT-Creation-Date: 2007-10-21 18:08+0200\n"
+"PO-Revision-Date: 2007-10-21 18:09+0200\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\n"
 "MIME-Version: 1.0\n"
@@ -42,11 +42,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
-#: ../finch/finch.c:418
-#, fuzzy
+#. 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
 msgid "Finch"
-msgstr "Francès"
+msgstr "Finch"
 
 #: ../finch/finch.c:206
 #, c-format
@@ -74,23 +75,24 @@ msgstr ""
 "  -n, --nologin       no entra automàticament\n"
 "  -v, --version       mostra la versió actual i surt\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
+"El %s ha trobat errors en migrar els paràmetres de %s a %s. Investigueu una "
+"mica i completeu la migració manualment. Informeu d'aquest error a http://"
+"developer.pidgin.im"
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../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
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/jabber/jabber.c:1227
 #: ../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
@@ -98,86 +100,82 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
-#: ../finch/gntaccount.c:124
+#: ../finch/gntaccount.c:123
 msgid "Account was not added"
 msgstr "No s'ha afegit el compte"
 
-#: ../finch/gntaccount.c:125
+#: ../finch/gntaccount.c:124
 msgid "Screenname of an account must be non-empty."
 msgstr "El nom d'usuari d'un compte no pot ser buit."
 
-#: ../finch/gntaccount.c:437
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "Notifica si hi ha correu nou"
 
-#: ../finch/gntaccount.c:447
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Recorda la contrasenya"
 
-#: ../finch/gntaccount.c:485
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
-msgstr ""
+msgstr "No hi ha connectors de protocl instal·lats."
 
-#: ../finch/gntaccount.c:486
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
-msgstr ""
+msgstr "(Segurament us heu oblidat de fer un «make install».)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1468
+#: ../pidgin/gtkblist.c:4025
 msgid "Modify Account"
 msgstr "Modifica el compte"
 
-#: ../finch/gntaccount.c:496
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "Compte nou"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
+#: ../finch/gntaccount.c:528
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Nom d'usuari:"
 
-#: ../finch/gntaccount.c:542
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../finch/gntaccount.c:552
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Àlies:"
 
 #. Cancel button
 #. Cancel
-#: ../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:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:884
-#: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../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
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
-#: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
+#: ../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/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
@@ -212,164 +210,162 @@ msgstr "Àlies:"
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
 #: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../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
 msgid "Cancel"
 msgstr "Cancel·la"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
+#: ../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
 msgid "Save"
 msgstr "Desa"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1895
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Esteu segur que voleu suprimir %s?"
 
-#: ../finch/gntaccount.c:635
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
-msgstr "Suprimeix un compte"
+msgstr "Suprimeix el compte"
 
 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../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
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:81
+#: ../pidgin/gtkaccount.c:2320 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ../finch/gntaccount.c:675
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr "Podeu habilitar/inhabilitar comptes d'aquesta llista."
 
 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../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
 #: ../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:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
-#: ../pidgin/gtkrequest.c:275
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2496
+#: ../pidgin/gtkblist.c:5926 ../pidgin/gtkconv.c:1624
+#: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Afegeix"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Modifica"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2443
 #, 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:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2495
 msgid "Add buddy to your list?"
 msgstr "Voleu afegir l'amic a la llista?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2553
 #, 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:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2576
+#: ../pidgin/gtkaccount.c:2582
 msgid "Authorize buddy?"
 msgstr "Voleu autoritzar l'amic?"
 
-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
 msgid "Authorize"
 msgstr "Autoritza"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2578 ../pidgin/gtkaccount.c:2584
 msgid "Deny"
 msgstr "Denega"
 
-#: ../finch/gntblist.c:289
+#: ../finch/gntblist.c:288
 msgid "You must provide a screename for the buddy."
 msgstr "Heu de proporcionar el nom d'usuari per a l'amic."
 
-#: ../finch/gntblist.c:291
+#: ../finch/gntblist.c:290
 msgid "You must provide a group."
 msgstr "Heu de proporcionar un grup."
 
-#: ../finch/gntblist.c:293
+#: ../finch/gntblist.c:292
 msgid "You must select an account."
 msgstr "Heu de seleccionar un compte."
 
-#: ../finch/gntblist.c:295
+#: ../finch/gntblist.c:294
 msgid "The selected account is not online."
-msgstr ""
+msgstr "El compte seleccionat no està en línia."
 
-#: ../finch/gntblist.c:300
+#: ../finch/gntblist.c:299
 msgid "Error adding buddy"
 msgstr "S'ha produït un error en afegir un amic"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2858
+#: ../pidgin/gtkaccount.c:1976 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Nom d'usuari"
 
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
+#: ../libpurple/protocols/msn/msn.c:1364
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkrequest.c:278
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:999
+#: ../pidgin/gtkdialogs.c:1023 ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Àlies"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
 msgid "Group"
 msgstr "Grup"
 
-#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
+#: ../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:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../pidgin/gtkblist.c:2988 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Comptes"
 
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -378,186 +374,178 @@ msgstr "Comptes"
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/yahoo/yahoo.c:3321 ../pidgin/gtkblist.c:5433
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Afegeix un amic"
 
-#: ../finch/gntblist.c:341
+#: ../finch/gntblist.c:340
 msgid "Please enter buddy information."
 msgstr "Introduïu informació sobre l'amic."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Xats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
+#: ../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
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nom"
 
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
 msgid "Auto-join"
 msgstr "Entra automàticament"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5812
 msgid "Add Chat"
 msgstr "Afegeix un xat"
 
-#: ../finch/gntblist.c:420
+#: ../finch/gntblist.c:419
 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."
 
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
 msgid "Error adding group"
 msgstr "S'ha produït un error en afegir el grup"
 
-#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:433
 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:447
+#: ../finch/gntblist.c:446
 msgid "A group with the name already exists."
 msgstr "Ja existeix un grup amb aquest nom."
 
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
+#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5923
 msgid "Add Group"
 msgstr "Afegeix un grup"
 
-#: ../finch/gntblist.c:454
+#: ../finch/gntblist.c:453
 msgid "Enter the name of the group"
 msgstr "Introduïu el nom del grup"
 
-#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:801
 msgid "Edit Chat"
 msgstr "Edita el xat"
 
-#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:801
 msgid "Please Update the necessary fields."
 msgstr "Actualitzeu els camps necessaris."
 
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
 msgid "Edit"
 msgstr "Edita"
 
-#: ../finch/gntblist.c:828
+#: ../finch/gntblist.c:827
 msgid "Edit Settings"
 msgstr "Edita els paràmetres"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Informació"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
-#, fuzzy
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
-msgstr "S'està connectant..."
+msgstr "S'està recuperant..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:436
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Aconsegueix informació"
 
-#: ../finch/gntblist.c:908
+#: ../finch/gntblist.c:907
 msgid "Add Buddy Pounce"
 msgstr "Afegeix un avís per a l'amic"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../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
 msgid "Send File"
 msgstr "Envia un fitxer"
 
-#: ../finch/gntblist.c:919
+#: ../finch/gntblist.c:918
 msgid "View Log"
 msgstr "Visualitza el registre"
 
-#: ../finch/gntblist.c:1000
+#: ../finch/gntblist.c:999
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Introduïu un nou nom per a %s"
 
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
+#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
 msgid "Rename"
 msgstr "Reanomena"
 
-#: ../finch/gntblist.c:1002
-#, fuzzy
+#: ../finch/gntblist.c:1001
 msgid "Set Alias"
-msgstr "Àlies"
+msgstr "Estableix un àlies"
 
-#: ../finch/gntblist.c:1003
+#: ../finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
 msgstr "Introduïu una cadena buida per a reiniciar el nom."
 
-#: ../finch/gntblist.c:1079
+#: ../finch/gntblist.c:1078
 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:1087
+#: ../finch/gntblist.c:1086
 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:1092
+#: ../finch/gntblist.c:1091
 #, 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:1095
+#: ../finch/gntblist.c:1094
 msgid "Confirm Remove"
 msgstr "Confirmeu que voleu suprimir"
 
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtkstatusbox.c:264
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1621 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Suprimeix"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4269
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Llista d'amics"
 
-#: ../finch/gntblist.c:1257
+#: ../finch/gntblist.c:1256
 msgid "Place tagged"
 msgstr "Lloc etiquetat"
 
-#: ../finch/gntblist.c:1262
+#: ../finch/gntblist.c:1261
 msgid "Toggle Tag"
 msgstr "Commuta l'etiqueta"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/gg/gg.c:2207
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../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
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -567,30 +555,29 @@ msgstr "Commuta l'etiqueta"
 #: ../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:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3012
 msgid "Nickname"
 msgstr "Sobrenom"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
+#: ../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:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../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
 msgid "Idle"
 msgstr "Inactiu"
 
-#: ../finch/gntblist.c:1334
-#, fuzzy
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
-msgstr "Mòbil"
+msgstr "Al mòbil"
 
-#: ../finch/gntblist.c:1415
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -599,12 +586,12 @@ msgstr ""
 "En línia: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:1424
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Compte: %s (%s)"
 
-#: ../finch/gntblist.c:1436
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -613,53 +600,49 @@ msgstr ""
 "\n"
 "Vist per darrera vegada: fa %s"
 
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Nou..."
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1073
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Desat..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:86
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Connectors"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:731
+#: ../pidgin/gtkdialogs.c:869 ../pidgin/gtkdialogs.c:950
 msgid "_Name"
 msgstr "_Nom"
 
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:736
+#: ../pidgin/gtkdialogs.c:874 ../pidgin/gtkdialogs.c:955
 msgid "_Account"
 msgstr "_Compte"
 
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:744
 msgid "New Instant Message"
 msgstr "Missatge instantani nou"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:746
 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."
 
-#. Not multiline
-#. Not masked?
-#. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1736
-#: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../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
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -677,162 +660,54 @@ msgstr ""
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
 #: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkrequest.c:270
+#: ../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
 msgid "OK"
 msgstr "D'acord"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Opcions"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Envia MI..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
-msgstr "Per grup"
+msgstr "Mostra els grups buits"
 
-#: ../finch/gntblist.c:2257
-#, fuzzy
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Mostra amics desconnectats"
 
-#: ../finch/gntblist.c:2263
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Ordena per estat"
 
-#: ../finch/gntblist.c:2267
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "Ordena alfabèticament"
 
-#: ../finch/gntblist.c:2271
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Ordena per la mida del registre"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
-#, fuzzy
-msgid "Certificate Import"
-msgstr "Port de connexió"
-
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
-msgid "Specify a hostname"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
-msgid "Type the host name this certificate is for."
-msgstr ""
-
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
-#, c-format
-msgid ""
-"File %s could not be imported.\n"
-"Make sure that the file is readable and in PEM format.\n"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
-msgid "Certificate Import Error"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
-msgid "X.509 certificate import failed"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
-#, fuzzy
-msgid "Select a PEM certificate"
-msgstr "Seleccioneu un fitxer"
-
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
-#, c-format
-msgid ""
-"Export to file %s failed.\n"
-"Check that you have write permission to the target path\n"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
-msgid "Certificate Export Error"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
-msgid "X.509 certificate export failed"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
-msgid "PEM X.509 Certificate Export"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:188
-#, fuzzy, c-format
-msgid "Certificate for %s"
-msgstr "Estat per a %s"
-
-#: ../finch/gntcertmgr.c:195
-#, c-format
-msgid ""
-"Common name: %s\n"
-"\n"
-"SHA1 fingerprint:\n"
-"%s"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:198
-msgid "SSL Host Certificate"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
-#, c-format
-msgid "Really delete certificate for %s?"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
-msgid "Confirm certificate delete"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
-msgid "Certificate Manager"
-msgstr ""
-
-#. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
-msgid "Hostname"
-msgstr "Ordinador"
-
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
-#: ../pidgin/gtkdebug.c:835
-msgid "Info"
-msgstr "Info"
-
-#. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
-#: ../pidgin/gtkrequest.c:273
-msgid "Close"
-msgstr "Tanca"
-
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:113
 #, c-format
 msgid "%s disconnected."
 msgstr "%s s'ha desconnectat."
 
-#: ../finch/gntconn.c:128
-#, fuzzy, c-format
+#: ../finch/gntconn.c:114
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -841,56 +716,50 @@ msgid ""
 msgstr ""
 "%s\n"
 "\n"
-"El %s no intentarà connectar de nou aquest compte fins que no corregiu "
+"El Finch no intentarà connectar de nou aquest compte fins que no corregiu "
 "l'error i rehabiliteu el compte."
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
-msgid "Re-enable Account"
-msgstr "Rehabilita el compte"
-
-#: ../finch/gntconv.c:139
+#: ../finch/gntconv.c:118
 msgid "No such command."
 msgstr "No existeix l'ordre."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:122 ../pidgin/gtkconv.c:465
 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:148 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:127 ../pidgin/gtkconv.c:471
 msgid "Your command failed for an unknown reason."
 msgstr "L'ordre ha fallat per motius desconeguts."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:132 ../pidgin/gtkconv.c:478
 msgid "That command only works in chats, not IMs."
 msgstr "Aquesta ordre només funciona en xats, no en MI."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:135 ../pidgin/gtkconv.c:481
 msgid "That command only works in IMs, not chats."
 msgstr "Aquesta ordre només funciona en MI, no en xats."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:139 ../pidgin/gtkconv.c:486
 msgid "That command doesn't work on this protocol."
 msgstr "Aquesta ordre no funciona per a aquest protocol."
 
-#: ../finch/gntconv.c:168
-#, fuzzy
+#: ../finch/gntconv.c:147
 msgid "Message was not sent, because you are not signed on."
-msgstr ""
-"El missatge no s'ha pogut enviar perquè s'està enviant massa de pressa:"
+msgstr "El missatge no s'ha enviat perquè no esteu connectat."
 
-#: ../finch/gntconv.c:251
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:677
 #, c-format
 msgid ""
 "\n"
@@ -899,77 +768,49 @@ msgstr ""
 "\n"
 "L'usuari %s està escrivint..."
 
-#: ../finch/gntconv.c:298
-#, fuzzy
+#: ../finch/gntconv.c:277
 msgid "You have left this chat."
-msgstr "Parleu en un xat"
-
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
-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:393 ../pidgin/gtkconv.c:1370
-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."
+msgstr "Heu sortit d'aquest xat"
 
-#: ../finch/gntconv.c:442
-#, fuzzy
+#: ../finch/gntconv.c:371
 msgid "Send To"
-msgstr "_Envia a"
+msgstr "Envia a"
 
-#: ../finch/gntconv.c:486
-#, fuzzy
+#: ../finch/gntconv.c:415
 msgid "Conversation"
-msgstr "Converses"
+msgstr "Conversa"
 
 # FIXME ?
-#: ../finch/gntconv.c:492
-#, fuzzy
+#: ../finch/gntconv.c:421
 msgid "Clear Scrollback"
-msgstr "/Conversa/_Neteja la finestra"
+msgstr "Neteja la finestra"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:425 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Mostra marques horàries"
 
-#: ../finch/gntconv.c:512
-#, fuzzy
+#: ../finch/gntconv.c:441
 msgid "Add Buddy Pounce..."
-msgstr "Afegeix un avís per a l'amic"
+msgstr "Afegeix un avís per a l'amic..."
 
-#: ../finch/gntconv.c:527
-#, fuzzy
-msgid "Enable Logging"
-msgstr "/Opcions/Habilita el registre"
-
-#: ../finch/gntconv.c:533
-#, fuzzy
-msgid "Enable Sounds"
-msgstr "Habilita els sons:"
-
-#: ../finch/gntconv.c:739
+#: ../finch/gntconv.c:643
 msgid "<AUTO-REPLY> "
 msgstr "<RESPOSTA-AUTOMÀTICA> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:765
 msgid "List of users:\n"
 msgstr "Llista d'usuaris:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:910 ../pidgin/gtkconv.c:308
 msgid "Supported debug options are:  version"
 msgstr "Les opcions de depuració disponibles són:  version"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:945 ../pidgin/gtkconv.c:357
 msgid "No such command (in this context)."
 msgstr "L'ordre no existeix (en aquest context)."
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:948 ../pidgin/gtkconv.c:360
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -977,7 +818,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:1120 ../pidgin/gtkconv.c:7560
+#: ../finch/gntconv.c:1006 ../pidgin/gtkconv.c:7320
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -985,11 +826,11 @@ msgstr ""
 "say &lt;missatge&gt;: envia un missatge normalment com si no féssiu servir "
 "cap ordre."
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1009 ../pidgin/gtkconv.c:7323
 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:1126 ../pidgin/gtkconv.c:7566
+#: ../finch/gntconv.c:1012 ../pidgin/gtkconv.c:7326
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -997,44 +838,43 @@ msgstr ""
 "debug &lt;opció&gt;: envia informació de depuració diversa a la conversa "
 "actual."
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1015 ../pidgin/gtkconv.c:7329
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Neteja la conversa."
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1018 ../pidgin/gtkconv.c:7335
 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:1135
-#, fuzzy
+#: ../finch/gntconv.c:1021
 msgid "users:  Show the list of users in the chat."
-msgstr "statuses: mostra la finestra d'estats desats."
+msgstr "users: mostra la llista d'usuaris del xat."
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1026
 msgid "plugins: Show the plugins window."
 msgstr "plugins: mostra la finestra de connectors."
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1029
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: mostra la llista d'amics."
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1032
 msgid "accounts: Show the accounts window."
 msgstr "accounts: mostra la finestra dels comptes."
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1035
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: mostra la finestra de depuració."
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1038
 msgid "prefs: Show the preference window."
 msgstr "prefs: mostra la finestra de preferències."
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1041
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: mostra la finestra d'estats desats."
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:84 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Finestra de depuració"
 
@@ -1042,188 +882,199 @@ 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:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Neteja"
 
-#: ../finch/gntdebug.c:262
-#, fuzzy
+#: ../finch/gntdebug.c:261
 msgid "Filter: "
-msgstr "Filtre"
+msgstr "Filtre: "
 
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Fes una pausa"
 
-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
+#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Transferència de fitxers - %d%% de %d fitxers"
 
 #. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:85
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Transferència de fitxers"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Progrés"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Nom del fitxer"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Mida"
 
-#: ../finch/gntft.c:201
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Velocitat"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Restant"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
+#: ../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:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../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:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
+#: ../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
 msgid "Status"
 msgstr "Estat"
 
-#: ../finch/gntft.c:211
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "Tanca aquesta finestra quan totes les transferències hagin finalitzat"
 
-#: ../finch/gntft.c:218
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Neteja les transferències acabades"
 
-#: ../finch/gntft.c:232
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Atura"
 
-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
+#. 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
 msgid "Waiting for transfer to begin"
 msgstr "S'està esperant a iniciar la transferència"
 
-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "S'ha cancel·lat"
 
-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Ha fallat"
 
-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
-#, fuzzy, c-format
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
+#, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KB/s"
 
-#: ../finch/gntft.c:431
+#: ../finch/gntft.c:430
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
+msgstr "S'ha desat el fitxer com a %s."
 
-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1116
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "S'ha finalitzat"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "S'està transferint"
 
-#: ../finch/gntnotify.c:165
+#: ../finch/gntnotify.c:164
 msgid "Emails"
 msgstr "Correus electrònics"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr "Teniu correu!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "Remitent"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Assumpte"
 
-#: ../finch/gntnotify.c:201
+#: ../finch/gntnotify.c:200
 #, 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:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "Nou correu electrònic"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "Informació quant a %s"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Informació sobre l'amic"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continua"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1600 ../pidgin/gtkdebug.c:834
+msgid "Info"
+msgstr "Info"
+
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1561
 msgid "IM"
 msgstr "MI"
 
-#: ../finch/gntnotify.c:389
+#: ../finch/gntnotify.c:388
 msgid "Join"
 msgstr "Entra"
 
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Convida"
 
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:394
 msgid "(none)"
 msgstr "(cap)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
 msgid "ERROR"
-msgstr ""
+msgstr "ERROR"
 
-#: ../finch/gntplugin.c:75
-#, fuzzy
+#: ../finch/gntplugin.c:74
 msgid "loading plugin failed"
-msgstr "Ha fallat el ping"
+msgstr "no s'ha pogut carregar el connector"
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:83
 msgid "unloading plugin failed"
-msgstr ""
+msgstr "no s'ha pogut descarregar el connector"
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1240,19 +1091,19 @@ msgstr ""
 "Web: %s\n"
 "Nom del fitxer: %s\n"
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:186
 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:235
+#: ../finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr "No hi ha opcions de configuració per a aquest connector."
 
-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:259
 msgid "You can (un)load plugins from the following list."
 msgstr "Podeu carregar o descarregar connectors de la llista següent."
 
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr "Configura el connector"
 
@@ -1261,377 +1112,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:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
+#: ../finch/gntui.c:88 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2062
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:182 ../pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr "Introduïu un amic a qui avisar."
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Avís nou per a l'amic"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr "Edita l'avís per a l'amic"
 
 # FIXME
-#: ../finch/gntpounce.c:333
+#: ../finch/gntpounce.c:332
 msgid "Pounce Who"
 msgstr "Avisa dels Who"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Compte:"
 
-#: ../finch/gntpounce.c:358
+#: ../finch/gntpounce.c:357
 msgid "Buddy name:"
 msgstr "Nom de l'amic:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Avisa quan..."
 
-#: ../finch/gntpounce.c:376
+#: ../finch/gntpounce.c:375
 msgid "Signs on"
 msgstr "Es connecti"
 
-#: ../finch/gntpounce.c:377
+#: ../finch/gntpounce.c:376
 msgid "Signs off"
 msgstr "Es desconnecti"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:377
 msgid "Goes away"
 msgstr "Passi a absent"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:378
 msgid "Returns from away"
 msgstr "Torni a estar present"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:379
 msgid "Becomes idle"
 msgstr "Passi a inactiu"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:380
 msgid "Is no longer idle"
 msgstr "Ja no estigui inactiu"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:381
 msgid "Starts typing"
 msgstr "Comenci a escriure"
 
-#: ../finch/gntpounce.c:383
+#: ../finch/gntpounce.c:382
 msgid "Pauses while typing"
 msgstr "S'aturi mentre tecleja"
 
-#: ../finch/gntpounce.c:384
+#: ../finch/gntpounce.c:383
 msgid "Stops typing"
 msgstr "Pari d'escriure"
 
-#: ../finch/gntpounce.c:385
+#: ../finch/gntpounce.c:384
 msgid "Sends a message"
 msgstr "Enviï un missatge"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Acció"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:415
 msgid "Open an IM window"
 msgstr "Obre una finestra de MI"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:416
 msgid "Pop up a notification"
 msgstr "Mostra una notificació emergent"
 
-#: ../finch/gntpounce.c:418
+#: ../finch/gntpounce.c:417
 msgid "Send a message"
 msgstr "Envia un missatge"
 
-#: ../finch/gntpounce.c:419
+#: ../finch/gntpounce.c:418
 msgid "Execute a command"
 msgstr "Executa una ordre"
 
-#: ../finch/gntpounce.c:420
+#: ../finch/gntpounce.c:419
 msgid "Play a sound"
 msgstr "Reprodueix un so"
 
-#: ../finch/gntpounce.c:448
+#: ../finch/gntpounce.c:447
 msgid "Pounce only when my status is not available"
 msgstr "Avisa només quan el meu estat no estigui disponible"
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Recurrent"
 
-#: ../finch/gntpounce.c:618
-#, fuzzy
+#: ../finch/gntpounce.c:617
 msgid "Cannot create pounce"
-msgstr "No es pot canviar el sobrenom"
+msgstr "No s'ha pogut crear l'avís"
 
-#: ../finch/gntpounce.c:619
-#, fuzzy
+#: ../finch/gntpounce.c:618
 msgid "You do not have any accounts."
-msgstr "Heu de seleccionar un compte."
+msgstr "No teniu cap compte."
 
-#: ../finch/gntpounce.c:620
+#: ../finch/gntpounce.c:619
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "Abans de poder crear un avís heu de crear un compte."
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
 #, 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:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:83 ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Avisos per a amics"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s us ha començat a escriure (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s s'ha aturat mentre us escrivia (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s s'ha connectat (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s ha deixat d'estar inactiu (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ha deixat d'estar absent (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha deixat d'escriure-us (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s s'ha desconnectat (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s ha passat a inactiu (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s ha passat a absent (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s us ha enviat un missatge. (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
-#, c-format
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Esdeveniment d'avís desconegut, informeu-nos-en."
 
-#: ../finch/gntprefs.c:92
-#, fuzzy
+#: ../finch/gntprefs.c:91
 msgid "Based on keyboard use"
-msgstr "Basat en l'ús del teclat o el ratolí"
+msgstr "Basat en l'ús del teclat"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1925
 msgid "From last sent message"
 msgstr "Des del darrer missatge enviat"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:1924 ../pidgin/gtkprefs.c:1938
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Mai"
 
-#: ../finch/gntprefs.c:184
+#: ../finch/gntprefs.c:183
 msgid "Show Idle Time"
 msgstr "Mostra el temps d'inactivitat"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
-msgstr "Mostra amics desconnectats"
+msgstr "Mostra els amics desconnectats"
 
-#: ../finch/gntprefs.c:192
+#: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr "Notifica als amics quan els escrigui"
 
-#: ../finch/gntprefs.c:198
+#: ../finch/gntprefs.c:197
 msgid "Log format"
 msgstr "Format del registre"
 
-#: ../finch/gntprefs.c:199
+#: ../finch/gntprefs.c:198
 msgid "Log IMs"
 msgstr "Registra els missatges instantanis"
 
-#: ../finch/gntprefs.c:200
+#: ../finch/gntprefs.c:199
 msgid "Log chats"
 msgstr "Registra els xats"
 
-#: ../finch/gntprefs.c:201
+#: ../finch/gntprefs.c:200
 msgid "Log status change events"
 msgstr "Registra tots els canvis d'estat"
 
-#: ../finch/gntprefs.c:207
-#, fuzzy
+#: ../finch/gntprefs.c:206
 msgid "Report Idle time"
-msgstr "Informa del _temps d'inactivitat:"
+msgstr "Informa del temps d'inactivitat"
 
-#: ../finch/gntprefs.c:208
-#, fuzzy
+#: ../finch/gntprefs.c:207
 msgid "Change status when idle"
-msgstr "Canvia l'estat quan estigui _inactiu"
+msgstr "Canvia l'estat quan estigui inactiu"
 
-#: ../finch/gntprefs.c:209
-#, fuzzy
+#: ../finch/gntprefs.c:208
 msgid "Minutes before changing status"
-msgstr "_Minuts abans de canviar l'estat:"
+msgstr "Minuts abans de canviar l'estat"
 
-#: ../finch/gntprefs.c:210
-#, fuzzy
+#: ../finch/gntprefs.c:209
 msgid "Change status to"
-msgstr "Canvia l'e_stat a:"
+msgstr "Canvia l'estat a"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2028
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Converses"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1464 ../pidgin/gtkprefs.c:2039
 msgid "Logging"
 msgstr "Registre"
 
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr "Encara no està implementat."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "Desa el fitxer..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "Obre un fitxer..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:94 ../pidgin/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Un amic es connecta"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:95 ../pidgin/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Un amic es desconnecta"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:65
 msgid "Message received"
 msgstr "Es rep un missatge"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "El missatge rebut inicia una conversa"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:67
 msgid "Message sent"
 msgstr "S'envia un missatge"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Una persona entra al xat"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Una persona surt del xat"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Parleu en un xat"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Altres parlen en un xat"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Algú diu el vostre nom en un xat"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:357 ../pidgin/gtksound.c:310
 msgid "GStreamer Failure"
 msgstr "Fallada del GStreamer"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:358 ../pidgin/gtksound.c:311
 msgid "GStreamer failed to initialize."
 msgstr "Ha fallat la inicialització del GStreamer."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:712 ../finch/gntsound.c:798 ../pidgin/gtkprefs.c:1584
+#: ../pidgin/gtkprefs.c:1673 ../pidgin/gtkprefs.c:1867
 msgid "(default)"
-msgstr ""
+msgstr "(predeterminat)"
 
-#: ../finch/gntsound.c:729
-#, fuzzy
+#: ../finch/gntsound.c:725
 msgid "Select Sound File ..."
-msgstr "Selecciona una carpeta..."
+msgstr "Seleccioneu un fitxer de so..."
 
-#: ../finch/gntsound.c:904
-#, fuzzy
+#: ../finch/gntsound.c:900
 msgid "Sound Preferences"
-msgstr "Preferències"
+msgstr "Preferències del so"
 
-#: ../finch/gntsound.c:915
-#, fuzzy
+#: ../finch/gntsound.c:911
 msgid "Profiles"
-msgstr "Perfil"
+msgstr "Perfils"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:950 ../pidgin/gtkprefs.c:1712
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../finch/gntsound.c:957
-#, fuzzy
+#: ../finch/gntsound.c:953
 msgid "Console Beep"
 msgstr "Avís sonor del terminal"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1716
 msgid "Command"
 msgstr "Ordre"
 
-#: ../finch/gntsound.c:959
-#, fuzzy
+#: ../finch/gntsound.c:955
 msgid "No Sound"
-msgstr "Sense sons"
+msgstr "Sense so"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1707
 msgid "Sound Method"
 msgstr "Mètodes de reproducció del so"
 
-#: ../finch/gntsound.c:966
-#, fuzzy
+#: ../finch/gntsound.c:962
 msgid "Method: "
-msgstr "_Mètode:"
+msgstr "Mètode: "
 
-#: ../finch/gntsound.c:973
-#, fuzzy, c-format
+#: ../finch/gntsound.c:969
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
@@ -1640,83 +1477,80 @@ msgstr ""
 "(%s per al nom de fitxer)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:977 ../pidgin/gtkprefs.c:1751
 msgid "Sound Options"
 msgstr "Opcions de so"
 
-#: ../finch/gntsound.c:982
-#, fuzzy
+#: ../finch/gntsound.c:978
 msgid "Sounds when conversation has focus"
-msgstr "Sons quan la conversa tingui el _focus"
+msgstr "Sons quan la conversa tingui el focus"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:986 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1758 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Sempre"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:987 ../pidgin/gtkprefs.c:1756
 msgid "Only when available"
 msgstr "Si estic disponible"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:988 ../pidgin/gtkprefs.c:1757
 msgid "Only when not available"
 msgstr "Només si no estic disponible"
 
-#: ../finch/gntsound.c:999
-#, fuzzy
+#: ../finch/gntsound.c:995
 msgid "Volume(0-100):"
-msgstr "Volum:"
+msgstr "Volum (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1014 ../pidgin/gtkprefs.c:1793
 msgid "Sound Events"
 msgstr "Esdeveniments de so"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1016 ../pidgin/gtkprefs.c:1852
 msgid "Event"
 msgstr "Esdeveniment"
 
-#: ../finch/gntsound.c:1020
-#, fuzzy
+#: ../finch/gntsound.c:1016
 msgid "File"
-msgstr "Ha fallat"
+msgstr "Fitxer"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:1035 ../pidgin/gtkprefs.c:1871
 msgid "Test"
 msgstr "Prova"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
 msgid "Reset"
 msgstr "Reinicia"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
 msgid "Choose..."
 msgstr "Tria..."
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Esteu segur que voleu suprimir «%s»?"
 
-#: ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:140
 msgid "Delete Status"
 msgstr "Estat de la supressió"
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
+#: ../finch/gntstatus.c:175 ../pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr "Estats desats"
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1359
+#: ../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:500
+#: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr "Títol"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
+#: ../finch/gntstatus.c:182 ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr "Tipus"
 
@@ -1728,31 +1562,31 @@ msgstr "Tipus"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
+#: ../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:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
-#: ../libpurple/protocols/myspace/myspace.c:148
+#: ../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:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
+#: ../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
@@ -1760,100 +1594,76 @@ msgstr "Tipus"
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/yahoo/yahoo.c:3729
+#: ../libpurple/protocols/yahoo/yahoo.c:3735
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
+#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Missatge"
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "Empra"
 
-#: ../finch/gntstatus.c:301
+#: ../finch/gntstatus.c:300
 msgid "Invalid title"
 msgstr "El títol no és vàlid"
 
-#: ../finch/gntstatus.c:302
+#: ../finch/gntstatus.c:301
 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:310
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "El títol està duplicat"
 
-#: ../finch/gntstatus.c:311
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Introduïu un títol diferent per a l'estat."
 
-#: ../finch/gntstatus.c:452
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Sub-estat"
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Estat:"
 
-#: ../finch/gntstatus.c:479
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "Missatge:"
 
-#: ../finch/gntstatus.c:528
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "Edita l'estat"
 
-#: ../finch/gntstatus.c:570
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Utilitza un estat diferent per a aquests comptes"
 
 #. Save & Use
-#: ../finch/gntstatus.c:604
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "Desa i fes servir"
 
-#: ../finch/gntui.c:85
-msgid "Certificates"
-msgstr ""
-
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntui.c:87 ../pidgin/gtkprefs.c:2030
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../finch/gntui.c:91
+#: ../finch/gntui.c:89
 msgid "Statuses"
 msgstr "Estats"
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#, fuzzy
-msgid "Error loading the plugin."
-msgstr "S'han produït errors en descarregar el connector."
-
-#: ../finch/plugins/gntclipboard.c:116
-#, fuzzy
-msgid "Couldn't find X display"
-msgstr "No s'ha pogut obrir el fitxer"
-
-#: ../finch/plugins/gntclipboard.c:122
-#, fuzzy
-msgid "Couldn't find window"
-msgstr "No s'ha pogut obrir el fitxer"
-
-#: ../finch/plugins/gntclipboard.c:129
-msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
-
-#: ../finch/plugins/gntclipboard.c:158
+#: ../finch/plugins/gntclipboard.c:149
 msgid "GntClipboard"
 msgstr "Porta-retalls Gnt"
 
-#: ../finch/plugins/gntclipboard.c:160
+#: ../finch/plugins/gntclipboard.c:151
 msgid "Clipboard plugin"
 msgstr "Connector per al porta-retalls"
 
-#: ../finch/plugins/gntclipboard.c:161
+#: ../finch/plugins/gntclipboard.c:152
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1965,104 +1775,102 @@ msgstr ""
 msgid "Lastlog"
 msgstr "Lastlog"
 
-#. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
+#: ../finch/plugins/lastlog.c:99
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: cerca cadenes al registre."
 
-#: ../finch/plugins/lastlog.c:122
+#: ../finch/plugins/lastlog.c:121
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
+#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
 msgid "Lastlog plugin."
 msgstr "Connector lastlog."
 
-#: ../libpurple/account.c:791
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "comptes"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "Es necessita la contrasenya per a poder connectar."
 
-#: ../libpurple/account.c:992
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Introduïu la contrasenya de %s (%s)"
 
-#: ../libpurple/account.c:999
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "Introduïu la contrasenya"
 
-#: ../libpurple/account.c:1004
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "Desa la contrasenya"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
-#: ../libpurple/connection.c:178
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "No s'ha trobat el connector per al protocol %s"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4021
 msgid "Connection Error"
 msgstr "Error de connexió"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1334
 msgid "New passwords do not match."
 msgstr "Les contrasenyes noves no coincideixen."
 
-#: ../libpurple/account.c:1208
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "Ompliu tots els camps completament."
 
-#: ../libpurple/account.c:1231
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "Contrasenya original"
 
-#: ../libpurple/account.c:1238
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: ../libpurple/account.c:1245
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "Nova contrasenya (repetiu-la)"
 
-#: ../libpurple/account.c:1251
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "Canvia la contrasenya de %s"
 
-#: ../libpurple/account.c:1259
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "Introduïu la contrasenya actual, i la nova."
 
-#: ../libpurple/account.c:1290
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "Canvia la informació d'usuari de %s"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Estableix les dades d'usuari"
 
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../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:160
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../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
 msgid "Buddies"
 msgstr "Amics"
 
@@ -2070,174 +1878,23 @@ msgstr "Amics"
 msgid "buddy list"
 msgstr "llista d'amics"
 
-#: ../libpurple/certificate.c:545
-msgid "(DOES NOT MATCH)"
-msgstr ""
-
-#. Make messages
-#: ../libpurple/certificate.c:549
-#, c-format
-msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
-
-#: ../libpurple/certificate.c:550
-#, c-format
-msgid ""
-"Common name: %s %s\n"
-"Fingerprint (SHA1): %s"
-msgstr ""
-
-#. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
-msgid "Single-use Certificate Verification"
-msgstr ""
-
-#. Scheme name
-#. Pool name
-#: ../libpurple/certificate.c:872
-msgid "Certificate Authorities"
-msgstr ""
-
-#. Scheme name
-#. Pool name
-#: ../libpurple/certificate.c:1040
-msgid "SSL Peers Cache"
-msgstr ""
-
-#. Make messages
-#: ../libpurple/certificate.c:1171
-#, fuzzy, c-format
-msgid "Accept certificate for %s?"
-msgstr "Voleu acceptar la invitació del xat?"
-
-#. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
-msgid "SSL Certificate Verification"
-msgstr ""
-
-#. Number of actions
-#: ../libpurple/certificate.c:1186
-#, fuzzy
-msgid "Accept"
-msgstr "_Accepta"
-
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
-msgid "Reject"
-msgstr "Rebutja"
-
-#: ../libpurple/certificate.c:1188
-msgid "_View Certificate..."
-msgstr ""
-
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-
-#: ../libpurple/certificate.c:1331
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr ""
-
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
-#, fuzzy
-msgid "SSL Certificate Error"
-msgstr "Error d'escriptura"
-
-#: ../libpurple/certificate.c:1340
-#, fuzzy
-msgid "Invalid certificate chain"
-msgstr "El títol no és vàlid"
-
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
-
-#: ../libpurple/certificate.c:1408
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-
-#: ../libpurple/certificate.c:1417
-msgid "Invalid certificate authority signature"
-msgstr ""
-
-#. Make messages
-#: ../libpurple/certificate.c:1881
-#, c-format
-msgid ""
-"Common name: %s\n"
-"\n"
-"Fingerprint (SHA1): %s\n"
-"\n"
-"Activation date: %s\n"
-"Expiration date: %s\n"
-msgstr ""
-
-#. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
-#, fuzzy
-msgid "Certificate Information"
-msgstr "Informació del servidor"
-
-#: ../libpurple/connection.c:107
+#: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Error en el registre"
 
-#: ../libpurple/connection.c:180
-#, fuzzy
-msgid "Unregistration Error"
-msgstr "Error en el registre"
-
-#: ../libpurple/connection.c:350
+#: ../libpurple/connection.c:293
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s s'ha connectat"
 
-#: ../libpurple/connection.c:380
+#: ../libpurple/connection.c:323
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s se n'ha anat"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
-#: ../libpurple/protocols/msn/servconn.c:141
+#: ../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
 msgid "Unknown error"
 msgstr "Error desconegut"
@@ -2260,40 +1917,40 @@ msgstr "El missatge és massa llarg."
 msgid "Unable to send message."
 msgstr "No s'ha pogut enviar el missatge."
 
-#: ../libpurple/conversation.c:1211
+#: ../libpurple/conversation.c:1169
 msgid "Send Message"
 msgstr "Envia el missatge"
 
-#: ../libpurple/conversation.c:1214
+#: ../libpurple/conversation.c:1172
 msgid "_Send Message"
 msgstr "_Envia el missatge"
 
-#: ../libpurple/conversation.c:1620
+#: ../libpurple/conversation.c:1578
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ha entrat a la sala."
 
-#: ../libpurple/conversation.c:1623
+#: ../libpurple/conversation.c:1581
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ha entrat a la sala."
 
-#: ../libpurple/conversation.c:1733
+#: ../libpurple/conversation.c:1691
 #, c-format
 msgid "You are now known as %s"
 msgstr "Ara us feu dir %s"
 
-#: ../libpurple/conversation.c:1753
+#: ../libpurple/conversation.c:1711
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ara es fa dir %s"
 
-#: ../libpurple/conversation.c:1828
+#: ../libpurple/conversation.c:1786
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha sortit de la sala."
 
-#: ../libpurple/conversation.c:1831
+#: ../libpurple/conversation.c:1789
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha sortit de la sala (%s)."
@@ -2313,25 +1970,25 @@ msgstr "No s'ha pogut obtenir el nom: %s"
 msgid "Failed to get serv name: %s"
 msgstr "No s'ha pogut obtenir el nom del servidor: %s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
+msgstr "No s'està executant el servidor D-BUS del purple pel motiu d'aquí sota"
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
+#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
 msgid "No name"
 msgstr "Sense nom"
 
 # FIXME
-#: ../libpurple/dnsquery.c:511
+#: ../libpurple/dnsquery.c:510
 msgid "Unable to create new resolver process\n"
 msgstr "No s'ha pogut crear un procés resoledor nou\n"
 
 # FIXME
-#: ../libpurple/dnsquery.c:516
+#: ../libpurple/dnsquery.c:515
 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:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2340,14 +1997,14 @@ msgstr ""
 "S'ha produït un error en resoldre %s: \n"
 "%s."
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
+#: ../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:574
+#: ../libpurple/dnsquery.c:573
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2356,21 +2013,20 @@ msgstr ""
 "S'ha produït un error en llegir del procés resoledor:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:578
-#, c-format
+#: ../libpurple/dnsquery.c:577
 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:761
+#: ../libpurple/dnsquery.c:760
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "S'ha produït un error en crear un fil: %s"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:761
 msgid "Unknown reason"
 msgstr "Motiu desconegut"
 
-#: ../libpurple/ft.c:209
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2379,7 +2035,7 @@ msgstr ""
 "S'ha produït un error en llegir %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:213
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2388,7 +2044,7 @@ msgstr ""
 "S'ha produït un error en escriure %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:217
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2397,39 +2053,39 @@ msgstr ""
 "S'ha produït un error en accedir %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:253
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr "No es pot escriure al directori."
 
-#: ../libpurple/ft.c:268
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "No es pot enviar un fitxer de 0 octets."
 
-#: ../libpurple/ft.c:278
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "No es pot enviar un directori."
 
-#: ../libpurple/ft.c:287
+#: ../libpurple/ft.c:285
 #, 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:347
+#: ../libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s us vol enviar %s (%s)"
 
-#: ../libpurple/ft.c:354
+#: ../libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s us vol enviar un fitxer"
 
-#: ../libpurple/ft.c:397
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Voleu acceptar la transferència del fitxer de %s?"
 
-#: ../libpurple/ft.c:401
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2440,62 +2096,60 @@ msgstr ""
 "Ordinador remot: %s\n"
 "Port remot: %d"
 
-#: ../libpurple/ft.c:436
+#: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s us ofereix enviar el fitxer %s"
 
-#: ../libpurple/ft.c:488
+#: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s no és un nom de fitxer vàlid.\n"
 
-#: ../libpurple/ft.c:509
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "S'està oferint enviar %s a %s"
 
-#: ../libpurple/ft.c:521
+#: ../libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "S'està iniciant la transferència de %s de %s?"
 
-#: ../libpurple/ft.c:682
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "S'ha completat la transferència del fitxer %s"
 
-#: ../libpurple/ft.c:685
-#, c-format
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr "S'ha completat la transferència del fitxer"
 
-#: ../libpurple/ft.c:1103
+#: ../libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Heu cancel·lat la transferència de %s"
 
-#: ../libpurple/ft.c:1108
-#, c-format
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr "S'ha cancel·lat la transferència del fitxer"
 
-#: ../libpurple/ft.c:1166
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s ha cancel·lat la transferència de %s"
 
-#: ../libpurple/ft.c:1171
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s ha cancel·lat la transferència del fitxer"
 
-#: ../libpurple/ft.c:1228
+#: ../libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Ha fallat la transferència a %s."
 
-#: ../libpurple/ft.c:1230
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Ha fallat la transferència de %s."
@@ -2664,32 +2318,32 @@ msgstr "Si l'ordre especificada ha de gestionar URL «xmpp»"
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Si l'ordre especificada ha de gestionar URL «ymsgr»"
 
-#: ../libpurple/log.c:183
+#: ../libpurple/log.c:182
 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:598
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:612
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Text"
 
-#: ../libpurple/log.c:626
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Format pla antic"
 
-#: ../libpurple/log.c:839
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "Ha fallat el registre d'aquesta conversa."
 
-#: ../libpurple/log.c:1282
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1366
+#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2698,7 +2352,7 @@ msgstr ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "RESPOSTA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1368
+#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2707,17 +2361,17 @@ msgstr ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "RESPOSTA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>No s'ha pogut trobar la ruta del registre.</b></font>"
 
-#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>No s'ha pogut llegir el fitxer: %s</b></font>"
 
-#: ../libpurple/log.c:1500
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA-AUTOMÀTICA>: %s\n"
@@ -2728,7 +2382,6 @@ msgid "You are using %s, but this plugin requires %s."
 msgstr "Esteu emprant %s, però aquest connector requereix %s."
 
 #: ../libpurple/plugin.c:380
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Aques connector no ha definit cap ID."
 
@@ -2813,14 +2466,14 @@ msgstr "De_sa"
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../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
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
@@ -2863,8 +2516,8 @@ 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:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
 msgstr "Notes"
 
@@ -2884,18 +2537,18 @@ msgstr "Edita les notes..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
 msgid "Buddy Notes"
 msgstr "Notes quant a l'amic"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
 msgid "Store notes on particular buddies."
 msgstr "Emmagatzema notes sobre un amic en particular."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74
 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."
 
@@ -3095,7 +2748,7 @@ msgstr "(UTC)"
 
 #: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
-msgstr "L'usuari està fora de línia."
+msgstr "L'usuari no està connectat."
 
 #: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
@@ -3160,7 +2813,7 @@ msgstr "Messenger Plus!"
 #: ../libpurple/plugins/log_reader.c:2388
 #: ../libpurple/plugins/log_reader.c:2486
 msgid "QIP"
-msgstr ""
+msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
@@ -3283,7 +2936,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:156
+#: ../libpurple/plugins/offlinemsg.c:152
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -3292,43 +2945,43 @@ 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:160
+#: ../libpurple/plugins/offlinemsg.c:156
 msgid "Offline Message"
 msgstr "Missatge de fora de línia"
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:157
 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:165
+#: ../libpurple/plugins/offlinemsg.c:161
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Sí"
 
-#: ../libpurple/plugins/offlinemsg.c:166
+#: ../libpurple/plugins/offlinemsg.c:162
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "No"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "Desa els missatges fora de línia en un avís"
 
-#: ../libpurple/plugins/offlinemsg.c:197
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "No ho demanis, desa-ho sempre en un avís."
 
@@ -3358,13 +3011,12 @@ msgid "Psychic mode for incoming conversation"
 msgstr "Mode psíquic per a converses entrants"
 
 #: ../libpurple/plugins/psychic.c:22
-#, fuzzy
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Fa que apareguin finestres de conversa així que altres usuaris us comencin a "
-"enviar missatges. Funciona per a AIM, ICQ, Jabber, Sametime, i Yahoo!"
+"enviar missatges. Funciona per a AIM, ICQ, XMPP, Sametime, i Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
@@ -3423,30 +3075,24 @@ msgstr "Connector simple"
 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:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
-msgid "X.509 Certificates"
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
-msgid "GNUTLS"
-msgstr "GNUTLS"
+#: ../libpurple/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
-msgid "Provides SSL support through GNUTLS."
-msgstr "Proporciona suport per a SSL a través de la biblioteca GNUTLS."
+#: ../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."
 
 #. *< type
 #. *< ui_requirement
@@ -3454,18 +3100,18 @@ msgstr "Proporciona suport per a SSL a través de la biblioteca GNUTLS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
-msgid "NSS"
-msgstr "NSS"
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
+msgid "GNUTLS"
+msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Proporciona suport per a SSL a través de la biblioteca NSS de Mozilla."
+#: ../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."
 
 #. *< type
 #. *< ui_requirement
@@ -3473,18 +3119,18 @@ msgstr "Proporciona suport per a SSL a través de la biblioteca NSS de Mozilla."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
+msgid "NSS"
+msgstr "NSS"
 
 #. *< 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-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/statenotify.c:50
 #, c-format
@@ -3577,25 +3223,25 @@ msgstr ""
 "executant?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/bonjour/bonjour.c:614
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:828
 msgid "First name"
 msgstr "Nom"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/bonjour/bonjour.c:617
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr "Cognoms"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1325
-#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/bonjour/bonjour.c:350
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3604,16 +3250,15 @@ msgstr "Cognoms"
 msgid "E-Mail"
 msgstr "Correu electrònic"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:623
 msgid "AIM Account"
 msgstr "Compte AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
-#, fuzzy
+#: ../libpurple/protocols/bonjour/bonjour.c:356
+#: ../libpurple/protocols/bonjour/bonjour.c:626
 msgid "XMPP Account"
-msgstr "Compte AIM"
+msgstr "Compte XMPP"
 
 #. *< type
 #. *< ui_requirement
@@ -3625,19 +3270,28 @@ msgstr "Compte AIM"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:460
+#: ../libpurple/protocols/bonjour/bonjour.c:462
 msgid "Bonjour Protocol Plugin"
 msgstr "Connector per al protocol Bonjour"
 
 # FIXME
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:505
+#: ../libpurple/protocols/bonjour/bonjour.c:512
+#: ../libpurple/protocols/bonjour/bonjour.c:561
 msgid "Purple Person"
 msgstr "Persona porpa"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
+#. 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/silc10/silc.c:681
@@ -3649,38 +3303,38 @@ msgstr "Correu electrònic"
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
+#: ../libpurple/protocols/bonjour/jabber.c:383
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s ha finalitzat la conversa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:435
+#: ../libpurple/protocols/bonjour/jabber.c:658
+#: ../libpurple/protocols/bonjour/jabber.c:676
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "No s'ha pogut enviar el missatge, no s'ha pogut iniciar la conversa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:581
 msgid "Cannot open socket"
 msgstr "No s'ha pogut obrir el sòcol"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:589
 msgid "Error setting socket options"
 msgstr "S'ha produït un error en establir les opcions del sòcol"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:613
 msgid "Could not bind socket to port"
 msgstr "No s'ha pogut vincular el sòcol al port"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:621
 msgid "Could not listen on socket"
 msgstr "No s'ha pogut escoltar al sòcol"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "Opcions del servidor intermediari invàlides"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3750,49 +3404,48 @@ msgstr "S'ha registrat el nou compte Gadu-Gadu"
 msgid "Registration completed successfully!"
 msgstr "S'ha registrat amb èxit."
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Password"
 msgstr "Contrasenya"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "Contrasenya (torneu-la a escriure)"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "Introduïu el testimoni actual"
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "Testimoni actual"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registra un compte Gadu-Gadu nou"
 
-#: ../libpurple/protocols/gg/gg.c:504
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "Empleneu els camps següents"
 
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../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/qq/buddy_info.c:49
 msgid "City"
 msgstr "Ciutat"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "Any de naixement"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../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/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
@@ -3800,244 +3453,243 @@ msgstr "Any de naixement"
 msgid "Gender"
 msgstr "Sexe"
 
-#: ../libpurple/protocols/gg/gg.c:651
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "Home o dona"
 
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3702
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Home"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3702
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Dona"
 
-#: ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "Només en línia"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "Cerca amics"
 
 # FIXME: uh, s'ha de millorar... (josep)
-#: ../libpurple/protocols/gg/gg.c:663
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "Introduïu el criteri de cerca"
 
-#: ../libpurple/protocols/gg/gg.c:701
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "Empleneu els camps."
 
-#: ../libpurple/protocols/gg/gg.c:713
+#: ../libpurple/protocols/gg/gg.c:708
 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:727
+#: ../libpurple/protocols/gg/gg.c:722
 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:736
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Canvia la contrasenya per al compte Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:737
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "S'ha canviat la contrasenya."
 
-#: ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "Contrasenya actual"
 
-#: ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:790
 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:799 ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "Canvia la contrasenya per al Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:876
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Seleccioneu un xat per a l'amic: %s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "Afegeix al xat..."
 
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../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:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../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
 msgid "Offline"
 msgstr "Fora de línia"
 
-#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1468
 #: ../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:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3079 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
 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:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
+#: ../libpurple/protocols/jabber/buddy.c:1472
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
+#: ../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:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
-#: ../pidgin/gtkstatusbox.c:1058
-#, c-format
+#: ../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
 msgid "Away"
 msgstr "Absent"
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:2669
+#: ../libpurple/protocols/oscar/oscar.c:3669
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../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/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nom"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
 msgid "Birth Year"
 msgstr "Any de naixement"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
+#: ../libpurple/protocols/oscar/oscar.c:3881
 msgid "Unable to display the search results."
 msgstr "No s'han pogut mostrar els resultats de la cerca."
 
-#: ../libpurple/protocols/gg/gg.c:1171
+#: ../libpurple/protocols/gg/gg.c:1166
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directori públic del Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1172
+#: ../libpurple/protocols/gg/gg.c:1167
 msgid "Search results"
 msgstr "Resultats de la cerca"
 
-#: ../libpurple/protocols/gg/gg.c:1215
+#: ../libpurple/protocols/gg/gg.c:1210
 msgid "No matching users found"
 msgstr "No s'ha trobat cap usuari que coincideixi"
 
-#: ../libpurple/protocols/gg/gg.c:1216
+#: ../libpurple/protocols/gg/gg.c:1211
 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:1310 ../libpurple/protocols/gg/gg.c:1463
+#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
 msgid "Unable to read socket"
 msgstr "No s'ha pogut llegir el sòcol"
 
-#: ../libpurple/protocols/gg/gg.c:1395
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list downloaded"
 msgstr "S'ha baixat la llista d'amics"
 
-#: ../libpurple/protocols/gg/gg.c:1396
+#: ../libpurple/protocols/gg/gg.c:1391
 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:1403
+#: ../libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
 msgstr "S'ha pujat la llista d'amics"
 
-#: ../libpurple/protocols/gg/gg.c:1404
+#: ../libpurple/protocols/gg/gg.c:1399
 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:1509 ../libpurple/protocols/gg/gg.c:1715
+#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Ha fallat la connexió."
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "Blocat"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Afegeix al xat"
 
-#: ../libpurple/protocols/gg/gg.c:1653
+#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Desbloca"
 
-#: ../libpurple/protocols/gg/gg.c:1657
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Bloca"
 
-#: ../libpurple/protocols/gg/gg.c:1674
+#: ../libpurple/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "_Nom del xat:"
 
-#: ../libpurple/protocols/gg/gg.c:1914
+#: ../libpurple/protocols/gg/gg.c:1909
 msgid "Chat error"
 msgstr "Error en el xat"
 
-#: ../libpurple/protocols/gg/gg.c:1915
+#: ../libpurple/protocols/gg/gg.c:1910
 msgid "This chat name is already in use"
 msgstr "Aquest nom de xat ja existeix"
 
-#: ../libpurple/protocols/gg/gg.c:1998
+#: ../libpurple/protocols/gg/gg.c:1993
 msgid "Not connected to the server."
 msgstr "No esteu connectat al servidor."
 
-#: ../libpurple/protocols/gg/gg.c:2021
+#: ../libpurple/protocols/gg/gg.c:2016
 msgid "Find buddies..."
 msgstr "Cerca amics..."
 
-#: ../libpurple/protocols/gg/gg.c:2027
+#: ../libpurple/protocols/gg/gg.c:2022
 msgid "Change password..."
 msgstr "Canvia la contrasenya..."
 
-#: ../libpurple/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Upload buddylist to Server"
 msgstr "Puja la llista d'amics al servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2037
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
 msgstr "Baixa la llista d'amics del servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2041
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
 msgstr "Suprimeix la llista d'amics del servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
 msgstr "Desa la llista d'amics a un fitxer..."
 
-#: ../libpurple/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2044
 msgid "Load buddylist from file..."
 msgstr "Carrega la llista d'amics d'un fitxer..."
 
@@ -4052,16 +3704,16 @@ msgstr "Carrega la llista d'amics d'un fitxer..."
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
+#: ../libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Connector per al protocol Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
+#: ../libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
 msgstr "Popular MI polonesa"
 
-#: ../libpurple/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
 msgstr "Usuari Gadu-Gadu"
 
@@ -4091,7 +3743,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:287
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "File Transfer Failed"
 msgstr "Ha fallat la transferència del fitxer"
 
@@ -4118,8 +3770,8 @@ 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:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/myspace/myspace.c:3484
 msgid "Server has disconnected"
 msgstr "El servidor ha desconnectat"
 
@@ -4133,7 +3785,7 @@ msgid "_Channel:"
 msgstr "_Canal:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
@@ -4144,59 +3796,69 @@ 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:1280
+#: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
+#: ../libpurple/protocols/myspace/myspace.c:637
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
+#: ../libpurple/protocols/simple/simple.c:1676
+#: ../libpurple/protocols/yahoo/yahoo.c:2922
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "S'està connectant"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 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:317
+#: ../libpurple/protocols/myspace/myspace.c:653
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/simple/simple.c:1591
 msgid "Couldn't create socket"
 msgstr "No s'ha pogut crear el sòcol"
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/myspace/myspace.c:3597
+#: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "No s'ha pogut connectar a l'ordinador"
 
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../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
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: ../libpurple/protocols/irc/irc.c:773
+#: ../libpurple/protocols/irc/irc.c:775
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
+#: ../libpurple/protocols/yahoo/yahoochat.c:1402
 msgid "Users"
 msgstr "Usuaris"
 
-#: ../libpurple/protocols/irc/irc.c:776
+#: ../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/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1506
+#: ../libpurple/protocols/yahoo/yahoochat.c:1411
 msgid "Topic"
 msgstr "Tema"
 
@@ -4208,33 +3870,33 @@ msgstr "Tema"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
 msgstr "Connector per al protocol d'IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:917
 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:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
+#: ../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/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
+#: ../libpurple/protocols/simple/simple.c:1855
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
+#: ../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
@@ -4243,13 +3905,12 @@ msgstr "Servidor"
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:946
+#: ../libpurple/protocols/irc/irc.c:948
 msgid "Encodings"
 msgstr "Codificacions"
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
+#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -4265,7 +3926,7 @@ msgstr "Codificacions"
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -4275,7 +3936,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:960
+#: ../libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
 msgstr "Utilitza SSL"
 
@@ -4306,7 +3967,7 @@ msgid " <i>(identified)</i>"
 msgstr "<i>(identificat)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3670
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4465,9 +4126,9 @@ msgid "PING reply -- Lag: %lu seconds"
 msgstr "Resposta al PING -- Retard: %lu segons"
 
 #: ../libpurple/protocols/irc/msgs.c:1110
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "Cal registre"
+msgstr "No s'ha pogut entrar a %s: cal registrar-se."
 
 #: ../libpurple/protocols/irc/msgs.c:1111
 #: ../libpurple/protocols/silc/ops.c:1093
@@ -4587,7 +4248,7 @@ msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canal]:  llista els usuaris connectats al canal."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:1830
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;sobrenom nou&gt;:  canvia el vostre sobrenom."
 
@@ -4692,9 +4353,10 @@ msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [servidor] &lt;sobrenom&gt;:  obté informació sobre un usuari."
 
 #: ../libpurple/protocols/irc/parse.c:155
-#, fuzzy
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois [servidor] &lt;sobrenom&gt;:  obté informació sobre un usuari."
+msgstr ""
+"whowas &lt;sobrenom&gt;:  obté informació sobre un usuari que ja s'ha "
+"desconnectat."
 
 #: ../libpurple/protocols/irc/parse.c:465
 #, c-format
@@ -4716,71 +4378,53 @@ msgstr "Resposta de CTCP PING"
 msgid "Disconnected."
 msgstr "Desconnectat."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
-msgid "Unknown Error"
-msgstr "Error desconegut"
-
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
-#, fuzzy
-msgid "Ad-Hoc Command Failed"
-msgstr "S'ha inhabilitat l'ordre"
-
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
-#, fuzzy
-msgid "execute"
-msgstr "Inesperat"
-
-#: ../libpurple/protocols/jabber/auth.c:53
+#: ../libpurple/protocols/jabber/auth.c:52
 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:116
+#: ../libpurple/protocols/jabber/auth.c:115
 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:319
-#: ../libpurple/protocols/jabber/auth.c:508
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"Aquest servidor requereix autenticació de text sobre un flux no xifrat. "
-"Voleu permetre això i continuar amb l'autenticació?"
+"%s requereix autenticació de text sobre un flux no xifrat. Voleu permetre-ho "
+"i continuar amb l'autenticació?"
 
-#: ../libpurple/protocols/jabber/auth.c:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:510
-#: ../libpurple/protocols/jabber/auth.c:511
-#: ../libpurple/protocols/jabber/auth.c:598
-#: ../libpurple/protocols/jabber/auth.c:599
+#: ../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
 msgid "Plaintext Authentication"
 msgstr "Autenticació de text"
 
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
 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:462
-#: ../libpurple/protocols/jabber/auth.c:561
-#: ../libpurple/protocols/jabber/auth.c:776
-#: ../libpurple/protocols/jabber/auth.c:917
-#: ../libpurple/protocols/jabber/auth.c:942
-#: ../libpurple/protocols/jabber/auth.c:961
-#: ../libpurple/protocols/jabber/jabber.c:123
+#: ../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
 msgid "Invalid response from server."
 msgstr "La resposta del servidor no és vàlida."
 
-#: ../libpurple/protocols/jabber/auth.c:600
+#: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4788,115 +4432,113 @@ 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:797
-#: ../libpurple/protocols/jabber/auth.c:820
+#: ../libpurple/protocols/jabber/auth.c:769
+#: ../libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
 msgstr "Repte del servidor invàlid"
 
-#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
 msgstr "Error en el SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1219
+#: ../libpurple/protocols/jabber/buddy.c:271
+#: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nom"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1231
+#: ../libpurple/protocols/jabber/buddy.c:272
+#: ../libpurple/protocols/jabber/buddy.c:838
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Cognoms"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1234
+#: ../libpurple/protocols/jabber/buddy.c:273
+#: ../libpurple/protocols/jabber/buddy.c:842
 msgid "Given Name"
 msgstr "Nom comú"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
+#: ../libpurple/protocols/jabber/buddy.c:275
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
+#: ../libpurple/protocols/jabber/buddy.c:276
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
 msgstr "Adreça"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
+#: ../libpurple/protocols/jabber/buddy.c:277
+#: ../libpurple/protocols/jabber/buddy.c:890
 msgid "Extended Address"
 msgstr "Adreça (cont.)"
 
-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
+#: ../libpurple/protocols/jabber/buddy.c:278
+#: ../libpurple/protocols/jabber/buddy.c:898
 msgid "Locality"
 msgstr "Ubicació"
 
-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
+#: ../libpurple/protocols/jabber/buddy.c:279
+#: ../libpurple/protocols/jabber/buddy.c:902
 msgid "Region"
 msgstr "Província"
 
-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
+#: ../libpurple/protocols/jabber/buddy.c:280
+#: ../libpurple/protocols/jabber/buddy.c:906
 msgid "Postal Code"
 msgstr "Codi postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
+#: ../libpurple/protocols/jabber/buddy.c:281
+#: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "País"
 
-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1306
-#: ../libpurple/protocols/jabber/buddy.c:1313
+#: ../libpurple/protocols/jabber/buddy.c:282
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Telephone"
 msgstr "Telèfon"
 
-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
 msgstr "Nom de l'organització"
 
-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:967
 msgid "Organization Unit"
 msgstr "Secció de l'organització"
 
-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/buddy.c:976
 msgid "Role"
 msgstr "Rol"
 
-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3719
 msgid "Birthday"
 msgstr "Data de naixement"
 
-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
-#: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
-#: ../pidgin/gtkprefs.c:739
+#: ../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
 msgid "Description"
 msgstr "Descripció"
 
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
 msgid "Edit XMPP vCard"
-msgstr "Edita la vCard del Jabber"
+msgstr "Edita la vCard de l'XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
+#: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4904,416 +4546,116 @@ msgstr ""
 "Les dades següents són opcionals. Introduïu només la informació que us "
 "sembli."
 
-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
+#: ../libpurple/protocols/jabber/buddy.c:659
+#: ../libpurple/protocols/jabber/buddy.c:700
 msgid "Operating System"
 msgstr "Sistema operatiu"
 
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
-msgid "Last Activity"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Estableix informació del directori"
-
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
-msgid "Service Discovery Items"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Adreça (cont.)"
-
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Posa un àlies a un xat"
-
-#: ../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
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Ordre"
-
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
-msgid "PubSub Service"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
-msgid "Out of Band Data"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Error en el registre"
-
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
-#, fuzzy
-msgid "User Location"
-msgstr "Ubicació"
-
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
-#, fuzzy
-msgid "User Avatar"
-msgstr "Cerca d'usuaris"
-
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Notificació de l'estat dels amics"
-
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
-#, fuzzy
-msgid "Software Version"
-msgstr "Aquesta versió no està implementada"
-
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Orientació"
-
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
-msgid "File Transfer"
-msgstr "Transferència de fitxers"
-
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
-#, fuzzy
-msgid "User Mood"
-msgstr "Modes d'usuari"
-
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
-#, fuzzy
-msgid "User Activity"
-msgstr "Límit d'usuaris"
-
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Capacitats"
-
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
-#, fuzzy
-msgid "User Tune"
-msgstr "Nom d'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
-#, fuzzy
-msgid "User Profile"
-msgstr "Estableix perfil"
-
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
-#, fuzzy
-msgid "Jingle"
-msgstr "Entra"
-
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
-msgid "Jingle Audio"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
-#, fuzzy
-msgid "User Nickname"
-msgstr "Nom d'usuari"
-
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
-msgid "Jingle ICE UDP"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
-msgid "Jingle ICE TCP"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Vídeo en directe"
-
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
-msgid "Jingle DTMF"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Es rep un missatge"
-
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Empremta babble de la clau pública"
-
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
-#, fuzzy
-msgid "User Chatting"
-msgstr "Opcions d'usuari"
-
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
-#, fuzzy
-msgid "User Browsing"
-msgstr "Modes d'usuari"
-
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
-#, fuzzy
-msgid "User Gaming"
-msgstr "Nom d'usuari"
-
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
-#, fuzzy
-msgid "User Viewing"
-msgstr "Límit d'usuaris"
-
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping"
-msgstr "Ping"
-
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Xifrat Trillian"
-
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
-msgid "Entity Time"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
-msgid "Delayed Delivery"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
-msgid "Collaborative Data Objects"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
-msgid "File Repository and Sharing"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
-msgid "Hop Check"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
-msgid "Capabilities"
-msgstr "Capacitats"
-
-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
-#: ../libpurple/protocols/jabber/si.c:859
+#: ../libpurple/protocols/jabber/buddy.c:669
+#: ../libpurple/protocols/jabber/libxmpp.c:202
+#: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "Recurs"
 
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
+#: ../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
 msgid "Priority"
 msgstr "Prioritat"
 
-#: ../libpurple/protocols/jabber/buddy.c:1237
+#: ../libpurple/protocols/jabber/buddy.c:846
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Primer cognom"
 
-#: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../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/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:1276
+#: ../libpurple/protocols/jabber/buddy.c:886
 msgid "P.O. Box"
 msgstr "Apartat de correus"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Logo"
 msgstr "Logotip"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1409
 msgid "Un-hide From"
 msgstr "No m'amaguis de"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1413
 msgid "Temporarily Hide From"
 msgstr "Amaga-me'n temporalment"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1421
 msgid "Cancel Presence Notification"
 msgstr "Cancel·la la notificació de presència"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1428
 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:1970
+#: ../libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
-msgstr "Dessubscriu"
-
-#: ../libpurple/protocols/jabber/buddy.c:1985
-#, fuzzy
-msgid "Log In"
-msgstr "Connectat"
-
-#: ../libpurple/protocols/jabber/buddy.c:1989
-msgid "Log Out"
-msgstr "Desconnecta"
+msgstr "Cancel·la la subscripció"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
-#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/buddy.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1252
 msgid "Chatty"
 msgstr "Xerraire"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:1474
 msgid "Extended Away"
-msgstr "Absent durant una bona estona"
+msgstr "Absent des de fa una bona estona"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
-#: ../libpurple/protocols/jabber/jabber.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
+#: ../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
-#, c-format
 msgid "Do Not Disturb"
 msgstr "No molesteu"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:1621
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3681
 msgid "Last Name"
 msgstr "Cognoms"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:1657
 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:2319
+#: ../libpurple/protocols/jabber/buddy.c:1732
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5321,41 +4663,40 @@ 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:2339
+#: ../libpurple/protocols/jabber/buddy.c:1752
 msgid "Directory Query Failed"
 msgstr "Ha fallat la consulta al directori"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:1753
 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:2374
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instruccions del servidor: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:1794
 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 que hi coincideixin."
+msgstr ""
+"Introduïu un o més camps per cercar usuaris de XMPP que hi coincideixin."
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
+#: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/oscar/oscar.c:3684
+#: ../libpurple/protocols/oscar/oscar.c:3693
 msgid "E-Mail Address"
 msgstr "Adreça de correu electrònic"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1824
 msgid "Search for XMPP users"
-msgstr "Cerca un usuari"
+msgstr "Cerca usuarus XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
@@ -5367,25 +4708,25 @@ msgstr "Cerca un usuari"
 msgid "Search"
 msgstr "Cerca"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:1840
 msgid "Invalid Directory"
 msgstr "Directori invàlid"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:1857
 msgid "Enter a User Directory"
 msgstr "Introduïu un directori d'usuari"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:1858
 msgid "Select a user directory to search"
 msgstr "Seleccioneu quin directori d'usuari cercar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:1861
 msgid "Search Directory"
 msgstr "Directori de cerca"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:5244
+#: ../libpurple/protocols/yahoo/yahoochat.c:963
 msgid "_Room:"
 msgstr "Sa_la:"
 
@@ -5475,29 +4816,25 @@ msgstr "Seleccioneu a quin servidor de conferencies consultar"
 msgid "Find Rooms"
 msgstr "Cerca sales"
 
-#: ../libpurple/protocols/jabber/jabber.c:92
+#: ../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:145
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
+#: ../libpurple/protocols/jabber/jabber.c:247
+#: ../libpurple/protocols/jabber/jabber.c:300
+#: ../libpurple/protocols/jabber/jabber.c:328
 msgid "Write error"
 msgstr "Error d'escriptura"
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
+#: ../libpurple/protocols/jabber/jabber.c:396
+#: ../libpurple/protocols/jabber/jabber.c:433
 msgid "Read Error"
 msgstr "Error de lectura"
 
-#: ../libpurple/protocols/jabber/jabber.c:482
+#: ../libpurple/protocols/jabber/jabber.c:467
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/yahoo/yahoo.c:2541
+#: ../libpurple/protocols/yahoo/yahoo.c:2573
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5506,73 +4843,55 @@ msgstr ""
 "No s'ha pogut establir una connexió amb al servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:529
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "No s'ha pogut crear el sòcol"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
 msgid "Invalid XMPP ID"
-msgstr "ID invàlid"
+msgstr "ID de l'XMPP invàlid"
 
-#: ../libpurple/protocols/jabber/jabber.c:580
+#: ../libpurple/protocols/jabber/jabber.c:573
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr ""
+msgstr "L'ID de l'XMPP no és vàlid. Cal especificar un domini."
 
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "S'ha registrat %s a %s amb èxit"
 
-#: ../libpurple/protocols/jabber/jabber.c:662
-#, fuzzy, c-format
-msgid "Registration to %s successful"
-msgstr "S'ha registrat %s a %s amb èxit"
-
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "S'ha registrat amb èxit"
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
-msgid "Registration Failed"
-msgstr "Ha fallat el registre"
-
-#: ../libpurple/protocols/jabber/jabber.c:692
-#, fuzzy, c-format
-msgid "Registration from %s successfully removed"
-msgstr "S'ha registrat %s a %s amb èxit"
-
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
-#, fuzzy
-msgid "Unregistration 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:703
-#: ../libpurple/protocols/jabber/jabber.c:704
-#, fuzzy
-msgid "Unregistration Failed"
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
+msgid "Registration Failed"
 msgstr "Ha fallat el registre"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "Ja esteu registrat"
 
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3760
+#: ../libpurple/protocols/oscar/oscar.c:3773
 msgid "State"
 msgstr "Estat"
 
-#: ../libpurple/protocols/jabber/jabber.c:967
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "Codi postal"
 
-#: ../libpurple/protocols/jabber/jabber.c:972
+#: ../libpurple/protocols/jabber/jabber.c:858
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -5582,553 +4901,377 @@ msgstr "Codi postal"
 msgid "Phone"
 msgstr "Telèfon"
 
-#: ../libpurple/protocols/jabber/jabber.c:982
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "Data"
 
-#: ../libpurple/protocols/jabber/jabber.c:987
-#, fuzzy
-msgid "Unregister"
-msgstr "Registra"
-
-#: ../libpurple/protocols/jabber/jabber.c:994
-#, fuzzy
-msgid ""
-"Please fill out the information below to change your account registration."
-msgstr "Empleneu els camps següents per registrar un compte nou."
-
-#: ../libpurple/protocols/jabber/jabber.c:997
+#: ../libpurple/protocols/jabber/jabber.c:876
 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:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
 msgid "Register New XMPP Account"
-msgstr "Registra un compte Jabber nou"
+msgstr "Registra un compte XMPP nou"
 
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:881
 msgid "Register"
 msgstr "Registra"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
-#, fuzzy, c-format
-msgid "Change Account Registration at %s"
-msgstr "Canvia la informació d'usuari de %s"
-
-#: ../libpurple/protocols/jabber/jabber.c:1013
-#, fuzzy, c-format
-msgid "Register New Account at %s"
-msgstr "Registra un compte Jabber nou"
-
-#: ../libpurple/protocols/jabber/jabber.c:1016
-#, fuzzy
-msgid "Change Registration"
-msgstr "Error en el registre"
-
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
-#, fuzzy
-msgid "Error unregistering account"
-msgstr "S'ha produït un error en canviar la informació del compte"
-
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
-#, fuzzy
-msgid "Account successfully unregistered"
-msgstr "Heu creat un Qun"
-
-#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Initializing Stream"
 msgstr "S'està inicialitzant el flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
-#, fuzzy
-msgid "Initializing SSL/TLS"
-msgstr "S'està inicialitzant el flux"
-
-#: ../libpurple/protocols/jabber/jabber.c:1293
+#: ../libpurple/protocols/jabber/jabber.c:1055
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "S'està autenticant"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Re-initializing Stream"
 msgstr "S'està reinicialitzant el flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../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
 msgid "Not Authorized"
 msgstr "No autoritzat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "Both"
 msgstr "Ambdós"
 
-#: ../libpurple/protocols/jabber/jabber.c:1444
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "From (To pending)"
 msgstr "De (a pendent)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1446
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From"
 msgstr "De"
 
-#: ../libpurple/protocols/jabber/jabber.c:1449
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "To"
 msgstr "A"
 
-#: ../libpurple/protocols/jabber/jabber.c:1451
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "None (To pending)"
 msgstr "Cap (a pendent)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
+#: ../libpurple/protocols/jabber/jabber.c:1179
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Cap"
 
-#: ../libpurple/protocols/jabber/jabber.c:1456
+#: ../libpurple/protocols/jabber/jabber.c:1182
 msgid "Subscription"
 msgstr "Subscripció"
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr "Estat d'ànim"
-
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#, fuzzy
-msgid "Mood Text"
-msgstr "Tipus de sang"
-
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#, fuzzy
-msgid "Tune Artist"
-msgstr "Artistes"
-
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#, fuzzy
-msgid "Tune Title"
-msgstr "Títol"
-
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
-msgid "Tune Album"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
-msgid "Tune Genre"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
-#, fuzzy
-msgid "Tune Comment"
-msgstr "Comentari de l'amic"
-
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
-msgid "Tune Track"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
-msgid "Tune Time"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
-msgid "Tune Year"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
-msgid "Tune URL"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-#, fuzzy
-msgid "Allow Buzz"
-msgstr "Permet"
-
-#: ../libpurple/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/jabber/jabber.c:1312
 msgid "Password Changed"
 msgstr "S'ha canviat la contrasenya"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1313
 msgid "Your password has been changed."
 msgstr "La vostra contrasenya s'ha canviat."
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
+#: ../libpurple/protocols/jabber/jabber.c:1317
+#: ../libpurple/protocols/jabber/jabber.c:1318
 msgid "Error changing password"
 msgstr "S'ha produït un error en canviar la contrasenya"
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
+#: ../libpurple/protocols/jabber/jabber.c:1375
 msgid "Password (again)"
 msgstr "Contrasenya (repetiu-la)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Change XMPP Password"
-msgstr "Canvia la contrasenya"
+msgstr "Canvia la contrasenya de l'XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "Introduïu la nova contrasenya"
 
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6338
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Estableix informació d'usuari..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6349
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Canvia la contrasenya..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "Cerca usuaris..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1845
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "Sol·licitud incorrecta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "Conflicte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "La característica no està implementada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "Prohibit"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "Desaparegut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "Error intern del servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "No s'ha trobat l'element"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
-#, fuzzy
+# FIX
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Malformed XMPP ID"
-msgstr "l'ID Jabber està mal format"
+msgstr "l'ID de l'XMPP està malmès"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "No acceptable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "No permès"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "De pagament"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "El destinatari no està disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "Cal registre"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "No s'ha trobat el servidor remot"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "El servidor remot ha excedit el temps d'espera"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "El servidor està sobrecarregat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "El servei no està disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "Cal subscripció"
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "Sol·licitud inesperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "S'ha avortat l'autorització"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "La codificació de l'autorització no és correcta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "Authzid invàlid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "El mecanisme d'autorització no és vàlid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "El mecanisme d'autorització és massa feble"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "Ha fallat temporalment l'autenticació"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "S'ha produït un error en l'autenticació"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "Format incorrecte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "Prefix d'espai de noms incorrecte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "Conflicte de recurs"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "La connexió ha excedit el temps d'espera"
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "L'ordinador ha desaparegut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "Servidor desconegut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "Adreçament incorrecte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "ID invàlid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "Espai de noms invàlid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "XML invàlid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1943
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "Ordinadors no coincidents"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "Violació de la política"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "Ha fallat la connexió remota"
 
 # Mirar com es traduïa 'Constraint variables'
-#: ../libpurple/protocols/jabber/jabber.c:1951
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "Restriccions del recurs"
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "XML restringit"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "Veu altres ordinadors"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "Apagada del Sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "Condició no definida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "La codificació no està implementada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "El tipus de permanència no està implementada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "Aquesta versió no està implementada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML mal format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "Error de flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
+#: ../libpurple/protocols/jabber/jabber.c:1686
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "No s'ha pogut bandejar l'usuari %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2072
+#: ../libpurple/protocols/jabber/jabber.c:1706
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliació desconeguda: «%s»"
 
-#: ../libpurple/protocols/jabber/jabber.c:2077
+#: ../libpurple/protocols/jabber/jabber.c:1711
 #, 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:2096
+#: ../libpurple/protocols/jabber/jabber.c:1730
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol desconegut: «%s»"
 
-#: ../libpurple/protocols/jabber/jabber.c:2101
+#: ../libpurple/protocols/jabber/jabber.c:1735
 #, 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:2154
+#: ../libpurple/protocols/jabber/jabber.c:1788
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "No s'ha pogut fer fora l'usuari %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
-#, fuzzy, c-format
-msgid "Unable to ping user %s"
-msgstr "No s'ha pogut bandejar l'usuari %s"
-
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2213
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2239
-#, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr ""
-"No s'ha pogut reproduir el so perquè el fitxer seleccionat (%s) no existeix."
-
-#: ../libpurple/protocols/jabber/jabber.c:2253
+#: ../libpurple/protocols/jabber/jabber.c:1822
 msgid "config:  Configure a chat room."
 msgstr "config:  configura la sala de xat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:1826
 msgid "configure:  Configure a chat room."
 msgstr "configure:  configura la sala de xat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  surt de la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:1840
 msgid "register:  Register with a chat room."
 msgstr "register:  registra a una sala de xat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:1846
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [tema nou]:  mostra o canvia el tema."
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:1852
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [sala]:  bandeja un usuari de la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2289
+#: ../libpurple/protocols/jabber/jabber.c:1858
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6136,7 +5279,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:2295
+#: ../libpurple/protocols/jabber/jabber.c:1864
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6144,34 +5287,25 @@ 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:2301
+#: ../libpurple/protocols/jabber/jabber.c:1870
 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:2307
+#: ../libpurple/protocols/jabber/jabber.c:1876
 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:2313
+#: ../libpurple/protocols/jabber/jabber.c:1882
 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:2318
+#: ../libpurple/protocols/jabber/jabber.c:1887
 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:2324
-msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
-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
@@ -6182,102 +5316,88 @@ msgstr "buzz: fa sonar un soroll a un usuari per tal de que us pari atenció"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
-#, fuzzy
+#: ../libpurple/protocols/jabber/libxmpp.c:169
+#: ../libpurple/protocols/jabber/libxmpp.c:171
 msgid "XMPP Protocol Plugin"
-msgstr "Connector per al protocol MSN"
+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:202 ../pidgin/gtkaccount.c:506
-#, fuzzy
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:509
 msgid "Domain"
-msgstr "Romanès"
-
-#: ../libpurple/protocols/jabber/libxmpp.c:210
-#, fuzzy
-msgid "Require SSL/TLS"
-msgstr "Requereix TLS"
+msgstr "Domini"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Force old (port 5223) SSL"
 msgstr "Força l'antic port SSL (5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:219
+#: ../libpurple/protocols/jabber/libxmpp.c:211
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permet autorització de text sobre fluxos sense xifrar"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/jabber/libxmpp.c:216
+#: ../libpurple/protocols/myspace/myspace.c:4414
+#: ../libpurple/protocols/simple/simple.c:1861
 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:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
+#: ../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:837
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:838
 msgid "Connect server"
 msgstr "Servidor on connectar-se"
 
-#: ../libpurple/protocols/jabber/message.c:106
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
 msgid "%s has left the conversation."
-msgstr "%s ha finalitzat la conversa."
+msgstr "%s ha deixat la conversa."
 
-#: ../libpurple/protocols/jabber/message.c:161
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "Missatge de %s"
 
-#: ../libpurple/protocols/jabber/message.c:225
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ha canviat el tema a: %s"
 
-#: ../libpurple/protocols/jabber/message.c:227
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "El tema és: %s"
 
-#: ../libpurple/protocols/jabber/message.c:275
+#: ../libpurple/protocols/jabber/message.c:267
 #, 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:278
-#, fuzzy
+#: ../libpurple/protocols/jabber/message.c:270
 msgid "XMPP Message Error"
-msgstr "Missatge d'error de Jabber"
-
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s us ha afegit [%s]"
+msgstr "Missatge d'error de l'XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:407
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (Codi %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
+#: ../libpurple/protocols/jabber/parser.c:193
 msgid "XML Parse error"
 msgstr "Error en l'anàlisi de l'XML"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:292
 msgid "Unknown Error in presence"
 msgstr "Error desconegut en la presència"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:367
 msgid "Create New Room"
 msgstr "Crea una nova sala"
 
-#: ../libpurple/protocols/jabber/presence.c:510
+#: ../libpurple/protocols/jabber/presence.c:368
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6285,117 +5405,63 @@ msgstr ""
 "Ara es crearà una nova sala. Voleu configurar-la o acceptar els valors "
 "predeterminats?"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:374
 msgid "_Configure Room"
 msgstr "_Configura la sala"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:375
 msgid "_Accept Defaults"
 msgstr "_Accepta els valors predeterminats"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:417
 #, c-format
 msgid "Error in chat %s"
 msgstr "S'ha produït un error en el xat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error joining chat %s"
 msgstr "S'ha produït un error en entrar al xat %s"
 
-#: ../libpurple/protocols/jabber/si.c:775
+#: ../libpurple/protocols/jabber/si.c:769
 #, 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:776
-#: ../libpurple/protocols/jabber/si.c:777
-#: ../libpurple/protocols/jabber/si.c:845
+#: ../libpurple/protocols/jabber/si.c:770
+#: ../libpurple/protocols/jabber/si.c:771
+#: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
 msgstr "Ha fallat la transferència del fitxer"
 
-#: ../libpurple/protocols/jabber/si.c:838
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/si.c:832
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "No s'ha pogut enviar el missatge a %s."
+msgstr "No s'ha pogut enviar el fitxer a %s, el JID no és vàlid"
 
-#: ../libpurple/protocols/jabber/si.c:840
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/si.c:834
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr ""
-"No s'ha pogut enviar el fitxer a %s, atès que l'usuari no permet la "
-"transferència de fitxers"
+msgstr "No s'ha pogut enviar el fitxer a %s, l'usuari no està connectat"
 
-#: ../libpurple/protocols/jabber/si.c:842
-#, fuzzy, c-format
+# FIXME: uh?
+#: ../libpurple/protocols/jabber/si.c:836
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
-"No s'ha pogut enviar el fitxer a %s, atès que l'usuari no permet la "
-"transferència de fitxers"
+"No s'ha pogut enviar el fitxer a %s, no esteu subscrit a la presència de "
+"l'usuari"
 
-#: ../libpurple/protocols/jabber/si.c:857
+#: ../libpurple/protocols/jabber/si.c:851
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
-msgstr ""
+msgstr "Escolliu a quin recurs de %s voleu enviar aquest fitxer"
 
-#: ../libpurple/protocols/jabber/si.c:873
-#, fuzzy
+#: ../libpurple/protocols/jabber/si.c:867
 msgid "Select a Resource"
-msgstr "Seleccioneu un nombre"
-
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
-#, fuzzy
-msgid "Edit User Mood"
-msgstr "Modes d'usuari"
-
-#: ../libpurple/protocols/jabber/usermood.c:181
-msgid "Please select your mood from the list."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usermood.c:183
-#: ../libpurple/protocols/jabber/usernick.c:78
-#, fuzzy
-msgid "Set"
-msgstr "E_specifica"
-
-#: ../libpurple/protocols/jabber/usermood.c:191
-#, fuzzy
-msgid "Set Mood..."
-msgstr "Envia MI..."
-
-#: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
-msgid "Set User Nickname"
-msgstr "Estableix el límit d'usuaris"
-
-#: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
-msgid "Please specify a new nickname for you."
-msgstr "Introduïu un nou nom per a %s"
-
-#: ../libpurple/protocols/jabber/usernick.c:77
-msgid ""
-"This information is visible to all contacts on your contact list, so choose "
-"something appropriate."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usernick.c:99
-#, fuzzy
-msgid "Set Nickname..."
-msgstr "Sobrenom"
-
-#: ../libpurple/protocols/jabber/xdata.c:378
-#, fuzzy
-msgid "Actions"
-msgstr "Acció"
-
-#: ../libpurple/protocols/jabber/xdata.c:380
-#, fuzzy
-msgid "Select an action"
-msgstr "Selecció"
+msgstr "Seleccioneu un recurs"
 
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
@@ -6420,275 +5486,222 @@ msgstr ""
 "%s és a la llista local però no a la del servidor. Voleu afegir aquest amic?"
 
 #: ../libpurple/protocols/msn/error.c:36
-#, c-format
 msgid "Unable to parse message"
 msgstr "No s'ha pogut analitzar el missatge"
 
 #: ../libpurple/protocols/msn/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
-#, c-format
 msgid "Invalid e-mail address"
 msgstr "L'adreça de correu no és vàlida"
 
 #: ../libpurple/protocols/msn/error.c:49
-#, c-format
 msgid "User does not exist"
 msgstr "L'usuari no existeix."
 
 #: ../libpurple/protocols/msn/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
-#, c-format
 msgid "Already logged in"
 msgstr "Ja esteu connectat"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, c-format
 msgid "Invalid screen name"
 msgstr "El nom d'usuari no és vàlid"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, c-format
 msgid "Invalid friendly name"
 msgstr "El nom amistós no és vàlid"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, c-format
 msgid "List full"
 msgstr "Llista plena"
 
 #: ../libpurple/protocols/msn/error.c:68
-#, c-format
 msgid "Already there"
 msgstr "Ja hi és"
 
 #: ../libpurple/protocols/msn/error.c:72
-#, c-format
 msgid "Not on list"
 msgstr "No és a la llista"
 
 #: ../libpurple/protocols/msn/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
-#, c-format
 msgid "Already in the mode"
 msgstr "Ja esteu en aquest mode"
 
 #: ../libpurple/protocols/msn/error.c:82
-#, c-format
 msgid "Already in opposite list"
 msgstr "Ja és a la llista contrària"
 
 #: ../libpurple/protocols/msn/error.c:86
-#, c-format
 msgid "Too many groups"
 msgstr "Massa grups"
 
 #: ../libpurple/protocols/msn/error.c:89
-#, c-format
 msgid "Invalid group"
 msgstr "El nom del grup no és vàlid"
 
 #: ../libpurple/protocols/msn/error.c:92
-#, c-format
 msgid "User not in group"
 msgstr "L'usuari no és al grup"
 
 #: ../libpurple/protocols/msn/error.c:95
-#, c-format
 msgid "Group name too long"
 msgstr "El nom del grup és massa llarg"
 
 #: ../libpurple/protocols/msn/error.c:98
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "No es pot suprimir el grup zero"
 
 #: ../libpurple/protocols/msn/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
-#, c-format
 msgid "Switchboard failed"
 msgstr "Ha fallat el Switchboard"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Ha fallat la transferència de la notificació"
 
 #: ../libpurple/protocols/msn/error.c:116
-#, c-format
 msgid "Required fields missing"
 msgstr "Falten camps obligatoris"
 
 #: ../libpurple/protocols/msn/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:120
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Not logged in"
 msgstr "No està connectat"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "El servei està temporalment fora de servei"
 
 #: ../libpurple/protocols/msn/error.c:131
-#, c-format
 msgid "Database server error"
 msgstr "Error del servidor de bases de dades"
 
 #: ../libpurple/protocols/msn/error.c:135
-#, c-format
 msgid "Command disabled"
 msgstr "S'ha inhabilitat l'ordre"
 
 #: ../libpurple/protocols/msn/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
-#, c-format
 msgid "Memory allocation error"
 msgstr "S'ha produït un error en reservar memòria"
 
 #: ../libpurple/protocols/msn/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
-#, 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
-#, c-format
 msgid "Server unavailable"
 msgstr "El servidor no està disponible"
 
 #: ../libpurple/protocols/msn/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
-#, 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
-#, 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
-#, c-format
 msgid "Error creating connection"
 msgstr "S'ha produït un error en crear la connexió"
 
 #: ../libpurple/protocols/msn/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
-#, c-format
 msgid "Unable to write"
 msgstr "No és possible escriure"
 
 #: ../libpurple/protocols/msn/error.c:186
-#, c-format
 msgid "Session overload"
 msgstr "La sessió està sobrecarregada"
 
 #: ../libpurple/protocols/msn/error.c:190
-#, c-format
 msgid "User is too active"
 msgstr "L'usuari està massa actiu"
 
 #: ../libpurple/protocols/msn/error.c:193
-#, c-format
 msgid "Too many sessions"
 msgstr "Massa sessions"
 
 #: ../libpurple/protocols/msn/error.c:196
-#, c-format
 msgid "Passport not verified"
 msgstr "El passaport no està verificat"
 
 #: ../libpurple/protocols/msn/error.c:199
-#, c-format
 msgid "Bad friend file"
 msgstr "Fitxer d'amics incorrecte"
 
 #: ../libpurple/protocols/msn/error.c:203
-#, c-format
 msgid "Not expected"
 msgstr "Inesperat"
 
 #: ../libpurple/protocols/msn/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
-#, c-format
 msgid "Server too busy"
 msgstr "El servidor està massa ocupat"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
+#: ../libpurple/protocols/oscar/oscar.c:1378
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "Ha fallat l'autenticació"
 
 #: ../libpurple/protocols/msn/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
-#, c-format
 msgid "Not accepting new users"
 msgstr "No s'accepten usuaris nous"
 
 #: ../libpurple/protocols/msn/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
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "El compte de passaport encara no està verificat"
 
 #: ../libpurple/protocols/msn/error.c:244
-#, c-format
 msgid "Bad ticket"
 msgstr "Tiquet incorrecte"
 
@@ -6702,49 +5715,39 @@ msgstr "Codi d'error desconegut %d"
 msgid "MSN Error: %s\n"
 msgstr "Error d'MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
-msgid "Nudge"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:131
-#, fuzzy, c-format
-msgid "%s has nudged you!"
-msgstr "%s us ha afegit [%s]"
-
-#: ../libpurple/protocols/msn/msn.c:132
-#, c-format
-msgid "Nudging %s..."
-msgstr ""
+#: ../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:174
+#: ../libpurple/protocols/msn/msn.c:146
 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:282
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "Establiu el vostre nom amistós."
 
-#: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:255
 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:301
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "Estableix el número de telèfon de casa."
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "Estableix el número de telèfon de la feina."
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr "Estableix el número de telèfon del mòbil."
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "Voleu permetre pàgines de mòbil d'MSN?"
 
-#: ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:323
 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?"
@@ -6752,132 +5755,132 @@ 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:357
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "Permet"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "Denega"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "Pot ser que aquest compte Hotmail no sigui actiu."
 
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "Envia un missatge de mòbil."
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "Pàgina"
 
-#: ../libpurple/protocols/msn/msn.c:549
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "Us té"
 
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3739
 msgid "Be Right Back"
 msgstr "Torno de seguida"
 
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
+#: ../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/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3057
+#: ../libpurple/protocols/yahoo/yahoo.c:3742
 msgid "Busy"
 msgstr "Ocupat"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:3065
+#: ../libpurple/protocols/yahoo/yahoo.c:3754
 msgid "On the Phone"
 msgstr "Al telèfon"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:3069
+#: ../libpurple/protocols/yahoo/yahoo.c:3760
 msgid "Out to Lunch"
 msgstr "A fora dinant"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "Estableix el nom amistós..."
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "Estableix el número de telèfon de casa..."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "Estableix el número de telèfon de la feina..."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr "Estableix el número del telèfon mòbil..."
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Habilita/inhabilita dispositius mòbils..."
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permet/denega pàgines de mòbil..."
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "Obre la safata d'entrada de Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr "Envia a un mòbil"
 
-#: ../libpurple/protocols/msn/msn.c:688
+#: ../libpurple/protocols/msn/msn.c:660
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Inicia un _xat"
 
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:698
 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:754
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "No s'ha pogut connectar al servidor."
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
 #: ../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:1581 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "General"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/myspace/myspace.c:1948
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Edat"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Ocupació"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/myspace/myspace.c:1957
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -6885,189 +5888,189 @@ msgstr "Ocupació"
 msgid "Location"
 msgstr "Ubicació"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
 msgid "Hobbies and Interests"
 msgstr "Aficions i interessos"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../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
 msgid "A Little About Me"
 msgstr "Una mica sobre mi"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Estat civil"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Interests"
 msgstr "Interessos"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Pets"
 msgstr "Mascotes"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
 msgstr "Poble natal"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Places Lived"
 msgstr "Llocs on heu viscut"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Music"
 msgstr "Música"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Cita textual preferida"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Contact Info"
 msgstr "Informació del contacte"
 
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Personal"
 msgstr "Personal"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
 msgstr "Altres coses significatives"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
 msgstr "Pàgina personal"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Home Phone 2"
 msgstr "Pàgina personal 2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:3763
 msgid "Home Address"
 msgstr "Adreça de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Personal Mobile"
 msgstr "Mòbil personal"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Personal E-Mail"
 msgstr "Correu electrònic personal"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Personal IM"
 msgstr "MI personal"
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Anniversary"
 msgstr "Aniversari"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr "Feina"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1646
 #: ../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:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3784
 msgid "Company"
 msgstr "Empresa"
 
-#: ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1648
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departament"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr "Professió"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr "Telèfon de la feina"
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr "Telèfon de la feina 2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3776
 msgid "Work Address"
 msgstr "Adreça de la feina"
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr "Mòbil de la feina"
 
 # pager -> cercapersones (termcat)
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
 msgstr "Cercapersones de la feina"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr "Fax de la feina"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr "Correu electrònic de la feina"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr "MI de la feina"
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr "Data d'inici"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
 msgid "Favorite Things"
 msgstr "Coses preferides"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr "Darrera actualització"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1804
 #: ../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:1859
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr "L'usuari no ha creat cap perfil públic."
 
-#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:1829
 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 "
@@ -7076,7 +6079,7 @@ 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:1864
+#: ../libpurple/protocols/msn/msn.c:1833
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7084,7 +6087,7 @@ 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:1872
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL del perfil"
@@ -7099,30 +6102,24 @@ msgstr "URL del perfil"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
-msgstr "Connector per al protocol AIM"
+msgstr "Connector per al protocol MSN"
 
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr "Empra el mètode HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2199
-#, fuzzy
-msgid "HTTP Method Server"
-msgstr "Servidor de proves d'IPC"
-
-#: ../libpurple/protocols/msn/msn.c:2204
+#: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr "Mostra emoticones personalitzades"
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2176
 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:135
+#: ../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
@@ -7136,8 +6133,8 @@ msgstr "nudge: doneu un cop de colze a un usuari perquè us pari atenció"
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+#: ../libpurple/protocols/yahoo/yahoochat.c:1321
+#: ../libpurple/protocols/yahoo/yahoochat.c:1347
 msgid "Unable to connect"
 msgstr "No s'ha pogut connectar"
 
@@ -7223,15 +6220,15 @@ msgstr[1] ""
 "\n"
 "Després que el manteniment s'hagi completat, us podreu tornar a connectar."
 
-#: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Error en escriure"
 
-#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Error en llegir"
 
-#: ../libpurple/protocols/msn/servconn.c:146
+#: ../libpurple/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7339,6 +6336,9 @@ msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
+"No s'ha pogut enviar el missatge perquè no s'ha pogut establir cap sessió "
+"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
 msgid ""
@@ -7352,6 +6352,11 @@ 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
+#, 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."
@@ -7371,420 +6376,391 @@ msgstr "No s'ha pogut afegir «%s»."
 msgid "The screen name specified is invalid."
 msgstr "El nom d'usuari especificat no és vàlid."
 
-#: ../libpurple/protocols/myspace/myspace.c:111
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:232
 msgid "Missing Cipher"
-msgstr "Codi"
+msgstr "Manca el mètode de xifratge"
 
-#: ../libpurple/protocols/myspace/myspace.c:112
+#: ../libpurple/protocols/myspace/myspace.c:233
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "No s'ha pogut trobar el mètode de xifratge RC4"
 
-#: ../libpurple/protocols/myspace/myspace.c:113
+#: ../libpurple/protocols/myspace/myspace.c:234
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
+"Actualitzeu a una versió (>=2.0.1) del libpurple que permeti l'RC4. No es "
+"carregarà el connector del MySpaceIM."
 
-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/myspace.c:303
+msgid "zap"
 msgstr ""
 
-#. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
-msgid "MySpaceIM Error"
+#: ../libpurple/protocols/myspace/myspace.c:303
+#: ../libpurple/protocols/myspace/myspace.c:1696
+msgid "zapped"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:349
-#, fuzzy
-msgid "Reading challenge"
-msgstr "S'estan llegint dades"
-
-#: ../libpurple/protocols/myspace/myspace.c:355
-#, fuzzy
-msgid "Unexpected challenge length from server"
-msgstr "Repte del servidor invàlid"
-
-#: ../libpurple/protocols/myspace/myspace.c:359
-#, fuzzy
-msgid "Logging in"
-msgstr "Registre"
-
-#: ../libpurple/protocols/myspace/myspace.c:1286
-#, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
+#: ../libpurple/protocols/myspace/myspace.c:303
+msgid "Zapping"
 msgstr ""
 
-#. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
-#, fuzzy
-msgid "New mail messages"
-msgstr "Missatge d'absència nou"
+#: ../libpurple/protocols/myspace/myspace.c:304
+msgid "whack"
+msgstr "bufetejar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
-msgid "New blog comments"
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:304
+#: ../libpurple/protocols/myspace/myspace.c:1697
+msgid "whacked"
+msgstr "bufetejat"
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
-msgid "New profile comments"
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:304
+msgid "Whacking"
+msgstr "Bufetejant"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
-msgid "New friend requests!"
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:305
+msgid "torch"
+msgstr "encendre"
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
-msgid "New picture comments"
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:305
+#: ../libpurple/protocols/myspace/myspace.c:1698
+msgid "torched"
+msgstr "encès"
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
-msgid "MySpace"
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:305
+msgid "Torching"
+msgstr "Encenent"
 
-#. 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:1543
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Connectat"
+#: ../libpurple/protocols/myspace/myspace.c:306
+msgid "smooch"
+msgstr "fer un petó"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
-#, fuzzy
-msgid "No username set"
-msgstr "Sense nom"
+#: ../libpurple/protocols/myspace/myspace.c:306
+#: ../libpurple/protocols/myspace/myspace.c:1699
+msgid "smooched"
+msgstr "fet un petó"
 
-#: ../libpurple/protocols/myspace/myspace.c:1555
-msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:306
+msgid "Smooching"
+msgstr "Fent un petó"
 
-#: ../libpurple/protocols/myspace/myspace.c:1782
-#, fuzzy, c-format
-msgid "Protocol error, code %d: %s"
-msgstr "El procés ha tornat el codi d'error %d"
-
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#, fuzzy
-msgid "Failed to add buddy"
-msgstr "No s'ha pogut entrar al xat de l'amic."
+#: ../libpurple/protocols/myspace/myspace.c:307
+msgid "hug"
+msgstr "abraçar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#, fuzzy
-msgid "'addbuddy' command failed."
-msgstr "Carrega la llista d'amics d'un fitxer..."
+#: ../libpurple/protocols/myspace/myspace.c:307
+#: ../libpurple/protocols/myspace/myspace.c:1700
+msgid "hugged"
+msgstr "abraçat"
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#, fuzzy
-msgid "persist command failed"
-msgstr "Ha fallat el Switchboard"
+#: ../libpurple/protocols/myspace/myspace.c:307
+msgid "Hugging"
+msgstr "Abraçant"
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
-#, c-format
-msgid "No such user: %s"
+#: ../libpurple/protocols/myspace/myspace.c:308
+msgid "bslap"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
-#, fuzzy
-msgid "User lookup"
-msgstr "Sales d'usuari"
-
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
-msgid "Failed to remove buddy"
-msgstr "No s'ha pogut entrar al xat de l'amic."
-
-#: ../libpurple/protocols/myspace/myspace.c:2228
-msgid "'delbuddy' command failed"
+#: ../libpurple/protocols/myspace/myspace.c:308
+#: ../libpurple/protocols/myspace/myspace.c:1701
+msgid "bslapped"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
-msgid "blocklist command failed"
-msgstr "Ha fallat el Switchboard"
+#: ../libpurple/protocols/myspace/myspace.c:308
+msgid "Bslapping"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
+#: ../libpurple/protocols/myspace/myspace.c:309
 #, fuzzy
-msgid "Invalid input condition"
-msgstr "S'està finalitzant la connexió"
+msgid "goose"
+msgstr "pessigar el cul"
 
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
+#: ../libpurple/protocols/myspace/myspace.c:309
+#: ../libpurple/protocols/myspace/myspace.c:1702
 #, fuzzy
-msgid "Read buffer full"
-msgstr "Cua plena"
+msgid "goosed"
+msgstr "pessigat al cul"
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
+#: ../libpurple/protocols/myspace/myspace.c:309
 #, fuzzy
-msgid "Unparseable message"
-msgstr "No s'ha pogut analitzar el missatge"
+msgid "Goosing"
+msgstr "Pessigant el cul"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "No s'ha pogut connectar a l'ordinador"
+#: ../libpurple/protocols/myspace/myspace.c:310
+msgid "hi-five"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
-#, fuzzy
-msgid "IM Friends"
-msgstr "Finestres de M_I"
+#: ../libpurple/protocols/myspace/myspace.c:310
+#: ../libpurple/protocols/myspace/myspace.c:1703
+msgid "hi-fived"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
-#, c-format
-msgid ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
+#: ../libpurple/protocols/myspace/myspace.c:310
+msgid "Hi-fiving"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "La resposta del servidor no és vàlida."
+#: ../libpurple/protocols/myspace/myspace.c:311
+msgid "punk"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
-msgid "Add friends from MySpace.com"
+#: ../libpurple/protocols/myspace/myspace.c:311
+#: ../libpurple/protocols/myspace/myspace.c:1704
+msgid "punk'd"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
+#: ../libpurple/protocols/myspace/myspace.c:311
 #, fuzzy
-msgid "Importing friends failed"
-msgstr "Fitxer d'amics incorrecte"
+msgid "Punking"
+msgstr "Ping"
 
-#. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
-#, fuzzy
-msgid "Find people..."
-msgstr "Cerca amics..."
+#: ../libpurple/protocols/myspace/myspace.c:312
+msgid "raspberry"
+msgstr "morrejar"
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
-#, fuzzy
-msgid "Change IM name..."
-msgstr "Canvia la meva cara"
+#: ../libpurple/protocols/myspace/myspace.c:312
+#: ../libpurple/protocols/myspace/myspace.c:1705
+msgid "raspberried"
+msgstr "morrejat"
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
-msgid "myim URL handler"
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:312
+msgid "Raspberry'ing"
+msgstr "Morregant"
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
-msgid "No suitable MySpaceIM account could be found to open this myim URL."
+#: ../libpurple/protocols/myspace/myspace.c:469
+msgid "Zap"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
-msgid "Enable the proper MySpaceIM account and try again."
+#: ../libpurple/protocols/myspace/myspace.c:622
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
 msgstr ""
+"El MySpace no permet contrasenyes més llarges de %d caràcters, la vostra en "
+"té %d."
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
-msgid "Show display name in status text"
-msgstr ""
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:628
+#: ../libpurple/protocols/myspace/myspace.c:2939
+msgid "MySpaceIM Error"
+msgstr "S'ha produïtun error en el MySpaceIM"
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
-#, fuzzy
-msgid "Show headline in status text"
-msgstr "Mostr_a els àlies a les pestanyes/títols"
+# FIXME
+#: ../libpurple/protocols/myspace/myspace.c:684
+msgid "Reading challenge"
+msgstr "Repte de lectura"
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
-#, fuzzy
-msgid "Send emoticons"
-msgstr "Opcions de so"
+#: ../libpurple/protocols/myspace/myspace.c:690
+msgid "Unexpected challenge length from server"
+msgstr "El repte del servidor té una mida inesperada"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
-msgid "Screen resolution (dots per inch)"
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:694
+msgid "Logging in"
+msgstr "S'està entrant"
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
-#, fuzzy
-msgid "Base font size (points)"
-msgstr "Tipus de lletra més gran"
+# FIXME: this is not going to translate well at all (josep)
+#: ../libpurple/protocols/myspace/myspace.c:1725
+#, c-format
+msgid "*** You have been %s! ***"
+msgstr "*** Se us ha %s! ***"
 
-#: ../libpurple/protocols/myspace/user.c:95
+#: ../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/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/myspace/myspace.c:1940
+#: ../libpurple/protocols/oscar/oscar.c:2934
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libpurple/protocols/myspace/user.c:124
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1962
 msgid "Headline"
-msgstr "_Gestor:"
+msgstr "Titular"
 
-#: ../libpurple/protocols/myspace/user.c:129
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1967
 msgid "Song"
-msgstr "_Ordenació:"
+msgstr "Cançó"
 
-#: ../libpurple/protocols/myspace/user.c:134
+#: ../libpurple/protocols/myspace/myspace.c:1972
 msgid "Total Friends"
-msgstr ""
+msgstr "Nombre d'amics"
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1983
+#: ../libpurple/protocols/myspace/myspace.c:1986
+#: ../libpurple/protocols/myspace/myspace.c:1989
 msgid "Client Version"
-msgstr "Tanca la conversa"
+msgstr "Versió del client"
 
-#. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
-msgid "Zap"
+#: ../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)"
 
-#: ../libpurple/protocols/myspace/zap.c:44
-#, fuzzy, c-format
-msgid "%s has zapped you!"
-msgstr "%s us ha afegit [%s]"
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "New mail messages"
+msgstr "Missatges de correu nous"
 
-#: ../libpurple/protocols/myspace/zap.c:44
-#, fuzzy, c-format
-msgid "Zapping %s..."
-msgstr "S'està trucant a %s"
+#: ../libpurple/protocols/myspace/myspace.c:2397
+msgid "New blog comments"
+msgstr "Comentaris al bloc nous"
 
-#: ../libpurple/protocols/myspace/zap.c:45
-msgid "Whack"
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:2398
+msgid "New profile comments"
+msgstr "Comentaris al perfil nous"
 
-#: ../libpurple/protocols/myspace/zap.c:45
-#, fuzzy, c-format
-msgid "%s has whacked you!"
-msgstr "%s us ha afegit [%s]"
+#: ../libpurple/protocols/myspace/myspace.c:2399
+msgid "New friend requests!"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:45
-#, c-format
-msgid "Whacking %s..."
+#: ../libpurple/protocols/myspace/myspace.c:2400
+msgid "New picture comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy
-msgid "Torch"
-msgstr "Tema"
+#: ../libpurple/protocols/myspace/myspace.c:2430
+msgid "MySpace"
+msgstr "MySpace"
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy, c-format
-msgid "%s has torched you!"
-msgstr "L'usuari us ha blocat"
+#. 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
+msgid "Connected"
+msgstr "Connectat"
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/myspace.c:2931
 #, c-format
-msgid "Torching %s..."
-msgstr ""
+msgid "Protocol error, code %d: %s"
+msgstr "S'ha produït un error en el protocol amb codi %d: %s"
 
-#: ../libpurple/protocols/myspace/zap.c:47
-msgid "Smooch"
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:3099
+#: ../libpurple/protocols/myspace/myspace.c:3133
+msgid "Failed to add buddy"
+msgstr "No s'ha pogut afegir l'amic"
 
-#: ../libpurple/protocols/myspace/zap.c:47
-#, fuzzy, c-format
-msgid "%s has smooched you!"
-msgstr "%s s'ha connectat."
+#: ../libpurple/protocols/myspace/myspace.c:3099
+msgid "'addbuddy' command failed."
+msgstr "Ha fallat l'ordre «addbuddy»."
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#: ../libpurple/protocols/myspace/myspace.c:3133
+#: ../libpurple/protocols/myspace/myspace.c:3375
+msgid "persist command failed"
+msgstr "Ha fallat l'ordre «persist»"
+
+#: ../libpurple/protocols/myspace/myspace.c:3243
 #, c-format
-msgid "Smooching %s..."
-msgstr ""
+msgid "No such user: %s"
+msgstr "Aquest usuari no existeix: %s"
 
-#: ../libpurple/protocols/myspace/zap.c:48
-msgid "Hug"
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:3244
+msgid "User lookup"
+msgstr "Cerca d'usuaris"
 
-#: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy, c-format
-msgid "%s has hugged you!"
-msgstr "%s s'ha connectat."
+#: ../libpurple/protocols/myspace/myspace.c:3356
+#: ../libpurple/protocols/myspace/myspace.c:3375
+#: ../libpurple/protocols/myspace/myspace.c:3397
+msgid "Failed to remove buddy"
+msgstr "No s'ha pogut suprimir l'amic"
 
-#: ../libpurple/protocols/myspace/zap.c:48
-#, c-format
-msgid "Hugging %s..."
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:3356
+msgid "'delbuddy' command failed"
+msgstr "Ha fallat l'ordre «delbuddy»"
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy
-msgid "Slap"
-msgstr "Endormiscat"
+#: ../libpurple/protocols/myspace/myspace.c:3397
+msgid "blocklist command failed"
+msgstr "Ha fallat l'ordre «blocklist»"
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy, c-format
-msgid "%s has slapped you!"
-msgstr "%s us ha afegit [%s]"
+#: ../libpurple/protocols/myspace/myspace.c:3443
+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
+msgid "Read buffer full"
+msgstr "La memòria intermèdia de lectura és plena"
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#: ../libpurple/protocols/myspace/myspace.c:3530
+msgid "Unparseable message"
+msgstr "No es pot analitzar el missatge"
+
+#: ../libpurple/protocols/myspace/myspace.c:3599
 #, c-format
-msgid "Slapping %s..."
-msgstr ""
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "No s'ha pogut connectar a l'ordinador: %s (%d)"
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy
-msgid "Goose"
-msgstr "Desaparegut"
+#: ../libpurple/protocols/myspace/myspace.c:3942
+msgid "IM Friends"
+msgstr "Amics de MI"
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
-msgid "%s has goosed you!"
-msgstr "%s ha passat a absent."
+#: ../libpurple/protocols/myspace/myspace.c:4039
+#, c-format
+msgid "%d buddies were added or updated"
+msgstr "S'han afegit o actualitzat %d amics"
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
-msgid "Goosing %s..."
-msgstr "S'està cercant %s"
+# Nota: títol de finestra (josep)
+#: ../libpurple/protocols/myspace/myspace.c:4041
+msgid "Add contacts from server"
+msgstr "Addicó de contactes del servidor"
 
-#: ../libpurple/protocols/myspace/zap.c:51
-msgid "High-five"
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:4066
+#: ../libpurple/protocols/myspace/myspace.c:4141
+msgid "Add friends from MySpace.com"
+msgstr "Afegeox amics de MySpace.com"
 
-#: ../libpurple/protocols/myspace/zap.c:51
-#, fuzzy, c-format
-msgid "%s has high-fived you!"
-msgstr "%s s'ha connectat."
+# Heh,tinc amics d'importació
+#: ../libpurple/protocols/myspace/myspace.c:4067
+msgid "Importing friends failed"
+msgstr "Ha fallat la importació d'amics"
 
-#: ../libpurple/protocols/myspace/zap.c:51
-#, c-format
-msgid "High-fiving %s..."
-msgstr ""
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:4133
+msgid "Find people..."
+msgstr "Cerca persones..."
 
-#: ../libpurple/protocols/myspace/zap.c:52
-msgid "Punk"
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:4136
+msgid "Change IM name..."
+msgstr "Canvia el nom de MI..."
 
-#: ../libpurple/protocols/myspace/zap.c:52
-#, fuzzy, c-format
-msgid "%s has punk'd you!"
-msgstr "%s s'ha connectat."
+# FIXME: display name
+#: ../libpurple/protocols/myspace/myspace.c:4418
+msgid "Show display name in status text"
+msgstr "Mostra el nom d'usuari a la barra d'estat"
 
-#: ../libpurple/protocols/myspace/zap.c:52
-#, c-format
-msgid "Punking %s..."
-msgstr ""
+# FIXME: headline
+#: ../libpurple/protocols/myspace/myspace.c:4421
+msgid "Show headline in status text"
+msgstr "Mostra el títol a la barra d'estat"
 
-#: ../libpurple/protocols/myspace/zap.c:53
-msgid "Raspberry"
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:4426
+msgid "Send emoticons"
+msgstr "Envia emoticones"
 
-#: ../libpurple/protocols/myspace/zap.c:53
-#, fuzzy, c-format
-msgid "%s has raspberried you!"
-msgstr "%s s'ha connectat."
+#: ../libpurple/protocols/myspace/myspace.c:4431
+msgid "Screen resolution (dots per inch)"
+msgstr "Resolució de la pantalla (punts per polzada)"
 
-#: ../libpurple/protocols/myspace/zap.c:53
-#, c-format
-msgid "Raspberrying %s..."
-msgstr ""
+# FIXME: base... (josep)
+#: ../libpurple/protocols/myspace/myspace.c:4434
+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
+#, 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ó"
 
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
@@ -8125,7 +7101,6 @@ 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
-#, 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."
 
@@ -8153,19 +7128,19 @@ msgid "Server port"
 msgstr "Port en el servidor"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../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
 msgid "Server closed the connection."
 msgstr "El servidor ha tancat la connexió."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../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
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8175,9 +7150,9 @@ msgstr ""
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "S'han rebut dades invàlides a la connexió amb el servidor."
 
@@ -8212,7 +7187,7 @@ msgid "ICQ Protocol Plugin"
 msgstr "Connector per al protocol ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4357
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codificació"
@@ -8243,108 +7218,108 @@ msgid "Direct IM established"
 msgstr "S'ha establert una connexió directa de MI"
 
 # FIXME
-#: ../libpurple/protocols/oscar/oft.c:656
+#: ../libpurple/protocols/oscar/oft.c:657
 #, 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:116
+#: ../libpurple/protocols/oscar/oscar.c:115
 msgid "Invalid error"
 msgstr "Error invàlid"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid SNAC"
 msgstr "SNAC invàlid"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Rate to host"
 msgstr "Ràtio a l'ordinador"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to client"
 msgstr "Ràtio al client"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Service unavailable"
 msgstr "Servei no disponible"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service not defined"
 msgstr "Servei no definit"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Obsolete SNAC"
 msgstr "SNAC obsolet"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Not supported by host"
 msgstr "El servidor no ho permet"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by client"
 msgstr "El client no ho permet"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Refused by client"
 msgstr "Rebutjat pel client"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Reply too big"
 msgstr "Resposta massa gran"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Responses lost"
 msgstr "S'han perdut respostes"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Request denied"
 msgstr "Petició denegada"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Busted SNAC payload"
 msgstr "Càrrega SNAC malmesa"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Insufficient rights"
 msgstr "Drets insuficients"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "In local permit/deny"
 msgstr "En la llista de permès/denegat local"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Too evil (sender)"
 msgstr "Massa malvat (remitent)"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (receiver)"
 msgstr "Massa malvat (receptor)"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "User temporarily unavailable"
 msgstr "Usuari no disponible temporalment"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "No match"
 msgstr "Cap coincidència"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "List overflow"
 msgstr "Sobreeiximent de la llista"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "Request ambiguous"
 msgstr "Petició ambigua"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Queue full"
 msgstr "Cua plena"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Not while on AOL"
 msgstr "No es pot fer mentre estigui a AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
+#: ../libpurple/protocols/oscar/oscar.c:347
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -8356,7 +7331,7 @@ msgstr ""
 "codificació que fa servir, podeu especificar-la a les opcions avançades del "
 "compte AIM/ICQ.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:457
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8367,21 +7342,21 @@ msgstr ""
 "defectuós)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Icona de l'amic"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Veu"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "MI AIM directes"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:647
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -8389,131 +7364,125 @@ msgstr "MI AIM directes"
 msgid "Chat"
 msgstr "Xat"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:5960
 msgid "Get File"
 msgstr "Aconsegueix el fitxer"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Jocs"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Afegits"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "Envia la llista d'amics"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "Connexió directa a ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "Usuari AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "Servidor repetidor d'ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "Antic ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Xifrat Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "Seguretat habilitada"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Xat de vídeo"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "Vídeo en directe"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Càmera"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5730
 msgid "Free For Chat"
 msgstr "Lliure per parlar"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5765
 msgid "Not Available"
 msgstr "No disponible"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5751
 msgid "Occupied"
 msgstr "Ocupat"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr "Conscient de la web"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
-#, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:3073 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:738
 msgid "Online"
 msgstr "En línia"
 
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3677
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1123
 msgid "IP Address"
 msgstr "Adreça IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Warning Level"
 msgstr "Nivell d'avís"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "Comentari de l'amic"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8522,7 +7491,7 @@ msgstr ""
 "No s'ha pogut connectar al servidor d'autenticació:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8531,54 +7500,55 @@ msgstr ""
 "No s'ha pogut connectar al servidor BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "S'ha enviat el nom d'usuari"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1047
 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:1077
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "S'està finalitzant la connexió"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:1258
+#, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must be a valid email address, or start with a letter "
 "and contain only letters, numbers and spaces, or contain only numbers."
 msgstr ""
-"No s'ha pogut entrar: No s'ha pogut entrar com a %s perquè el nom d'usuari "
-"no és vàlid. Els noms d'usuari han de començar amb una lletra i contenir "
-"només lletres, nombres o espais, o només nombres."
+"No s'ha pogut entrar: no s'ha pogut entrar com a %s perquè el nom d'usuari "
+"no és vàlid. Els noms d'usuari han de ser adreces de correu vàlides, o "
+"començar amb una lletra i contenir només lletres, nombres o espais, o només "
+"nombres."
 
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/yahoo/yahoo.c:2088
 msgid "Invalid screen name."
 msgstr "El nom d'usuari no és vàlid."
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
+#: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:2109
 msgid "Incorrect password."
 msgstr "La contrasenya no és correcta."
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1355
 msgid "Your account is currently suspended."
 msgstr "El vostre compte està actualment suspès."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1359
 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:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1375
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -8587,44 +7557,44 @@ msgstr ""
 "deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
 "encara més temps."
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#: ../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:1410
+#: ../libpurple/protocols/oscar/oscar.c:1408
 msgid "Could Not Connect"
 msgstr "No s'ha pogut connectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Received authorization"
 msgstr "S'ha rebut l'autorització"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "La clau SecurID que heu entrat no és vàlida."
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "Introduïu el SecureID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduïu el nombre de 6 dígits de la pantalla digital."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#: ../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
 msgid "_OK"
 msgstr "_D'acord"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8634,55 +7604,55 @@ msgstr ""
 "que això es resolgui. Comproveu si hi ha actualitzacions a %s."
 
 # FIXME: hash (josep)
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "No s'ha pogut obtenir un hash d'AIM d'entrada vàlid."
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "Se us pot desconnectar d'aquí a poc temps. Comproveu si hi ha "
 "actualitzacions a %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1623
 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:1655
+#: ../libpurple/protocols/oscar/oscar.c:1652
 msgid "Password sent"
 msgstr "S'ha enviat la contrasenya"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1708
 msgid "Unable to initialize connection"
 msgstr "No s'ha pogut inicialitzar la connexió"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2212
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "Missatge de petició d'autorització:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr "Autoritzeu-me, si us plau."
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../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
 msgid "No reason given."
 msgstr "No s'ha indicat cap motiu."
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr "Missatge de denegació de l'autorització:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8693,17 +7663,17 @@ msgstr ""
 "llista d'amics pel següent motiu:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr "S'ha denegat l'autorització ICQ."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "L'usuari %u us ha permès afegir-lo a la vostra llista d'amics."
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8716,7 +7686,7 @@ msgstr ""
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8729,7 +7699,7 @@ msgstr ""
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8742,38 +7712,38 @@ msgstr ""
 "Missatge:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "L'usuari %u d'ICQ us ha enviat un amic: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2476
 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:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Afegeix"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
 msgstr "_Rebutja"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2566
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "S'ha perdut %hu missatge de %s perquè no era vàlid."
-msgstr[1] "S'ha perdut %hu missatges de %s perquè no eren vàlids."
+msgstr[1] "S'han perdut %hu missatges de %s perquè no eren vàlids."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2575
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "S'ha perdut %hu missatge de %s perquè era massa llarg."
-msgstr[1] "S'ha perdut %hu missatges de %s perquè eren massa llargs."
+msgstr[1] "S'han perdut %hu missatges de %s perquè eren massa llargs."
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2584
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8782,7 +7752,7 @@ msgid_plural ""
 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:2623
+#: ../libpurple/protocols/oscar/oscar.c:2593
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -8790,14 +7760,14 @@ msgstr[0] "S'ha perdut %hu missatge de %s perquè ell/ella era massa dolent/a."
 msgstr[1] ""
 "S'han perdut %hu missatges de %s perquè ell/ella era massa dolent/a."
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2602
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "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:2641
+#: ../libpurple/protocols/oscar/oscar.c:2611
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -8805,47 +7775,51 @@ msgstr[0] "S'ha perdut %hu missatge de %s per motius desconeguts."
 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:2796
+#: ../libpurple/protocols/oscar/oscar.c:2766
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2771
+#: ../libpurple/protocols/oscar/oscar.c:2835
 msgid "Unknown reason."
 msgstr "Motiu desconegut."
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
+#: ../libpurple/protocols/oscar/oscar.c:2769
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "No s'ha pogut enviar el missatge a %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2835
 #, c-format
 msgid "User information not available: %s"
 msgstr "La informació de l'usuari no està disponible: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2866
 msgid "Online Since"
 msgstr "En línia des de"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2871
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Membre des de"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2876
+msgid "Capabilities"
+msgstr "Capacitats"
+
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Available Message"
 msgstr "Missatge de disponibilitat"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3014
 msgid "Your AIM connection may be lost."
 msgstr "La vostra connexió d'AIM es pot perdre."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
+#: ../libpurple/protocols/oscar/oscar.c:3202
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8853,7 +7827,7 @@ msgstr ""
 "[No s'ha pogut mostrar el missatge d'aquest usuari perquè contenia caràcters "
 "invàlids.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3366
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8861,83 +7835,82 @@ 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:3479
+#: ../libpurple/protocols/oscar/oscar.c:3449
 #: ../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:3729
+#: ../libpurple/protocols/oscar/oscar.c:3699
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Telèfon mòbil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3729
 msgid "Personal Web Page"
 msgstr "Pàgina web personal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3753
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Informació addicional"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Zip Code"
 msgstr "Codi postal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3785
 msgid "Division"
 msgstr "Divisió"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Position"
 msgstr "Posició"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3788
 msgid "Web Page"
 msgstr "Pàgina web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Work Information"
 msgstr "Informació de la feina"
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3847
 msgid "Pop-Up Message"
 msgstr "Missatge emergent"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3887
 #, 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:3922
+#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Screen name"
 msgstr "Nom d'usuari"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3918
 #, 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:3969
+#: ../libpurple/protocols/oscar/oscar.c:3939
 #, 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:3971
+#: ../libpurple/protocols/oscar/oscar.c:3941
 msgid "Account Confirmation Requested"
 msgstr "S'ha sol·licitat la confirmació del compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:3972
 msgid "Error Changing Account Info"
 msgstr "S'ha produït un error en canviar la informació del compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:3975
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8946,13 +7919,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:4008
+#: ../libpurple/protocols/oscar/oscar.c:3978
 #, 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:4011
+#: ../libpurple/protocols/oscar/oscar.c:3981
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8961,7 +7934,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:4014
+#: ../libpurple/protocols/oscar/oscar.c:3984
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -8970,7 +7943,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:4017
+#: ../libpurple/protocols/oscar/oscar.c:3987
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -8979,7 +7952,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:4020
+#: ../libpurple/protocols/oscar/oscar.c:3990
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -8988,32 +7961,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:4023
+#: ../libpurple/protocols/oscar/oscar.c:3993
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: error desconegut."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4003
 #, 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:4035
+#: ../libpurple/protocols/oscar/oscar.c:4005
 msgid "Account Info"
 msgstr "Informació del compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
+#: ../libpurple/protocols/oscar/oscar.c:4177
 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:4489
+#: ../libpurple/protocols/oscar/oscar.c:4448
 msgid "Unable to set AIM profile."
 msgstr "No s'ha pogut establir el perfil d'AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4449
 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 "
@@ -9023,8 +7996,8 @@ 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:4504
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4463
+#, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -9032,16 +8005,17 @@ msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"S'ha excedit el límit màxim per la mida del perfil d'%d octet. S'ha retallat."
+"S'ha excedit el límit màxim de la mida del perfil, que és d'%d octet. S'ha "
+"retallat."
 msgstr[1] ""
-"S'ha excedit el límit màxim per la mida del perfil de %d octets. S'ha "
+"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:4509
+#: ../libpurple/protocols/oscar/oscar.c:4468
 msgid "Profile too long."
 msgstr "Perfil massa llarg."
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4513
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9054,32 +8028,32 @@ msgstr[0] ""
 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:4559
+#: ../libpurple/protocols/oscar/oscar.c:4518
 msgid "Away message too long."
 msgstr "El missatge d'absència és massa llarg."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4587
+#, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
 "must be a valid email address, or start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "No s'ha pogut afegir l'amic %s perquè el nom d'usuari no és vàlid. Els noms "
-"d'usuari han de començar amb una lletra i contenir lletres, nombres i "
-"espais, o només nombres."
+"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:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4589
+#: ../libpurple/protocols/oscar/oscar.c:5022
+#: ../libpurple/protocols/oscar/oscar.c:5037
 msgid "Unable To Add"
 msgstr "No s'ha pogut afegir"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4698
 msgid "Unable To Retrieve Buddy List"
 msgstr "No s'ha pogut obtenir la llista d'amics"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
+#: ../libpurple/protocols/oscar/oscar.c:4699
 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."
@@ -9087,15 +8061,15 @@ 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+#: ../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
 msgid "Orphans"
 msgstr "Orfes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5020
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9104,17 +8078,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:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5020
+#: ../libpurple/protocols/oscar/oscar.c:5035
 msgid "(no name)"
 msgstr "(sense nom)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5034
+#, c-format
 msgid "Could not add the buddy %s for an unknown reason."
-msgstr "L'ordre ha fallat per motius desconeguts."
+msgstr "Per motius desconeguts no s'ha pogut afegir l'amic %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5128
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9123,22 +8097,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:5186
+#: ../libpurple/protocols/oscar/oscar.c:5136
 msgid "Authorization Given"
 msgstr "S'ha donat l'autorització"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5209
 #, 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:5260
+#: ../libpurple/protocols/oscar/oscar.c:5210
 msgid "Authorization Granted"
 msgstr "S'ha concedit l'autorització"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5213
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9149,119 +8123,119 @@ msgstr ""
 "pels motius següents:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5214
 msgid "Authorization Denied"
 msgstr "S'ha denegat l'autorització"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5250
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "Int_ercanvi:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5290
 msgid "Invalid chat name specified."
 msgstr "S'ha especificat un nom de xat invàlid."
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5359
 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:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5519
+#: ../libpurple/protocols/oscar/oscar.c:5524
 msgid "Away Message"
 msgstr "Missatge d'absència"
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5524
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(s'està recuperant)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5724
 msgid "iTunes Music Store Link"
 msgstr "Enllaç al magatzem de música iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5832
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentari sobre l'amic %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5833
 msgid "Buddy Comment:"
 msgstr "Comentari sobre l'amic:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5880
 #, 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:5934
+#: ../libpurple/protocols/oscar/oscar.c:5884
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
 "Atès que això revela la vostra adreça IP, es podria considerar com un risc "
-"de seguretat.. Voleu continuar?"
+"de seguretat. Voleu continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:5890
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "C_onnecta"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:5925
 msgid "Get AIM Info"
 msgstr "Obtén informació de AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:5931
 msgid "Edit Buddy Comment"
 msgstr "Edita el comentari sobre l'amic"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:5939
 msgid "Get Status Msg"
 msgstr "Aconsegueix el missatge d'estat"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:5952
 msgid "Direct IM"
 msgstr "MI directa"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:5974
 msgid "Re-request Authorization"
 msgstr "Torna a demanar l'autorització"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6033
 msgid "Require authorization"
 msgstr "Requereix autorització"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6036
 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:6091
+#: ../libpurple/protocols/oscar/oscar.c:6041
 msgid "ICQ Privacy Options"
 msgstr "Opcions de privadesa d'ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6060
 msgid "The new formatting is invalid."
 msgstr "El format nou no és vàlid."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6061
 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:6164
+#: ../libpurple/protocols/oscar/oscar.c:6114
 msgid "Change Address To:"
 msgstr "Canvia l'adreça per:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6160
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>no esteu esperant cap autorització</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6163
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Esteu esperant l'autorització dels següents amics"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9269,73 +8243,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:6231
+#: ../libpurple/protocols/oscar/oscar.c:6181
 msgid "Find Buddy by E-Mail"
 msgstr "Troba un amic per l'adreça de correu"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6182
 msgid "Search for a buddy by e-mail address"
 msgstr "Cerca un amic per l'adreça de correu"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6183
 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:6236
+#: ../libpurple/protocols/oscar/oscar.c:6186
 msgid "_Search"
 msgstr "C_erca"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid "Set User Info (URL)..."
 msgstr "Estableix informació d'usuari (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6355
 msgid "Change Password (URL)"
 msgstr "Canvia la contrasenya (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6359
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configura el reenviament de MI (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6369
 msgid "Set Privacy Options..."
 msgstr "Estableix les opcions de privadesa..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6376
 msgid "Confirm Account"
 msgstr "Confirma el compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6380
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostra l'adreça actualment registrada"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6384
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Canvia l'adreça actualment registrada..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6391
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostra els amics pendents d'autorització"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6397
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Cerca un amic per l'adreça de correu..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6402
 msgid "Search for Buddy by Information"
 msgstr "Cerca un amic per la informació"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
+#: ../libpurple/protocols/oscar/oscar.c:6470
 msgid "Use recent buddies group"
 msgstr "Utilitza el grup d'amics recent"
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../libpurple/protocols/oscar/oscar.c:6473
 msgid "Show how long you have been idle"
 msgstr "Mostra quant de temps heu estat inactiu"
 
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../libpurple/protocols/oscar/oscar.c:6628
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9344,28 +8318,27 @@ msgstr ""
 "per a la transferència de fitxers\n"
 "(és més lent, però acostuma a funcionar)"
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:674
 #, 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:782
+#: ../libpurple/protocols/oscar/peer.c:759
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "S'està intentant connectar amb %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:856
-#, c-format
+#: ../libpurple/protocols/oscar/peer.c:833
 msgid "Attempting to connect via proxy server."
 msgstr "S'està intentant connectar a través d'un servidor intermediari."
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1010
 #, 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:1037
+#: ../libpurple/protocols/oscar/peer.c:1014
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -9541,12 +8514,13 @@ msgid "Your information has been updated"
 msgstr "S'ha actualitzat la vostra informació"
 
 #: ../libpurple/protocols/qq/buddy_info.c:560
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
 "%s."
 msgstr ""
-"De moment no es permet establir cares personalitzades. Trieu una imatge de "
+"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
@@ -9573,10 +8547,17 @@ msgstr "Rebutja la sol·licitud"
 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
-#, fuzzy
 msgid "Add buddy with auth request failed"
-msgstr "Afegeix un amic amb manca de sol·licitud d'autorització"
+msgstr "Ha fallat la sol·licitut per afegir un amic amb autorització"
 
 #. TODO: We don't really need to notify the user about this, do we?
 #: ../libpurple/protocols/qq/buddy_opt.c:309
@@ -9585,9 +8566,8 @@ msgstr "Heu suprimit amb èxit un amic"
 
 #. TODO: Does the user really need to be notified about this?
 #: ../libpurple/protocols/qq/buddy_opt.c:338
-#, fuzzy
 msgid "You have successfully removed yourself from your friend's buddy list"
-msgstr "Us heu suprimit amb èxit d'un amic"
+msgstr "Us heu suprimit amb èxit de la llista d'amics del vostre amic"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
@@ -9615,9 +8595,9 @@ msgid "Send"
 msgstr "Envia"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:418
-#, fuzzy, c-format
+#, c-format
 msgid "You have added %d to buddy list"
-msgstr "Heu afegit en/na %d a la llista d'amics"
+msgstr "Heu afegit %d a la llista d'amics"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
@@ -9645,14 +8625,13 @@ msgstr "Descripció del grup"
 
 #: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
-msgstr "Autor"
+msgstr "Autorització"
 
 #: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
 #: ../libpurple/protocols/qq/group.c:120
-#, fuzzy
 msgid "Please enter external group ID"
 msgstr "Introduïu l'ID del grup extern"
 
@@ -9661,7 +8640,7 @@ msgid "You can only search for permanent QQ groups\n"
 msgstr "Només podeu cercar grups QQ permanents\n"
 
 #: ../libpurple/protocols/qq/group_im.c:126
-#, fuzzy, c-format
+#, c-format
 msgid "User %d requested to join group %d"
 msgstr "L'usuari %d ha sol·licitat unir-se al grup %d"
 
@@ -9693,24 +8672,24 @@ msgid "Approve"
 msgstr "Aprova"
 
 #: ../libpurple/protocols/qq/group_im.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr ""
-"La vostra sol·liciut d'entrar al grup %d l'ha rebutjada l'administrador %d"
+"L'administrador %2$d ha rebutjat la vostra sol·liciut per entrar al grup %1$d"
 
 #: ../libpurple/protocols/qq/group_im.c:221
-#, fuzzy, c-format
+#, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr ""
-"La vostra sol·liciut d'entrar al grup %d l'ha aprovada l'administrador %d"
+"L'administrador %2$d ha aprovat la vostra sol·liciut per entrar al grup %1$d"
 
 #: ../libpurple/protocols/qq/group_im.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "Vós [%d] heu sortit del grup «%d»"
 
 #: ../libpurple/protocols/qq/group_im.c:291
-#, fuzzy, c-format
+#, c-format
 msgid "You [%d] have been added to group \"%d\""
 msgstr "Vós [%d] heu estat afegit al grup «%d»"
 
@@ -9719,7 +8698,6 @@ msgid "This group has been added to your buddy list"
 msgstr "S'ha afegit aquest grup a la vostra llista d'amics"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-#, fuzzy
 msgid "I am not a member"
 msgstr "No en sóc membre"
 
@@ -9744,7 +8722,6 @@ msgid "This group does not allow others to join"
 msgstr "Aquest grup no permet que s'hi afegeixi ningú"
 
 #: ../libpurple/protocols/qq/group_join.c:233
-#, fuzzy
 msgid "You have successfully left the group"
 msgstr "Heu sortit del grup correctament"
 
@@ -9753,19 +8730,16 @@ msgid "QQ Group Auth"
 msgstr "Autorització de grup QQ"
 
 #: ../libpurple/protocols/qq/group_join.c:258
-#, fuzzy
 msgid "Your authorization request has been accepted by the QQ server"
-msgstr "El servidor QQ ha acceptat l'operació d'autorització"
+msgstr "El servidor QQ ha acceptat la sol·licitud d'autorització"
 
 #: ../libpurple/protocols/qq/group_join.c:329
-#, fuzzy
 msgid "You entered a group ID outside the acceptable range"
 msgstr "Heu entrat un identificador de grup fora del rang"
 
 #: ../libpurple/protocols/qq/group_join.c:360
-#, fuzzy
 msgid "Are you sure you want to leave this Qun?"
-msgstr "Esteu segur que voleu suprimir %s?"
+msgstr "Esteu segur que voleu deixar aquest Qun?"
 
 #: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
@@ -9787,22 +8761,18 @@ msgstr "S'ha produït un error d'orientació del grup"
 #. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
 #: ../libpurple/protocols/qq/sys_msg.c:87
-#, fuzzy
 msgid "Do you want to approve the request?"
 msgstr "Voleu aprovar aquesta sol·licitud?"
 
 #: ../libpurple/protocols/qq/group_opt.c:137
-#, fuzzy
 msgid "Enter your reason:"
 msgstr "Indiqueu-ne el motiu:"
 
 #: ../libpurple/protocols/qq/group_opt.c:235
-#, fuzzy
 msgid "You have successfully modified Qun member"
 msgstr "Heu modificat amb èxit el membre del Qun"
 
 #: ../libpurple/protocols/qq/group_opt.c:305
-#, fuzzy
 msgid "You have successfully modified Qun information"
 msgstr "Heu modificat amb èxit la informació del Qun"
 
@@ -9823,19 +8793,16 @@ msgid "System Message"
 msgstr "Missatge del sistema"
 
 #: ../libpurple/protocols/qq/im.c:576
-#, fuzzy
 msgid "Failed to send IM."
-msgstr "No s'ha pogut obtenir el nom: %s"
+msgstr "No s'ha pogut enviar la MI."
 
 #: ../libpurple/protocols/qq/keep_alive.c:87
-#, fuzzy
 msgid "Keep alive error"
-msgstr "Error en llegir"
+msgstr "Error de permanència"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-#, fuzzy
 msgid "Error requesting login token"
-msgstr "S'ha produït un error en crear la connexió"
+msgstr "S'ha produït un error en sol·licitar un testimoni d'entrada"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
@@ -9855,14 +8822,12 @@ msgid "Unknown-%d"
 msgstr "Desconegut-%d"
 
 #: ../libpurple/protocols/qq/qq.c:211
-#, fuzzy
 msgid "TCP Address"
-msgstr "Adreça IP"
+msgstr "Adreça TCP"
 
 #: ../libpurple/protocols/qq/qq.c:213
-#, fuzzy
 msgid "UDP Address"
-msgstr "Adreça IP"
+msgstr "Adreça UDP"
 
 #: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
@@ -9917,9 +8882,8 @@ msgid "Login Information"
 msgstr "Informació de la connexió"
 
 #: ../libpurple/protocols/qq/qq.c:533
-#, fuzzy
 msgid "Set My Information"
-msgstr "Informació del servidor"
+msgstr "Estableix la meva informació"
 
 #: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
@@ -9930,14 +8894,12 @@ msgid "Show Login Information"
 msgstr "Mostra informació de la connexió"
 
 #: ../libpurple/protocols/qq/qq.c:560
-#, fuzzy
 msgid "Leave this QQ Qun"
 msgstr "Surt d'aquest Qun QQ"
 
 #: ../libpurple/protocols/qq/qq.c:584
-#, fuzzy
 msgid "Block this buddy"
-msgstr "Bloca l'usuari"
+msgstr "Bloca aquest usuari"
 
 #. *< type
 #. *< ui_requirement
@@ -9954,9 +8916,8 @@ msgid "QQ Protocol\tPlugin"
 msgstr "Connector per al protocol QQ"
 
 #: ../libpurple/protocols/qq/qq.c:752
-#, fuzzy
 msgid "Connect using TCP"
-msgstr "S'està connectant"
+msgstr "Connecta amb TCP"
 
 #: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
@@ -9991,7 +8952,6 @@ msgid "Login failed, no reply"
 msgstr "Ha fallat l'entrada, no s'ha obtingut resposta"
 
 #: ../libpurple/protocols/qq/sys_msg.c:110
-#, fuzzy
 msgid "Do you want to add this buddy?"
 msgstr "Voleu afegir aquest amic?"
 
@@ -10007,9 +8967,9 @@ msgid "Would you like to add him?"
 msgstr "Voleu afegir-lo?"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "%s has added you [%s] to his or her buddy list"
-msgstr "%s us ha afegit a la seva llista d'amics."
+msgstr "%s us ha afegit [%s] a la seva llista d'amics"
 
 #: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
@@ -10017,13 +8977,13 @@ msgid "User %s rejected your request"
 msgstr "L'usuari %s ha declinat la vostra sol·licitud"
 
 #: ../libpurple/protocols/qq/sys_msg.c:212
-#, fuzzy, c-format
+#, c-format
 msgid "User %s approved your request"
 msgstr "L'usuari %s ha acceptat la vostra sol·licitud"
 
 #. TODO: this should go through purple_account_request_authorization()
 #: ../libpurple/protocols/qq/sys_msg.c:238
-#, fuzzy, c-format
+#, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s us vol afegir [%s] com a amic"
 
@@ -10058,7 +9018,7 @@ msgstr "Informació del grup %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
-msgstr "Informació de la llibreta d'adreces Notes"
+msgstr "Informació de la llibreta d'adreces del Notes"
 
 #: ../libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
@@ -10066,7 +9026,7 @@ msgstr "Convida el grup a una conferència..."
 
 #: ../libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
-msgstr "Obtén informació de la llibreta d'adreces Notes"
+msgstr "Obtén informació de la llibreta d'adreces del Notes"
 
 #: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
@@ -10156,6 +9116,10 @@ msgstr "Altaveus"
 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
 msgid "Supports"
@@ -10221,7 +9185,7 @@ msgstr "Convida a la conferència..."
 msgid "Send TEST Announcement"
 msgstr "Envia un anunci TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4299
 msgid "Topic:"
 msgstr "Tema:"
 
@@ -10246,7 +9210,7 @@ msgstr "Configuració de la connexió Meanwhile"
 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:4041
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4026
 msgid "Connect"
 msgstr "Connecta"
 
@@ -10426,7 +9390,7 @@ 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:756
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "Resultats de la cerca"
 
@@ -10869,6 +9833,13 @@ msgstr "Ansiós"
 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/ops.c:1224
 #: ../libpurple/protocols/silc10/buddy.c:1562
@@ -11002,7 +9973,6 @@ 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> "
 
@@ -11041,7 +10011,6 @@ msgstr "Llista de les claus públiques del canal"
 
 #: ../libpurple/protocols/silc/chat.c:435
 #: ../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 "
@@ -11240,9 +10209,8 @@ msgid "Error during file transfer"
 msgstr "S'ha produït un error en la transferència"
 
 #: ../libpurple/protocols/silc/ft.c:87
-#, fuzzy
 msgid "Remote disconnected"
-msgstr "%s s'ha desconnectat"
+msgstr "El remot s'ha desconnectat"
 
 #: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
@@ -11253,14 +10221,12 @@ msgid "Key agreement failed"
 msgstr "Ha fallat l'acord sobre la clau"
 
 #: ../libpurple/protocols/silc/ft.c:114
-#, fuzzy
 msgid "Connection timed out"
-msgstr "La connexió ha expirat."
+msgstr "La connexió ha expirat"
 
 #: ../libpurple/protocols/silc/ft.c:118
-#, fuzzy
 msgid "Creating connection failed"
-msgstr "Ha fallat la connexió"
+msgstr "No s'ha pogut crear la connexió"
 
 #: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
@@ -11287,9 +10253,8 @@ msgid "Cannot send file"
 msgstr "No s'ha pogut enviar el fitxer"
 
 #: ../libpurple/protocols/silc/ops.c:57
-#, fuzzy
 msgid "Error occurred"
-msgstr "Error"
+msgstr "S'ha produït un error"
 
 #: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
 #: ../libpurple/protocols/silc/ops.c:551
@@ -11467,9 +10432,8 @@ msgid "Cannot get room list"
 msgstr "No s'ha pogut obtenir la llista de sales"
 
 #: ../libpurple/protocols/silc/ops.c:1468
-#, fuzzy
 msgid "Network is empty"
-msgstr "Estadístiques de xarxa"
+msgstr "La xarxa és buida"
 
 #: ../libpurple/protocols/silc/ops.c:1512
 #: ../libpurple/protocols/silc10/ops.c:1507
@@ -11541,6 +10505,13 @@ msgid "Network Statistics"
 msgstr "Estadístiques de xarxa"
 
 #: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
+
+#: ../libpurple/protocols/silc/ops.c:1596
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ha fallat el ping"
@@ -11557,12 +10528,11 @@ msgstr "No s'ha pogut matar l'usuari"
 
 #: ../libpurple/protocols/silc/ops.c:1648
 msgid "WATCH"
-msgstr ""
+msgstr "VIGILA"
 
 #: ../libpurple/protocols/silc/ops.c:1648
-#, fuzzy
 msgid "Cannot watch user"
-msgstr "No es pot afegir a un mateix"
+msgstr "No es pot vigilar l'usuari"
 
 #: ../libpurple/protocols/silc/ops.c:1724
 #: ../libpurple/protocols/silc/ops.c:1775
@@ -11670,9 +10640,8 @@ msgid "Connecting to SILC Server"
 msgstr "S'està connectant al servidor SILC"
 
 #: ../libpurple/protocols/silc/silc.c:352
-#, fuzzy, c-format
 msgid "Could not load SILC key pair"
-msgstr "No s'ha pogut carregar la parella de claus SILC: %s"
+msgstr "No s'ha pogut carregar el parell de claus SILC"
 
 #: ../libpurple/protocols/silc/silc.c:366
 #: ../libpurple/protocols/silc10/silc.c:355
@@ -11689,11 +10658,9 @@ msgstr "Sense memòria"
 msgid "Cannot initialize SILC protocol"
 msgstr "No s'ha pogut inicialitzar el protocol SILC"
 
-# DUBTE: "key pair" --> "joc de claus", o "parell de claus"?
 #: ../libpurple/protocols/silc/silc.c:445
-#, fuzzy
 msgid "Error loading SILC key pair"
-msgstr "S'està creant el joc de claus SILC..."
+msgstr "S'ha produït un error en carregar el parell de claus claus SILC"
 
 #: ../libpurple/protocols/silc/silc.c:739
 #: ../libpurple/protocols/silc10/silc.c:650
@@ -11701,8 +10668,7 @@ 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:1641
-#, c-format
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1638
 msgid "Normal"
 msgstr "Normal"
 
@@ -11765,9 +10731,8 @@ msgid "Your VCard File"
 msgstr "El fitxer de la vostra VCard"
 
 #: ../libpurple/protocols/silc/silc.c:812
-#, fuzzy
 msgid "Timezone (UTC)"
-msgstr "Fus horari"
+msgstr "Fus horari (UTC)"
 
 #: ../libpurple/protocols/silc/silc.c:816
 #: ../libpurple/protocols/silc/silc.c:817
@@ -12100,7 +11065,7 @@ 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:2036
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2031
 msgid "Network"
 msgstr "Xarxa"
 
@@ -12114,6 +11079,7 @@ msgstr "Fitxer de la clau pública"
 msgid "Private Key file"
 msgstr "Fitxer de la clau privada"
 
+# FIXME
 #: ../libpurple/protocols/silc/silc.c:1935
 #: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
@@ -12153,20 +11119,17 @@ msgstr "Obre la pissarra automàticament"
 msgid "Digitally sign and verify all messages"
 msgstr "Signa i verifica digitalment tots els missatges"
 
-# DUBTE: "key pair" --> "joc de claus", o "parell de claus"?
 #: ../libpurple/protocols/silc/util.c:207
 #: ../libpurple/protocols/silc/util.c:249
 #: ../libpurple/protocols/silc10/util.c:207
 #: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
-msgstr "S'està creant el joc de claus SILC..."
+msgstr "S'està creant el parell de claus SILC..."
 
-# DUBTE: "key pair" --> "joc de claus", o "parell de claus"?
 #: ../libpurple/protocols/silc/util.c:215
 #: ../libpurple/protocols/silc/util.c:257
-#, fuzzy
 msgid "Cannot create SILC key pair\n"
-msgstr "S'està creant el joc de claus SILC..."
+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,
@@ -12220,9 +11183,9 @@ msgid "Key Length: \t%d bits\n"
 msgstr "Longitud de la clau: \t%d bits\n"
 
 #: ../libpurple/protocols/silc/util.c:372
-#, fuzzy, c-format
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "Motiu: %s"
+msgstr "Versió: \t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:369
@@ -12299,55 +11262,49 @@ msgid "No server statistics available"
 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 "Fallida: Les versions no coincideixen, actualitzeu el client"
+msgstr "Error: les versions no coincideixen, actualitzeu el client"
 
+# NOTA: remot és també un substantiu: «dit del component d'una xarxa que
+# 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 "Fallida: El remot no es fia de o no suporta la vostra clau pública"
+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 "Fallida: El remot no implementa el grup KE proposat"
+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 "Fallida: El remot no implementa el xifrat proposat"
+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 "Fallida: El remot no implementa la PKCS proposada"
+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 ""
-"Fallida: El remot no implementa la funció de suma de comprovació proposada"
+"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"
+msgstr "Fallida: el remot no implementa l'HMAC proposada"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
 msgid "Failure: Incorrect signature"
-msgstr "Fallida: La signatura no és correcta"
+msgstr "Error: la signatura no és correcta"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
 msgid "Failure: Invalid cookie"
-msgstr "Fallida: La galeta no és vàlida"
+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ó"
+msgstr "Error: ha fallat l'autenticació"
 
 #: ../libpurple/protocols/silc10/silc.c:182
 msgid "Cannot initialize SILC Client connection"
@@ -12372,31 +11329,26 @@ msgid "Could not write"
 msgstr "No s'ha pogut escriure"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:1489
 msgid "Could not connect"
 msgstr "No s'ha pogut connectar"
 
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
-msgid "Unknown server response."
-msgstr "Error desconegut del servidor."
-
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/simple/simple.c:1523
+#: ../libpurple/protocols/simple/simple.c:1565
+#: ../libpurple/protocols/simple/simple.c:1578
+#: ../libpurple/protocols/simple/simple.c:1629
 msgid "Could not create listen socket"
 msgstr "No s'ha pogut crear el sòcol per a escoltar"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1546
 msgid "Couldn't resolve host"
 msgstr "No s'ha pogut obtenir l'adreça de l'ordinador"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1637
 msgid "Could not resolve hostname"
 msgstr "No s'ha pogut resoltre el nom de l'ordinador"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1654
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "Els noms d'usuari SIP no poden contenir espais en blanc ni @"
 
@@ -12408,36 +11360,36 @@ msgstr "Els noms d'usuari SIP no poden contenir espais en blanc ni @"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1829
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Connector per al protocol SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "El connector per al protocol SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publica l'estat (nota: tothom us pot estar observant)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:1864
 msgid "Use UDP"
 msgstr "Utilitza UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1866
 msgid "Use proxy"
 msgstr "Utilitza un servidor intermediari"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:1868
 msgid "Proxy"
 msgstr "Servidor intermediari"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "Auth User"
 msgstr "Usuari Auth"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:1872
 msgid "Auth Domain"
 msgstr "Domini Auth"
 
@@ -12482,7 +11434,6 @@ msgid "Warning of %s not allowed."
 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."
@@ -12509,48 +11460,39 @@ 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."
 
@@ -12560,22 +11502,18 @@ msgid "Failure unknown: %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."
@@ -12614,8 +11552,8 @@ msgstr "TOC ha tornat de la pausa. Ja podeu enviar missatges de nou."
 msgid "Password Change Successful"
 msgstr "S'ha canviat la contrasenya amb èxit"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5532
+#: ../pidgin/gtkblist.c:5885
 msgid "_Group:"
 msgstr "_Grup:"
 
@@ -12681,12 +11619,19 @@ msgstr "Connector per al protocol TOC"
 #, 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
 msgid "Your Yahoo! message did not get sent."
 msgstr "No s'ha pogut enviar el vostre missatge de Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:910
+#, 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:"
@@ -12715,7 +11660,7 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "S'ha rebutjat afegir l'amic"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1977
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12726,11 +11671,11 @@ msgstr ""
 "reconegut. Probablement no us podreu connectar al Yahoo. Comproveu si hi ha "
 "actualitzacions a %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:1980
 msgid "Failed Yahoo! Authentication"
 msgstr "Ha fallat l'autenticació amb Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2046
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12739,177 +11684,174 @@ 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:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2049
 msgid "Ignore buddy?"
 msgstr "Voleu ignorar l'amic?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2112
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "El vostre compte està blocat, entreu a la web de Yahoo!"
+msgstr "El vostre compte està blocat, entreu al web de Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2115
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
-"Error desconegut número %d. Això es pot solucionar entrant a la web de Yahoo!"
+"S'ha produït un error desconegut, número %d. Això es pot solucionar entrant "
+"al web de Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2169
 #, 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:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2172
 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:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2291
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2634
 msgid "Received unexpected HTTP response from server."
 msgstr "S'ha rebut una resposta HTTP inesperada del servidor."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+#: ../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
 msgid "Connection problem"
 msgstr "Hi ha un problema de connexió"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:2684
+#, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr ""
-"S'ha perdut la connexió amb el servidor:\n"
+"S'ha perdut la connexió amb %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:2709
+#, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
-"No s'ha pogut establir una connexió amb al servidor:\n"
+"No s'ha pogut establir la connexió amb %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3059
+#: ../libpurple/protocols/yahoo/yahoo.c:3745
 msgid "Not at Home"
 msgstr "Fora de casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3061
+#: ../libpurple/protocols/yahoo/yahoo.c:3748
 msgid "Not at Desk"
 msgstr "Fora de l'escriptori"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3063
+#: ../libpurple/protocols/yahoo/yahoo.c:3751
 msgid "Not in Office"
 msgstr "Fora de l'oficina"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3067
+#: ../libpurple/protocols/yahoo/yahoo.c:3757
 msgid "On Vacation"
 msgstr "De vacances"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3071
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Stepped Out"
 msgstr "Ha marxat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3164
+#: ../libpurple/protocols/yahoo/yahoo.c:3194
 msgid "Not on server list"
 msgstr "No és a la llista del servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3211
+#: ../libpurple/protocols/yahoo/yahoo.c:3269
 msgid "Appear Online"
 msgstr "Simula estar en línia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3214
+#: ../libpurple/protocols/yahoo/yahoo.c:3290
 msgid "Appear Permanently Offline"
 msgstr "Simula estar permanentment fora de línia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3232
 msgid "Presence"
 msgstr "Presència"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3275
 msgid "Appear Offline"
 msgstr "Simula estar fora de línia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#: ../libpurple/protocols/yahoo/yahoo.c:3284
 msgid "Don't Appear Permanently Offline"
 msgstr "No simulis estar permanentment fora de línia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3332
 msgid "Join in Chat"
 msgstr "Entra a un xat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3338
 msgid "Initiate Conference"
 msgstr "Inicia una conferència"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3366
 msgid "Presence Settings"
 msgstr "Paràmetres de la presència"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3372
 msgid "Start Doodling"
 msgstr "Comença a dibuixar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3473
 msgid "Activate which ID?"
 msgstr "Quin ID voleu activar?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
-msgid "Join whom in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3484
+msgid "Join who in chat?"
 msgstr "A qui us voleu unir al xat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
 msgid "Activate ID..."
 msgstr "Activa l'ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 msgid "Join User in Chat..."
 msgstr "Entra a un xat d'un usuari..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "Open Inbox"
-msgstr "Obre la safata d'entrada de Hotmail"
+msgstr "Obre la safata d'entrada"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-#, fuzzy
-msgid "Buzz"
-msgstr "Buzz!!"
+#: ../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:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#: ../libpurple/protocols/yahoo/yahoo.c:4084
 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:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4089
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  llista les sales de la xarxa Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../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
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: fa una petició a l'usuari per iniciar una sessió Doodle"
 
@@ -12923,61 +11865,133 @@ msgstr "doodle: fa una petició a l'usuari per iniciar una sessió Doodle"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4305
+#: ../libpurple/protocols/yahoo/yahoo.c:4307
 msgid "Yahoo Protocol Plugin"
 msgstr "Connector per al protocol Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4330
 msgid "Yahoo Japan"
 msgstr "Yahoo Japó"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4333
 msgid "Pager server"
 msgstr "Servidor de cercapersones"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4336
 msgid "Japan Pager server"
 msgstr "Servidor de cercapersones del Japó"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4339
 msgid "Pager port"
 msgstr "Port per al cercapersones"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4342
 msgid "File transfer server"
 msgstr "Servidor de transferència de fitxers"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4345
 msgid "Japan file transfer server"
 msgstr "Servidor de transferència de fitxers del Japó"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4348
 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:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4351
 msgid "Chat room locale"
 msgstr "Característiques locals de la sala de xat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4354
 msgid "Ignore conference and chatroom invitations"
 msgstr "Bloca invitacions a conferències i sales de xat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4362
 msgid "Chat room list URL"
 msgstr "URL de la llista de sales de xat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4365
 msgid "Yahoo Chat server"
 msgstr "Servidor de xat de Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4368
 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
 #.
@@ -12987,7 +12001,7 @@ msgstr "Envia la sol·licitud d'un dibuix."
 
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
 msgid "Unable to establish file descriptor."
 msgstr "No s'ha pogut establir un descriptor de fitxer."
 
@@ -13090,78 +12104,6 @@ msgstr ""
 msgid "The user's profile is empty."
 msgstr "El perfil d'usuari està buit."
 
-#: ../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 estan 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:456
 msgid "Connection problem with the YCHT server."
 msgstr "Problema de connexió amb el servidor YCHT."
@@ -13290,7 +12232,7 @@ msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
-msgstr "Dessubscriu"
+msgstr "Torna a subscriure"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
@@ -13343,8 +12285,8 @@ msgstr "Regne"
 msgid "Exposure"
 msgstr "Exposició"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13353,79 +12295,84 @@ msgstr ""
 "No s'ha pogut crear el sòcol:\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:658
 #, 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:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
+#: ../libpurple/proxy.c:782
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Error en la connexió al servidor intermediari d'HTTP %d"
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:778
 #, 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:1012
+#: ../libpurple/proxy.c:995
 #, c-format
 msgid "Error resolving %s"
 msgstr "S'ha produït un error en resoldre %s"
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1697
 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.
 #.
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "_Sí"
 
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "_No"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1398
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "_Accepta"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
+#: ../libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr "Ara mateix no sóc aquí"
 
-#: ../libpurple/savedstatuses.c:535
+#: ../libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr "estats desats"
 
-#: ../libpurple/server.c:234
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ara es fa dir %s\n"
 
-#: ../libpurple/server.c:302
+# FIXME: not going to look well (josep)
+#: ../libpurple/server.c:289
 #, c-format
-msgid "Requesting %s's attention..."
-msgstr ""
+msgid "Attention! You have been %s."
+msgstr "Alerta! Se us ha %s."
+
+#: ../libpurple/server.c:291 ../libpurple/server.c:298
+msgid "Attention!"
+msgstr "Alerta!"
 
-#: ../libpurple/server.c:347
-#, fuzzy, c-format
-msgid "%s has requested your attention!"
-msgstr "%s ha sol·licitat les vostres dades"
+#: ../libpurple/server.c:296
+#, c-format
+msgid "Attention! %s %s."
+msgstr "Alerta! %s %s."
 
-#: ../libpurple/server.c:796
+#: ../libpurple/server.c:749
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13434,97 +12381,77 @@ msgstr ""
 "%s ha convidat a %s a la sala de xat %s:\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:754
 #, 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:805
+#: ../libpurple/server.c:758
 msgid "Accept chat invitation?"
 msgstr "Voleu acceptar la invitació del xat?"
 
-#: ../libpurple/sslconn.c:164
-#, fuzzy
-msgid "SSL Connection Failed"
-msgstr "Ha fallat la connexió"
-
-#: ../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
-#, fuzzy
-msgid "Unknown SSL error"
-msgstr "Error desconegut"
-
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "Sense especificar"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
-#, fuzzy
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "No molesteu"
 
-#: ../libpurple/status.c:159
-#, fuzzy
+#: ../libpurple/status.c:158
 msgid "Extended away"
 msgstr "Absent durant una bona estona"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:159
 msgid "Mobile"
 msgstr "Mòbil"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s ha canviat l'estat de %s a %s"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s ara es fa dir %s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s ja no està %s"
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s ha passat a inactiu"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s ja no està inactiu"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s ha passat a inactiu"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s ja no està inactiu"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2702
 #, c-format
 msgid "Error Reading %s"
 msgstr "S'ha produït un error en llegir %s"
 
-#: ../libpurple/util.c:2723
+#: ../libpurple/util.c:2703
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13533,67 +12460,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:3223
+#: ../libpurple/util.c:3203
 msgid "Calculating..."
 msgstr "S'està calculant..."
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3206
 msgid "Unknown."
 msgstr "Desconegut."
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3232
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segon"
 msgstr[1] "%d segons"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3244
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dies"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3252
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d hores"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3258
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d hores"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3266
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minut"
 msgstr[1] "%s, %d minuts"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3272
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuts"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3532
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
+msgstr "No s'ha pogut obrir %s: s'ha redirigit massa vegades"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3569 ../libpurple/util.c:3864
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "No s'ha pogut connectar a %s"
 
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3692
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13602,17 +12529,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:3747
+#: ../libpurple/util.c:3727
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "S'ha produït un error en llegir de %s: %s"
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3758
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "S'ha produït un error en escriure a %s: %s."
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3783
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "No s'ha pogut conectar a %s: %s"
@@ -13638,77 +12565,71 @@ msgid "The orientation of the tray."
 msgstr "Orientació de l'àrea de notificació."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
+#: ../pidgin/gtkaccount.c:410
 msgid "Login Options"
 msgstr "Opcions d'entrada"
 
-#: ../pidgin/gtkaccount.c:428
-#, fuzzy
+#: ../pidgin/gtkaccount.c:431
 msgid "Pro_tocol:"
-msgstr "Protocol:"
+msgstr "Pro_tocol:"
 
-#: ../pidgin/gtkaccount.c:439
-#, fuzzy
+#: ../pidgin/gtkaccount.c:442
 msgid "Screen _name:"
-msgstr "Nom d'usuari:"
+msgstr "_Nom d'usuari:"
 
-#: ../pidgin/gtkaccount.c:529
-#, fuzzy
+#: ../pidgin/gtkaccount.c:532
 msgid "_Local alias:"
-msgstr "Àlies local:"
+msgstr "Àlies _local:"
 
-#: ../pidgin/gtkaccount.c:533
-#, fuzzy
+#: ../pidgin/gtkaccount.c:536
 msgid "Remember pass_word"
-msgstr "Recorda la contrasenya"
+msgstr "Recorda la contrasen_ya"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
+#: ../pidgin/gtkaccount.c:594
 msgid "User Options"
 msgstr "Opcions d'usuari"
 
-#: ../pidgin/gtkaccount.c:604
-#, fuzzy
+#: ../pidgin/gtkaccount.c:607
 msgid "New _mail notifications"
-msgstr "Notifica si hi ha correu nou"
+msgstr "_Notifica si hi ha correu nou"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
-#, fuzzy
+#: ../pidgin/gtkaccount.c:612
 msgid "Use this buddy _icon for this account:"
-msgstr "Utilitza aquesta icona d'amic per a aquest compte:"
+msgstr "Utilitza aquesta _icona d'amic per a aquest compte:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
+#: ../pidgin/gtkaccount.c:732
 #, c-format
 msgid "%s Options"
 msgstr "Opcions de %s"
 
-#: ../pidgin/gtkaccount.c:936
+#: ../pidgin/gtkaccount.c:937
 msgid "Use GNOME Proxy Settings"
 msgstr "Empra la configuració del servidor intermediari del Gnome"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:938
 msgid "Use Global Proxy Settings"
 msgstr "Empra les opcions globals per al servidor intermediari"
 
-#: ../pidgin/gtkaccount.c:943
+#: ../pidgin/gtkaccount.c:944
 msgid "No Proxy"
 msgstr "Sense servidor intermediari"
 
-#: ../pidgin/gtkaccount.c:949
+#: ../pidgin/gtkaccount.c:950
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
+#: ../pidgin/gtkaccount.c:956
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
+#: ../pidgin/gtkaccount.c:962
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:968 ../pidgin/gtkprefs.c:1208
 msgid "Use Environmental Settings"
 msgstr "Empra les opcions de l'entorn"
 
@@ -13717,73 +12638,64 @@ 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:1006
+#: ../pidgin/gtkaccount.c:1007
 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:1009
+#: ../pidgin/gtkaccount.c:1010
 msgid "you can see the butterflies mating"
 msgstr "podreu veure les papallones aparellant-se"
 
-#: ../pidgin/gtkaccount.c:1030
+#: ../pidgin/gtkaccount.c:1031
 msgid "Proxy Options"
 msgstr "Opcions del servidor intermediari"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1045 ../pidgin/gtkprefs.c:1202
 msgid "Proxy _type:"
 msgstr "_Tipus de servidor intermediari"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1054 ../pidgin/gtkprefs.c:1223
 msgid "_Host:"
 msgstr "_Ordinador:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1058 ../pidgin/gtkprefs.c:1241
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1065
+#: ../pidgin/gtkaccount.c:1066
 msgid "_Username:"
 msgstr "_Nom d'usuari:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1073 ../pidgin/gtkprefs.c:1278
 msgid "Pa_ssword:"
 msgstr "_Contrasenya:"
 
-#: ../pidgin/gtkaccount.c:1195
-#, fuzzy
-msgid "Unable to save new account"
-msgstr "No s'ha pogut crear una nova connexió."
-
-#: ../pidgin/gtkaccount.c:1196
-msgid "An account already exists with the specified criteria."
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1468
 msgid "Add Account"
 msgstr "Afegeix un compte"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1487
 msgid "_Basic"
 msgstr "_Bàsic"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1494
 msgid "Create this new account on the server"
-msgstr ""
+msgstr "Crea aquest compte nou al servidor"
 
-#: ../pidgin/gtkaccount.c:1515
+#: ../pidgin/gtkaccount.c:1510
 msgid "_Advanced"
 msgstr "_Avançat"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1968 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Habilitat"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:1996
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2196
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13807,11 +12719,11 @@ msgstr ""
 "partir del menú <b>Comptes->Afegeix/Edita</b> de la finestra de la llista "
 "d'amics."
 
-#: ../pidgin/gtkblist.c:767
+#: ../pidgin/gtkblist.c:760
 msgid "Join a Chat"
 msgstr "Entra a un xat"
 
-#: ../pidgin/gtkblist.c:788
+#: ../pidgin/gtkblist.c:781
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -13819,241 +12731,220 @@ 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:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:792 ../pidgin/gtkblist.c:5480
+#: ../pidgin/gtkblist.c:5846 ../pidgin/gtkpounce.c:538
+#: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Compte:"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Bloca"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1081
 msgid "Un_block"
 msgstr "Des_bloca"
 
 # Això és el botó, alerta l'amplada!
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1132
 msgid "Get _Info"
 msgstr "_Informació"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1135 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
+#: ../pidgin/gtkblist.c:1141
 msgid "_Send File"
-msgstr "Envia un fitxer"
+msgstr "_Envia un fitxer"
 
-#: ../pidgin/gtkblist.c:1155
-#, fuzzy
+#: ../pidgin/gtkblist.c:1148
 msgid "Add Buddy _Pounce"
-msgstr "Afegeix un avís per a l'amic"
+msgstr "Afegeix un avís _per a l'amic"
 
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1153 ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
 msgid "View _Log"
 msgstr "Visua_litza el registre"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1170 ../pidgin/gtkblist.c:1179
+#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
 msgid "_Alias..."
 msgstr "À_lies..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1173 ../pidgin/gtkblist.c:1181
+#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
 msgid "_Remove"
 msgstr "Sup_rimeix"
 
-#: ../pidgin/gtkblist.c:1238
+#: ../pidgin/gtkblist.c:1231
 msgid "Add a _Buddy"
 msgstr "_Afegeix un amic"
 
-#: ../pidgin/gtkblist.c:1241
+#: ../pidgin/gtkblist.c:1234
 msgid "Add a C_hat"
 msgstr "A_fegeix un xat"
 
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1237
 msgid "_Delete Group"
-msgstr "_Suprimeix un grup"
+msgstr "_Suprimeix el grup"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1239
 msgid "_Rename"
 msgstr "_Canvia el nom"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "En_tra"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1260
 msgid "Auto-Join"
 msgstr "Entra automàticament"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1322
 msgid "_Collapse"
 msgstr "_Redueix"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1327
 msgid "_Expand"
-msgstr "_Expandeix"
+msgstr "_Amplia"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1572 ../pidgin/gtkblist.c:1584
+#: ../pidgin/gtkblist.c:4574 ../pidgin/gtkblist.c:4584
 msgid "/Tools/Mute Sounds"
 msgstr "/Eines/Inhabilita els sons"
 
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
+#: ../pidgin/gtkblist.c:2044 ../pidgin/gtkconv.c:4701
+#: ../pidgin/gtkpounce.c:429
 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:2869
+#: ../pidgin/gtkblist.c:2852
 msgid "/_Buddies"
 msgstr "/_Amics"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amics/_Missatge instantani nou..."
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amics/_Entra a un xat..."
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:2855
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amics/Aconsegueix informació de l'_usuari..."
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2856
 msgid "/Buddies/View User _Log..."
 msgstr "/Amics/_Visualitza el registre de l'usuari..."
 
-#: ../pidgin/gtkblist.c:2875
-#, fuzzy
-msgid "/Buddies/Show"
-msgstr "/Amics/_Desconnecta"
-
-#: ../pidgin/gtkblist.c:2876
-#, fuzzy
-msgid "/Buddies/Show/_Offline Buddies"
+#: ../pidgin/gtkblist.c:2858
+msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amics/Mostra els amics des_connectats"
 
-#: ../pidgin/gtkblist.c:2877
-#, fuzzy
-msgid "/Buddies/Show/_Empty Groups"
+#: ../pidgin/gtkblist.c:2859
+msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amics/Mostra els grups _buits"
 
-#: ../pidgin/gtkblist.c:2878
-#, fuzzy
-msgid "/Buddies/Show/Buddy _Details"
+#: ../pidgin/gtkblist.c:2860
+msgid "/Buddies/Show Buddy _Details"
 msgstr "/Amics/Mostra els _detalls dels amics"
 
-#: ../pidgin/gtkblist.c:2879
-#, fuzzy
-msgid "/Buddies/Show/Idle _Times"
+#: ../pidgin/gtkblist.c:2861
+msgid "/Buddies/Show Idle _Times"
 msgstr "/Amics/Mostra el _temps d'inactivitat"
 
-#: ../pidgin/gtkblist.c:2880
-#, fuzzy
-msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Amics/Mostra els grups _buits"
-
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2862
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amics/_Ordena els amics"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2864
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amics/Afegeix un _amic..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:2865
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amics/Afegeix un _xat..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:2866
 msgid "/Buddies/Add _Group..."
 msgstr "/Amics/Afegeix un _grup..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/_Quit"
 msgstr "/Amics/_Surt"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:2871
 msgid "/_Accounts"
 msgstr "/_Comptes"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
+#: ../pidgin/gtkblist.c:2872 ../pidgin/gtkblist.c:6544
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Comptes/Afegeix\\/Edita"
 
 # Accelerador a la "n" com en la resta de programes
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:2875
 msgid "/_Tools"
 msgstr "/Ei_nes"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:2876
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Eines/_Avís per a amics"
 
-#: ../pidgin/gtkblist.c:2896
-#, fuzzy
-msgid "/Tools/_Certificates"
-msgstr "/Eines/_Estats"
-
-#: ../pidgin/gtkblist.c:2897
+#: ../pidgin/gtkblist.c:2877
 msgid "/Tools/Plu_gins"
 msgstr "/Eines/_Connectors"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:2878
 msgid "/Tools/Pr_eferences"
 msgstr "/Eines/Pr_eferències"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:2879
 msgid "/Tools/Pr_ivacy"
 msgstr "/Eines/_Privadesa"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:2881
 msgid "/Tools/_File Transfers"
 msgstr "/Eines/Transferència de _fitxers"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:2882
 msgid "/Tools/R_oom List"
 msgstr "/Eines/_Llista de sales"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:2883
 msgid "/Tools/System _Log"
 msgstr "/Eines/_Registre del sistema"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:2885
 msgid "/Tools/Mute _Sounds"
 msgstr "/Eines/Inhabilita els _sons"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:2888
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/A_juda en línia"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:2889
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Finestra de _depuració"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:2893
 msgid "/Help/_About"
 msgstr "/Ajuda/_Quant a"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:2922
 #, c-format
 msgid ""
 "\n"
@@ -14062,129 +12953,133 @@ msgstr ""
 "\n"
 "<b>Compte:</b> %s"
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3000
 msgid "Buddy Alias"
 msgstr "Àlies de l'amic"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3029
 msgid "Logged In"
 msgstr "Connectat"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3075
 msgid "Last Seen"
 msgstr "Vist per darrer cop"
 
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3095
 msgid "Spooky"
 msgstr "Esfereïdor"
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3097
 msgid "Awesome"
 msgstr "Fantàstic"
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3099
 msgid "Rockin'"
 msgstr "Xalant"
 
-#: ../pidgin/gtkblist.c:3453
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:3438
+#, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "Inactiu %dh %02dm"
+msgstr "Inactiu %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3440
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactiu %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3442
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactiu %dm"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3587
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amics/Missatge instantani nou..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3588 ../pidgin/gtkblist.c:3621
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amics/Entra a un xat..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3589
 msgid "/Buddies/Get User Info..."
 msgstr "/Amics/Aconsegueix informació de l'usuari..."
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3590
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amics/Afegeix un amic..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3591 ../pidgin/gtkblist.c:3624
 msgid "/Buddies/Add Chat..."
 msgstr "/Amics/Afegeix un xat..."
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3592
 msgid "/Buddies/Add Group..."
 msgstr "/Amics/Afegeix un grup..."
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3627
 msgid "/Tools/Privacy"
 msgstr "/Eines/Privadesa"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3630
 msgid "/Tools/Room List"
 msgstr "/Eines/Llista de sales"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3727 ../pidgin/gtkdocklet.c:153
 #, 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:3822
+#: ../pidgin/gtkblist.c:3807
 msgid "Manually"
 msgstr "Manualment"
 
-#: ../pidgin/gtkblist.c:3824
+#: ../pidgin/gtkblist.c:3809
 msgid "Alphabetically"
 msgstr "Alfabèticament"
 
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:3810
 msgid "By status"
 msgstr "Per estat"
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:3811
 msgid "By log size"
 msgstr "Per la mida del registre"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4016 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s s'ha desconnectat"
 
-#: ../pidgin/gtkblist.c:4067
+#: ../pidgin/gtkblist.c:4026
+msgid "Re-enable Account"
+msgstr "Rehabilita el compte"
+
+#: ../pidgin/gtkblist.c:4052
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s s'ha desconnectat: %s</span>"
 
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4204
 msgid "<b>Username:</b>"
 msgstr "<b>Nom d'usuari:</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4211
 msgid "<b>Password:</b>"
 msgstr "<b>Contrasenya:</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4222
 msgid "_Login"
 msgstr "_Nom d'usuari"
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4305
 msgid "/Accounts"
 msgstr "/Comptes"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4319
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
@@ -14202,32 +13097,23 @@ msgstr ""
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
-#, fuzzy
-msgid "/Buddies/Show/Offline Buddies"
+#: ../pidgin/gtkblist.c:4568
+msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amics/Mostra els amics desconnectats"
 
-#: ../pidgin/gtkblist.c:4600
-#, fuzzy
-msgid "/Buddies/Show/Empty Groups"
+#: ../pidgin/gtkblist.c:4571
+msgid "/Buddies/Show Empty Groups"
 msgstr "/Amics/Mostra els grups buits"
 
-#: ../pidgin/gtkblist.c:4606
-#, fuzzy
-msgid "/Buddies/Show/Buddy Details"
+#: ../pidgin/gtkblist.c:4577
+msgid "/Buddies/Show Buddy Details"
 msgstr "/Amics/Mostra els detalls dels amics"
 
-#: ../pidgin/gtkblist.c:4609
-#, fuzzy
-msgid "/Buddies/Show/Idle Times"
+#: ../pidgin/gtkblist.c:4580
+msgid "/Buddies/Show Idle Times"
 msgstr "/Amics/Mostra el temps d'inactivitat"
 
-#: ../pidgin/gtkblist.c:4612
-#, fuzzy
-msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Amics/Mostra els grups buits"
-
-#: ../pidgin/gtkblist.c:5507
+#: ../pidgin/gtkblist.c:5457
 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. "
@@ -14238,27 +13124,25 @@ msgstr ""
 "l'amic. El sobrenom substituirà el nom d'usuari allà on sigui possible.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
-#, fuzzy
+#: ../pidgin/gtkblist.c:5492
 msgid "_Screen name:"
-msgstr "Nom d'usuari:"
+msgstr "_Nom d'usuari:"
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
-#, fuzzy
+#: ../pidgin/gtkblist.c:5514 ../pidgin/gtkblist.c:5867
 msgid "A_lias:"
-msgstr "Àlies:"
+msgstr "À_lies:"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:5779
 msgid "This protocol does not support chat rooms."
 msgstr "Aquest protocol no implementa sales de xat."
 
-#: ../pidgin/gtkblist.c:5842
+#: ../pidgin/gtkblist.c:5795
 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:5883
+#: ../pidgin/gtkblist.c:5836
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14266,49 +13150,43 @@ msgstr ""
 "Introduïu un àlies i la informació adient sobre el xat que vulgueu afegir a "
 "la llista d'amics.\n"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:5924
 msgid "Please enter the name of the group to be added."
 msgstr "Introduïu el nom del grup que vulgueu afegir."
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6564
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Comptes/"
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:6588
 msgid "_Edit Account"
 msgstr "_Edita el compte"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#: ../pidgin/gtkblist.c:6601 ../pidgin/gtkconv.c:3007
 msgid "No actions available"
 msgstr "No hi ha accions disponibles"
 
-#: ../pidgin/gtkblist.c:6654
+#: ../pidgin/gtkblist.c:6609
 msgid "_Disable"
 msgstr "_Inhabilita"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:6621
 msgid "Enable Account"
 msgstr "Habilita el compte"
 
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:6627
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Comptes/Habilita el compte"
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:6676
 msgid "/Tools"
 msgstr "/Eines"
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:6746
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amics/Ordena els amics"
 
-#. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
-#, fuzzy
-msgid "SSL Servers"
-msgstr "Servidor"
-
-#: ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkconn.c:179
 #, c-format
 msgid ""
 "%s\n"
@@ -14321,26 +13199,25 @@ msgstr ""
 "El %s no intentarà connectar de nou aquest compte fins que no corregiu "
 "l'error i rehabiliteu el compte."
 
-#: ../pidgin/gtkconv.c:482
-#, fuzzy
+#: ../pidgin/gtkconv.c:458
 msgid "Unknown command."
-msgstr "Ordre desconeguda"
+msgstr "Ordre desconeguda."
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:730 ../pidgin/gtkconv.c:756
 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:774
+#: ../pidgin/gtkconv.c:750
 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:827
+#: ../pidgin/gtkconv.c:803
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convida l'amic a una sala de xat"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
+#: ../pidgin/gtkconv.c:833
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14348,859 +13225,852 @@ msgstr ""
 "Introduïu el nom de l'usuari que vulgueu convidar, així com un missatge "
 "d'invitació opcional."
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:854
 msgid "_Buddy:"
 msgstr "_Amic:"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
+#: ../pidgin/gtkconv.c:874 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "_Missatge:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
+#: ../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:953
+#: ../pidgin/gtkconv.c:937
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversa amb %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:973
 msgid "Save Conversation"
 msgstr "Desa la conversa"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1122 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Cerca"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1148 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Cerca:"
 
-#: ../pidgin/gtkconv.c:1622
+#: ../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
 msgid "Un-Ignore"
 msgstr "No ignoris"
 
-#: ../pidgin/gtkconv.c:1625
+#: ../pidgin/gtkconv.c:1590
 msgid "Ignore"
 msgstr "Ignora"
 
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1610
 msgid "Get Away Message"
 msgstr "Aconsegueix el missatge d'absència"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1633
 msgid "Last said"
 msgstr "El darrer que es digué"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2522
 msgid "Unable to save icon file to disk."
 msgstr "No s'ha pogut desar el fitxer de la icona al disc."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2573
 msgid "Save Icon"
 msgstr "Desa la icona"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2625
 msgid "Animate"
 msgstr "Anima"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2630
 msgid "Hide Icon"
 msgstr "Oculta la icona"
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2633
 msgid "Save Icon As..."
 msgstr "Anomena i desa la icona..."
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2637
 msgid "Set Custom Icon..."
 msgstr "Estableix una icona personalitzada..."
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2650
 msgid "Remove Custom Icon"
 msgstr "Suprimeix la icona personalitzada"
 
-#: ../pidgin/gtkconv.c:2861
-msgid "Show All"
-msgstr ""
-
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2792
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/_Missatge instantani nou..."
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2799
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Cerca..."
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2801
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Visualitza el _registre"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2802
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/Anomena i _desa..."
 
 # FIXME ?
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/_Neteja la finestra"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/Envia un _fitxer..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2809
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Afegeix un a_vís per a l'amic..."
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2811
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Aconsegueix informació"
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2813
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/Con_vida..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2815
 msgid "/Conversation/M_ore"
 msgstr "/Conversa/_Més"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2819
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversa/Àl_ies..."
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2821
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloca..."
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2823
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversa/_Desbloca..."
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2825
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/_Afegeix..."
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2827
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/Sup_rimeix..."
 
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2832
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversa/Insereix un _enllaç..."
 
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2834
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Insereix una _imatge..."
 
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2840
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Tanca"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:2844
 msgid "/_Options"
 msgstr "/_Opcions"
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:2845
 msgid "/Options/Enable _Logging"
 msgstr "/Opcions/Habilita el _registre"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:2846
 msgid "/Options/Enable _Sounds"
 msgstr "/Opcions/Habilita els _sons"
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:2847
+msgid "/Options/Show Buddy _Icon"
+msgstr "/Opcions/Mostra la icona de l'amic"
+
+#: ../pidgin/gtkconv.c:2849
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opcions/Mos_tra les barres d'eines per al format"
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:2850
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opcions/_Mostra les marques horàries"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:2995
 msgid "/Conversation/More"
 msgstr "/Conversa/Més"
 
-#: ../pidgin/gtkconv.c:3117
-#, fuzzy
+#: ../pidgin/gtkconv.c:3051
 msgid "/Options"
-msgstr "/_Opcions"
+msgstr "/Opcions"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3086 ../pidgin/gtkconv.c:3118
 msgid "/Conversation"
 msgstr "/Conversa"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3126
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Visualitza el registre"
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3132
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Envia un fitxer..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3136
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Afegeix avís per a l'amic..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3142
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Aconsegueix informació"
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3146
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convida..."
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3152
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Àlies..."
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3156
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloca"
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3160
 msgid "/Conversation/Unblock..."
 msgstr "/Conversa/Desbloca..."
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3164
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Afegeix..."
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3168
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Suprimeix..."
 
-#: ../pidgin/gtkconv.c:3240
+#: ../pidgin/gtkconv.c:3174
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversa/Insereix un enllaç..."
 
-#: ../pidgin/gtkconv.c:3244
+#: ../pidgin/gtkconv.c:3178
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Insereix una imatge..."
 
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3184
 msgid "/Options/Enable Logging"
 msgstr "/Opcions/Habilita el registre"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3187
 msgid "/Options/Enable Sounds"
 msgstr "/Opcions/Habilita els sons"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3200
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opcions/Mostra les barres d'eines per al format"
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3203
 msgid "/Options/Show Timestamps"
 msgstr "/Opcions/Mostra les marques horàries"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../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
 msgid "User is typing..."
 msgstr "L'usuari està escrivint..."
 
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3335
 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:3574 ../pidgin/gtkconv.c:8022
-#, fuzzy
+#: ../pidgin/gtkconv.c:3518 ../pidgin/gtkconv.c:7782
 msgid "_Send To"
 msgstr "_Envia a"
 
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:4231
 msgid "_Send"
 msgstr "_Envia"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4335
 msgid "0 people in room"
 msgstr "No hi ha ningú a la sala"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5603 ../pidgin/gtkconv.c:5724
 #, 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:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6327 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Teclejant"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6331
 msgid "Stopped Typing"
 msgstr "Pari d'escriure"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6334
 msgid "Nick Said"
 msgstr "S'ha dit el sobrenom"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6337 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Missatges sense llegir"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6340
 msgid "New Event"
 msgstr "Esdeveniment nou"
 
-#: ../pidgin/gtkconv.c:7572
-#, fuzzy
+#: ../pidgin/gtkconv.c:7332
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Neteja la conversa."
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7496
 msgid "Confirm close"
 msgstr "Confirma en tancar"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7528
 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:8355
+#: ../pidgin/gtkconv.c:8114
 msgid "Close other tabs"
 msgstr "Tanca les altres pestanyes"
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8120
 msgid "Close all tabs"
 msgstr "Tanca totes les pestanyes"
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8128
 msgid "Detach this tab"
 msgstr "Desenganxa aquesta pestanya"
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8134
 msgid "Close this tab"
 msgstr "Tanca aquesta pestanya"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:8632
 msgid "Close conversation"
 msgstr "Tanca la conversa"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9232
 msgid "Last created window"
 msgstr "Finestra creada per darrer cop"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9234
 msgid "Separate IM and Chat windows"
 msgstr "Separa les finestres de MI de les de xat"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9236 ../pidgin/gtkprefs.c:1412
 msgid "New window"
 msgstr "Finestra nova"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9238
 msgid "By group"
 msgstr "Per grup"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9240
 msgid "By account"
 msgstr "Per compte"
 
-#: ../pidgin/gtkdebug.c:234
+#: ../pidgin/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "Desa el registre de depuració"
 
-#: ../pidgin/gtkdebug.c:582
+#: ../pidgin/gtkdebug.c:581
 msgid "Invert"
 msgstr "Inverteix"
 
-#: ../pidgin/gtkdebug.c:585
+#: ../pidgin/gtkdebug.c:584
 msgid "Highlight matches"
 msgstr "Ressalta les coincidències"
 
-#: ../pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:651
 msgid "_Icon Only"
 msgstr "Només _icona"
 
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:652
 msgid "_Text Only"
 msgstr "Només _text"
 
-#: ../pidgin/gtkdebug.c:654
+#: ../pidgin/gtkdebug.c:653
 msgid "_Both Icon & Text"
 msgstr "Ic_ones i text"
 
-#: ../pidgin/gtkdebug.c:775
+#: ../pidgin/gtkdebug.c:774
 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:794
+#: ../pidgin/gtkdebug.c:793
 msgid "Right click for more options."
 msgstr "Feu clic amb el botó principal per a més opcions"
 
-#: ../pidgin/gtkdebug.c:824
+#: ../pidgin/gtkdebug.c:823
 msgid "Level "
 msgstr "Nivell "
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
 msgid "Select the debug filter level."
 msgstr "Seleccioneu el nivell de depuració."
 
-#: ../pidgin/gtkdebug.c:833
+#: ../pidgin/gtkdebug.c:832
 msgid "All"
 msgstr "Tot"
 
 # FIXME
-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:833
 msgid "Misc"
 msgstr "Altres"
 
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:835
 msgid "Warning"
 msgstr "Avís"
 
-#: ../pidgin/gtkdebug.c:837
+#: ../pidgin/gtkdebug.c:836
 msgid "Error "
 msgstr "Error"
 
-#: ../pidgin/gtkdebug.c:838
+#: ../pidgin/gtkdebug.c:837
 msgid "Fatal Error"
 msgstr "Error fatal"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:113
 msgid "lead developer"
 msgstr "desenvolupador principal"
 
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
+#: ../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
 msgid "developer"
 msgstr "desenvolupador"
 
-#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "suport"
 
 # CQ -> Control de qualitat (josep)
-#: ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:87
 msgid "support/QA"
 msgstr "suport/CQ"
 
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:108
 msgid "developer & webmaster"
 msgstr "desenvolupador i mantenidor de la pàgina web"
 
-#: ../pidgin/gtkdialogs.c:99
-msgid "Senior Contributor/QA"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:108
+#: ../pidgin/gtkdialogs.c:104
 msgid "win32 port"
 msgstr "adaptació a win32"
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:105 ../pidgin/gtkdialogs.c:106
 msgid "maintainer"
 msgstr "mantenidor"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:107
 msgid "libfaim maintainer"
-msgstr "mantenidor de libfaim"
+msgstr "mantenidor del libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:110
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker i conductor designat"
 
-#: ../pidgin/gtkdialogs.c:115
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:111
 msgid "XMPP developer"
-msgstr "desenvolupador"
+msgstr "desenvolupador de l'XMPP"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:112
 msgid "original author"
 msgstr "autor original"
 
-#: ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:128
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:129
 msgid "Arabic"
 msgstr "Àrab"
 
-#: ../pidgin/gtkdialogs.c:135
-msgid "Belarusian Latin"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:218
 msgid "Bulgarian"
 msgstr "Búlgar"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
 msgid "Bengali"
 msgstr "Bengalí"
 
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:136
 msgid "Bosnian"
 msgstr "Bosnià"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:220
 msgid "Catalan"
 msgstr "Català"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Valencian-Catalan"
 msgstr "Valencià-català"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:221
 msgid "Czech"
 msgstr "Txec"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
 msgid "Danish"
 msgstr "Danès"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:222
 msgid "German"
 msgstr "Alemany"
 
 # FIXME
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:147
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
 msgid "Greek"
 msgstr "Grec"
 
-#: ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:150
 msgid "Australian English"
 msgstr "Anglès d'Austràlia"
 
-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:151
 msgid "Canadian English"
 msgstr "Anglès canadenc"
 
-#: ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:152
 msgid "British English"
 msgstr "Anglès britànic"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:153
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:226
 msgid "Spanish"
 msgstr "Espanyol"
 
-#: ../pidgin/gtkdialogs.c:161
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:155
 msgid "Estonian"
-msgstr "Bosnià"
+msgstr "Estoni"
 
 # Èuscar, millor? (josep)
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
 msgid "Euskera(Basque)"
 msgstr "Basc"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
 msgid "Finnish"
 msgstr "Finès"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "French"
 msgstr "Francès"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:233
 msgid "Galician"
 msgstr "Gallec"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:166
 msgid "Gujarati Language Team"
-msgstr ""
+msgstr "Equip de traducció del Gujarati"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:234
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:168
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:169
 msgid "Hungarian"
 msgstr "Hongarès"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:170
 msgid "Indonesian"
 msgstr "Indonesi"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:235
 msgid "Italian"
 msgstr "Italià"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237 ../pidgin/gtkdialogs.c:238
 msgid "Japanese"
 msgstr "Japonès"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:239
 msgid "Georgian"
 msgstr "Georgià"
 
-#: ../pidgin/gtkdialogs.c:179
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:173
 msgid "Ubuntu Georgian Translators"
-msgstr "Traductors actuals"
+msgstr "Traductors al georgià de l'Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:174
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:174
 msgid "Kannada Translation team"
-msgstr ""
+msgstr "Equip de traducció del Kannada"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Korean"
 msgstr "Coreà"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kurdish"
 msgstr "Kurd"
 
-#: ../pidgin/gtkdialogs.c:185
-#, fuzzy
-msgid "Lao"
-msgstr "Lleó"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243
 msgid "Lithuanian"
 msgstr "Lituà"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:244
 msgid "Macedonian"
 msgstr "Macedoni"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:245
 msgid "Bokmål Norwegian"
 msgstr "Noruec bokmål"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:183
 msgid "Nepali"
 msgstr "Nepalès"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:184
 msgid "Dutch, Flemish"
 msgstr "Holandès, Flamenc"
 
-#: ../pidgin/gtkdialogs.c:193
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:185
 msgid "Norwegian Nynorsk"
 msgstr "Noruec (Nynorsk)"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:246
 msgid "Polish"
 msgstr "Polonès"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:189
 msgid "Portuguese"
 msgstr "Portuguès"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:190
 msgid "Portuguese-Brazil"
 msgstr "Portuguès de Brasil"
 
-#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:191
 msgid "Pashto"
 msgstr "Paixto"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:192
 msgid "Romanian"
 msgstr "Romanès"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:248
 msgid "Russian"
 msgstr "Rus"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:251
 msgid "Slovak"
 msgstr "Eslovac"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:252
 msgid "Slovenian"
 msgstr "Eslovè"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:197
 msgid "Albanian"
 msgstr "Albanès"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
 msgid "Serbian"
 msgstr "Serbi"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:254
 msgid "Swedish"
 msgstr "Suec"
 
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:201
 msgid "Tamil"
 msgstr "Tàmil"
 
 # FIXME
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:202
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:203
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:255
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:205
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:205
 msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "Equip del Vi de Gnome i T.M.Thanh"
+msgstr "Equip del vietnamita del Gnome i T.M.Thanh"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:256
 msgid "Simplified Chinese"
 msgstr "Xinès simplificat"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:209
 msgid "Hong Kong Chinese"
-msgstr ""
+msgstr "Xinès de Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:257
 msgid "Traditional Chinese"
 msgstr "Xinès tradicional"
 
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:217
 msgid "Amharic"
 msgstr "Amhàric"
 
-#: ../pidgin/gtkdialogs.c:357
+#: ../pidgin/gtkdialogs.c:342
 #, c-format
 msgid "About %s"
 msgstr "Quant al %s"
 
-#: ../pidgin/gtkdialogs.c:400
-#, fuzzy, c-format
+#: ../pidgin/gtkdialogs.c:380
+#, 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, 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."
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
+"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
+"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
+"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
+"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
+"contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr ""
+"El %s és un client de missatgeria instantània modular basat en libpurpel, "
+"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 "
+"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>"
-msgstr ""
-"El %s és un client de missatgeria instantània modular, capaç d'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 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:418
-#, c-format
+#: ../pidgin/gtkdialogs.c:395
 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:423
+#: ../pidgin/gtkdialogs.c:400
 msgid "Current Developers"
 msgstr "Desenvolupadors actuals"
 
-#: ../pidgin/gtkdialogs.c:438
+#: ../pidgin/gtkdialogs.c:415
 msgid "Crazy Patch Writers"
 msgstr "Esbojarrats escriptors de pedaços"
 
-#: ../pidgin/gtkdialogs.c:453
+#: ../pidgin/gtkdialogs.c:430
 msgid "Retired Developers"
 msgstr "Desenvolupadors retirats"
 
-#: ../pidgin/gtkdialogs.c:468
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:445
 msgid "Retired Crazy Patch Writers"
-msgstr "Esbojarrats escriptors de pedaços"
+msgstr "Escriptors de pedaços retirats"
 
-#: ../pidgin/gtkdialogs.c:483
+#: ../pidgin/gtkdialogs.c:460
 msgid "Artists"
 msgstr "Artistes"
 
-#: ../pidgin/gtkdialogs.c:498
+#: ../pidgin/gtkdialogs.c:475
 msgid "Current Translators"
 msgstr "Traductors actuals"
 
-#: ../pidgin/gtkdialogs.c:518
+#: ../pidgin/gtkdialogs.c:495
 msgid "Past Translators"
 msgstr "Antics traductors"
 
-#: ../pidgin/gtkdialogs.c:536
+#: ../pidgin/gtkdialogs.c:513
 msgid "Debugging Information"
 msgstr "Informació de depuració"
 
-#: ../pidgin/gtkdialogs.c:906
+#: ../pidgin/gtkdialogs.c:882
 msgid "Get User Info"
 msgstr "Aconsegueix dades de l'usuari"
 
-#: ../pidgin/gtkdialogs.c:908
+#: ../pidgin/gtkdialogs.c:884
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -15208,11 +14078,11 @@ msgstr ""
 "Introduïu el nom d'usuari o àlies de la persona de la qual vulgueu veure la "
 "informació."
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:974
 msgid "View User Log"
 msgstr "Visualitza el registre de l'usuari"
 
-#: ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:976
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -15220,32 +14090,32 @@ msgstr ""
 "Introduïu el nom d'usuari o l'àlies de la persona de la qual vulgueu veure "
 "el registre."
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Contact"
 msgstr "Posa un àlies al contacte"
 
-#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:997
 msgid "Enter an alias for this contact."
 msgstr "Introduïu un àlies per a aquest contacte."
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1019
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduïu un àlies per a %s."
 
-#: ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkdialogs.c:1021
 msgid "Alias Buddy"
 msgstr "Posa un àlies a un amic"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1042
 msgid "Alias Chat"
 msgstr "Posa un àlies a un xat"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1043
 msgid "Enter an alias for this chat."
 msgstr "Introduïu un àlies per a aquest xat."
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1082
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15260,15 +14130,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:1114
+#: ../pidgin/gtkdialogs.c:1090
 msgid "Remove Contact"
 msgstr "Suprimeix el contacte"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1093
 msgid "_Remove Contact"
 msgstr "_Suprimeix el contacte"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1124
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15276,15 +14146,15 @@ msgid ""
 msgstr ""
 "Ara es fusionarà el grup %s dins del grup anomenat %s. Voleu continuar?"
 
-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1131
 msgid "Merge Groups"
 msgstr "Fusiona els grups"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1134
 msgid "_Merge Groups"
 msgstr "_Fusiona els grups"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1184
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15293,40 +14163,40 @@ msgstr ""
 "Ara se suprimirà el grup %s i tots els seus membres de la llista d'amics. "
 "Voleu continuar?"
 
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1187
 msgid "Remove Group"
 msgstr "Suprimeix el grup"
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1190
 msgid "_Remove Group"
 msgstr "_Suprimeix el grup"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1223
 #, 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:1250
+#: ../pidgin/gtkdialogs.c:1226
 msgid "Remove Buddy"
 msgstr "Suprimeix l'amic"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1229
 msgid "_Remove Buddy"
 msgstr "Sup_rimeix un amic"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1250
 #, 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:1277
+#: ../pidgin/gtkdialogs.c:1253
 msgid "Remove Chat"
 msgstr "Suprimeix el Xat"
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1256
 msgid "_Remove Chat"
 msgstr "_Suprimeix el Xat"
 
@@ -15353,7 +14223,6 @@ msgid "Mute Sounds"
 msgstr "Inhabilita els sons"
 
 #: ../pidgin/gtkdocklet.c:535
-#, fuzzy
 msgid "Blink on new message"
 msgstr "Parpelleja si hi ha missatges nous"
 
@@ -15361,131 +14230,131 @@ msgstr "Parpelleja si hi ha missatges nous"
 msgid "Quit"
 msgstr "Surt"
 
-#: ../pidgin/gtkft.c:154
+#: ../pidgin/gtkft.c:153
 msgid "Not started"
 msgstr "No s'ha iniciat"
 
-#: ../pidgin/gtkft.c:274
+#: ../pidgin/gtkft.c:273
 msgid "<b>Receiving As:</b>"
 msgstr "<b>S'està rebent com a:</b>"
 
-#: ../pidgin/gtkft.c:276
+#: ../pidgin/gtkft.c:275
 msgid "<b>Receiving From:</b>"
 msgstr "<b>S'està rebent de:</b>"
 
-#: ../pidgin/gtkft.c:280
+#: ../pidgin/gtkft.c:279
 msgid "<b>Sending To:</b>"
 msgstr "<b>S'està enviant a:</b>"
 
-#: ../pidgin/gtkft.c:282
+#: ../pidgin/gtkft.c:281
 msgid "<b>Sending As:</b>"
 msgstr "<b>S'està enviant com a:</b>"
 
-#: ../pidgin/gtkft.c:498
+#: ../pidgin/gtkft.c:497
 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:503
+#: ../pidgin/gtkft.c:502
 msgid "An error occurred while opening the file."
 msgstr "S'ha produït un error en obrir el fitxer."
 
-#: ../pidgin/gtkft.c:540
+#: ../pidgin/gtkft.c:539
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "S'ha produït un error en executar %s: %s"
 
-#: ../pidgin/gtkft.c:549
+#: ../pidgin/gtkft.c:548
 #, c-format
 msgid "Error running %s"
 msgstr "S'ha produït un error en executar %s"
 
-#: ../pidgin/gtkft.c:550
+#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Process returned error code %d"
 msgstr "El procés ha tornat el codi d'error %d"
 
-#: ../pidgin/gtkft.c:697
+#: ../pidgin/gtkft.c:696
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: ../pidgin/gtkft.c:698
+#: ../pidgin/gtkft.c:697
 msgid "Local File:"
 msgstr "Fitxer local:"
 
-#: ../pidgin/gtkft.c:700
+#: ../pidgin/gtkft.c:699
 msgid "Speed:"
 msgstr "Velocitat:"
 
-#: ../pidgin/gtkft.c:701
+#: ../pidgin/gtkft.c:700
 msgid "Time Elapsed:"
 msgstr "Temps transcorregut:"
 
-#: ../pidgin/gtkft.c:702
+#: ../pidgin/gtkft.c:701
 msgid "Time Remaining:"
 msgstr "Temps restant:"
 
-#: ../pidgin/gtkft.c:784
+#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "Tanca aquesta finestra quan totes les transferències hagin _finalitzat"
 
-#: ../pidgin/gtkft.c:794
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "_Neteja les transferències acabades"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "_Detalls de la transferència de fitxers"
 
 #. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Pausa"
 
 #. Resume button
-#: ../pidgin/gtkft.c:843
+#: ../pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr "_Continua"
 
-#: ../pidgin/gtkimhtml.c:816
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Enganxa com a _text"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1138
 msgid "_Reset formatting"
 msgstr "_Restableix el format"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "Color dels enllaços"
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "El color amb què pintar els enllaços."
 
 # FIXME: prelight? (josep)
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
 msgstr "Color dels enllaços"
 
-#: ../pidgin/gtkimhtml.c:1378
+#: ../pidgin/gtkimhtml.c:1377
 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:1598
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "_Copia l'adreça de correu"
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "_Obre l'enllaç en el navegador"
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: ../pidgin/gtkimhtml.c:3369
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15496,7 +14365,7 @@ msgstr ""
 "\n"
 "Es farà servir PNG per defecte."
 
-#: ../pidgin/gtkimhtml.c:3372
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15506,7 +14375,7 @@ msgstr ""
 "\n"
 "Per defecte es farà servir PNG."
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15518,7 +14387,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15529,36 +14398,35 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "Desa imatge"
 
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
-msgstr "_Desa imatge..."
+msgstr "_Desa la imatge..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:163
+#: ../pidgin/gtkimhtmltoolbar.c:153
 msgid "Select Font"
 msgstr "Selecciona el tipus de lletra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
+#: ../pidgin/gtkimhtmltoolbar.c:232
 msgid "Select Text Color"
 msgstr "Selecciona el color del text"
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
+#: ../pidgin/gtkimhtmltoolbar.c:311
 msgid "Select Background Color"
 msgstr "Selecciona el color de fons"
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
+#: ../pidgin/gtkimhtmltoolbar.c:400
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:408
 msgid "_Description"
 msgstr "_Descripció"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
+#: ../pidgin/gtkimhtmltoolbar.c:411
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -15566,182 +14434,93 @@ msgstr ""
 "Introduïu l'URL i la descripció de l'enllaç que vulgueu inserir. La "
 "descripció és opcional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtkimhtmltoolbar.c:415
 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:430 ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "Insert Link"
 msgstr "Insereix un enllaç"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1207
 msgid "_Insert"
 msgstr "_Insereix"
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
+#: ../pidgin/gtkimhtmltoolbar.c:493
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "No s'ha pogut emmagatzemar la imatge: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
+#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
 msgid "Insert Image"
 msgstr "Insereix una imatge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:761
+#: ../pidgin/gtkimhtmltoolbar.c:740
 msgid "This theme has no available smileys."
 msgstr "Aquest tema no disposa d'emoticones."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
+#: ../pidgin/gtkimhtmltoolbar.c:757
 msgid "Smile!"
 msgstr "Somrieu!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:820 ../pidgin/gtkimhtmltoolbar.c:1164
 msgid "_Font"
-msgstr "Tipus de lletra"
+msgstr "_Tipus de lletra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-#, fuzzy
-msgid "Group Items"
-msgstr "ID del Grup"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-msgid "Ungroup Items"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Negreta"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Itàlica"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Subratllat"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1091
-msgid "Strikethrough"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1093
-#, fuzzy
-msgid "Increase Font Size"
-msgstr "Ignora la _mida de la lletra"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1094
-msgid "Decrease Font Size"
-msgstr ""
-
-# FIXME?
-#: ../pidgin/gtkimhtmltoolbar.c:1096
-#, fuzzy
-msgid "Font Face"
-msgstr "Tipus de lletra"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1097
-#, fuzzy
-msgid "Background Color"
-msgstr "Color de fons"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1098
-#, fuzzy
-msgid "Foreground Color"
-msgstr "Color del text"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1100
-#, fuzzy
-msgid "Reset Formatting"
-msgstr "Restableix el format"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1103
-#, fuzzy
-msgid "Insert IM Image"
-msgstr "Insereix una imatge"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1104
-#, fuzzy
-msgid "Insert Smiley"
-msgstr "Insereix una emoticona"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1179
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1124
 msgid "<b>_Bold</b>"
-msgstr "<b>Contrasenya:</b>"
+msgstr "<b>_Negreta</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1125
 msgid "<i>_Italic</i>"
-msgstr " <i>(ircop)</i>"
+msgstr " <i>_Cursiva</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1126
 msgid "<u>_Underline</u>"
-msgstr "Subratllat"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1182
-msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
+msgstr "<u>_Subratllat</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1127
 msgid "<span size='larger'>_Larger</span>"
-msgstr ""
-"<span size='larger' weight='bold'>S'ha produït un error en desar la imatge.</"
-"span>\n"
-"\n"
-"%s"
+msgstr "<span size='larger'>Més _gran</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1129
 msgid "_Normal"
-msgstr "Normal"
+msgstr "N_ormal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1131
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
+msgstr "<span size='smaller'>Més _petita</span>"
 
 # FIXME?
 #. 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:1191
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1135
 msgid "_Font face"
-msgstr "Tipus de lletra"
+msgstr "_Tipus de lletra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1136
 msgid "Foreground _color"
-msgstr "Color del text"
+msgstr "Color del te_xt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1137
 msgid "Bac_kground color"
-msgstr "Color de fons"
+msgstr "Color de _fons"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Smiley"
-msgstr "Somrieu!"
+msgstr "_Emoticona"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1276
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "_Image"
-msgstr "Desa imatge"
+msgstr "_Imatge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1227
 msgid "_Link"
-msgstr "_Nom d'usuari"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1288
-msgid "_Horizontal rule"
-msgstr ""
+msgstr "E_nllaç"
 
-#: ../pidgin/gtklog.c:293
+#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -15750,7 +14529,7 @@ msgstr ""
 "Esteu segur que voleu suprimir el registre de la conversa amb %s iniciada a "
 "les %s?"
 
-#: ../pidgin/gtklog.c:304
+#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -15759,7 +14538,7 @@ msgstr ""
 "Esteu segur que voleu suprimir el registre de la conversa a %s iniciada a "
 "les %s?"
 
-#: ../pidgin/gtklog.c:309
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -15768,23 +14547,23 @@ msgstr ""
 "Esteu segur que voleu suprimir permanentment el registre del sistema iniciat "
 "a les %s?"
 
-#: ../pidgin/gtklog.c:453
+#: ../pidgin/gtklog.c:452
 #, 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:456
+#: ../pidgin/gtklog.c:455
 #, 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:503
+#: ../pidgin/gtklog.c:502
 msgid "%B %Y"
 msgstr "%B de %Y"
 
 # FIXME
-#: ../pidgin/gtklog.c:550
+#: ../pidgin/gtklog.c:549
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -15792,7 +14571,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:554
+#: ../pidgin/gtklog.c:553
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -15800,37 +14579,37 @@ msgstr ""
 "Els missatges instantanis només es registraran si s'habilita la preferència "
 "«Registra tots els missatges instantanis»."
 
-#: ../pidgin/gtklog.c:557
+#: ../pidgin/gtklog.c:556
 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:561
+#: ../pidgin/gtklog.c:560
 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:576
+#: ../pidgin/gtklog.c:575
 msgid "_Browse logs folder"
 msgstr "_Navega la carpeta dels registres"
 
-#: ../pidgin/gtklog.c:640
+#: ../pidgin/gtklog.c:639
 msgid "Total log size:"
 msgstr "Mida total del registre:"
 
-#: ../pidgin/gtklog.c:709
+#: ../pidgin/gtklog.c:708
 #, c-format
 msgid "Conversations in %s"
 msgstr "Converses a %s"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
 #, c-format
 msgid "Conversations with %s"
 msgstr "Converses amb %s"
 
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:803
 msgid "System Log"
 msgstr "Registre del sistema"
 
@@ -15840,7 +14619,7 @@ 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
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -15860,6 +14639,7 @@ msgstr ""
 "  -c, --config=DIR    utilitza DIR per als fitxers de configuració\n"
 "  -d, --debug         mostra missatges de depuració a la sortida estàndard\n"
 "  -h, --help          mostra aquesta ajuda i surt\n"
+"  -m, --multiple      permet que hi hagi més d'una instància\n"
 "  -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"
@@ -15867,7 +14647,7 @@ msgstr ""
 
 # FIXME: backtrace -> traça (bug-buddy) ?
 #: ../pidgin/gtkmain.c:512
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
@@ -15893,82 +14673,81 @@ msgstr ""
 "\n"
 "Si podeu reproduir aquest error, feu-ho saber als desenvolupadors\n"
 "del Pidgin, enviant-los un error de programació a:\n"
-"%sbug.php\n"
+"%ssimpleticket\n"
 "\n"
 "Assegureu-vos que indiqueu el que estàveu 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"
-"%sgdb.php\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"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
-#, fuzzy
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
 msgid "Pidgin"
-msgstr "Porc"
+msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:349
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Obre els _missatges"
 
-#: ../pidgin/gtknotify.c:402
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Teniu correu electrònic.</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:521
 #, 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:564
-#, fuzzy, c-format
+#: ../pidgin/gtknotify.c:532
+#, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Teniu %d correu electrònic nou.</b>"
 msgstr[1] "<b>Teniu %d correus electrònics nous.</b>"
 
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "L'ordre «%s» per al navegador no és vàlida."
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "No s'ha pogut obrir l'URL"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "S'ha produït un error en executar «%s»: %s"
 
-#: ../pidgin/gtknotify.c:1145
+#: ../pidgin/gtknotify.c:1113
 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:265
+#: ../pidgin/gtkplugin.c:264
 msgid "The following plugins will be unloaded."
 msgstr "Es descarregaran els connectors següents."
 
-#: ../pidgin/gtkplugin.c:284
+#: ../pidgin/gtkplugin.c:283
 msgid "Multiple plugins will be unloaded."
 msgstr "Es descarregaran diversos connectors."
 
-#: ../pidgin/gtkplugin.c:288
+#: ../pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
 msgstr "Descarrega connectors"
 
-#: ../pidgin/gtkplugin.c:400
+#: ../pidgin/gtkplugin.c:399
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -15979,7 +14758,7 @@ msgstr ""
 "<span weight=\"bold\">Lloc web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nom del fitxer:</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:410
+#: ../pidgin/gtkplugin.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -15990,128 +14769,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:536
+#: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
 msgstr "Config_ura el connector"
 
-#: ../pidgin/gtkplugin.c:599
+#: ../pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalls del connector</b>"
 
-#: ../pidgin/gtkpounce.c:157
+#: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "Seleccioneu un fitxer"
 
 # FIXME
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "Avisa dels Whom"
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "Nom de l'_amic:"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr "Es _connecti"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr "Es _desconnecti"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr "Passi a _absent"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr "To_rni a estar present"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr "Passi a _inactiu"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr "Ja no estigui i_nactiu"
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "Comenci a _escriure"
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr "S'_aturi mentre tecleja"
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr "Pari d'e_scriure"
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "Enviï un _missatge"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr "Obre u_na finestra de MI"
 
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr "Mostra una _notificació emergent"
 
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "Envia un _missatge"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr "E_xecuta una ordre"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr "Reproduei_x un so"
 
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "Nav_ega..."
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "Na_vega..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "Pre_visualitza"
 
-#: ../pidgin/gtkpounce.c:798
-#, fuzzy
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
-msgstr "Avisa n_omés quan el meu estat no estigui disponible"
+msgstr "Avisa n_omés quan el meu estat sigui no disponible"
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "_Recurrent"
 
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Objectiu de l'avís"
 
-#: ../pidgin/gtkprefs.c:386
+#: ../pidgin/gtkprefs.c:385
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-#, fuzzy
 msgid "Default"
-msgstr "Predeterminat del GNOME"
+msgstr "Predeterminat"
 
-#: ../pidgin/gtkprefs.c:517
+#: ../pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
 msgstr "No s'ha pogut desempaquetar el tema d'emoticones."
 
-#: ../pidgin/gtkprefs.c:644
+#: ../pidgin/gtkprefs.c:643
 msgid "Install Theme"
-msgstr ""
+msgstr "Instal·la el tema"
 
-#: ../pidgin/gtkprefs.c:697
+#: ../pidgin/gtkprefs.c:696
 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."
@@ -16119,258 +14896,253 @@ 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:732
+#: ../pidgin/gtkprefs.c:731
 msgid "Icon"
 msgstr "Icona"
 
-#: ../pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:893
 msgid "System Tray Icon"
 msgstr "Icona d'estat"
 
-#: ../pidgin/gtkprefs.c:895
+#: ../pidgin/gtkprefs.c:894
 msgid "_Show system tray icon:"
 msgstr "Mostra la icona d'estat:"
 
-#: ../pidgin/gtkprefs.c:899
+#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Si hi ha missatges sense llegir"
 
 # REVIEW
-#: ../pidgin/gtkprefs.c:904
+#: ../pidgin/gtkprefs.c:903
 msgid "Conversation Window Hiding"
 msgstr "Ocultació de les finestres"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:904
 msgid "_Hide new IM conversations:"
 msgstr "_Amaga noves converses de MI:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1939
 msgid "When away"
 msgstr "En estar absent"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
+#: ../pidgin/gtkprefs.c:915
 msgid "Tabs"
 msgstr "Pestanyes"
 
-#: ../pidgin/gtkprefs.c:918
+#: ../pidgin/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostra MI i xats en finestres amb _pestanyes"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:931
 msgid "Show close b_utton on tabs"
 msgstr "Mosta el b_otó de tancar a les pestanyes"
 
-#: ../pidgin/gtkprefs.c:935
+#: ../pidgin/gtkprefs.c:934
 msgid "_Placement:"
 msgstr "_Posicionament:"
 
-#: ../pidgin/gtkprefs.c:937
+#: ../pidgin/gtkprefs.c:936
 msgid "Top"
 msgstr "A dalt"
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:937
 msgid "Bottom"
 msgstr "A baix"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:938
 msgid "Left"
 msgstr "A la dreta"
 
-#: ../pidgin/gtkprefs.c:940
+#: ../pidgin/gtkprefs.c:939
 msgid "Right"
 msgstr "A l'esquerra"
 
-#: ../pidgin/gtkprefs.c:942
+#: ../pidgin/gtkprefs.c:941
 msgid "Left Vertical"
 msgstr "Vertical esquerre"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:942
 msgid "Right Vertical"
 msgstr "Vertical dret"
 
-#: ../pidgin/gtkprefs.c:950
+#: ../pidgin/gtkprefs.c:949
 msgid "N_ew conversations:"
 msgstr "Converses noves:"
 
-#: ../pidgin/gtkprefs.c:995
+#: ../pidgin/gtkprefs.c:994
 msgid "Show _formatting on incoming messages"
 msgstr "Mostra el format dels missatges entrants"
 
-#: ../pidgin/gtkprefs.c:998
-#, fuzzy
+#: ../pidgin/gtkprefs.c:997
 msgid "Show _detailed information"
-msgstr "Mostra informació de la connexió"
+msgstr "Mostra informació _detallada"
 
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
 msgstr "Habilita l'_animació de les icones dels amics"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1006
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notifica als amics quan els escrigui"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1009
 msgid "Highlight _misspelled words"
 msgstr "Ressalta les paraules _mal escrites"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1013
 msgid "Use smooth-scrolling"
 msgstr "Utilitza el desplaçament suau"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1016
 msgid "F_lash window when IMs are received"
 msgstr "_Fes que la finestra faci un flaix quan hi arribin missatges"
 
-#: ../pidgin/gtkprefs.c:1019
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1018
 msgid "Minimi_ze new conversation windows"
-msgstr "_Alça la finestra de conversa"
+msgstr "_Minimitza les finestres de conversa noves"
 
-#: ../pidgin/gtkprefs.c:1023
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1022
 msgid "Font"
 msgstr "Tipus de lletra"
 
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:1024
 msgid "Use document font from _theme"
-msgstr ""
+msgstr "Empra el tipus de lletra del document del _tema"
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:1026
 msgid "Use font from _theme"
-msgstr ""
+msgstr "Empra el tipus de lletra del _tema"
 
-#: ../pidgin/gtkprefs.c:1029
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1028
 msgid "Conversation _font:"
-msgstr "Entrada de la conversa"
+msgstr "_Tipus de lletra de la conversa:"
 
-#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:1041
 msgid "Default Formatting"
 msgstr "Format per defecte"
 
-#: ../pidgin/gtkprefs.c:1062
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1059
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
 "Així és com els missatges de text sortints apareixeran quan feu servir "
-"protocols que implementin el format. :)"
+"protocols que implementin el text formatat."
 
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1125
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1137
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemple: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1141
 msgid "_Autodetect IP address"
 msgstr "Detecta l'_adreça IP automàticament"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1150
 msgid "Public _IP:"
 msgstr "_IP pública:"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1179
 msgid "Ports"
 msgstr "Ports"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1182
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especifica _manualment el rang de ports on escoltar"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1185
 msgid "_Start port:"
 msgstr "Port _inicial:"
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1192
 msgid "_End port:"
 msgstr "Port _final:"
 
-#: ../pidgin/gtkprefs.c:1203
+#: ../pidgin/gtkprefs.c:1200
 msgid "Proxy Server"
 msgstr "Servidor intermediari"
 
-#: ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkprefs.c:1204
 msgid "No proxy"
 msgstr "Sense servidor intermediari"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1260
 msgid "_User:"
 msgstr "_Usuari:"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1325
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1326
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1327
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1328
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1329
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1330
 msgid "GNOME Default"
 msgstr "Predeterminat del GNOME"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1331
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1332
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1333
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1334
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1343
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1396
 msgid "Browser Selection"
 msgstr "Selecció del navegador"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1400
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1408
 msgid "_Open link in:"
 msgstr "_Obre la ubicació de l'enllaç a:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1410
 msgid "Browser default"
 msgstr "Predeterminat del navegador"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1411
 msgid "Existing window"
 msgstr "Finestra existent"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1413
 msgid "New tab"
 msgstr "Nova pestanya"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1427
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16379,69 +15151,63 @@ msgstr ""
 "_Manual:\n"
 "(%s per a l'URL)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1467
 msgid "Log _format:"
 msgstr "_Format del registre:"
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log all _instant messages"
 msgstr "_Registra tots els missatges instantanis"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all c_hats"
 msgstr "Registra tots els _xats"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all _status changes to system log"
 msgstr "Regi_stra tots els canvis d'estat al registre del sistema"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1622
 msgid "Sound Selection"
 msgstr "Selecció de sons"
 
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
+#: ../pidgin/gtkprefs.c:1632
 msgid "Quietest"
 msgstr "El més silenciós"
 
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quieter"
 msgstr "Més silenciós"
 
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quiet"
 msgstr "Silenciós"
 
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
+#: ../pidgin/gtkprefs.c:1640
 msgid "Loud"
 msgstr "Alt"
 
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
+#: ../pidgin/gtkprefs.c:1642
 msgid "Louder"
 msgstr "Més alt"
 
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
+#: ../pidgin/gtkprefs.c:1644
 msgid "Loudest"
 msgstr "El més alt"
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1708
 msgid "_Method:"
 msgstr "_Mètode:"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1710
 msgid "Console beep"
 msgstr "Avís sonor del terminal"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1717
 msgid "No sounds"
 msgstr "Sense sons"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1725
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16450,284 +15216,282 @@ msgstr ""
 "Ordre per al so\n"
 "(%s per al nom de fitxer)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1752
 msgid "Sounds when conversation has _focus"
 msgstr "Sons quan la conversa tingui el _focus"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1754
 msgid "Enable sounds:"
 msgstr "Habilita els sons:"
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1765
 msgid "Volume:"
 msgstr "Volum:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1845
 msgid "Play"
 msgstr "Reprodueix"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1922
 msgid "_Report idle time:"
 msgstr "Informa del _temps d'inactivitat:"
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:1927
 msgid "Based on keyboard or mouse use"
 msgstr "Basat en l'ús del teclat o el ratolí"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:1936
 msgid "_Auto-reply:"
 msgstr "Resposta _automàtica:"
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1940
 msgid "When both away and idle"
 msgstr "En estar absent i inactiu alhora"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:1946
 msgid "Auto-away"
 msgstr "Auto-absència"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1948
 msgid "Change status when _idle"
 msgstr "Canvia l'estat quan estigui _inactiu"
 
-#: ../pidgin/gtkprefs.c:1957
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1952
 msgid "_Minutes before becoming idle:"
-msgstr "_Minuts abans de canviar l'estat:"
+msgstr "_Minuts abans de passar a inactiu:"
 
-#: ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:1960
 msgid "Change _status to:"
 msgstr "Canvia l'e_stat a:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:1981
 msgid "Status at Startup"
 msgstr "L'estat en iniciar"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:1983
 msgid "Use status from last _exit at startup"
 msgstr "_En iniciar, empra el mateix estat que en sortir per darrer cop"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:1989
 msgid "Status to a_pply at startup:"
 msgstr "Es_tatus a utilitzar en iniciar:"
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2027
 msgid "Interface"
 msgstr "Interfície"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2029
 msgid "Smiley Themes"
 msgstr "Temes d'emoticones"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2036
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2040
 msgid "Status / Idle"
 msgstr "Estat / Inactiu"
 
-#: ../pidgin/gtkprivacy.c:80
+#: ../pidgin/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Permet a tots els usuaris contactar amb mi"
 
-#: ../pidgin/gtkprivacy.c:81
+#: ../pidgin/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "Només permet els usuaris de la llista d'amics"
 
-#: ../pidgin/gtkprivacy.c:82
+#: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Només permet els usuaris indicats aquí sota"
 
-#: ../pidgin/gtkprivacy.c:83
+#: ../pidgin/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Bloca tots els usuaris"
 
-#: ../pidgin/gtkprivacy.c:84
+#: ../pidgin/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Bloca els usuaris indicats aquí sota"
 
-#: ../pidgin/gtkprivacy.c:370
+#: ../pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "Privadesa"
 
-#: ../pidgin/gtkprivacy.c:382
+#: ../pidgin/gtkprivacy.c:381
 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:394
+#: ../pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr "Estableix la privadesa de:"
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr "Permet l'usuari"
 
-#: ../pidgin/gtkprivacy.c:558
+#: ../pidgin/gtkprivacy.c:557
 msgid "Type a user you permit to contact you."
 msgstr "Escriviu quin usuari permeteu que us contacti."
 
-#: ../pidgin/gtkprivacy.c:559
+#: ../pidgin/gtkprivacy.c:558
 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:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr "_Permet"
 
-#: ../pidgin/gtkprivacy.c:568
+#: ../pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Voleu permetre que %s us pugui contactar?"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:569
 #, 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:599 ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Bloca un usuari"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:599
 msgid "Type a user to block."
 msgstr "Escriviu l'usuari que vulgueu blocar."
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:600
 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:609
+#: ../pidgin/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "Voleu blocar %s?"
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Esteu segur que voleu blocar %s?"
 
-#: ../pidgin/gtkrequest.c:272
+#: ../pidgin/gtkrequest.c:271
 msgid "Apply"
 msgstr "Aplica"
 
-#: ../pidgin/gtkrequest.c:1507
+#: ../pidgin/gtkrequest.c:1504
 msgid "That file already exists"
 msgstr "Aquest fitxer ja existeix"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1505
 msgid "Would you like to overwrite it?"
 msgstr "El voleu sobreescriure?"
 
-#: ../pidgin/gtkrequest.c:1511
+#: ../pidgin/gtkrequest.c:1508
 msgid "Overwrite"
 msgstr "Sobreescriu"
 
-#: ../pidgin/gtkrequest.c:1512
+#: ../pidgin/gtkrequest.c:1509
 msgid "Choose New Name"
 msgstr "Trieu un nom nou"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1647 ../pidgin/gtkrequest.c:1661
 msgid "Select Folder..."
 msgstr "Selecciona una carpeta..."
 
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:375
+#: ../pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr "Llista de sales"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:443
+#: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr "_Aconsegueix la llista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
+#: ../pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr "_Afegeix el xat"
 
 # He omès "saved", que sembla que no hi cal (josep)
-#: ../pidgin/gtksavedstatuses.c:337
+#: ../pidgin/gtksavedstatuses.c:336
 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:620 ../pidgin/gtksavedstatuses.c:1266
+#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
 msgstr "_Utilitza"
 
-#: ../pidgin/gtksavedstatuses.c:780
+#: ../pidgin/gtksavedstatuses.c:779
 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:970
+#: ../pidgin/gtksavedstatuses.c:969
 msgid "Different"
 msgstr "Diferent"
 
-#: ../pidgin/gtksavedstatuses.c:1159
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "_Title:"
 msgstr "_Títol:"
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "E_stat:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
+#: ../pidgin/gtksavedstatuses.c:1209
 msgid "Use a _different status for some accounts"
 msgstr "Utilitza un estat _diferent per a determinats comptes"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
+#: ../pidgin/gtksavedstatuses.c:1273
 msgid "Sa_ve & Use"
 msgstr "Desa i _fes servir"
 
-#: ../pidgin/gtksavedstatuses.c:1480
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "Estat per a %s"
 
-#: ../pidgin/gtkstatusbox.c:664
+#: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "S'està esperant la connexió de xarxa"
 
-#: ../pidgin/gtkutils.c:632
-#, fuzzy
+#: ../pidgin/gtkutils.c:631
 msgid "Google Talk"
-msgstr "Commuta l'etiqueta"
+msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
 #, 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:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "No s'ha pogut carregar la imatge"
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "No s'ha pogut enviar la carpeta %s."
 
-#: ../pidgin/gtkutils.c:1499
-#, fuzzy, c-format
+#: ../pidgin/gtkutils.c:1498
+#, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
 "El %s no pot transferir una carpeta. Haureu d'enviar per separat cada un "
-"dels fitxers"
+"dels fitxers."
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "Heu arrossegat una imatge"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1531
 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."
@@ -16735,32 +15499,31 @@ 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:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "Estableix com a icona de l'amic"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "Envia un fitxer d'imatge"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
-msgstr "Insereix un el missatge"
+msgstr "Insereix en el missatge"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1543
 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:1551
-#, fuzzy
+#: ../pidgin/gtkutils.c:1550
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 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."
+"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:1552
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16773,11 +15536,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:1610
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "No es pot enviar el llançador"
 
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1609
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -16785,7 +15548,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:2345
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16796,27 +15559,27 @@ msgstr ""
 "<b>Mida del fitxer:</b> %s\n"
 "<b>Mida de la imatge:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2640
 #, 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:2643
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Error en la icona"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "No s'ha pogut establir la icona"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "No s'ha pogut obrir el fitxer «%s»: %s"
 
-#: ../pidgin/gtkutils.c:2793
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -16832,47 +15595,47 @@ msgstr "Desa un fitxer"
 msgid "Select color"
 msgstr "Seleccioneu un color"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "À_lies"
 
-#: ../pidgin/pidginstock.c:89
+#: ../pidgin/pidginstock.c:83
 msgid "Close _tabs"
 msgstr "Tanca les _pestanyes"
 
-#: ../pidgin/pidginstock.c:91
+#: ../pidgin/pidginstock.c:85
 msgid "_Get Info"
 msgstr "_Aconsegueix informació"
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "Conv_ida"
 
-#: ../pidgin/pidginstock.c:93
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "_Modifica"
 
-#: ../pidgin/pidginstock.c:94
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "_Obre el correu"
 
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
-#, fuzzy
 msgid "Pidgin smileys"
-msgstr "Opcions del Pidgwin"
+msgstr "Emoticones del Pidgin"
 
+# Nom propi: http://www.penguinpimps.com/?
+# "proxenetes" no queda gens, s'hi podria posar alguna altra cosa (josep)
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
-msgstr ""
+msgstr "Penguin Pimps"
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
-msgstr ""
+msgstr "Si seleccioneu això s'inhabilitaran les emoticones gràfiques."
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
-#, fuzzy
 msgid "none"
-msgstr "(cap)"
+msgstr "cap"
 
 #: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
@@ -16943,12 +15706,12 @@ msgstr "L'amic està absent"
 
 #: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
-msgstr "L'amic està absent «de fa temps»"
+msgstr "L'amic està absent «fa una bona estona»"
 
 #. Not used yet.
 #: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
-msgstr "L'amis és mòbil"
+msgstr "L'amic és mòbil"
 
 #: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
@@ -16968,7 +15731,7 @@ msgstr ""
 
 #: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
-msgstr "Utilitza el darrer amic quan les puntuacions siguin iguals"
+msgstr "Empra el darrer amic quan les puntuacions siguin iguals"
 
 #: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
@@ -17035,6 +15798,18 @@ msgstr "Missatges rebuts"
 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"
@@ -17061,6 +15836,8 @@ msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
+"Nota: la preferència «Converses noves» s'ha d'establir a «Pel nombre de "
+"converses»."
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
@@ -17160,20 +15937,20 @@ msgstr ""
 "una de nova."
 
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
 msgid "Group:"
 msgstr "Grup:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
 msgid "New Person"
 msgstr "Nova persona"
 
 # FIXME: seleccioneu un amic?
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr "Seleccioneu un amic"
 
@@ -17194,7 +15971,7 @@ msgstr "Detalls de l'_usuari"
 #. "Associate Buddy" button
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
-msgstr "_Associa amic"
+msgstr "_Associa l'amic"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
@@ -17227,7 +16004,8 @@ msgstr "Configuració de la integració amb l'Evolution"
 #: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
-"Seleccioneu tots els comptes on els amics s'hagin d'afegir automàticament."
+"Seleccioneu tots els comptes en què s'hagin d'afegir automàticament els "
+"amics."
 
 #. *< type
 #. *< ui_requirement
@@ -17248,35 +16026,44 @@ msgstr "Integració amb l'Evolution"
 msgid "Provides integration with Evolution."
 msgstr "Proporciona la integració amb l'Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
 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:266
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
 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:286
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr "Tipus de compte:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr "Informació opcional:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr "Nom:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr "Cognoms:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
 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
@@ -17298,15 +16085,6 @@ msgstr ""
 "Prova per veure si tots els senyals de la interfície d'usuari funcionen "
 "correctament."
 
-#: ../pidgin/plugins/gtkbuddynote.c:36
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Buddy Note</b>: %s"
-msgstr ""
-"\n"
-"<b>Àlies de l'amic:</b> %s"
-
 #: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "Historial"
@@ -17353,11 +16131,11 @@ msgstr "Marca amb una ratlla que indica missatges nous a la conversa"
 msgid "Draw Markerline in "
 msgstr "Dibuixa la línia de marca a "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
 msgid "_IM windows"
 msgstr "Finestres de M_I"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
 msgid "C_hat windows"
 msgstr "Finestres de _xat"
 
@@ -17373,32 +16151,32 @@ msgstr ""
 msgid "Music messaging session confirmed."
 msgstr "S'ha confirmat la sessió de missatgeria de música."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr "Missatgeria de música"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "Hi ha hagut un conflicte en executar l'ordre:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "S'ha produït un error en executar l'editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr "S'ha produït el següent error:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr "Configuració dels missatges de música"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr "Camí de l'editor de partitures"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "_Aplica"
 
@@ -17410,12 +16188,12 @@ msgstr "_Aplica"
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Connector de missatgeria de música per a composar conjuntament."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 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."
@@ -17425,74 +16203,74 @@ msgstr ""
 "temps real."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:678
+#: ../pidgin/plugins/notify.c:672
 msgid "Notify For"
 msgstr "Notifica per a"
 
-#: ../pidgin/plugins/notify.c:697
+#: ../pidgin/plugins/notify.c:691
 msgid "\t_Only when someone says your screen name"
 msgstr "\tN_omés quan algú digui el vostre sobrenom"
 
-#: ../pidgin/plugins/notify.c:707
+#: ../pidgin/plugins/notify.c:701
 msgid "_Focused windows"
 msgstr "_Finestres actives"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
+#: ../pidgin/plugins/notify.c:709
 msgid "Notification Methods"
 msgstr "Mètodes de notificació"
 
-#: ../pidgin/plugins/notify.c:722
+#: ../pidgin/plugins/notify.c:716
 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:741
+#: ../pidgin/plugins/notify.c:735
 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:750
+#: ../pidgin/plugins/notify.c:744
 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:758
+#: ../pidgin/plugins/notify.c:752
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Aplica l'opció «_URGENT» del gestor de finestres"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:767
+#: ../pidgin/plugins/notify.c:761
 msgid "R_aise conversation window"
 msgstr "_Alça la finestra de conversa"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
+#: ../pidgin/plugins/notify.c:769
 msgid "Notification Removal"
 msgstr "Supressió de notificacions"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:780
+#: ../pidgin/plugins/notify.c:774
 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:787
+#: ../pidgin/plugins/notify.c:781
 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:795
+#: ../pidgin/plugins/notify.c:789
 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:803
+#: ../pidgin/plugins/notify.c:797
 msgid "Remove when a _message gets sent"
 msgstr "Suprimeix quan s'enviï un _missatge"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
+#: ../pidgin/plugins/notify.c:806
 msgid "Remove on switch to conversation ta_b"
 msgstr "Suprimeix en canviar a la _pestanya de la conversa"
 
@@ -17502,7 +16280,7 @@ msgstr "Suprimeix en canviar a la _pestanya de la conversa"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:907
+#: ../pidgin/plugins/notify.c:901
 msgid "Message Notification"
 msgstr "Notificació de missatges"
 
@@ -17510,7 +16288,7 @@ msgstr "Notificació de missatges"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
 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 "
@@ -17587,7 +16365,6 @@ msgid "Select Color"
 msgstr "Selecciona el color per a %s"
 
 #: ../pidgin/plugins/pidginrc.c:300
-#, c-format
 msgid "Select Interface Font"
 msgstr "Selecciona el tipus de lletra de la interfície"
 
@@ -17638,7 +16415,7 @@ msgstr "Tipus de lletra"
 
 #: ../pidgin/plugins/pidginrc.c:497
 msgid "Gtkrc File Tools"
-msgstr ""
+msgstr "Eines de fitxer Gtkrc"
 
 #: ../pidgin/plugins/pidginrc.c:502
 #, c-format
@@ -17666,28 +16443,27 @@ msgid "Lets you send raw input to text-based protocols."
 msgstr "Us permet enviar dades en brut als protocols en mode text."
 
 #: ../pidgin/plugins/raw.c:178
-#, fuzzy
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"Permet enviar dades en brut als protocols en mode text (Jabber, MSN, IRC, "
-"TOC). Premeu la tecla de retorn a la caixa d'entrada per enviar-les. "
+"Us permet enviar dades en brut als protocols en mode text (XMPP, MSN, IRC, "
+"TOC). Premeu la tecla de retorn del quadre d'entrada per enviar-les. "
 "Observeu la finestra de depuració."
 
 #: ../pidgin/plugins/relnot.c:71
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
 "from <a href=\"%s\">%s</a><hr>"
-msgstr "Esteu emprant la versió %s del %s. La versió actual és %s.<hr>"
+msgstr ""
+"Esteu emprant la versió %s del %s. La versió actual és %s, la podeu obtenir "
+"de <a href=\"%s\">%s</a><hr>"
 
 #: ../pidgin/plugins/relnot.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "<b>ChangeLog:</b><br>%s"
-msgstr ""
-"<b>Registre de canvis:</b>\n"
-"%s<br><br>"
+msgstr "<b>Registre de canvis:</b><br>%s"
 
 #: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
@@ -17836,9 +16612,8 @@ msgid "Timestamp Format Options"
 msgstr "Opcions del format de les marques horàries"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, fuzzy, c-format
 msgid "_Force 24-hour time format"
-msgstr "_Força el format de 24 hores (%s tradicional)"
+msgstr "_Força el format de 24 hores"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -17888,44 +16663,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:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:597
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:644
 msgid "Opacity:"
 msgstr "Opacitat:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:561
 msgid "IM Conversation Windows"
 msgstr "Finestres de MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "_IM window transparency"
 msgstr "Transparència de les finestres de M_I"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:576
 msgid "_Show slider bar in IM window"
 msgstr "_Mostra la barra d'ajustament a la finestra de MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:583
 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:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:586
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:634
 msgid "Always on top"
 msgstr "Sempre per sobre"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:618
 msgid "Buddy List Window"
 msgstr "Finestra de la llista d'amics"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "_Buddy List window transparency"
 msgstr "_Transparència de la finestra de la llista d'amics"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:632
 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"
@@ -17936,19 +16711,19 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:692
 msgid "Transparency"
 msgstr "Transparència"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:695
 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:698
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:697
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -17993,13 +16768,12 @@ msgid "_Flash window when chat messages are received"
 msgstr "_Fes que la finestra parpellegi quan arribin missatges de xat"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:371
-#, fuzzy
 msgid "Windows Pidgin Options"
-msgstr "Opcions del Pidgwin"
+msgstr "Opcions del Pidgin per al Windows"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
-msgstr "Opcions específiques de la versió del Pidgin per a Windows"
+msgstr "Opcions específiques de la versió del Pidgin per al Windows"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
@@ -18056,109 +16830,6 @@ msgstr "Envia i rep estrofes XMPP en brut."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "Mostra amics desconnectats"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Port"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "Per estat"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "Per la mida del registre"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "No s'ha pogut connectar al servidor."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Seleccioneu la llibreta d'adreces Notes"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "Testimoni actual"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Connector per al protocol Novel GroupWise Messenger"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Ha fallat l'autenticació normal"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s us ha donat un cop de colze!"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Error desconegut"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "No s'ha pogut connectar al servidor."
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s ha canviat l'estat de %s a %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s ara es fa dir %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s ja no està %s"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_Missatge:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "_Envia un fitxer"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Afegeix un avís _per a l'amic"
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "No està permès mentre estigueu fora de línia"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "No està permès mentre estigueu fora de línia"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "Afegeix un amic"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "Afegeix un xat"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Persa"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "Utilització dels comptes"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Compte:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "_Envia a"
-
 #~ msgid "Toggle offline buddies"
 #~ msgstr "Commuta els amics desconnectats"
 
@@ -18286,9 +16957,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Connector per al protocol Jabber"
 
-#~ msgid "You have just sent a Nudge!"
-#~ msgstr "Acabeu d'enviar un cop de colze!"
-
 #~ msgid "User information for %s unavailable:"
 #~ msgstr "La informació de %s no està disponible:"
 
@@ -18360,6 +17028,9 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ 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"
 
@@ -18369,12 +17040,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Reject online status attribute requests"
 #~ msgstr "Rebutja les sol·licituds quant als atributs en línia"
 
-#~ 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!"
-
 #~ msgid "Unavailable"
 #~ msgstr "No disponible"
 
@@ -18384,12 +17049,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "/Tools/Buddy Pounces"
 #~ msgstr "/Eines/Avís per a amics"
 
-#~ 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 "Jabber developer"
 #~ msgstr "Desenvolupador de Jabber"
 
@@ -18407,12 +17066,18 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ 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"
 
@@ -18488,6 +17153,12 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ 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"
 
@@ -18694,6 +17365,9 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Wrong password!"
 #~ msgstr "La contrasenya no és correcta."
 
+#~ msgid "Selection"
+#~ msgstr "Selecció"
+
 #~ msgid "Faces"
 #~ msgstr "Cares"
 
@@ -18836,6 +17510,9 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ 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."
 
@@ -18860,6 +17537,11 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ 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."
@@ -18883,12 +17565,18 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ "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"
 
@@ -18971,6 +17659,9 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ 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"
 
@@ -18996,6 +17687,9 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ "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 "
@@ -19025,6 +17719,9 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Call ended."
 #~ msgstr "Ha finalitzat la trucada."
 
+#~ msgid "Calling %s"
+#~ msgstr "S'està trucant a %s"
+
 #~ msgid "End Call"
 #~ msgstr "Finalitza la trucada"
 
@@ -19078,6 +17775,9 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ 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í"
 
@@ -19284,6 +17984,9 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "/Tools/Pl_ugin Actions"
 #~ msgstr "/Eines/Acci_ons del connector"
 
+#~ msgid "/Tools/_Statuses"
+#~ msgstr "/Eines/_Estats"
+
 #~ msgid "Reconnect"
 #~ msgstr "Torna a connectar"
 
@@ -19400,6 +18103,9 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ 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"
 
@@ -19508,6 +18214,9 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Show fewer options"
 #~ msgstr "Mostra menys opcions"
 
+#~ msgid "/Buddies/_Signoff"
+#~ msgstr "/Amics/_Desconnecta"
+
 #~ msgid "/Tools/_Away"
 #~ msgstr "/Eines/_Absent"
 
@@ -19659,6 +18368,9 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ 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"
 
@@ -19981,6 +18693,9 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ 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"
diff --git a/po/de.po b/po/de.po
index 6cdf7f9bfb..b16280fcc6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-01 08:48+0200\n"
-"PO-Revision-Date: 2007-10-01 11:30+0200\n"
+"POT-Creation-Date: 2007-10-16 08:27+0200\n"
+"PO-Revision-Date: 2007-10-16 09:47+0200\n"
 "Last-Translator: Jochen Kemnade <kemnade@gmail.com>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -106,7 +106,7 @@ msgid "(You probably forgot to 'make install'.)"
 msgstr "(Sie haben wahrscheinlich vergessen 'make install' aufzurufen.)"
 
 #: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4322
+#: ../pidgin/gtkaccount.c:1474 ../pidgin/gtkblist.c:4367
 msgid "Modify Account"
 msgstr "Konto bearbeiten"
 
@@ -136,10 +136,10 @@ msgstr "Alias:"
 #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
 #: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
 #: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:472 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntblist.c:2287
+#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:472 ../finch/gntpounce.c:459
+#: ../finch/gntpounce.c:667 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
+#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
 #: ../libpurple/account.c:1013 ../libpurple/account.c:1263
 #: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
@@ -153,15 +153,15 @@ msgstr "Alias:"
 #: ../libpurple/protocols/jabber/jabber.c:1017
 #: ../libpurple/protocols/jabber/jabber.c:1737
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
 #: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
 #: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
 #: ../libpurple/protocols/msn/msn.c:362
-#: ../libpurple/protocols/oscar/oscar.c:6146
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/oscar/oscar.c:6147
+#: ../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
@@ -196,8 +196,8 @@ msgstr "Alias:"
 #: ../libpurple/protocols/silc10/silc.c:942
 #: ../libpurple/protocols/yahoo/yahoo.c:1034
 #: ../libpurple/protocols/yahoo/yahoo.c:3500
-#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:6267
+#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1909
+#: ../pidgin/gtkaccount.c:2496 ../pidgin/gtkblist.c:6321
 #: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
 #: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
 #: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
@@ -209,7 +209,7 @@ msgstr "Alias:"
 #: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
 #: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
 #: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -224,8 +224,8 @@ msgstr "Abbrechen"
 msgid "Save"
 msgstr "Speichern"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1901
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wollen Sie %s wirklich löschen?"
@@ -238,14 +238,14 @@ msgstr "Konto löschen"
 #: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
 #: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkaccount.c:1908 ../pidgin/gtklog.c:327
 #: ../pidgin/gtkpounce.c:1107 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "Löschen"
 
 #: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../pidgin/gtkaccount.c:2326 ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "Konten"
 
@@ -255,16 +255,16 @@ msgstr "Sie können Konten auf der folgenden Liste (de)aktivieren."
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2305
-#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:383 ../finch/gntpounce.c:713
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2372
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:713
 #: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883
 #: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:6266 ../pidgin/gtkconv.c:1712
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2495
+#: ../pidgin/gtkblist.c:6320 ../pidgin/gtkconv.c:1713
 #: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Hinzufügen"
@@ -274,33 +274,33 @@ msgstr "Hinzufügen"
 msgid "Modify"
 msgstr "Bearbeiten"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2442
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s hat %s zu seinem Buddy gemacht%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2494
 msgid "Add buddy to your list?"
 msgstr "Benutzer zu Ihrer Buddy-Liste hinzufügen?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2552
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s möchte %s zu seiner oder ihrer Buddy-Liste hinzufügen%s%s"
 
 #: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2575
+#: ../pidgin/gtkaccount.c:2581
 msgid "Authorize buddy?"
 msgstr "Buddy autorisieren?"
 
 #: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Authorize"
 msgstr "Autorisieren"
 
 #: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
 msgid "Deny"
 msgstr "Sperren"
 
@@ -325,7 +325,7 @@ msgid "Error adding buddy"
 msgstr "Fehler beim Hinzufügen des Buddys"
 
 #: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2902
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "Benutzername"
 
@@ -346,10 +346,11 @@ msgid "Group"
 msgstr "Gruppe"
 
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3206 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1275 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:2210 ../finch/gntblist.c:2274 ../finch/gntnotify.c:174
+#: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3206
+#: ../pidgin/gtknotify.c:511 ../pidgin/gtkpounce.c:1275
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
 
@@ -362,7 +363,7 @@ msgstr "Konto"
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5772
+#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5826
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Buddy hinzufügen"
@@ -376,10 +377,11 @@ msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
+#: ../finch/gntblist.c:407 ../finch/gntblist.c:2205
+#: ../libpurple/protocols/jabber/jabber.c:924
 #: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1694 ../libpurple/protocols/msn/msn.c:1759
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1780
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
 #: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -391,7 +393,7 @@ msgstr "Name"
 msgid "Auto-join"
 msgstr "Automatisch beitreten"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6154
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6208
 msgid "Add Chat"
 msgstr "Chat hinzufügen"
 
@@ -413,7 +415,7 @@ msgstr "Es gibt schon eine Gruppe mit diesem Namen."
 
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6263
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6317
 msgid "Add Group"
 msgstr "Gruppe hinzufügen"
 
@@ -437,11 +439,11 @@ msgstr "Bearbeiten"
 msgid "Edit Settings"
 msgstr "Einstellungen bearbeiten"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Information"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "Empfange..."
 
@@ -459,7 +461,7 @@ msgstr "Buddy-Alarm hinzufügen"
 #: ../finch/gntblist.c:915 ../finch/gntconv.c:546
 #: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "Datei versenden"
 
@@ -505,14 +507,14 @@ msgid "Confirm Remove"
 msgstr "Entfernen bestätigen"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1709 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:276
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Entfernen"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2355 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4566
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2422 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4610
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Buddy-Liste"
@@ -539,7 +541,7 @@ msgstr "Markierung umkehren"
 #: ../libpurple/protocols/jabber/jabber.c:1590
 #: ../libpurple/protocols/jabber/jabber.c:1613
 #: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1515 ../libpurple/protocols/msn/msn.c:1697
+#: ../libpurple/protocols/msn/msn.c:1515 ../libpurple/protocols/msn/msn.c:1691
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -555,7 +557,7 @@ msgstr "Spitzname"
 
 #. Idle stuff
 #: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/bonjour/bonjour.c:354
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
 #: ../libpurple/protocols/msn/state.c:32
@@ -594,31 +596,21 @@ msgstr ""
 "\n"
 "Zuletzt gesehen: vor %s"
 
-#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:582
 #: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "Neu..."
 
-#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:583
 #: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "Gespeichert..."
 
 #: ../finch/gntblist.c:2089 ../finch/gntplugin.c:343 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "_Name"
-
-#: ../finch/gntblist.c:2210 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "_Konto"
-
 #: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:767
 msgid "New Instant Message"
 msgstr "Neue Sofortnachricht"
@@ -640,7 +632,7 @@ msgstr ""
 #: ../libpurple/protocols/jabber/xdata.c:399
 #: ../libpurple/protocols/msn/msn.c:289 ../libpurple/protocols/msn/msn.c:306
 #: ../libpurple/protocols/msn/msn.c:323 ../libpurple/protocols/msn/msn.c:340
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libpurple/protocols/oscar/oscar.c:6146
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -659,47 +651,67 @@ msgstr ""
 #: ../libpurple/protocols/silc10/silc.c:735
 #: ../libpurple/protocols/yahoo/yahoo.c:1033
 #: ../libpurple/protocols/yahoo/yahoo.c:3499
-#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4321
+#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4366
 #: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
 #: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
 #: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "OK"
 
+#: ../finch/gntblist.c:2270
+msgid "Channel"
+msgstr "Kanal"
+
+#: ../finch/gntblist.c:2282 ../pidgin/gtkblist.c:924
+msgid "Join a Chat"
+msgstr "Chat betreten"
+
+#: ../finch/gntblist.c:2284
+msgid "Please enter the name of the chat you want to join."
+msgstr "Bitte geben Sie die den Namen des Chats an, den Sie betreten möchten."
+
+#: ../finch/gntblist.c:2286 ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "Betreten"
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2261 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:797
+#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:797
 msgid "Options"
 msgstr "Optionen"
 
-#: ../finch/gntblist.c:2267
+#: ../finch/gntblist.c:2330
 msgid "Send IM..."
 msgstr "Nachricht senden..."
 
-#: ../finch/gntblist.c:2271
+#: ../finch/gntblist.c:2334
+msgid "Join Chat..."
+msgstr "Chat betreten..."
+
+#: ../finch/gntblist.c:2338
 msgid "Show"
 msgstr "Anzeigen"
 
-#: ../finch/gntblist.c:2276
+#: ../finch/gntblist.c:2343
 msgid "Empty groups"
 msgstr "Leere Gruppen"
 
-#: ../finch/gntblist.c:2282
+#: ../finch/gntblist.c:2349
 msgid "Offline buddies"
 msgstr "Offline-Buddys"
 
-#: ../finch/gntblist.c:2288
+#: ../finch/gntblist.c:2355
 msgid "Sort"
 msgstr "Sortieren"
 
-#: ../finch/gntblist.c:2293
+#: ../finch/gntblist.c:2360
 msgid "By Status"
 msgstr "Nach Status"
 
-#: ../finch/gntblist.c:2297 ../pidgin/gtkblist.c:4106
+#: ../finch/gntblist.c:2364 ../pidgin/gtkblist.c:4151
 msgid "Alphabetically"
 msgstr "Alphabetisch"
 
-#: ../finch/gntblist.c:2301
+#: ../finch/gntblist.c:2368
 msgid "By Log Size"
 msgstr "Nach Größe der Logs"
 
@@ -793,13 +805,13 @@ msgid "Certificate Manager"
 msgstr "Zertifikat-Manager"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:666
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Rechnername"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1688
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
 #: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "Info"
@@ -809,7 +821,7 @@ msgstr "Info"
 #: ../finch/gntplugin.c:211 ../finch/gntplugin.c:403 ../finch/gntpounce.c:738
 #: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:406
 #: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2469
 #: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "Schließen"
@@ -837,7 +849,7 @@ msgstr ""
 "Finch wird nicht versuchen, das Konto wieder zu verbinden bis Sie den Fehler "
 "behoben und das Konto wieder aktiviert haben."
 
-#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4323
+#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4368
 msgid "Re-enable Account"
 msgstr "Konten reaktivieren"
 
@@ -845,24 +857,24 @@ msgstr "Konten reaktivieren"
 msgid "No such command."
 msgstr "Es gibt kein solches Kommando."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:530
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaxfehler:  Sie übergaben dem Kommando eine falsche Anzahl von Argumenten."
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:536
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "Ihre Kommando scheiterte aus einem unbekannten Grund."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:543
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "Dieses Kommando funktioniert nur in Chats, nicht bei IMs."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:546
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "Dieses Kommando funktioniert nur bei IMs, nicht bei Chats."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:551
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "Dieses Kommando funktioniert nicht in diesem Protokoll."
 
@@ -893,13 +905,13 @@ msgstr ""
 msgid "You have left this chat."
 msgstr "Sie haben diesen Chat verlassen."
 
-#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1415
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Mitschnitt gestartet. Zukünftige Nachrichten dieser Unterhaltung werden "
 "mitgeschnitten."
 
-#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1423
+#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1424
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
@@ -943,15 +955,15 @@ msgstr "<AUTO-REPLY> "
 msgid "List of users:\n"
 msgstr "Liste der Benutzer:\n"
 
-#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:370
+#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "Unterstützte Debug-Optionen sind:  version"
 
-#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:422
+#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "Kein solches Kommando (in diesem Kontext)."
 
-#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:1090 ../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"
@@ -960,7 +972,7 @@ msgstr ""
 "zu erhalten.\n"
 "Die folgenden Kommandos sind in diesem Kontext verfügbar:\n"
 
-#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7642
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7688
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -968,13 +980,13 @@ msgstr ""
 "say &lt;Nachricht&gt;:  Sendet eine Nachricht genau so, als wenn Sie die "
 "Nachricht ohne ein Kommando absenden."
 
-#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7645
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7691
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;Aktion&gt;:  Sende eine IRC-ähnliche Aktion an einen Buddy oder einen "
 "Chat."
 
-#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7648
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7694
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -982,11 +994,11 @@ msgstr ""
 "debug &lt;Option&gt;:  Verschiedene Debugging-Informationen zur aktuellen "
 "Unterhaltung senden."
 
-#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7651
+#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7697
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Leert das Gesprächsfenster."
 
-#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7657
+#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7703
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;Kommando&gt;:  Hilfe zu einem bestimmten Kommando."
 
@@ -1018,7 +1030,7 @@ msgstr "prefs: Das Einstellungs-Fenster anzeigen."
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Das Fenster mit gespeicherten Status-Infos anzeigen."
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:988 ../pidgin/gtkconv.c:2657
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
 #: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "Konnte die Datei nicht öffnen."
@@ -1076,7 +1088,7 @@ msgstr "Verbleibend"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/bonjour/bonjour.c:358
 #: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/jabber/buddy.c:778
@@ -1137,7 +1149,7 @@ msgstr "Die Datei wurde unter %s gespeichert."
 msgid "Finished"
 msgstr "Fertig"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:386
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:388
 msgid "Transferring"
 msgstr "Übertragung"
 
@@ -1145,56 +1157,52 @@ msgstr "Übertragung"
 msgid "Emails"
 msgstr "E-Mails"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Sie haben Post!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:518
 msgid "Sender"
 msgstr "Abender"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:525
 msgid "Subject"
 msgstr "Betreff"
 
-#: ../finch/gntnotify.c:201
+#: ../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) hat %d neue Nachricht."
 msgstr[1] "%s (%s) hat %d neue Nachrichten."
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr "Neue Mail"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:942
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:948
 #, c-format
 msgid "Info for %s"
 msgstr "Info über %s"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:943
+#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:949
 msgid "Buddy Information"
 msgstr "Buddy-Information"
 
-#: ../finch/gntnotify.c:380 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Fortfahren"
 
-#: ../finch/gntnotify.c:389 ../pidgin/gtkconv.c:1649
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "Nachricht"
 
-#: ../finch/gntnotify.c:392
-msgid "Join"
-msgstr "Betreten"
-
-#: ../finch/gntnotify.c:395 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Einladen"
 
-#: ../finch/gntnotify.c:398
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(kein)"
 
@@ -1272,7 +1280,7 @@ msgstr "Plugin konfigurieren"
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:464 ../finch/gntplugin.c:471 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2069
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2069
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -1577,11 +1585,11 @@ msgstr "Andere sprechen im Chat"
 msgid "Someone says your screen name in chat"
 msgstr "Jemand nennt Ihren Benutzernamen im Chat"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:308
 msgid "GStreamer Failure"
 msgstr "GStreamer-Fehler"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:309
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer konnte nicht initialisiert werden."
 
@@ -1722,9 +1730,9 @@ msgstr "Typ"
 #. not independent
 #. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/bonjour/bonjour.c:270
+#: ../libpurple/protocols/bonjour/bonjour.c:277
+#: ../libpurple/protocols/bonjour/bonjour.c:360
 #: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
 #: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
@@ -1743,19 +1751,19 @@ msgstr "Typ"
 #: ../libpurple/protocols/novell/novell.c:2946
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/novell/novell.c:2958
-#: ../libpurple/protocols/oscar/oscar.c:5606
-#: ../libpurple/protocols/oscar/oscar.c:5824
-#: ../libpurple/protocols/oscar/oscar.c:5838
-#: ../libpurple/protocols/oscar/oscar.c:5854
-#: ../libpurple/protocols/oscar/oscar.c:5861
-#: ../libpurple/protocols/oscar/oscar.c:5868
+#: ../libpurple/protocols/oscar/oscar.c:5607
+#: ../libpurple/protocols/oscar/oscar.c:5825
+#: ../libpurple/protocols/oscar/oscar.c:5839
+#: ../libpurple/protocols/oscar/oscar.c:5855
+#: ../libpurple/protocols/oscar/oscar.c:5862
+#: ../libpurple/protocols/oscar/oscar.c:5869
 #: ../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/simple/simple.c:247
 #: ../libpurple/protocols/yahoo/yahoo.c:3753
 #: ../libpurple/protocols/yahoo/yahoo.c:3759
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
@@ -1917,16 +1925,16 @@ msgstr "GntGf"
 msgid "Toaster plugin"
 msgstr "Toaster-Plugin"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:123
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Unterhaltung mit %s am %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:150
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Das Verlaufs-Plugin erfordert das Mitschneiden"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:151
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1943,11 +1951,11 @@ msgstr ""
 msgid "GntHistory"
 msgstr "Gnt-Verlauf"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:194
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Zeigt vor kurzem mitgeschnittene Gespräche in neuen Gesprächen an."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:195
+#: ../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."
@@ -2000,7 +2008,7 @@ msgid "Missing protocol plugin for %s"
 msgstr "Fehlendes Protokoll-Plugin für %s"
 
 #: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4318
+#: ../pidgin/gtkblist.c:4363
 msgid "Connection Error"
 msgstr "Verbindungsfehler"
 
@@ -2054,7 +2062,7 @@ msgstr "Unbekannt"
 
 #: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
 #: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3249 ../pidgin/gtkblist.c:5662
+#: ../libpurple/protocols/myspace/myspace.c:3246 ../pidgin/gtkblist.c:5716
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2064,18 +2072,18 @@ msgstr "Buddys"
 msgid "buddy list"
 msgstr "Buddy-Liste"
 
-#: ../libpurple/certificate.c:545
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr "(stimmt nicht überein)"
 
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr ""
 "%s hat das folgende Zertifikat für den einmaligen Gebrauch präsentiert:"
 
-#: ../libpurple/certificate.c:550
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2085,39 +2093,39 @@ msgstr ""
 "Fingerabdruck (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
 msgstr "Zertifikatsüberprüfung für den einmaligen Gebrauch"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
+#: ../libpurple/certificate.c:885
 msgid "Certificate Authorities"
 msgstr "Zertifizierungsstelle"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:1053
 msgid "SSL Peers Cache"
 msgstr "SSL-Peers-Zwischenspeicher"
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
+#: ../libpurple/certificate.c:1184
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Akzeptieren Sie das Zertifikat für %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
+#: ../libpurple/certificate.c:1190
 msgid "SSL Certificate Verification"
 msgstr "SSL-Zertifikatsüberprüfung"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
+#: ../libpurple/certificate.c:1199
 msgid "Accept"
 msgstr "Akzeptieren"
 
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1200 ../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
@@ -2125,7 +2133,7 @@ msgstr "Akzeptieren"
 msgid "Reject"
 msgstr "Ablehnen"
 
-#: ../libpurple/certificate.c:1188
+#: ../libpurple/certificate.c:1201
 msgid "_View Certificate..."
 msgstr "Ze_rtifikat ansehen..."
 
@@ -2133,7 +2141,7 @@ msgstr "Ze_rtifikat ansehen..."
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
+#: ../libpurple/certificate.c:1301
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
@@ -2145,7 +2153,7 @@ msgstr ""
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
+#: ../libpurple/certificate.c:1326
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
@@ -2154,7 +2162,7 @@ msgstr ""
 "Das Zertifikat von „%s“ ist selbstsigniert. Es kann nicht automatisch "
 "geprüft werden."
 
-#: ../libpurple/certificate.c:1331
+#: ../libpurple/certificate.c:1344
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Die Zertifizierungskette, die für %s präsentiert wird, ist ungültig."
@@ -2164,16 +2172,16 @@ msgstr "Die Zertifizierungskette, die für %s präsentiert wird, ist ungültig."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+#: ../libpurple/certificate.c:1352 ../libpurple/certificate.c:1421
 msgid "SSL Certificate Error"
 msgstr "SSL-Zertifikatfehler"
 
-#: ../libpurple/certificate.c:1340
+#: ../libpurple/certificate.c:1353
 msgid "Invalid certificate chain"
 msgstr "Ungültige Zertifikationskette"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
+#: ../libpurple/certificate.c:1373
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2182,12 +2190,12 @@ msgstr ""
 "überprüft werden."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
+#: ../libpurple/certificate.c:1396
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr "Das Root-Zertifikat, welches angegeben wird, ist für Pidgin ungültig."
 
-#: ../libpurple/certificate.c:1408
+#: ../libpurple/certificate.c:1413
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2197,12 +2205,12 @@ msgstr ""
 "Die Zertifizierungskette, welche von %s präsentiert wird, hat keine gültige "
 "digitale Signatur von der Zertifizierungsstelle, zu der die Signatur gehört."
 
-#: ../libpurple/certificate.c:1417
+#: ../libpurple/certificate.c:1422
 msgid "Invalid certificate authority signature"
 msgstr "Unbekannte Zertifizierungsstellensignatur"
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1886
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2220,7 +2228,7 @@ msgstr ""
 "Ablaufdatum: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
+#: ../libpurple/certificate.c:1895
 msgid "Certificate Information"
 msgstr "Zertifikat-Information"
 
@@ -2245,7 +2253,7 @@ msgstr "+++ %s hat sich abgemeldet"
 #: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
 #: ../libpurple/protocols/jabber/buddy.c:2340
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:361
+#: ../libpurple/protocols/msn/session.c:363
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -2320,7 +2328,7 @@ msgstr "Kann den Namen nicht bekommen: %s"
 msgid "Failed to get serv name: %s"
 msgstr "Kann den Serv-Namen nicht bekommen: %s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Purple's D-Bus-Server läuft aus dem folgenden Grund nicht"
 
@@ -2336,7 +2344,7 @@ msgstr "Kann keinen neuen Auflösungsprozess erstellen\n"
 msgid "Unable to send request to resolver process\n"
 msgstr "Kann keine Nachricht an den Auflösungsprozess senden\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2345,8 +2353,8 @@ msgstr ""
 "Fehler beim Auflösen von %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Fehler beim Auflösen von %s: %d"
@@ -2365,12 +2373,12 @@ msgstr ""
 msgid "EOF while reading from resolver process"
 msgstr "EOF während vom Resolver-Prozess gelesen wurde"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Fehler beim Erzeugen eines Threads: %s"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
@@ -2822,13 +2830,13 @@ msgstr "_Speichern"
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
+#: ../libpurple/protocols/oscar/oscar.c:1455
 #: ../libpurple/protocols/oscar/oscar.c:2247
 #: ../libpurple/protocols/oscar/oscar.c:2296
-#: ../libpurple/protocols/oscar/oscar.c:5938
-#: ../libpurple/protocols/oscar/oscar.c:5993
-#: ../libpurple/protocols/oscar/oscar.c:6219
-#: ../libpurple/protocols/oscar/oscar.c:6289 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:5939
+#: ../libpurple/protocols/oscar/oscar.c:5994
+#: ../libpurple/protocols/oscar/oscar.c:6220
+#: ../libpurple/protocols/oscar/oscar.c:6290 ../libpurple/request.h:1388
 #: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
 msgid "_Cancel"
 msgstr "A_bbrechen"
@@ -2871,8 +2879,8 @@ msgstr ""
 "Dateiübertragung abgeschlossen ist\n"
 "(nur, wenn es keine Unterhaltung mit dem Sender gibt)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1770
-#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1794
 msgid "Notes"
 msgstr "Notizen"
 
@@ -3099,34 +3107,34 @@ 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 "Benutzer ist offline."
 
-#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Automatische Antwort gesendet:"
 
-#: ../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 hat sich abgemeldet."
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Eine oder mehrere Nachrichten konnten nicht zugestellt werden."
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Sie wurden vom Server getrennt."
 
-#: ../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."
@@ -3134,79 +3142,87 @@ msgstr ""
 "Sie sind nicht verbunden. Nachrichten können nicht empfangen werden bis Sie "
 "sich wieder anmelden."
 
-#: ../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 ""
 "Nachricht konnte nicht gesendet werden, da maximale Länge überschritten "
 "wurde."
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "Ihre Nachricht wurde nicht verschickt."
 
 #. 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 "Allgemeine Mitschnittseinstellungen"
 
-#: ../libpurple/plugins/log_reader.c:2458
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "Schnelle Größenberechnung"
 
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "Benutze Namensheuristiken"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "Mitschnittverzeichnis"
 
@@ -3216,21 +3232,21 @@ msgstr "Mitschnittverzeichnis"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "Mitschnittsbetrachter"
 
 #. *< 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 ""
 "Zeigt die Mitschnitte anderer Sofortnachrichtenprogramme im "
 "Mitschnittsbetrachter an."
 
 #. * 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"
@@ -3439,7 +3455,7 @@ msgstr "Tests, um zu sehen, ob das meiste funktioniert."
 
 #. Scheme name
 #: ../libpurple/plugins/ssl/ssl-gnutls.c:911
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "X.509-Zertifikate"
 
@@ -3468,7 +3484,7 @@ msgstr "Erlaubt SSL-Unterstützung mit GNUTLS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3476,8 +3492,8 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Erlaubt SSL-Unterstützung mit Mozilla NSS."
 
@@ -3579,33 +3595,43 @@ msgstr ""
 "ActiveTCL-Installation nicht erkannt. Wenn Sie TCL-Plugins benutzen wollen, "
 "dann installieren Sie ActiveTCL von http://www.activestate.com\n"
 
+#: ../libpurple/protocols/bonjour/bonjour.c:107
+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 ""
+"Apples Bonjour-Toolkit für Windows konnte nicht gefunden werden, für weitere "
+"Informationen besuchen Sie die FAQ unter: http://developer.pidgin.im/wiki/"
+"Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging."
+
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+#: ../libpurple/protocols/bonjour/bonjour.c:124
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Kann nicht auf eingehende IM-Verbindungen hören\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
+#: ../libpurple/protocols/bonjour/bonjour.c:149
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Keine Verbindung zum lokalen mDNS-Server. Ist er aktiviert?"
 
 # old strings
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/bonjour/bonjour.c:365
+#: ../libpurple/protocols/bonjour/bonjour.c:670
 #: ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/jabber/jabber.c:942
 msgid "First name"
 msgstr "Vorname"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/bonjour/bonjour.c:367
+#: ../libpurple/protocols/bonjour/bonjour.c:673
 #: ../libpurple/protocols/gg/gg.c:627
 #: ../libpurple/protocols/jabber/jabber.c:947
 msgid "Last name"
 msgstr "Nachname"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/bonjour/bonjour.c:371
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
@@ -3618,13 +3644,13 @@ msgstr "Nachname"
 msgid "E-Mail"
 msgstr "E-Mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:374
+#: ../libpurple/protocols/bonjour/bonjour.c:679
 msgid "AIM Account"
 msgstr "AIM-Konto"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:377
+#: ../libpurple/protocols/bonjour/bonjour.c:682
 msgid "XMPP Account"
 msgstr "XMPP-Konto"
 
@@ -3638,16 +3664,16 @@ msgstr "XMPP-Konto"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:481
+#: ../libpurple/protocols/bonjour/bonjour.c:483
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-Protokoll-Plugin"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:624
 msgid "Purple Person"
 msgstr "Purple-Person"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/bonjour/bonjour.c:676
 #: ../libpurple/protocols/gg/gg.c:477
 #: ../libpurple/protocols/jabber/jabber.c:932
 #: ../libpurple/protocols/silc/silc.c:770
@@ -3667,34 +3693,34 @@ msgid "%s has closed the conversation."
 msgstr "%s hat das Gespräch beendet."
 
 #: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:662
+#: ../libpurple/protocols/bonjour/jabber.c:680
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Die Nachricht kann nicht gesendet werden, das Gespräch kann nicht gestartet "
 "werden."
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:585
 msgid "Cannot open socket"
 msgstr "Kann die Socket nicht öffnen"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:593
 msgid "Error setting socket options"
 msgstr "Fehler beim Setzen der Socket-Optionen"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:617
 msgid "Could not bind socket to port"
 msgstr "Kann die Socket nicht an den Port binden"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:625
 msgid "Could not listen on socket"
 msgstr "Kann nicht an der Socket hören"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1842
 msgid "Invalid proxy settings"
 msgstr "Falsche Proxy-Einstellungen"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1842
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3802,8 +3828,8 @@ msgstr "Stadt"
 msgid "Year of birth"
 msgstr "Geburtsjahr"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1699
-#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1693
+#: ../libpurple/protocols/myspace/user.c:117
 #: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
@@ -3888,12 +3914,12 @@ msgstr "Zum Chat hinzufügen..."
 #: ../libpurple/protocols/jabber/buddy.c:2034
 #: ../libpurple/protocols/novell/novell.c:2833
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5656
+#: ../libpurple/protocols/oscar/oscar.c:5657
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
 #: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:154
 #: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Offline"
 
@@ -3904,7 +3930,7 @@ msgstr "Offline"
 #: ../libpurple/protocols/novell/novell.c:2821
 #: ../libpurple/protocols/qq/qq.c:280
 #: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Verfügbar"
 
@@ -3917,13 +3943,13 @@ msgstr "Verfügbar"
 #: ../libpurple/protocols/novell/novell.c:2824
 #: ../libpurple/protocols/oscar/oscar.c:733
 #: ../libpurple/protocols/oscar/oscar.c:4561
-#: ../libpurple/protocols/oscar/oscar.c:5684
+#: ../libpurple/protocols/oscar/oscar.c:5685
 #: ../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:3655
 #: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1941
 #: ../pidgin/gtkstatusbox.c:1058
 #, c-format
 msgid "Away"
@@ -4131,7 +4157,7 @@ msgstr "MOTD für %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
 #: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2361
+#: ../libpurple/protocols/myspace/myspace.c:2357
 msgid "Server has disconnected"
 msgstr "Serververbindung wurde unterbrochen"
 
@@ -4157,13 +4183,13 @@ msgstr "IRC-Nicknamen dürfen keine Leerzeichen enthalten"
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
 #: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:384
+#: ../libpurple/protocols/msn/session.c:386
 #: ../libpurple/protocols/myspace/myspace.c:302
 #: ../libpurple/protocols/novell/novell.c:2187
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/oscar/oscar.c:1289
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1718
+#: ../libpurple/protocols/simple/simple.c:1732
 #: ../libpurple/protocols/yahoo/yahoo.c:2941
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
@@ -4179,19 +4205,19 @@ msgstr "SSL-Unterstützung nicht verfügbar"
 #. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/myspace/myspace.c:318
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1633
+#: ../libpurple/protocols/simple/simple.c:465
+#: ../libpurple/protocols/simple/simple.c:1647
 msgid "Couldn't create socket"
 msgstr "Kann Socket nicht erstellen"
 
 #: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2474
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/myspace/myspace.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:1285
 msgid "Couldn't connect to host"
 msgstr "Keine Verbindung zum Host"
 
 #: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2357
+#: ../libpurple/protocols/myspace/myspace.c:2353
 msgid "Read error"
 msgstr "Fehler beim Lesen"
 
@@ -4231,22 +4257,22 @@ msgstr "Das IRC-Protokoll-Plugin mit weniger Problemen"
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:6723
+#: ../libpurple/protocols/msn/msn.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:6724
 #: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1898
+#: ../libpurple/protocols/simple/simple.c:1919
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2302
-#: ../libpurple/protocols/oscar/oscar.c:6726
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:6727
 #: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
@@ -4601,7 +4627,7 @@ msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [Kanal]:  Listet die Benutzer im aktuellen Kanal auf."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2299
+#: ../libpurple/protocols/jabber/jabber.c:2304
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Ihren Spitznamen ändern."
 
@@ -4712,21 +4738,21 @@ msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr ""
 "whowas &lt;Nick&gt;:  Informationen zu einem abgemeldeten Benutzer abrufen."
 
-#: ../libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Antwortzeit von %s: %lu Sekunden"
 
-#: ../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 "CTCP PING Antwort"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:632
+#: ../libpurple/protocols/irc/parse.c:636 ../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."
@@ -4894,7 +4920,7 @@ msgstr "Funktion"
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1768
+#: ../libpurple/protocols/msn/msn.c:1762
 #: ../libpurple/protocols/oscar/oscar.c:3763
 msgid "Birthday"
 msgstr "Geburtstag"
@@ -4902,7 +4928,7 @@ msgstr "Geburtstag"
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3314
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3314
 #: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Beschreibung"
@@ -5278,7 +5304,7 @@ msgstr "Abwesend (erweitert)"
 #: ../libpurple/protocols/jabber/buddy.c:2044
 #: ../libpurple/protocols/jabber/jabber.c:1622
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5860
+#: ../libpurple/protocols/oscar/oscar.c:5861
 #: ../libpurple/protocols/sametime/sametime.c:3297
 #, c-format
 msgid "Do Not Disturb"
@@ -5370,7 +5396,7 @@ msgid "Search Directory"
 msgstr "Suche im Verzeichnis"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5344
+#: ../libpurple/protocols/oscar/oscar.c:5345
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Raum:"
@@ -5631,7 +5657,7 @@ msgid "Initializing SSL/TLS"
 msgstr "Initialisiere SSL/TLS"
 
 #: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:390
+#: ../libpurple/protocols/msn/session.c:392
 msgid "Authenticating"
 msgstr "Authentifizierung"
 
@@ -5644,7 +5670,7 @@ msgstr "Initialisiere Stream nochmal"
 #: ../libpurple/protocols/jabber/jabber.c:1909
 #: ../libpurple/protocols/jabber/jabber.c:1945
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5654
+#: ../libpurple/protocols/oscar/oscar.c:5655
 msgid "Not Authorized"
 msgstr "Nicht autorisiert"
 
@@ -5685,7 +5711,7 @@ msgstr "Abonnement"
 #: ../libpurple/protocols/jabber/jabber.c:1579
 #: ../libpurple/protocols/jabber/jabber.c:1602
 #: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
+#: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1212
 #: ../libpurple/protocols/silc10/buddy.c:1557
@@ -5808,7 +5834,7 @@ msgid "Please enter your new password"
 msgstr "Bitte geben Sie Ihr neues Passwort ein"
 
 #: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6440
+#: ../libpurple/protocols/oscar/oscar.c:6441
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
@@ -5816,7 +5842,7 @@ msgstr "Benutzer-Info setzen..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6451
+#: ../libpurple/protocols/oscar/oscar.c:6452
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
@@ -6061,65 +6087,65 @@ msgstr "Kann den Benutzer %s nicht herauswerfen"
 msgid "Unable to ping user %s"
 msgstr "Kann den Benutzer %s nicht anpingen"
 
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+#: ../libpurple/protocols/jabber/jabber.c:2203
+#: ../libpurple/protocols/jabber/jabber.c:2214
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr "Kann nicht anklopfen, da nichts über den Benutzer %s bekannt ist."
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
+#: ../libpurple/protocols/jabber/jabber.c:2209
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr "Kann nicht anklopfen, da der Benutzer %s vielleicht offline ist."
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
+#: ../libpurple/protocols/jabber/jabber.c:2240
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "Kann nicht anklopfen, da der Benutzer %s dies nicht unterstützt."
 
-#: ../libpurple/protocols/jabber/jabber.c:2250
+#: ../libpurple/protocols/jabber/jabber.c:2262
 #: ../libpurple/protocols/yahoo/yahoo.c:4121
 msgid "Buzz"
 msgstr "Anklopfen"
 
-#: ../libpurple/protocols/jabber/jabber.c:2251
+#: ../libpurple/protocols/jabber/jabber.c:2263
 #: ../libpurple/protocols/jabber/message.c:307
 #: ../libpurple/protocols/yahoo/yahoo.c:4122
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%s hat bei Ihnen angeklopft!"
 
-#: ../libpurple/protocols/jabber/jabber.c:2252
+#: ../libpurple/protocols/jabber/jabber.c:2264
 #: ../libpurple/protocols/yahoo/yahoo.c:4123
 #, c-format
 msgid "Buzzing %s..."
 msgstr "%s anklopfen..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2291
+#: ../libpurple/protocols/jabber/jabber.c:2296
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfiguriere einen Chatraum."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Konfiguriere einen Chatraum."
 
-#: ../libpurple/protocols/jabber/jabber.c:2304
+#: ../libpurple/protocols/jabber/jabber.c:2309
 msgid "part [room]:  Leave the room."
 msgstr "part [Raum]:  Verlasse den Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libpurple/protocols/jabber/jabber.c:2314
 msgid "register:  Register with a chat room."
 msgstr "register:  Für einen Chatraum anmelden."
 
-#: ../libpurple/protocols/jabber/jabber.c:2315
+#: ../libpurple/protocols/jabber/jabber.c:2320
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [neues Thema]:  Thema ändern oder anzeigen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2321
+#: ../libpurple/protocols/jabber/jabber.c:2326
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;Benutzer&gt; [Raum]:  Verbanne einen Benutzer aus dem Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:2327
+#: ../libpurple/protocols/jabber/jabber.c:2332
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6127,7 +6153,7 @@ msgstr ""
 "affiliate &lt;Benutzer&gt; &lt;owner|admin|member|outcast|none&gt;: Setze "
 "eine Benutzerzugehörigkeit für den Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:2333
+#: ../libpurple/protocols/jabber/jabber.c:2338
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6135,31 +6161,31 @@ msgstr ""
 "role &lt;Benutzer&gt; &lt;moderator|participant|visitor|none&gt;: Setze eine "
 "Rolle für den Benutzer im Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:2339
+#: ../libpurple/protocols/jabber/jabber.c:2344
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;Benutzer&gt; [Nachricht]:  Lade einen Benutzer in den Raum ein."
 
-#: ../libpurple/protocols/jabber/jabber.c:2345
+#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;Raum&gt; [Server]:  Betrete einen Chat auf diesem Server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2351
+#: ../libpurple/protocols/jabber/jabber.c:2356
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;Benutzer&gt; [Raum]:  Kickt einen Benutzer aus dem Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:2356
+#: ../libpurple/protocols/jabber/jabber.c:2361
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;Benutzer&gt; &lt;Nachricht&gt;:  Sendet eine private Nachricht an "
 "einen anderen Benutzer."
 
-#: ../libpurple/protocols/jabber/jabber.c:2362
+#: ../libpurple/protocols/jabber/jabber.c:2367
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tBenutzer/Kommponente/Server anpingen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2367
+#: ../libpurple/protocols/jabber/jabber.c:2372
 #: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Einen Kontakt anrufen, um seine Aufmerksamkeit zu erhalten"
@@ -6197,8 +6223,8 @@ msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Erlaube Klartext-Authentifikation über einen unverschlüsselten Kanal"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3282
-#: ../libpurple/protocols/simple/simple.c:1904
+#: ../libpurple/protocols/myspace/myspace.c:3279
+#: ../libpurple/protocols/simple/simple.c:1925
 msgid "Connect port"
 msgstr "Verbindungsport"
 
@@ -6206,7 +6232,7 @@ msgstr "Verbindungsport"
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3279
+#: ../libpurple/protocols/myspace/myspace.c:3276
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
@@ -6250,16 +6276,16 @@ msgstr " (Code %s)"
 msgid "XML Parse error"
 msgstr "Fehler bei Einlesen von XML-Daten"
 
-#: ../libpurple/protocols/jabber/presence.c:422
+#: ../libpurple/protocols/jabber/presence.c:423
 msgid "Unknown Error in presence"
 msgstr "Unbekannter Fehlercode"
 
-#: ../libpurple/protocols/jabber/presence.c:503
 #: ../libpurple/protocols/jabber/presence.c:504
+#: ../libpurple/protocols/jabber/presence.c:505
 msgid "Create New Room"
 msgstr "Einen neuen Chat-Raum erstellen"
 
-#: ../libpurple/protocols/jabber/presence.c:505
+#: ../libpurple/protocols/jabber/presence.c:506
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6267,20 +6293,20 @@ msgstr ""
 "Sie erstellen einen neuen Chat-Raum.  Möchten Sie den Raum konfigurieren "
 "oder akzeptieren Sie die Standardeinstellungen?"
 
-#: ../libpurple/protocols/jabber/presence.c:511
+#: ../libpurple/protocols/jabber/presence.c:512
 msgid "_Configure Room"
 msgstr "Raum _konfigurieren"
 
-#: ../libpurple/protocols/jabber/presence.c:512
+#: ../libpurple/protocols/jabber/presence.c:513
 msgid "_Accept Defaults"
 msgstr "Standards _akzeptieren"
 
-#: ../libpurple/protocols/jabber/presence.c:554
+#: ../libpurple/protocols/jabber/presence.c:555
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fehler im Chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:558
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Fehler beim Betreten des Chats %s"
@@ -6324,21 +6350,21 @@ msgstr ""
 msgid "Select a Resource"
 msgstr "Wählen Sie eine Ressource"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
 msgstr "Benutzerstimmung ändern"
 
-#: ../libpurple/protocols/jabber/usermood.c:181
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
 msgstr "Bitte setzen Sie eine Stimmung aus der Liste."
 
-#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Setzen"
 
-#: ../libpurple/protocols/jabber/usermood.c:191
+#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
 msgstr "Setze Stimmung..."
 
@@ -6355,8 +6381,8 @@ msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
-"Diese Information ist sichtbar für alle Kontakte in Ihrer Kontaktliste. So "
-"wählen Sie passendes."
+"Diese Information ist sichtbar für alle Kontakte in Ihrer Kontaktliste. "
+"Wählen Sie daher etwas geeignetes."
 
 #: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
@@ -6642,10 +6668,10 @@ msgid "Server too busy"
 msgstr "Server ist zu beschäftigt"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
+#: ../libpurple/protocols/oscar/oscar.c:1382
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1390
 #, c-format
 msgid "Authentication failed"
 msgstr "Authentifizierung fehlgeschlagen"
@@ -6839,18 +6865,18 @@ msgstr ""
 msgid "Failed to connect to server."
 msgstr "Verbindung zum Server nicht möglich."
 
-#: ../libpurple/protocols/msn/msn.c:1620 ../libpurple/protocols/msn/msn.c:1968
+#: ../libpurple/protocols/msn/msn.c:1619 ../libpurple/protocols/msn/msn.c:1962
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Fehler beim Empfangen des Profils"
 
-#: ../libpurple/protocols/msn/msn.c:1691 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1685 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "Allgemein"
 
-#: ../libpurple/protocols/msn/msn.c:1698
-#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/msn/msn.c:1692
+#: ../libpurple/protocols/myspace/user.c:113
 #: ../libpurple/protocols/oscar/oscar.c:3769
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
@@ -6858,14 +6884,14 @@ msgstr "Allgemein"
 msgid "Age"
 msgstr "Alter"
 
-#: ../libpurple/protocols/msn/msn.c:1700
+#: ../libpurple/protocols/msn/msn.c:1694
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Beruf"
 
-#: ../libpurple/protocols/msn/msn.c:1701
-#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/msn/msn.c:1695
+#: ../libpurple/protocols/myspace/user.c:121
 #: ../libpurple/protocols/novell/novell.c:1480
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -6873,188 +6899,188 @@ msgstr "Beruf"
 msgid "Location"
 msgstr "Ort"
 
-#: ../libpurple/protocols/msn/msn.c:1706 ../libpurple/protocols/msn/msn.c:1898
-#: ../libpurple/protocols/msn/msn.c:1904 ../libpurple/protocols/msn/msn.c:1911
+#: ../libpurple/protocols/msn/msn.c:1700 ../libpurple/protocols/msn/msn.c:1892
+#: ../libpurple/protocols/msn/msn.c:1898 ../libpurple/protocols/msn/msn.c:1905
 msgid "Hobbies and Interests"
 msgstr "Hobbys und Interessen"
 
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msn/msn.c:1838 ../libpurple/protocols/msn/msn.c:1845
-#: ../libpurple/protocols/msn/msn.c:1853 ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:1706 ../libpurple/protocols/msn/msn.c:1826
+#: ../libpurple/protocols/msn/msn.c:1832 ../libpurple/protocols/msn/msn.c:1839
+#: ../libpurple/protocols/msn/msn.c:1847 ../libpurple/protocols/msn/msn.c:1854
 msgid "A Little About Me"
 msgstr "Einige Informationen über mich"
 
-#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msn/msn.c:1723
 msgid "Social"
 msgstr "Sozial"
 
-#: ../libpurple/protocols/msn/msn.c:1731
+#: ../libpurple/protocols/msn/msn.c:1725
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Familienstatus"
 
-#: ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1726
 msgid "Interests"
 msgstr "Interessen"
 
-#: ../libpurple/protocols/msn/msn.c:1733
+#: ../libpurple/protocols/msn/msn.c:1727
 msgid "Pets"
 msgstr "Haustiere"
 
-#: ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1728
 msgid "Hometown"
 msgstr "Heimatstadt"
 
-#: ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1729
 msgid "Places Lived"
 msgstr "Bisherige Wohnorte"
 
-#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1730
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msn/msn.c:1731
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msn/msn.c:1732
 msgid "Music"
 msgstr "Musik"
 
-#: ../libpurple/protocols/msn/msn.c:1739 ../libpurple/protocols/msn/msn.c:1920
-#: ../libpurple/protocols/msn/msn.c:1926
+#: ../libpurple/protocols/msn/msn.c:1733 ../libpurple/protocols/msn/msn.c:1914
+#: ../libpurple/protocols/msn/msn.c:1920
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Lieblingsspruch"
 
-#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/msn/msn.c:1750
 msgid "Contact Info"
 msgstr "Kontakt-Info"
 
-#: ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1751
 msgid "Personal"
 msgstr "Privat"
 
-#: ../libpurple/protocols/msn/msn.c:1760
+#: ../libpurple/protocols/msn/msn.c:1754
 msgid "Significant Other"
 msgstr "Andere wichtige Dinge"
 
-#: ../libpurple/protocols/msn/msn.c:1761
+#: ../libpurple/protocols/msn/msn.c:1755
 msgid "Home Phone"
 msgstr "Telefon (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1756
 msgid "Home Phone 2"
 msgstr "Telefon 2 (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1763
+#: ../libpurple/protocols/msn/msn.c:1757
 #: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Home Address"
 msgstr "Privatadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1758
 msgid "Personal Mobile"
 msgstr "Handy (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1759
 msgid "Home Fax"
 msgstr "Fax (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1766
+#: ../libpurple/protocols/msn/msn.c:1760
 msgid "Personal E-Mail"
 msgstr "E-Mail (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msn/msn.c:1761
 msgid "Personal IM"
 msgstr "IM (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msn/msn.c:1763
 msgid "Anniversary"
 msgstr "Jahrestag"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1779
 msgid "Work"
 msgstr "Geschäftlich"
 
-#: ../libpurple/protocols/msn/msn.c:1787
+#: ../libpurple/protocols/msn/msn.c:1781
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Beruf"
 
-#: ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/msn/msn.c:1782
 #: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Company"
 msgstr "Firma"
 
-#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Abteilung"
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1784
 msgid "Profession"
 msgstr "Beruf"
 
-#: ../libpurple/protocols/msn/msn.c:1791
+#: ../libpurple/protocols/msn/msn.c:1785
 msgid "Work Phone"
 msgstr "Telefon (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1792
+#: ../libpurple/protocols/msn/msn.c:1786
 msgid "Work Phone 2"
 msgstr "Telefon 2 (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1787
 #: ../libpurple/protocols/oscar/oscar.c:3820
 msgid "Work Address"
 msgstr "Adresse (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msn/msn.c:1788
 msgid "Work Mobile"
 msgstr "Handy (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1789
 msgid "Work Pager"
 msgstr "Pager (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msn/msn.c:1790
 msgid "Work Fax"
 msgstr "Fax (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1791
 msgid "Work E-Mail"
 msgstr "E-Mail (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1792
 msgid "Work IM"
 msgstr "IM (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-#: ../libpurple/protocols/msn/msn.c:1869 ../libpurple/protocols/msn/msn.c:1875
-#: ../libpurple/protocols/msn/msn.c:1882 ../libpurple/protocols/msn/msn.c:1889
+#: ../libpurple/protocols/msn/msn.c:1863 ../libpurple/protocols/msn/msn.c:1869
+#: ../libpurple/protocols/msn/msn.c:1876 ../libpurple/protocols/msn/msn.c:1883
 msgid "Favorite Things"
 msgstr "Lieblingsdinge"
 
-#: ../libpurple/protocols/msn/msn.c:1934
+#: ../libpurple/protocols/msn/msn.c:1928
 msgid "Last Updated"
 msgstr "Zuletzt aktualisiert"
 
-#: ../libpurple/protocols/msn/msn.c:1945
+#: ../libpurple/protocols/msn/msn.c:1939
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../libpurple/protocols/msn/msn.c:1969
+#: ../libpurple/protocols/msn/msn.c:1963
 msgid "The user has not created a public profile."
 msgstr "Der Benutzer hat kein öffentliches Profil erstellt."
 
-#: ../libpurple/protocols/msn/msn.c:1970
+#: ../libpurple/protocols/msn/msn.c:1964
 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 "
@@ -7064,7 +7090,7 @@ msgstr ""
 "der Benutzer nicht existiert oder dass der Benutzer zwar existiert, aber "
 "kein öffentliches Profil angelegt hat."
 
-#: ../libpurple/protocols/msn/msn.c:1974
+#: ../libpurple/protocols/msn/msn.c:1968
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7072,7 +7098,7 @@ msgstr ""
 "Konnte keinerlei Information im Profil des Benutzers finden. Der Benutzer "
 "existiert wahrscheinlich nicht."
 
-#: ../libpurple/protocols/msn/msn.c:1982
+#: ../libpurple/protocols/msn/msn.c:1976
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL des Profils"
@@ -7087,23 +7113,23 @@ msgstr "URL des Profils"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2269 ../libpurple/protocols/msn/msn.c:2271
+#: ../libpurple/protocols/msn/msn.c:2263 ../libpurple/protocols/msn/msn.c:2265
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Windows Live Messenger Protokoll-Plugin"
 
-#: ../libpurple/protocols/msn/msn.c:2306
+#: ../libpurple/protocols/msn/msn.c:2300
 msgid "Use HTTP Method"
 msgstr "Benutze HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2311
+#: ../libpurple/protocols/msn/msn.c:2305
 msgid "HTTP Method Server"
 msgstr "HTTP-Methoden-Server"
 
-#: ../libpurple/protocols/msn/msn.c:2316
+#: ../libpurple/protocols/msn/msn.c:2310
 msgid "Show custom smileys"
 msgstr "Zeige benutzerdefinierte Smileys"
 
-#: ../libpurple/protocols/msn/msn.c:2324
+#: ../libpurple/protocols/msn/msn.c:2318
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Einen Kontakt anstoßen, um seine Aufmerksamkeit zu erhalten"
 
@@ -7121,8 +7147,8 @@ msgid "%s is not a valid group."
 msgstr "%s ist keine gültige Gruppe."
 
 #: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:934
-#: ../libpurple/protocols/msn/session.c:369
+#: ../libpurple/protocols/msn/notification.c:933
+#: ../libpurple/protocols/msn/session.c:371
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
@@ -7131,59 +7157,59 @@ msgstr "Unbekannter Fehler."
 msgid "%s on %s (%s)"
 msgstr "%s auf %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:512
+#: ../libpurple/protocols/msn/notification.c:511
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s hat Sie gerade angestoßen!"
 
-#: ../libpurple/protocols/msn/notification.c:839
+#: ../libpurple/protocols/msn/notification.c:838
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Unbekannter Fehler (%d)"
 
-#: ../libpurple/protocols/msn/notification.c:840
+#: ../libpurple/protocols/msn/notification.c:839
 #: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Kann den Benutzer nicht hinzufügen"
 
-#: ../libpurple/protocols/msn/notification.c:900
+#: ../libpurple/protocols/msn/notification.c:899
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Kann den Benutzer nicht zu %s (%s) hinzufügen"
 
-#: ../libpurple/protocols/msn/notification.c:904
+#: ../libpurple/protocols/msn/notification.c:903
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Kann den Benutzer nicht für %s (%s) blockieren"
 
-#: ../libpurple/protocols/msn/notification.c:908
+#: ../libpurple/protocols/msn/notification.c:907
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Kann den Benutzer nicht für %s (%s) erlauben"
 
-#: ../libpurple/protocols/msn/notification.c:916
+#: ../libpurple/protocols/msn/notification.c:915
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s konnte nicht hinzugefügt werden, da Ihre Buddy-Liste voll ist."
 
-#: ../libpurple/protocols/msn/notification.c:925
+#: ../libpurple/protocols/msn/notification.c:924
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ist kein gültiges Passport-Konto."
 
-#: ../libpurple/protocols/msn/notification.c:930
+#: ../libpurple/protocols/msn/notification.c:929
 msgid "Service Temporarily Unavailable."
 msgstr "Dienst momentan nicht verfügbar."
 
-#: ../libpurple/protocols/msn/notification.c:1268
+#: ../libpurple/protocols/msn/notification.c:1265
 msgid "Unable to rename group"
 msgstr "Kann die Gruppe nicht umbenennen"
 
-#: ../libpurple/protocols/msn/notification.c:1323
+#: ../libpurple/protocols/msn/notification.c:1320
 msgid "Unable to delete group"
 msgstr "Kann die Gruppe nicht löschen"
 
-#: ../libpurple/protocols/msn/notification.c:1939
+#: ../libpurple/protocols/msn/notification.c:1934
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7220,18 +7246,18 @@ msgstr "Verbindung zum OIM-Server nicht möglich"
 
 #: ../libpurple/protocols/msn/servconn.c:135
 #: ../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/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"
@@ -7254,60 +7280,60 @@ msgstr ""
 "Verbindungsfehler vom %s-Server:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:336
+#: ../libpurple/protocols/msn/session.c:338
 msgid "Our protocol is not supported by the server."
 msgstr "Unser Protokoll wird vom Server nicht unterstützt."
 
-#: ../libpurple/protocols/msn/session.c:340
+#: ../libpurple/protocols/msn/session.c:342
 msgid "Error parsing HTTP."
 msgstr "Fehler beim Verarbeiten von HTTP."
 
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/msn/session.c:346
 #: ../libpurple/protocols/oscar/flap_connection.c:384
 #: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "Sie haben sich von einem anderen Ort angemeldet."
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:351
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Die MSN-Server sind temporär nicht verfügbar. Bitte warten Sie und versuchen "
 "Sie es später nochmal."
 
-#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msn/session.c:356
 msgid "The MSN servers are going down temporarily."
 msgstr "Die MSN-Server werden kurzzeitig heruntergefahren."
 
-#: ../libpurple/protocols/msn/session.c:359
+#: ../libpurple/protocols/msn/session.c:361
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Kann nicht authentifizieren: %s"
 
-#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msn/session.c:366
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Ihre MSN-Buddy-Liste ist temporär nicht verfügbar. Bitte warten Sie und "
 "versuchen Sie es später nochmal."
 
-#: ../libpurple/protocols/msn/session.c:385
 #: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msn/session.c:389
 msgid "Handshaking"
 msgstr "Händedruck"
 
-#: ../libpurple/protocols/msn/session.c:388
+#: ../libpurple/protocols/msn/session.c:390
 msgid "Starting authentication"
 msgstr "Starte Authentifizierung"
 
-#: ../libpurple/protocols/msn/session.c:389
+#: ../libpurple/protocols/msn/session.c:391
 msgid "Getting cookie"
 msgstr "Cookie erhalten"
 
-#: ../libpurple/protocols/msn/session.c:391
+#: ../libpurple/protocols/msn/session.c:393
 msgid "Sending cookie"
 msgstr "Cookie senden"
 
-#: ../libpurple/protocols/msn/session.c:392
+#: ../libpurple/protocols/msn/session.c:394
 msgid "Retrieving buddy list"
 msgstr "Abfragen der Buddy-Liste"
 
@@ -7371,12 +7397,12 @@ msgstr ""
 "Nachricht konnte nicht gesendet werden, da ein unbekannter Fehler "
 "aufgetreten ist:"
 
-#: ../libpurple/protocols/msn/userlist.c:249
+#: ../libpurple/protocols/msn/userlist.c:243
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "Der Benutzer %s hat Sie zu seiner Buddy-Liste hinzugefügt."
 
-#: ../libpurple/protocols/msn/userlist.c:318
+#: ../libpurple/protocols/msn/userlist.c:312
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "Der Benutzer %s hat Sie von seiner Buddy-Liste gelöscht."
@@ -7384,12 +7410,12 @@ msgstr "Der Benutzer %s hat Sie von seiner Buddy-Liste gelöscht."
 #. 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:699
+#: ../libpurple/protocols/msn/userlist.c:693
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Kann „%s“ nicht hinzufügen."
 
-#: ../libpurple/protocols/msn/userlist.c:702
+#: ../libpurple/protocols/msn/userlist.c:696
 msgid "The screen name specified is invalid."
 msgstr "Der angegebene Benutzername ist ungültig."
 
@@ -7420,7 +7446,7 @@ msgstr ""
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1805
+#: ../libpurple/protocols/myspace/myspace.c:1806
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-Fehler"
 
@@ -7436,51 +7462,51 @@ msgstr "Unerwartete Challenge-Länge vom Server"
 msgid "Logging in"
 msgstr "Logge ein"
 
-#: ../libpurple/protocols/myspace/myspace.c:1288
+#: ../libpurple/protocols/myspace/myspace.c:1289
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr ""
 "Verbindung zum Server verloren (seit %d Sekunden keine Daten empfangen)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1331
 msgid "New mail messages"
 msgstr "Neue Mail-Nachrichten"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:1332
 msgid "New blog comments"
 msgstr "Neue Blog-Kommentare"
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1333
 msgid "New profile comments"
 msgstr "Neue Profil-Kommentare"
 
-#: ../libpurple/protocols/myspace/myspace.c:1333
+#: ../libpurple/protocols/myspace/myspace.c:1334
 msgid "New friend requests!"
 msgstr "Neue Freundschaftsanfragen!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1334
+#: ../libpurple/protocols/myspace/myspace.c:1335
 msgid "New picture comments"
 msgstr "Neue Bild-Kommentare"
 
-#: ../libpurple/protocols/myspace/myspace.c:1362
+#: ../libpurple/protocols/myspace/myspace.c:1363
 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:1545
+#: ../libpurple/protocols/myspace/myspace.c:1546
 #: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../libpurple/protocols/myspace/myspace.c:1556
-#: ../libpurple/protocols/myspace/myspace.c:1558
+#: ../libpurple/protocols/myspace/myspace.c:1557
+#: ../libpurple/protocols/myspace/myspace.c:1559
 msgid "No username set"
 msgstr "Kein Benutzername gesetzt"
 
-#: ../libpurple/protocols/myspace/myspace.c:1557
+#: ../libpurple/protocols/myspace/myspace.c:1558
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
@@ -7489,7 +7515,7 @@ msgstr ""
 "fuseaction=profile.username und wählen sie einen Benutzernamen und versuchen "
 "Sie sich erneut anzumelden."
 
-#: ../libpurple/protocols/myspace/myspace.c:1784
+#: ../libpurple/protocols/myspace/myspace.c:1785
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollfehler, Code %d: %s"
@@ -7504,57 +7530,57 @@ msgid "'addbuddy' command failed."
 msgstr "'addbuddy'-Kommando gescheitert."
 
 #: ../libpurple/protocols/myspace/myspace.c:2011
-#: ../libpurple/protocols/myspace/myspace.c:2252
+#: ../libpurple/protocols/myspace/myspace.c:2248
 msgid "persist command failed"
 msgstr "'persist'-Kommando gescheitert"
 
-#: ../libpurple/protocols/myspace/myspace.c:2120
+#: ../libpurple/protocols/myspace/myspace.c:2116
 #, c-format
 msgid "No such user: %s"
 msgstr "Kein solcher Benutzer: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2121
+#: ../libpurple/protocols/myspace/myspace.c:2117
 msgid "User lookup"
 msgstr "Benutzersuche"
 
-#: ../libpurple/protocols/myspace/myspace.c:2233
-#: ../libpurple/protocols/myspace/myspace.c:2252
-#: ../libpurple/protocols/myspace/myspace.c:2274
+#: ../libpurple/protocols/myspace/myspace.c:2229
+#: ../libpurple/protocols/myspace/myspace.c:2248
+#: ../libpurple/protocols/myspace/myspace.c:2270
 msgid "Failed to remove buddy"
 msgstr "Kontakt konnte nicht entfernt werden"
 
-#: ../libpurple/protocols/myspace/myspace.c:2233
+#: ../libpurple/protocols/myspace/myspace.c:2229
 msgid "'delbuddy' command failed"
 msgstr "'delbuddy'-Kommando gescheitert"
 
-#: ../libpurple/protocols/myspace/myspace.c:2274
+#: ../libpurple/protocols/myspace/myspace.c:2270
 msgid "blocklist command failed"
 msgstr "'blocklist'-Kommando gescheitert"
 
-#: ../libpurple/protocols/myspace/myspace.c:2320
+#: ../libpurple/protocols/myspace/myspace.c:2316
 msgid "Invalid input condition"
 msgstr "Ungültige Eingabebedingung"
 
 #. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2338
-#: ../libpurple/protocols/myspace/myspace.c:2369
+#: ../libpurple/protocols/myspace/myspace.c:2334
+#: ../libpurple/protocols/myspace/myspace.c:2365
 msgid "Read buffer full"
 msgstr "Lesepuffer voll"
 
-#: ../libpurple/protocols/myspace/myspace.c:2407
+#: ../libpurple/protocols/myspace/myspace.c:2403
 msgid "Unparseable message"
 msgstr "Kann die Nachricht nicht parsen"
 
-#: ../libpurple/protocols/myspace/myspace.c:2476
+#: ../libpurple/protocols/myspace/myspace.c:2472
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Konnte nicht zum Host verbinden: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2647
+#: ../libpurple/protocols/myspace/myspace.c:2643
 msgid "IM Friends"
 msgstr "IM-Freunde"
 
-#: ../libpurple/protocols/myspace/myspace.c:2746
+#: ../libpurple/protocols/myspace/myspace.c:2743
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
@@ -7563,60 +7589,60 @@ msgstr ""
 "%d Buddys wurden vom Server hinzugefügt oder aktualisiert (inklusive der "
 "Buddys, die schon auf der Serverliste sind)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2747
+#: ../libpurple/protocols/myspace/myspace.c:2744
 msgid "Add contacts from server"
 msgstr "Kontakte vom Server hinzufügen"
 
-#: ../libpurple/protocols/myspace/myspace.c:2799
-#: ../libpurple/protocols/myspace/myspace.c:2864
+#: ../libpurple/protocols/myspace/myspace.c:2796
+#: ../libpurple/protocols/myspace/myspace.c:2861
 msgid "Add friends from MySpace.com"
 msgstr "Freunde von MySpace.com hinzufügen"
 
-#: ../libpurple/protocols/myspace/myspace.c:2800
+#: ../libpurple/protocols/myspace/myspace.c:2797
 msgid "Importing friends failed"
 msgstr "Importieren der Freunde fehlgeschlagen"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2856
+#: ../libpurple/protocols/myspace/myspace.c:2853
 msgid "Find people..."
 msgstr "Finde Leute..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:2856
 msgid "Change IM name..."
 msgstr "IM-Namen ändern..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3161
+#: ../libpurple/protocols/myspace/myspace.c:3158
 msgid "myim URL handler"
 msgstr "myim-URL-Behandlungsroutine"
 
-#: ../libpurple/protocols/myspace/myspace.c:3162
+#: ../libpurple/protocols/myspace/myspace.c:3159
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 "Es konnte kein geeignetes MySpaceIm-Konto zum öffnen dieser myim-URL "
 "gefunden werden."
 
-#: ../libpurple/protocols/myspace/myspace.c:3163
+#: ../libpurple/protocols/myspace/myspace.c:3160
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 "Aktivieren Sie das passende MySpaceIM-Konto und versuchen Sie es erneut."
 
-#: ../libpurple/protocols/myspace/myspace.c:3286
+#: ../libpurple/protocols/myspace/myspace.c:3283
 msgid "Show display name in status text"
 msgstr "Displaynamen im Statustext anzeigen"
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
+#: ../libpurple/protocols/myspace/myspace.c:3286
 msgid "Show headline in status text"
 msgstr "Überschrift im Statustext anzeigen"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:3291
 msgid "Send emoticons"
 msgstr "Emoticons senden"
 
-#: ../libpurple/protocols/myspace/myspace.c:3299
+#: ../libpurple/protocols/myspace/myspace.c:3296
 msgid "Screen resolution (dots per inch)"
 msgstr "Bildschirmauflösung (dpi)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3302
+#: ../libpurple/protocols/myspace/myspace.c:3299
 msgid "Base font size (points)"
 msgstr "Basis-Schriftgrüße (Punkt)"
 
@@ -7626,27 +7652,24 @@ msgstr "Basis-Schriftgrüße (Punkt)"
 msgid "User"
 msgstr "Benutzer"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/myspace/user.c:104
 #: ../libpurple/protocols/oscar/oscar.c:2978
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/myspace/user.c:124
+#: ../libpurple/protocols/myspace/user.c:126
 msgid "Headline"
 msgstr "Überschrift"
 
-#: ../libpurple/protocols/myspace/user.c:129
+#: ../libpurple/protocols/myspace/user.c:131
 msgid "Song"
 msgstr "Lied"
 
-#: ../libpurple/protocols/myspace/user.c:134
+#: ../libpurple/protocols/myspace/user.c:139
 msgid "Total Friends"
 msgstr "Freunde insgesamt"
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
+#: ../libpurple/protocols/myspace/user.c:157
 msgid "Client Version"
 msgstr "Client-Version"
 
@@ -7705,49 +7728,46 @@ msgstr "%s abfackeln..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 #: ../libpurple/protocols/myspace/zap.c:62
-#, fuzzy
 msgid "Smooch"
 msgstr "Knutschen"
 
 #: ../libpurple/protocols/myspace/zap.c:62
-#, fuzzy
+#, c-format
 msgid "%s has smooched you!"
 msgstr "%s hat Sie geknutscht!"
 
 #: ../libpurple/protocols/myspace/zap.c:62
-#, fuzzy
+#, c-format
 msgid "Smooching %s..."
 msgstr "%s knutschen..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 #: ../libpurple/protocols/myspace/zap.c:65
-#, fuzzy
 msgid "Hug"
 msgstr "Knuddeln"
 
 #: ../libpurple/protocols/myspace/zap.c:65
-#, fuzzy
+#, c-format
 msgid "%s has hugged you!"
 msgstr "%s hat Sie geknuddelt!"
 
 #: ../libpurple/protocols/myspace/zap.c:65
-#, fuzzy
+#, c-format
 msgid "Hugging %s..."
 msgstr "%s knuddeln..."
 
 #. Slap means "to hit someone with an open/flat hand"
 #: ../libpurple/protocols/myspace/zap.c:68
-#, fuzzy
 msgid "Slap"
 msgstr "Ohrfeigen"
 
 #: ../libpurple/protocols/myspace/zap.c:68
-#, fuzzy
+#, c-format
 msgid "%s has slapped you!"
 msgstr "%s hat Ihnen eine Ohrfeige gegeben!"
 
 #: ../libpurple/protocols/myspace/zap.c:68
-#, fuzzy
+#, c-format
 msgid "Slapping %s..."
 msgstr "%s ohrfeigen..."
 
@@ -7770,17 +7790,16 @@ msgstr "%s zwicken..."
 #. * 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 "Fünf geben"
 
 #: ../libpurple/protocols/myspace/zap.c:76
-#, fuzzy
+#, c-format
 msgid "%s has high-fived you!"
 msgstr "%s hat Ihnen Fünf gegeben!"
 
 #: ../libpurple/protocols/myspace/zap.c:76
-#, fuzzy
+#, c-format
 msgid "High-fiving %s..."
 msgstr "%s Fünf geben..."
 
@@ -8189,17 +8208,17 @@ msgstr "Server-Port"
 #: ../libpurple/protocols/oscar/flap_connection.c:389
 #: ../libpurple/protocols/yahoo/yahoo.c:2471
 #: ../libpurple/protocols/yahoo/yahoo.c:2638
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:584
+#: ../libpurple/proxy.c:1126 ../libpurple/proxy.c:1235
+#: ../libpurple/proxy.c:1335 ../libpurple/proxy.c:1463
 msgid "Server closed the connection."
 msgstr "Der Server hat die Verbindung beendet."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:391
 #: ../libpurple/protocols/yahoo/yahoo.c:2465
-#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1138 ../libpurple/proxy.c:1247
+#: ../libpurple/proxy.c:1347 ../libpurple/proxy.c:1475
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8209,9 +8228,9 @@ msgstr ""
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../libpurple/proxy.c:1155 ../libpurple/proxy.c:1260
+#: ../libpurple/proxy.c:1359 ../libpurple/proxy.c:1431
+#: ../libpurple/proxy.c:1488
 msgid "Received invalid data on connection with server."
 msgstr "Ungültige Daten in der Verbindung mit dem Server empfangen."
 
@@ -8412,8 +8431,8 @@ msgstr ""
 "Client.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2391
+#: ../pidgin/gtkutils.c:2421
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Buddy-Icon"
@@ -8435,7 +8454,7 @@ msgid "Chat"
 msgstr "Chat"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6062
+#: ../libpurple/protocols/oscar/oscar.c:6063
 msgid "Get File"
 msgstr "Datei abrufen"
 
@@ -8508,19 +8527,19 @@ msgid "Camera"
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5832
+#: ../libpurple/protocols/oscar/oscar.c:5833
 #, c-format
 msgid "Free For Chat"
 msgstr "Bereit zum Chatten"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5867
+#: ../libpurple/protocols/oscar/oscar.c:5868
 #, c-format
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5853
+#: ../libpurple/protocols/oscar/oscar.c:5854
 #, c-format
 msgid "Occupied"
 msgstr "Beschäftigt"
@@ -8533,7 +8552,7 @@ msgstr "In Web"
 #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
 #: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
 #, c-format
 msgid "Invisible"
 msgstr "Unsichtbar"
@@ -8589,7 +8608,7 @@ msgstr "Verbindung hergestellt. Cookie gesendet"
 msgid "Finalizing connection"
 msgstr "Verbindung herstellen"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
+#: ../libpurple/protocols/oscar/oscar.c:1262
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8601,29 +8620,29 @@ msgstr ""
 "sein oder mit einem Buchstaben beginnen und nur Buchstaben, Ziffern und "
 "Leerzeichen enthalten oder nur aus Ziffern bestehen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1345
+#: ../libpurple/protocols/oscar/oscar.c:1347
 #: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "Ungültiger Benutzername."
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1047
+#: ../libpurple/protocols/simple/simple.c:1048
 #: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "Falsches Passwort."
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1359
 msgid "Your account is currently suspended."
 msgstr "Ihr Benutzerkonto ist momentan gesperrt."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1363
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Der AOL-Sofortnachrichtendienst ist zur Zeit nicht erreichbar."
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/oscar/oscar.c:1368
+#: ../libpurple/protocols/oscar/oscar.c:1379
 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."
@@ -8632,45 +8651,45 @@ msgstr ""
 "versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar "
 "noch länger warten."
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#: ../libpurple/protocols/oscar/oscar.c:1373
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Die Client-Version, die Sie nutzen ist zu alt. Bitte updaten Sie unter %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Could Not Connect"
 msgstr "Verbinden nicht möglich"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1416
 msgid "Received authorization"
 msgstr "Autorisierung empfangen"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1438
 msgid "The SecurID key entered is invalid."
 msgstr "Der eingegebene SecurID-Schlüssel ist falsch."
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1451
 msgid "Enter SecurID"
 msgstr "SecurID-Eingabe"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Geben Sie die 6-stellige Nummer vom Digital-Display ein."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
+#: ../libpurple/protocols/oscar/oscar.c:1454
 #: ../libpurple/protocols/oscar/oscar.c:2246
 #: ../libpurple/protocols/oscar/oscar.c:2295
-#: ../libpurple/protocols/oscar/oscar.c:5937
-#: ../libpurple/protocols/oscar/oscar.c:6218 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:6219 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1493
+#: ../libpurple/protocols/oscar/oscar.c:1536
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8679,26 +8698,26 @@ msgstr ""
 "Die Verbindung kann schnell unterbrochen werden. Vielleicht wollen Sie TOC "
 "benutzen bis dieser Fehler behoben wurde. Suchen Sie auf %s nach Updates."
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1496
+#: ../libpurple/protocols/oscar/oscar.c:1539
 msgid "Unable to get a valid AIM login hash."
 msgstr "Konnte keinen gültigen AIM Login-Hash bekommen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1624
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "Sie wurden in kurzer Zeit abgemeldet.  Überprüfen Sie %s wegen Updates."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1627
 msgid "Unable to get a valid login hash."
 msgstr "Konnte keinen gültigen Login-Hash bekommen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1657
 msgid "Password sent"
 msgstr "Passwort gesendet"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1713
 msgid "Unable to initialize connection"
 msgstr "Kann Verbindung nicht erstellen"
 
@@ -8719,7 +8738,7 @@ msgstr "Bitte autorisiere mich!"
 #: ../libpurple/protocols/oscar/oscar.c:2286
 #: ../libpurple/protocols/oscar/oscar.c:2294
 #: ../libpurple/protocols/oscar/oscar.c:2421
-#: ../libpurple/protocols/oscar/oscar.c:5313
+#: ../libpurple/protocols/oscar/oscar.c:5314
 #: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Kein Grund angegeben."
@@ -9137,8 +9156,8 @@ msgstr ""
 "Ziffern bestehen."
 
 #: ../libpurple/protocols/oscar/oscar.c:4648
-#: ../libpurple/protocols/oscar/oscar.c:5099
-#: ../libpurple/protocols/oscar/oscar.c:5114
+#: ../libpurple/protocols/oscar/oscar.c:5100
+#: ../libpurple/protocols/oscar/oscar.c:5115
 msgid "Unable To Add"
 msgstr "Kann nicht hinzufügen"
 
@@ -9157,13 +9176,13 @@ msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4950
 #: ../libpurple/protocols/oscar/oscar.c:4952
-#: ../libpurple/protocols/oscar/oscar.c:5179
 #: ../libpurple/protocols/oscar/oscar.c:5180
-#: ../libpurple/protocols/oscar/oscar.c:5185
+#: ../libpurple/protocols/oscar/oscar.c:5181
+#: ../libpurple/protocols/oscar/oscar.c:5186
 msgid "Orphans"
 msgstr "Waisen"
 
-#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:5098
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9172,17 +9191,17 @@ msgstr ""
 "Kann den Buddy %s nicht hinzufügen, weil Sie schon zu viele Buddys in Ihrer "
 "Buddy-Liste haben. Bitte entfernen Sie einen und versuchen Sie es nochmal."
 
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5112
+#: ../libpurple/protocols/oscar/oscar.c:5098
+#: ../libpurple/protocols/oscar/oscar.c:5113
 msgid "(no name)"
 msgstr "(kein Name)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5111
+#: ../libpurple/protocols/oscar/oscar.c:5112
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Konnte den Buddy %s aus einem unbekannten Grund nicht hinzufügen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5228
+#: ../libpurple/protocols/oscar/oscar.c:5229
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9191,24 +9210,24 @@ msgstr ""
 "Der Benutzer %s hat Ihnen gestattet, Sie zu seiner Buddy-Liste hinzuzufügen. "
 "Möchten Sie ihn hinzufügen?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5236
+#: ../libpurple/protocols/oscar/oscar.c:5237
 msgid "Authorization Given"
 msgstr "Autorisierung wurde gegeben"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5309
+#: ../libpurple/protocols/oscar/oscar.c:5310
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Der Benutzer %s hat Ihre Anfrage akzeptiert, ihn bzw. sie zu Ihrer Buddy-"
 "Liste hinzufügen zu dürfen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5310
+#: ../libpurple/protocols/oscar/oscar.c:5311
 msgid "Authorization Granted"
 msgstr "Autorisierung erteilt"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5313
+#: ../libpurple/protocols/oscar/oscar.c:5314
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9219,53 +9238,53 @@ msgstr ""
 "Liste hinzufügen zu dürfen, und zwar aus folgendem Grund:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5314
+#: ../libpurple/protocols/oscar/oscar.c:5315
 msgid "Authorization Denied"
 msgstr "Autorisierung abgelehnt"
 
-#: ../libpurple/protocols/oscar/oscar.c:5350
+#: ../libpurple/protocols/oscar/oscar.c:5351
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "A_ustausch:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5390
+#: ../libpurple/protocols/oscar/oscar.c:5391
 msgid "Invalid chat name specified."
 msgstr "Ungültiger Chat-Name angegeben."
 
-#: ../libpurple/protocols/oscar/oscar.c:5459
+#: ../libpurple/protocols/oscar/oscar.c:5460
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Ihr IM-Bild wurde nicht gesendet. Sie können keine IM-Bilder in AIM-Chats "
 "senden."
 
-#: ../libpurple/protocols/oscar/oscar.c:5621
-#: ../libpurple/protocols/oscar/oscar.c:5626
+#: ../libpurple/protocols/oscar/oscar.c:5622
+#: ../libpurple/protocols/oscar/oscar.c:5627
 msgid "Away Message"
 msgstr "Abwesenheitsnachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:5626
+#: ../libpurple/protocols/oscar/oscar.c:5627
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(empfange)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5826
+#: ../libpurple/protocols/oscar/oscar.c:5827
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5935
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy-Kommentar für %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5935
+#: ../libpurple/protocols/oscar/oscar.c:5936
 msgid "Buddy Comment:"
 msgstr "Buddy-Kommentar:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5982
+#: ../libpurple/protocols/oscar/oscar.c:5983
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Sie haben eine direkte IM-Verbindung mit %s ausgewählt."
 
-#: ../libpurple/protocols/oscar/oscar.c:5986
+#: ../libpurple/protocols/oscar/oscar.c:5987
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9273,66 +9292,66 @@ msgstr ""
 "Da dies Ihre IP-Adresse sichtbar macht, kann es als Sicherheitsrisiko "
 "betrachtet werden. Möchten Sie fortfahren?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5992
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:5993
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "V_erbinden"
 
-#: ../libpurple/protocols/oscar/oscar.c:6027
+#: ../libpurple/protocols/oscar/oscar.c:6028
 msgid "Get AIM Info"
 msgstr "AIM-Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:6033
+#: ../libpurple/protocols/oscar/oscar.c:6034
 msgid "Edit Buddy Comment"
 msgstr "Buddy-Kommentar bearbeiten"
 
-#: ../libpurple/protocols/oscar/oscar.c:6041
+#: ../libpurple/protocols/oscar/oscar.c:6042
 msgid "Get Status Msg"
 msgstr "Abwesenheitsmitteilung abrufen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6054
+#: ../libpurple/protocols/oscar/oscar.c:6055
 msgid "Direct IM"
 msgstr "Direkte Nachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:6076
+#: ../libpurple/protocols/oscar/oscar.c:6077
 msgid "Re-request Authorization"
 msgstr "Nochmal nach Autorisierung fragen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6135
+#: ../libpurple/protocols/oscar/oscar.c:6136
 msgid "Require authorization"
 msgstr "Autorisierung erforderlich"
 
-#: ../libpurple/protocols/oscar/oscar.c:6138
+#: ../libpurple/protocols/oscar/oscar.c:6139
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web aware (Wenn Sie dies aktivieren, werden Sie SPAM erhalten!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:6144
 msgid "ICQ Privacy Options"
 msgstr "ICQ Privatsphärenoptionen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6163
 msgid "The new formatting is invalid."
 msgstr "Die neue Formatierung ist ungültig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6163
+#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Benutzernamen-Formatierung kann nur die Groß-/Kleinschreibung und "
 "Leerzeichen ändern."
 
-#: ../libpurple/protocols/oscar/oscar.c:6216
+#: ../libpurple/protocols/oscar/oscar.c:6217
 msgid "Change Address To:"
 msgstr "Ändere die Adresse zu:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6262
+#: ../libpurple/protocols/oscar/oscar.c:6263
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Sie warten derzeit auf keine Autorisierungen</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6265
+#: ../libpurple/protocols/oscar/oscar.c:6266
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Sie warten auf Autorisierung von den folgenden Buddys"
 
-#: ../libpurple/protocols/oscar/oscar.c:6266
+#: ../libpurple/protocols/oscar/oscar.c:6267
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9341,73 +9360,73 @@ msgstr ""
 "den Buddy mit einem Rechtsklick anklicken und „Nochmal nach Autorisierung "
 "fragen“ auswählen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6283
+#: ../libpurple/protocols/oscar/oscar.c:6284
 msgid "Find Buddy by E-Mail"
 msgstr "Suche Buddys nach E-Mail-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6284
+#: ../libpurple/protocols/oscar/oscar.c:6285
 msgid "Search for a buddy by e-mail address"
 msgstr "Suche nach einem Buddy mit einer bestimmten E-Mail-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6285
+#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Geben Sie die E-Mail-Adresse des Buddys ein, nach dem Sie suchen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6288
+#: ../libpurple/protocols/oscar/oscar.c:6289
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6446
+#: ../libpurple/protocols/oscar/oscar.c:6447
 msgid "Set User Info (URL)..."
 msgstr "Benutzer-Info (URL) setzen..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6457
+#: ../libpurple/protocols/oscar/oscar.c:6458
 msgid "Change Password (URL)"
 msgstr "Ändere Passwort (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6461
+#: ../libpurple/protocols/oscar/oscar.c:6462
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfiguriere IM-Weiterleitung (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6472
 msgid "Set Privacy Options..."
 msgstr "Privatsphärenoptionen setzen..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6478
+#: ../libpurple/protocols/oscar/oscar.c:6479
 msgid "Confirm Account"
 msgstr "Konto bestätigen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6482
+#: ../libpurple/protocols/oscar/oscar.c:6483
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Zeige die aktuell registrierte E-Mail-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6486
+#: ../libpurple/protocols/oscar/oscar.c:6487
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Ändere die aktuell registrierte E-Mail-Adresse..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6493
+#: ../libpurple/protocols/oscar/oscar.c:6494
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Zeige Buddys, von denen Sie Autorisierung erwarten"
 
-#: ../libpurple/protocols/oscar/oscar.c:6499
+#: ../libpurple/protocols/oscar/oscar.c:6500
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Suche Buddys nach E-Mail-Adresse..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6504
+#: ../libpurple/protocols/oscar/oscar.c:6505
 msgid "Search for Buddy by Information"
 msgstr "Suche Buddy nach Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:6572
+#: ../libpurple/protocols/oscar/oscar.c:6573
 msgid "Use recent buddies group"
 msgstr "Benutze neueste Gruppe"
 
-#: ../libpurple/protocols/oscar/oscar.c:6575
+#: ../libpurple/protocols/oscar/oscar.c:6576
 msgid "Show how long you have been idle"
 msgstr "Anzeigen, wie lange ich untätig war"
 
-#: ../libpurple/protocols/oscar/oscar.c:6730
+#: ../libpurple/protocols/oscar/oscar.c:6731
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9415,27 +9434,27 @@ msgstr ""
 "Benutze immer den AIM/ICQ-Proxyserver\n"
 "(langsamer, aber zeigt Ihre IP-Adresse nicht)"
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Frage %s, ob er sich zu uns auf %s:%hu für Direkt-IM verbinden möchte."
 
-#: ../libpurple/protocols/oscar/peer.c:782
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Verbindungsversuch mit %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:856
+#: ../libpurple/protocols/oscar/peer.c:858
 #, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Verbindungsversuch über einen Proxyserver."
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s hat nach einer direkten Verbindung zu %s gefragt"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
+#: ../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 "
@@ -9597,20 +9616,20 @@ msgstr "Schwein"
 msgid "Other"
 msgstr "Andere"
 
-#: ../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 "Meine Informationen bearbeiten"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Meine Informationen aktualisieren"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Ihre Informationen wurden aktualisiert"
 
-#: ../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 "
@@ -9619,8 +9638,8 @@ msgstr ""
 "Das Setzen von benutzerdefinierten Gesichtern wird momentan nicht "
 "unterstützt. Bitte wählen Sie ein Bild von %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 "Ungültiges QQ-Gesicht"
 
@@ -10269,7 +10288,7 @@ msgstr "Zur Konferenz einladen..."
 msgid "Send TEST Announcement"
 msgstr "Sende TEST-Nachricht"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4434
 msgid "Topic:"
 msgstr "Thema:"
 
@@ -10294,7 +10313,7 @@ msgstr "Meanwhile-Verbindungseinstellungen"
 msgid "No Sametime Community Server Specified"
 msgstr "Kein Sametime-Community Server angegeben"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4323
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4368
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -10470,7 +10489,7 @@ msgstr ""
 "können diese Benutzer zu Ihrer Buddy-Liste hinzufügen oder ihnen Nachrichten "
 "senden, indem sie die folgenden Aktions-Buttons benutzen."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:757
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:762
 msgid "Search Results"
 msgstr "Suchergebnisse"
 
@@ -12421,35 +12440,35 @@ msgid "Could not load SILC key pair: %s"
 msgstr "Konnte SILC-Schlüsselpaar nicht laden: %s"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:417
 msgid "Could not write"
 msgstr "Konnte nicht schreiben"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1531
+#: ../libpurple/protocols/simple/simple.c:439
+#: ../libpurple/protocols/simple/simple.c:1545
 msgid "Could not connect"
 msgstr "Verbinden nicht möglich"
 
-#: ../libpurple/protocols/simple/simple.c:1061
+#: ../libpurple/protocols/simple/simple.c:1062
 msgid "Unknown server response."
 msgstr "Unbekannte Serverantwort."
 
-#: ../libpurple/protocols/simple/simple.c:1565
-#: ../libpurple/protocols/simple/simple.c:1607
-#: ../libpurple/protocols/simple/simple.c:1620
-#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1621
+#: ../libpurple/protocols/simple/simple.c:1634
+#: ../libpurple/protocols/simple/simple.c:1685
 msgid "Could not create listen socket"
 msgstr "Kann Listen-Socket nicht erstellen"
 
-#: ../libpurple/protocols/simple/simple.c:1588
+#: ../libpurple/protocols/simple/simple.c:1602
 msgid "Couldn't resolve host"
 msgstr "Kann den Hostnamen nicht auflösen"
 
-#: ../libpurple/protocols/simple/simple.c:1679
+#: ../libpurple/protocols/simple/simple.c:1693
 msgid "Could not resolve hostname"
 msgstr "Konnte den Hostnamen nicht auflösen"
 
-#: ../libpurple/protocols/simple/simple.c:1696
+#: ../libpurple/protocols/simple/simple.c:1710
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP-Benutzernamen dürfen keine Leerzeichen oder @-Symbole enthalten"
 
@@ -12461,36 +12480,36 @@ msgstr "SIP-Benutzernamen dürfen keine Leerzeichen oder @-Symbole enthalten"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protokoll-Plugin"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1873
+#: ../libpurple/protocols/simple/simple.c:1894
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Das SIP/SIMPLE-Protokoll-Plugin"
 
-#: ../libpurple/protocols/simple/simple.c:1901
+#: ../libpurple/protocols/simple/simple.c:1922
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Status veröffentlichen (Bemerkung: Jeder kann Sie sehen)"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1928
 msgid "Use UDP"
 msgstr "Benutze UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:1930
 msgid "Use proxy"
 msgstr "Proxy benutzen"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:1932
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:1934
 msgid "Auth User"
 msgstr "Auth-Benutzer"
 
-#: ../libpurple/protocols/simple/simple.c:1915
+#: ../libpurple/protocols/simple/simple.c:1936
 msgid "Auth Domain"
 msgstr "Auth-Domain"
 
@@ -12669,8 +12688,8 @@ msgstr ""
 msgid "Password Change Successful"
 msgstr "Passwortänderung erfolgreich"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5871
-#: ../pidgin/gtkblist.c:6227
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5925
+#: ../pidgin/gtkblist.c:6281
 msgid "_Group:"
 msgstr "_Gruppe:"
 
@@ -13387,8 +13406,8 @@ msgstr "Realm"
 msgid "Exposure"
 msgstr "Aussetzen"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:899 ../libpurple/proxy.c:1058
+#: ../libpurple/proxy.c:1629
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13397,29 +13416,29 @@ msgstr ""
 "Kann Socket nicht erstellen:\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Kann Antwort vom HTTP-Proxy nicht verarbeiten: %s\n"
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../libpurple/proxy.c:701 ../libpurple/proxy.c:747 ../libpurple/proxy.c:783
+#: ../libpurple/proxy.c:795
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-Proxy-Verbindungsfehler %d"
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:791
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 "Zugriff verboten: Der HTTP-Proxy-Server verbietet das Tunneling über Port %d."
 
-#: ../libpurple/proxy.c:1012
+#: ../libpurple/proxy.c:1019
 #, c-format
 msgid "Error resolving %s"
 msgstr "Fehler beim Auflösen von %s"
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1727
 msgid "Could not resolve host name"
 msgstr "Kann den Hostnamen nicht auflösen"
 
@@ -13505,7 +13524,8 @@ msgstr "Unbekannter SSL-Fehler"
 msgid "Unset"
 msgstr "Nicht gesetzt"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "Nicht stören"
 
@@ -13572,12 +13592,12 @@ msgstr "+++ %s wurde tätig"
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2705
+#: ../libpurple/util.c:2706
 #, c-format
 msgid "Error Reading %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: ../libpurple/util.c:2706
+#: ../libpurple/util.c:2707
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13586,67 +13606,67 @@ msgstr ""
 "Beim Einlesen Ihrer %s trat ein Fehler auf.  Die Liste wurde nicht geladen "
 "und die alte Datei wurde in %s~ umbenannt."
 
-#: ../libpurple/util.c:3206
+#: ../libpurple/util.c:3207
 msgid "Calculating..."
 msgstr "Berechne..."
 
-#: ../libpurple/util.c:3209
+#: ../libpurple/util.c:3210
 msgid "Unknown."
 msgstr "Unbekannt."
 
-#: ../libpurple/util.c:3235
+#: ../libpurple/util.c:3236
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: ../libpurple/util.c:3247
+#: ../libpurple/util.c:3248
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: ../libpurple/util.c:3255
+#: ../libpurple/util.c:3256
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d Stunde"
 msgstr[1] "%s, %d Stunden"
 
-#: ../libpurple/util.c:3261
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: ../libpurple/util.c:3269
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d Minute"
 msgstr[1] "%s, %d Minuten"
 
-#: ../libpurple/util.c:3275
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: ../libpurple/util.c:3535
+#: ../libpurple/util.c:3536
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Konnte %s nicht öffnen: Zu oft weitergeleitet"
 
-#: ../libpurple/util.c:3572 ../libpurple/util.c:3868
+#: ../libpurple/util.c:3573 ../libpurple/util.c:3869
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Verbindung zu %s nicht möglich"
 
-#: ../libpurple/util.c:3695
+#: ../libpurple/util.c:3696
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13655,17 +13675,17 @@ msgstr ""
 "Nicht genug Speicher für die Inhalte von %s verfügbar.  Eventuell versucht "
 "der Web-Server etwas böses zu tun."
 
-#: ../libpurple/util.c:3730
+#: ../libpurple/util.c:3731
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Fehler beim Lesen von %s: %s"
 
-#: ../libpurple/util.c:3761
+#: ../libpurple/util.c:3762
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: ../libpurple/util.c:3786
+#: ../libpurple/util.c:3787
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Verbindung zu %s nicht möglich: %s"
@@ -13682,11 +13702,11 @@ msgstr "Pidgin Internet-Sofortnachrichtendienst"
 msgid "Send instant messages over multiple protocols"
 msgstr "Sendet Sofortnachrichten über mehrere Protokolle"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Ausrichtung"
 
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "Die Ausrichtung der Kontrollleiste."
 
@@ -13805,32 +13825,32 @@ msgstr "Kann neues Konto nicht speichern"
 msgid "An account already exists with the specified criteria."
 msgstr "Ein Konto mit den angegebenen Daten existiert bereits."
 
-#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1474
 msgid "Add Account"
 msgstr "Konto hinzufügen"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1493
 msgid "_Basic"
 msgstr "_Einfach"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1500
 msgid "Create this new account on the server"
 msgstr "Dieses neue Konto auf dem Server anlegen"
 
-#: ../pidgin/gtkaccount.c:1515
+#: ../pidgin/gtkaccount.c:1516
 msgid "_Advanced"
 msgstr "_Erweitert"
 
 # Aktiv
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1974 ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:2002
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2202
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13859,8 +13879,10 @@ msgstr ""
 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] "Sie haben %d Kontakt als %s benannt. Möchten Sie diese mischen?"
-msgstr[1] "Sie haben %d Kontakte als %s benannt. Möchten Sie diese mischen?"
+msgstr[0] ""
+"Sie haben %d Kontakt als %s benannt. Möchten Sie diese zusammenführen?"
+msgstr[1] ""
+"Sie haben %d Kontakte als %s benannt. Möchten Sie diese zusammenführen"
 
 #: ../pidgin/gtkblist.c:525
 msgid ""
@@ -13875,11 +13897,7 @@ msgstr ""
 
 #: ../pidgin/gtkblist.c:527
 msgid "_Merge"
-msgstr "_Mischen"
-
-#: ../pidgin/gtkblist.c:924
-msgid "Join a Chat"
-msgstr "Chat betreten"
+msgstr "_Zusammenführen"
 
 #: ../pidgin/gtkblist.c:945
 msgid ""
@@ -13889,7 +13907,7 @@ msgstr ""
 "Bitte geben Sie geeignete Informationen über den Chat ein, den Sie betreten "
 "wollen.\n"
 
-#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6188
+#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6242
 #: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "_Konto:"
@@ -13985,11 +14003,11 @@ msgid "_Expand"
 msgstr "A_usklappen"
 
 #: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
-#: ../pidgin/gtkblist.c:4885 ../pidgin/gtkblist.c:4898
+#: ../pidgin/gtkblist.c:4929 ../pidgin/gtkblist.c:4942
 msgid "/Tools/Mute Sounds"
 msgstr "/Werkzeuge/Stummschalten"
 
-#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4903
+#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4919
 #: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -14019,8 +14037,8 @@ msgid "/Buddies/View User _Log..."
 msgstr "/Buddys/Benutzer-_Mitschnitt ansehen..."
 
 #: ../pidgin/gtkblist.c:3073
-msgid "/Buddies/Show"
-msgstr "/Buddys/Anzeigen"
+msgid "/Buddies/Sh_ow"
+msgstr "/Buddys/_Anzeigen"
 
 #: ../pidgin/gtkblist.c:3074
 msgid "/Buddies/Show/_Offline Buddies"
@@ -14067,7 +14085,7 @@ msgstr "/Buddys/_Beenden"
 msgid "/_Accounts"
 msgstr "/_Konten"
 
-#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6889
+#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6943
 msgid "/Accounts/Manage"
 msgstr "/Konten/Verwalten"
 
@@ -14177,85 +14195,86 @@ msgstr "Untätig %dh %02dm"
 msgid "Idle %dm"
 msgstr "Untätig %dm"
 
-#: ../pidgin/gtkblist.c:3806
+#: ../pidgin/gtkblist.c:3814
 msgid "/Buddies/New Instant Message..."
 msgstr "/Buddys/Neue Sofortnachricht..."
 
-#: ../pidgin/gtkblist.c:3807 ../pidgin/gtkblist.c:3840
+#: ../pidgin/gtkblist.c:3815 ../pidgin/gtkblist.c:3848
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddys/Chat betreten..."
 
-#: ../pidgin/gtkblist.c:3808
+#: ../pidgin/gtkblist.c:3816
 msgid "/Buddies/Get User Info..."
 msgstr "/Buddys/Benutzer-Info abrufen..."
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3817
 msgid "/Buddies/Add Buddy..."
 msgstr "/Buddys/Buddy hinzufügen..."
 
-#: ../pidgin/gtkblist.c:3810 ../pidgin/gtkblist.c:3843
+#: ../pidgin/gtkblist.c:3818 ../pidgin/gtkblist.c:3851
 msgid "/Buddies/Add Chat..."
 msgstr "/Buddys/Chat hinzufügen..."
 
-#: ../pidgin/gtkblist.c:3811
+#: ../pidgin/gtkblist.c:3819
 msgid "/Buddies/Add Group..."
 msgstr "/Buddys/Gruppe hinzufügen..."
 
-#: ../pidgin/gtkblist.c:3846
+#: ../pidgin/gtkblist.c:3854
 msgid "/Tools/Privacy"
 msgstr "/Werkzeuge/Privatsphäre"
 
-#: ../pidgin/gtkblist.c:3849
+#: ../pidgin/gtkblist.c:3857
 msgid "/Tools/Room List"
 msgstr "/Werkzeuge/Chaträume"
 
-#: ../pidgin/gtkblist.c:3944 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3989 ../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 ungelesene Nachricht von %s\n"
 msgstr[1] "%d ungelesene Nachrichten von %s\n"
 
-#: ../pidgin/gtkblist.c:4104
+#: ../pidgin/gtkblist.c:4149
 msgid "Manually"
 msgstr "Manuell"
 
-#: ../pidgin/gtkblist.c:4107
+#: ../pidgin/gtkblist.c:4152
 msgid "By status"
 msgstr "Nach Status"
 
-#: ../pidgin/gtkblist.c:4108
+#: ../pidgin/gtkblist.c:4153
 msgid "By log size"
 msgstr "Nach Größe der Logs"
 
-#: ../pidgin/gtkblist.c:4313 ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkblist.c:4358 ../pidgin/gtkconn.c:180
 #, c-format
 msgid "%s disconnected"
 msgstr "%s abgemeldet"
 
-#: ../pidgin/gtkblist.c:4349
+#: ../pidgin/gtkblist.c:4393
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s abgemeldet: %s</span>"
 
-#: ../pidgin/gtkblist.c:4501
+#: ../pidgin/gtkblist.c:4545
 msgid "<b>Username:</b>"
 msgstr "<b>Benutzername:</b>"
 
-#: ../pidgin/gtkblist.c:4508
+#: ../pidgin/gtkblist.c:4552
 msgid "<b>Password:</b>"
 msgstr "<b>Passwort:</b>"
 
-#: ../pidgin/gtkblist.c:4519
+#: ../pidgin/gtkblist.c:4563
 msgid "_Login"
 msgstr "_Anmelden"
 
-#: ../pidgin/gtkblist.c:4602
+#: ../pidgin/gtkblist.c:4646
 msgid "/Accounts"
 msgstr "/Konten"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:4660
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -14274,27 +14293,27 @@ msgstr ""
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4879
+#: ../pidgin/gtkblist.c:4923
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Buddys/Anzeigen/Offline-Buddys"
 
-#: ../pidgin/gtkblist.c:4882
+#: ../pidgin/gtkblist.c:4926
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Buddys/Anzeigen/leere Gruppen"
 
-#: ../pidgin/gtkblist.c:4888
+#: ../pidgin/gtkblist.c:4932
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Buddys/Anzeigen/Buddy-Details"
 
-#: ../pidgin/gtkblist.c:4891
+#: ../pidgin/gtkblist.c:4935
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Buddys/Anzeigen/Untätigkeitszeiten"
 
-#: ../pidgin/gtkblist.c:4894
+#: ../pidgin/gtkblist.c:4938
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Buddys/Anzeigen/Protokoll-Icons"
 
-#: ../pidgin/gtkblist.c:5796
+#: ../pidgin/gtkblist.c:5850
 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. "
@@ -14306,30 +14325,30 @@ msgstr ""
 "immer es möglich ist.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:5819
+#: ../pidgin/gtkblist.c:5873
 msgid "A_ccount:"
 msgstr "_Konto:"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5831
+#: ../pidgin/gtkblist.c:5885
 msgid "_Screen name:"
 msgstr "_Benutzername:"
 
-#: ../pidgin/gtkblist.c:5853 ../pidgin/gtkblist.c:6209
+#: ../pidgin/gtkblist.c:5907 ../pidgin/gtkblist.c:6263
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:6121
+#: ../pidgin/gtkblist.c:6175
 msgid "This protocol does not support chat rooms."
 msgstr "Dieses Protokoll unterstützt keine Chaträume."
 
-#: ../pidgin/gtkblist.c:6137
+#: ../pidgin/gtkblist.c:6191
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Sie sind derzeit mit keinem Chat-fähigen Protokoll angemeldet."
 
-#: ../pidgin/gtkblist.c:6178
+#: ../pidgin/gtkblist.c:6232
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14337,47 +14356,47 @@ msgstr ""
 "Bitte geben Sie einen Alias und geeignete Informationen über den Chat ein, "
 "den Sie in Ihre Buddy-Liste aufnehmen wollen.\n"
 
-#: ../pidgin/gtkblist.c:6237
+#: ../pidgin/gtkblist.c:6291
 msgid "Autojoin when account becomes online."
 msgstr "Automatisch beitreten, wenn das Konto online geht."
 
-#: ../pidgin/gtkblist.c:6238
+#: ../pidgin/gtkblist.c:6292
 msgid "Hide chat when the window is closed."
 msgstr "Chat verstecken, wenn das Fenster geschlossen wird."
 
-#: ../pidgin/gtkblist.c:6264
+#: ../pidgin/gtkblist.c:6318
 msgid "Please enter the name of the group to be added."
 msgstr "Bitte geben Sie den Namen der Gruppe ein, die hinzugefügt werden soll."
 
-#: ../pidgin/gtkblist.c:6909
+#: ../pidgin/gtkblist.c:6963
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Konten"
 
-#: ../pidgin/gtkblist.c:6933
+#: ../pidgin/gtkblist.c:6987
 msgid "_Edit Account"
 msgstr "Konto _bearbeiten"
 
-#: ../pidgin/gtkblist.c:6946 ../pidgin/gtkconv.c:3136
+#: ../pidgin/gtkblist.c:7000 ../pidgin/gtkconv.c:3143
 msgid "No actions available"
 msgstr "Keine Aktionen verfügbar"
 
-#: ../pidgin/gtkblist.c:6954
+#: ../pidgin/gtkblist.c:7008
 msgid "_Disable"
 msgstr "_Deaktivieren"
 
-#: ../pidgin/gtkblist.c:6966
+#: ../pidgin/gtkblist.c:7020
 msgid "Enable Account"
 msgstr "Konten aktivieren"
 
-#: ../pidgin/gtkblist.c:6972
+#: ../pidgin/gtkblist.c:7026
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Konten/Konto aktivieren"
 
-#: ../pidgin/gtkblist.c:7021
+#: ../pidgin/gtkblist.c:7075
 msgid "/Tools"
 msgstr "/Werkzeuge"
 
-#: ../pidgin/gtkblist.c:7091
+#: ../pidgin/gtkblist.c:7145
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddys/Buddys sortieren"
 
@@ -14399,27 +14418,27 @@ msgstr ""
 "%s wird nicht versuchen, das Konto wieder zu verbinden bis Sie den Fehler "
 "behoben und das Konto wieder aktiviert haben."
 
-#: ../pidgin/gtkconv.c:523
+#: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
 msgstr "Unbekanntes Kommando."
 
-#: ../pidgin/gtkconv.c:795 ../pidgin/gtkconv.c:821
+#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Der Buddy hat nicht das gleiche Protokoll wie dieser Chat."
 
-#: ../pidgin/gtkconv.c:815
+#: ../pidgin/gtkconv.c:816
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Sie sind im Moment nicht mit einem Konto angemeldet, welches benutzt werden "
 "kann, um diesen Buddy einzuladen."
 
-#: ../pidgin/gtkconv.c:868
+#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr "Buddy in einen Chatraum einladen"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:898
+#: ../pidgin/gtkconv.c:899
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14427,183 +14446,183 @@ msgstr ""
 "Bitte geben Sie den Benutzernamen der Person ein, die Sie einladen möchten "
 "zusammen mit einer optionalen Einladungsnachricht."
 
-#: ../pidgin/gtkconv.c:919
+#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: ../pidgin/gtkconv.c:930 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1194
 #: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "_Nachricht:"
 
-#: ../pidgin/gtkconv.c:994
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Unterhaltung mit %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1032
+#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "Unterhaltung speichern"
 
-#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Suchen"
 
-#: ../pidgin/gtkconv.c:1204 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Suche nach:"
 
-#: ../pidgin/gtkconv.c:1675
+#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "Nicht Ignorieren"
 
-#: ../pidgin/gtkconv.c:1678
+#: ../pidgin/gtkconv.c:1679
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../pidgin/gtkconv.c:1698
+#: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "Neue Abwesenheitsnachricht abholen"
 
-#: ../pidgin/gtkconv.c:1721
+#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
 msgstr "Zuletzt gesagt"
 
-#: ../pidgin/gtkconv.c:2665
+#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "Kann Icon-Datei nicht auf die Festplatte speichern."
 
-#: ../pidgin/gtkconv.c:2716
+#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "Icon speichern"
 
-#: ../pidgin/gtkconv.c:2768
+#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "Animieren"
 
-#: ../pidgin/gtkconv.c:2773
+#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "Icon verbergen"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "Icon speichern unter..."
 
-#: ../pidgin/gtkconv.c:2780
+#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr "Setze benutzerdefiniertes Icon..."
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2799
 msgid "Remove Custom Icon"
 msgstr "Benutzerdefiniertes Icon entfernen"
 
-#: ../pidgin/gtkconv.c:2924
+#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
 msgstr "Alle anzeigen"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2943
+#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "/_Unterhaltung"
 
-#: ../pidgin/gtkconv.c:2945
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Unterhaltung/_Neue Sofortnachricht..."
 
-#: ../pidgin/gtkconv.c:2950
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "/Unterhaltung/_Finden..."
 
-#: ../pidgin/gtkconv.c:2952
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr "/Unterhaltung/Betrachte _Mitschnitt"
 
-#: ../pidgin/gtkconv.c:2953
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "/Unterhaltung/_Speichern als..."
 
-#: ../pidgin/gtkconv.c:2955
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Unterhaltung/_Leeren"
 
-#: ../pidgin/gtkconv.c:2959
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "/Unterhaltung/Datei _senden..."
 
-#: ../pidgin/gtkconv.c:2960
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Unterhaltung/Buddy-Alar_m hinzufügen..."
 
-#: ../pidgin/gtkconv.c:2962
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/Unterhaltung/B_enutzer-Info abrufen"
 
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "/Unterhaltung/_Einladen..."
 
-#: ../pidgin/gtkconv.c:2966
+#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr "/Unterhaltung/M_ehr"
 
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr "/Unterhaltung/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2972
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "/Unterhaltung/_Blockieren..."
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr "/Unterhaltung/_Entsperren..."
 
-#: ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "/Unterhaltung/_Hinzufügen..."
 
-#: ../pidgin/gtkconv.c:2978
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/Unterhaltung/_Entfernen..."
 
-#: ../pidgin/gtkconv.c:2983
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Unterhaltung/Lin_k einfügen..."
 
-#: ../pidgin/gtkconv.c:2985
+#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Unterhaltung/Bil_d einfügen..."
 
-#: ../pidgin/gtkconv.c:2991
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "/Unterhaltung/S_chließen"
 
 #. Options
-#: ../pidgin/gtkconv.c:2995
+#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
 msgstr "/_Optionen"
 
-#: ../pidgin/gtkconv.c:2996
+#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
 msgstr "/Optionen/Schalte _Mitschnitt ein"
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "/Optionen/Schalte _Klänge ein"
 
-#: ../pidgin/gtkconv.c:2999
+#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Optionen/Zeige _Werkzeugleisten für Formatierung"
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Optionen/Zeige Zeitste_mpel"
 
-#: ../pidgin/gtkconv.c:3124
+#: ../pidgin/gtkconv.c:3131
 msgid "/Conversation/More"
 msgstr "/Unterhaltung/Mehr"
 
-#: ../pidgin/gtkconv.c:3180
+#: ../pidgin/gtkconv.c:3187
 msgid "/Options"
 msgstr "/Optionen"
 
@@ -14612,173 +14631,173 @@ msgstr "/Optionen"
 #. 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:3215 ../pidgin/gtkconv.c:3247
+#: ../pidgin/gtkconv.c:3222 ../pidgin/gtkconv.c:3254
 msgid "/Conversation"
 msgstr "/Unterhaltung"
 
-#: ../pidgin/gtkconv.c:3255
+#: ../pidgin/gtkconv.c:3262
 msgid "/Conversation/View Log"
 msgstr "/Unterhaltung/Betrachte Mitschnitt"
 
-#: ../pidgin/gtkconv.c:3261
+#: ../pidgin/gtkconv.c:3268
 msgid "/Conversation/Send File..."
 msgstr "/Unterhaltung/Datei senden ..."
 
-#: ../pidgin/gtkconv.c:3265
+#: ../pidgin/gtkconv.c:3272
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Unterhaltung/Buddy-Alarm hinzufügen..."
 
-#: ../pidgin/gtkconv.c:3271
+#: ../pidgin/gtkconv.c:3278
 msgid "/Conversation/Get Info"
 msgstr "/Unterhaltung/Info abrufen"
 
-#: ../pidgin/gtkconv.c:3275
+#: ../pidgin/gtkconv.c:3282
 msgid "/Conversation/Invite..."
 msgstr "/Unterhaltung/Einladen ..."
 
-#: ../pidgin/gtkconv.c:3281
+#: ../pidgin/gtkconv.c:3288
 msgid "/Conversation/Alias..."
 msgstr "/Unterhaltung/Alias..."
 
-#: ../pidgin/gtkconv.c:3285
+#: ../pidgin/gtkconv.c:3292
 msgid "/Conversation/Block..."
 msgstr "/Unterhaltung/Blockieren..."
 
-#: ../pidgin/gtkconv.c:3289
+#: ../pidgin/gtkconv.c:3296
 msgid "/Conversation/Unblock..."
 msgstr "/Unterhaltung/Entsperren..."
 
-#: ../pidgin/gtkconv.c:3293
+#: ../pidgin/gtkconv.c:3300
 msgid "/Conversation/Add..."
 msgstr "/Unterhaltung/Hinzufügen..."
 
-#: ../pidgin/gtkconv.c:3297
+#: ../pidgin/gtkconv.c:3304
 msgid "/Conversation/Remove..."
 msgstr "/Unterhaltung/Entfernen..."
 
-#: ../pidgin/gtkconv.c:3303
+#: ../pidgin/gtkconv.c:3310
 msgid "/Conversation/Insert Link..."
 msgstr "/Unterhaltung/Link einfügen..."
 
-#: ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3314
 msgid "/Conversation/Insert Image..."
 msgstr "/Unterhaltung/Bild einfügen..."
 
-#: ../pidgin/gtkconv.c:3313
+#: ../pidgin/gtkconv.c:3320
 msgid "/Options/Enable Logging"
 msgstr "/Optionen/Schalte Mitschnitt ein"
 
-#: ../pidgin/gtkconv.c:3316
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Sounds"
 msgstr "/Optionen/Schalte Klänge ein"
 
-#: ../pidgin/gtkconv.c:3329
+#: ../pidgin/gtkconv.c:3336
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Optionen/Zeige Werkzeugleisten für Formatierung"
 
-#: ../pidgin/gtkconv.c:3332
+#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Timestamps"
 msgstr "/Optionen/Zeige Zeitstempel"
 
-#: ../pidgin/gtkconv.c:3409 ../pidgin/gtkconv.c:3451
+#: ../pidgin/gtkconv.c:3416 ../pidgin/gtkconv.c:3458
 msgid "User is typing..."
 msgstr "Benutzer tippt gerade..."
 
-#: ../pidgin/gtkconv.c:3454
+#: ../pidgin/gtkconv.c:3461
 msgid "User has typed something and stopped"
 msgstr "Benutzer hat etwas getippt und wartet nun"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3637 ../pidgin/gtkconv.c:8103
+#: ../pidgin/gtkconv.c:3645 ../pidgin/gtkconv.c:8181
 msgid "S_end To"
 msgstr "S_enden an"
 
-#: ../pidgin/gtkconv.c:4349
+#: ../pidgin/gtkconv.c:4357
 msgid "_Send"
 msgstr "Ab_schicken"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4453
+#: ../pidgin/gtkconv.c:4470
 msgid "0 people in room"
 msgstr "0 Personen im Raum"
 
-#: ../pidgin/gtkconv.c:5823 ../pidgin/gtkconv.c:5944
+#: ../pidgin/gtkconv.c:5844 ../pidgin/gtkconv.c:5965
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d Person im Raum"
 msgstr[1] "%d Personen im Raum"
 
-#: ../pidgin/gtkconv.c:6550 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6572 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Tippt gerade"
 
-#: ../pidgin/gtkconv.c:6554
+#: ../pidgin/gtkconv.c:6576
 msgid "Stopped Typing"
 msgstr "Tippen gestoppt"
 
-#: ../pidgin/gtkconv.c:6557
+#: ../pidgin/gtkconv.c:6579
 msgid "Nick Said"
 msgstr "Spitzname gesagt"
 
-#: ../pidgin/gtkconv.c:6560 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6582 ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../pidgin/gtkconv.c:6563
+#: ../pidgin/gtkconv.c:6588
 msgid "New Event"
 msgstr "Neue Ereignisse"
 
-#: ../pidgin/gtkconv.c:7654
+#: ../pidgin/gtkconv.c:7700
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Leert alle Gesprächsfenster."
 
-#: ../pidgin/gtkconv.c:7817
+#: ../pidgin/gtkconv.c:7863
 msgid "Confirm close"
 msgstr "Schließen bestätigen"
 
-#: ../pidgin/gtkconv.c:7849
+#: ../pidgin/gtkconv.c:7895
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Sie haben ungelesene Nachrichten. Wollen Sie das Fenster wirklich schließen?"
 
-#: ../pidgin/gtkconv.c:8436
+#: ../pidgin/gtkconv.c:8514
 msgid "Close other tabs"
 msgstr "Andere Reiter schließen"
 
-#: ../pidgin/gtkconv.c:8442
+#: ../pidgin/gtkconv.c:8520
 msgid "Close all tabs"
 msgstr "Alle Reiter schließen"
 
-#: ../pidgin/gtkconv.c:8450
+#: ../pidgin/gtkconv.c:8528
 msgid "Detach this tab"
 msgstr "Diesen Reiter ablösen"
 
-#: ../pidgin/gtkconv.c:8456
+#: ../pidgin/gtkconv.c:8534
 msgid "Close this tab"
 msgstr "Diesen Reiter schließen"
 
-#: ../pidgin/gtkconv.c:8951
+#: ../pidgin/gtkconv.c:9031
 msgid "Close conversation"
 msgstr "Unterhaltung schließen"
 
-#: ../pidgin/gtkconv.c:9553
+#: ../pidgin/gtkconv.c:9633
 msgid "Last created window"
 msgstr "Letztes erstelltes Fenster"
 
-#: ../pidgin/gtkconv.c:9555
+#: ../pidgin/gtkconv.c:9635
 msgid "Separate IM and Chat windows"
 msgstr "Getrennte IM- und Chat-Fenster"
 
-#: ../pidgin/gtkconv.c:9557 ../pidgin/gtkprefs.c:1417
+#: ../pidgin/gtkconv.c:9637 ../pidgin/gtkprefs.c:1417
 msgid "New window"
 msgstr "Neues Fenster"
 
-#: ../pidgin/gtkconv.c:9559
+#: ../pidgin/gtkconv.c:9639
 msgid "By group"
 msgstr "Nach Gruppe"
 
-#: ../pidgin/gtkconv.c:9561
+#: ../pidgin/gtkconv.c:9641
 msgid "By account"
 msgstr "Nach Konto"
 
@@ -15254,6 +15273,16 @@ msgstr "Frühere Übersetzer"
 msgid "Debugging Information"
 msgstr "Debugging-Information"
 
+#: ../pidgin/gtkdialogs.c:754 ../pidgin/gtkdialogs.c:893
+#: ../pidgin/gtkdialogs.c:974
+msgid "_Name"
+msgstr "_Name"
+
+#: ../pidgin/gtkdialogs.c:759 ../pidgin/gtkdialogs.c:898
+#: ../pidgin/gtkdialogs.c:979
+msgid "_Account"
+msgstr "_Konto"
+
 #: ../pidgin/gtkdialogs.c:906
 msgid "Get User Info"
 msgstr "Benutzer-Info abrufen"
@@ -15393,31 +15422,31 @@ msgstr "Chat Entfernen"
 msgid "_Remove Chat"
 msgstr "Chat _entfernen"
 
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Rechtsklicken für weitere ungelesene Nachrichten...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "Ändere Status"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
 msgstr "Buddy-Liste anzeigen"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "Neue Nachricht..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
 msgstr "Stummschalten"
 
-#: ../pidgin/gtkdocklet.c:535
+#: ../pidgin/gtkdocklet.c:728
 msgid "Blink on New Message"
 msgstr "Bei neuen Nachrichten blinken"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "Beenden"
 
@@ -15849,17 +15878,17 @@ msgstr "_Mitschnitt-Ordner anschauen"
 msgid "Total log size:"
 msgstr "Gesamte Mitschnittgröße:"
 
-#: ../pidgin/gtklog.c:709
+#: ../pidgin/gtklog.c:710
 #, c-format
 msgid "Conversations in %s"
 msgstr "Unterhaltung in %s"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:718 ../pidgin/gtklog.c:785
 #, c-format
 msgid "Conversations with %s"
 msgstr "Unterhaltung mit %s"
 
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:810
 msgid "System Log"
 msgstr "System-Mitschnitt"
 
@@ -15952,36 +15981,36 @@ msgstr "Alle Nachrichten öffnen"
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sie haben Post!</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:545
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s hat %d neue Nachricht."
 msgstr[1] "%s hat %d neue Nachrichten."
 
-#: ../pidgin/gtknotify.c:564
+#: ../pidgin/gtknotify.c:569
 #, c-format
 msgid "<b>%d new e-mail.</b>"
 msgid_plural "<b>%d new e-mails.</b>"
 msgstr[0] "<b>%d neue E-Mail.</b>"
 msgstr[1] "<b>%d neue E-Mails.</b>"
 
-#: ../pidgin/gtknotify.c:991
+#: ../pidgin/gtknotify.c:997
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Das Browser-Kommando „%s“ ist falsch."
 
-#: ../pidgin/gtknotify.c:993 ../pidgin/gtknotify.c:1005
-#: ../pidgin/gtknotify.c:1018 ../pidgin/gtknotify.c:1146
+#: ../pidgin/gtknotify.c:999 ../pidgin/gtknotify.c:1011
+#: ../pidgin/gtknotify.c:1024 ../pidgin/gtknotify.c:1152
 msgid "Unable to open URL"
 msgstr "Kann die URL nicht öffnen"
 
-#: ../pidgin/gtknotify.c:1003 ../pidgin/gtknotify.c:1016
+#: ../pidgin/gtknotify.c:1009 ../pidgin/gtknotify.c:1022
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Fehler beim Aufruf von „%s“: %s"
 
-#: ../pidgin/gtknotify.c:1147
+#: ../pidgin/gtknotify.c:1153
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -16727,25 +16756,25 @@ msgstr "Status für %s"
 msgid "Waiting for network connection"
 msgstr "Warte auf Netzwerkverbindung"
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkutils.c:633
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1400 ../pidgin/gtkutils.c:1423
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Beim Laden von %s ist folgender Fehler aufgetreten: %s"
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1403 ../pidgin/gtkutils.c:1425
 msgid "Failed to load image"
 msgstr "Laden des Bildes fehlgeschlagen"
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1499
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kann Verzeichnis %s nicht senden."
 
-#: ../pidgin/gtkutils.c:1499
+#: ../pidgin/gtkutils.c:1500
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -16753,12 +16782,12 @@ msgid ""
 msgstr ""
 "%s kann keine Verzeichnisse übertragen. Bitte senden sie die Dateien einzeln."
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1534 ../pidgin/gtkutils.c:1546
+#: ../pidgin/gtkutils.c:1553
 msgid "You have dragged an image"
 msgstr "Sie haben ein Bild gewählt"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1535
 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."
@@ -16766,23 +16795,23 @@ msgstr ""
 "Sie können dieses Bild senden, es in diese Nachricht einfügen oder es als "
 "Buddy-Icon für diesen Benutzer verwenden."
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1541 ../pidgin/gtkutils.c:1561
 msgid "Set as buddy icon"
 msgstr "Als Buddy-Icons verwenden"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
 msgid "Send image file"
 msgstr "Bilddatei senden"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1562
 msgid "Insert in message"
 msgstr "In Nachricht einfügen"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1547
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Möchten Sie es als Buddy-Icon für diesen Benutzer verwenden?"
 
-#: ../pidgin/gtkutils.c:1551
+#: ../pidgin/gtkutils.c:1554
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -16790,7 +16819,7 @@ msgstr ""
 "Sie können dieses Bild als Dateiübertragung senden oder es als Buddy-Icon "
 "für diesen Benutzer verwenden."
 
-#: ../pidgin/gtkutils.c:1552
+#: ../pidgin/gtkutils.c:1555
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16803,11 +16832,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:1610
+#: ../pidgin/gtkutils.c:1614
 msgid "Cannot send launcher"
 msgstr "Kann Verknüpfung nicht senden"
 
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1614
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -16815,7 +16844,7 @@ msgstr ""
 "Sie haben eine Verknüpfung gewählt. Wahrscheinlich wollten sie das Ziel der "
 "Verknüpfung senden und nicht die Verknüpfung selbst."
 
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:2349
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16826,26 +16855,26 @@ msgstr ""
 "<b>Dateigröße:</b> %s\n"
 "<b>Bildgröße:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2645
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 "Die Datei '%s' ist zu groß für %s.  Bitte versuchen Sie ein kleineres Bild.\n"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2647
 msgid "Icon Error"
 msgstr "Icon-Fehler"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2648
 msgid "Could not set icon"
 msgstr "Konnte das Icon nicht setzen"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2748
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Öffnen der Datei '%s' fehlgeschlagen: %s"
 
-#: ../pidgin/gtkutils.c:2793
+#: ../pidgin/gtkutils.c:2797
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -17335,7 +17364,7 @@ msgstr ""
 "\n"
 "<b>Buddy-Notizen</b>: %s"
 
-#: ../pidgin/plugins/history.c:192
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "Verlauf"
 
@@ -17816,7 +17845,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 "Buddy-Ticker"
 
@@ -17824,7 +17853,7 @@ msgstr "Buddy-Ticker"
 #. *< 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 "Zeigt die Buddy-Liste als tickerähnliche Laufschrift."
 
diff --git a/po/it.po b/po/it.po
index 6e232f339a..39cc4781a8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -437,7 +437,7 @@ msgstr "Informazione"
 
 #: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Retrieving..."
-msgstr "Sacaricamento in corso..."
+msgstr "Scaricamento in corso..."
 
 #: ../finch/gntblist.c:904 ../finch/gntconv.c:507
 #: ../libpurple/protocols/silc/chat.c:899
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 661ae699c1..90d1290eb7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
+"POT-Creation-Date: 2007-10-17 03:21-0400\n"
 "PO-Revision-Date: 2007-05-20 20:22+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -18,9 +18,8 @@ msgstr ""
 
 #: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
 #: ../finch/finch.c:418
-#, fuzzy
 msgid "Finch"
-msgstr "法语"
+msgstr "Finch"
 
 #: ../finch/finch.c:206
 #, c-format
@@ -48,20 +47,22 @@ msgstr ""
 "  -n, --nologin       不自动登入\n"
 "  -v, --version       显示当前版本并退出\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
+"%s 在将您的设置从 %s 迁移到 %s 时遇到错误。您可能必须手动完成迁移操作。请将错误报告给 "
+"http://developer.pidgin.im"
 
 #: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:235 ../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:2029
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
 #: ../libpurple/protocols/jabber/jabber.c:1515
@@ -90,14 +91,14 @@ msgstr "记住密码"
 
 #: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
-msgstr ""
+msgstr "未安装协议插件。"
 
 #: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
-msgstr ""
+msgstr "(您可能忘记运行“make install”。)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1474 ../pidgin/gtkblist.c:4367
 msgid "Modify Account"
 msgstr "修改账户"
 
@@ -127,32 +128,32 @@ msgstr "别名："
 #: ../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:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntblist.c:2287
+#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:472 ../finch/gntpounce.c:459
+#: ../finch/gntpounce.c:667 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
+#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
 #: ../libpurple/account.c:1013 ../libpurple/account.c:1263
 #: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
 #: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
 #: ../libpurple/protocols/gg/gg.c:884
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/buddy.c:2416
+#: ../libpurple/protocols/jabber/buddy.c:2452
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:1008
 #: ../libpurple/protocols/jabber/jabber.c:1017
 #: ../libpurple/protocols/jabber/jabber.c:1737
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/msn/msn.c:362
+#: ../libpurple/protocols/oscar/oscar.c:6148
+#: ../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
@@ -185,10 +186,10 @@ msgstr "别名："
 #: ../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:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1909
+#: ../pidgin/gtkaccount.c:2496 ../pidgin/gtkblist.c:6321
 #: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
 #: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
 #: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
@@ -196,18 +197,18 @@ msgstr "别名："
 #: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
 #: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
 #: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1108
 #: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
 #: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
 #: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "取消"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:472 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
 #: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
 #: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
@@ -215,8 +216,8 @@ msgstr "取消"
 msgid "Save"
 msgstr "保存"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1901
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗？"
@@ -229,14 +230,14 @@ msgstr "删除账户"
 #: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
 #: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../pidgin/gtkaccount.c:1908 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1107 ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "删除"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2326 ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "账户"
 
@@ -246,15 +247,16 @@ msgstr "您可以启用/禁用以下列表中的账户。"
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2372
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:713
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2495
+#: ../pidgin/gtkblist.c:6320 ../pidgin/gtkconv.c:1713
 #: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "添加"
@@ -264,33 +266,33 @@ msgstr "添加"
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2442
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 已经将 %s 加为好友%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2494
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗？"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2552
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s 想要将 %s 添加为好友%s%s"
 
 #: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2575
+#: ../pidgin/gtkaccount.c:2581
 msgid "Authorize buddy?"
 msgstr "同意吗?"
 
 #: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Authorize"
 msgstr "同意"
 
 #: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
 msgid "Deny"
 msgstr "拒绝"
 
@@ -308,19 +310,19 @@ msgstr "您必须选择账户。"
 
 #: ../finch/gntblist.c:295
 msgid "The selected account is not online."
-msgstr ""
+msgstr "选中帐户不在线。"
 
 #: ../finch/gntblist.c:300
 msgid "Error adding buddy"
 msgstr "添加好友出错"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2903
+#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "用户名"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
+#: ../libpurple/protocols/msn/msn.c:1507
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
@@ -336,10 +338,11 @@ msgid "Group"
 msgstr "组"
 
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:2210 ../finch/gntblist.c:2274 ../finch/gntnotify.c:174
+#: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3206
+#: ../pidgin/gtknotify.c:511 ../pidgin/gtkpounce.c:1275
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "账户"
 
@@ -352,7 +355,7 @@ msgstr "账户"
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5826
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "添加好友"
@@ -361,15 +364,16 @@ msgstr "添加好友"
 msgid "Please enter buddy information."
 msgstr "请输入好友信息。"
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "聊天"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
+#: ../finch/gntblist.c:407 ../finch/gntblist.c:2205
+#: ../libpurple/protocols/jabber/jabber.c:924
 #: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
+#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1780
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
 #: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -381,13 +385,13 @@ msgstr "名称"
 msgid "Auto-join"
 msgstr "自动加入"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6208
 msgid "Add Chat"
 msgstr "添加聊天"
 
 #: ../finch/gntblist.c:420
 msgid "You can edit more information from the context menu later."
-msgstr ""
+msgstr "您可以稍候从快捷菜单中编辑更多信息。"
 
 #: ../finch/gntblist.c:433 ../finch/gntblist.c:446
 msgid "Error adding group"
@@ -403,7 +407,7 @@ msgstr "已存在同名组。"
 
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6317
 msgid "Add Group"
 msgstr "添加组"
 
@@ -427,17 +431,15 @@ msgstr "编辑"
 msgid "Edit Settings"
 msgstr "编辑设置"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
-#, fuzzy
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
 msgid "Information"
-msgstr "工作信息"
+msgstr "信息"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
-#, fuzzy
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
-msgstr "正在认证..."
+msgstr "正在获取..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:534
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -448,10 +450,10 @@ msgid "Add Buddy Pounce"
 msgstr "添加好友千里眼"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
 #: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "发送文件"
 
@@ -469,9 +471,8 @@ msgid "Rename"
 msgstr "重命名"
 
 #: ../finch/gntblist.c:1002
-#, fuzzy
 msgid "Set Alias"
-msgstr "别名"
+msgstr "设定别名"
 
 #: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
@@ -496,26 +497,25 @@ msgid "Confirm Remove"
 msgstr "确认删除"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:276
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "删除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2422 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4610
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "好友列表"
 
 #: ../finch/gntblist.c:1257
-#, fuzzy
 msgid "Place tagged"
-msgstr "已取消"
+msgstr "位置已标记"
 
 #: ../finch/gntblist.c:1262
 msgid "Toggle Tag"
-msgstr ""
+msgstr "切换标记"
 
 #. General
 #: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
@@ -523,15 +523,15 @@ msgstr ""
 #: ../libpurple/protocols/gg/gg.c:2207
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2399
 #: ../libpurple/protocols/jabber/jabber.c:937
 #: ../libpurple/protocols/jabber/jabber.c:1544
 #: ../libpurple/protocols/jabber/jabber.c:1567
 #: ../libpurple/protocols/jabber/jabber.c:1590
 #: ../libpurple/protocols/jabber/jabber.c:1613
 #: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/msn/msn.c:1515 ../libpurple/protocols/msn/msn.c:1691
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -541,26 +541,25 @@ msgstr ""
 #: ../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:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3230
 msgid "Nickname"
 msgstr "昵称"
 
 #. Idle stuff
 #: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/bonjour/bonjour.c:354
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2927
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258
+#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927
 msgid "Idle"
 msgstr "发呆"
 
 #: ../finch/gntblist.c:1334
-#, fuzzy
 msgid "On Mobile"
 msgstr "移动"
 
@@ -587,36 +586,26 @@ msgstr ""
 "\n"
 "上次看见：%s前"
 
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:582
 #: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "新建..."
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:583
 #: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "已存..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:343 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "插件"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "名称(_N)"
-
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "账户(_A)"
-
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:767
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:769
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "您想要跟谁聊？请输入他/她的用户名或别名。"
@@ -624,15 +613,15 @@ msgstr "您想要跟谁聊？请输入他/她的用户名或别名。"
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
+#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
 #: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
 #: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
 #: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
 #: ../libpurple/protocols/jabber/jabber.c:1736
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/msn/msn.c:289 ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:323 ../libpurple/protocols/msn/msn.c:340
+#: ../libpurple/protocols/oscar/oscar.c:6147
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -649,102 +638,126 @@ msgstr "您想要跟谁聊？请输入他/她的用户名或别名。"
 #: ../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:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4366
 #: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
 #: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
 #: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "确定"
 
+#: ../finch/gntblist.c:2270
+msgid "Channel"
+msgstr "频道"
+
+#: ../finch/gntblist.c:2282 ../pidgin/gtkblist.c:924
+msgid "Join a Chat"
+msgstr "加入聊天"
+
+#: ../finch/gntblist.c:2284
+msgid "Please enter the name of the chat you want to join."
+msgstr "请输入您想要加入的聊天名称。"
+
+#: ../finch/gntblist.c:2286 ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "加入"
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:797
 msgid "Options"
 msgstr "选项"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2330
 msgid "Send IM..."
 msgstr "发送消息..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "按组"
+#: ../finch/gntblist.c:2334
+msgid "Join Chat..."
+msgstr "加入聊天..."
 
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "显示离线好友"
+#: ../finch/gntblist.c:2338
+msgid "Show"
+msgstr "显示"
+
+#: ../finch/gntblist.c:2343
+msgid "Empty groups"
+msgstr "空组"
+
+#: ../finch/gntblist.c:2349
+msgid "Offline buddies"
+msgstr "离线好友"
+
+#: ../finch/gntblist.c:2355
+msgid "Sort"
+msgstr "排序"
 
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "按状态排序"
+#: ../finch/gntblist.c:2360
+msgid "By Status"
+msgstr "按状态"
 
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "按字母序排序"
+#: ../finch/gntblist.c:2364 ../pidgin/gtkblist.c:4151
+msgid "Alphabetically"
+msgstr "按字母序"
 
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "按日志大小排序"
+#: ../finch/gntblist.c:2368
+msgid "By Log Size"
+msgstr "按日志大小"
 
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
-#, fuzzy
 msgid "Certificate Import"
-msgstr "连接端口"
+msgstr "证书导入"
 
 #: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
-msgstr ""
+msgstr "指定主机名"
 
 #: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "输入此证书所适用的主机名。"
 
 #: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
-msgstr ""
+msgstr "无法导入文件 %s。\n请确定该文件可读取，且是 PEM 格式。\n"
 
 #: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "证书导入错误"
 
 #: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
-msgstr ""
+msgstr "X.509 证书导入失败"
 
 #: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
-#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "选择文件"
+msgstr "选择 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 ""
+msgstr "导出到文件 %s 失败。\n请检查您是否有目标路径的写权限\n"
 
 #: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "证书导出出错"
 
 #: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "X.509 证书导出失败"
 
 #: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "PEM X.509 证书导出"
 
 #: ../finch/gntcertmgr.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate for %s"
-msgstr "%s 的状态"
+msgstr "%s 的证书"
 
 #: ../finch/gntcertmgr.c:195
 #, c-format
@@ -773,39 +786,39 @@ msgid "Certificate Manager"
 msgstr ""
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:666
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "主机名"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
 #: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "信息"
 
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
+#: ../finch/gntplugin.c:211 ../finch/gntplugin.c:403 ../finch/gntpounce.c:738
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:406
 #: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2469
 #: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "关闭"
 
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s(%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s 已断开连接。"
 
-#: ../finch/gntconn.c:128
-#, fuzzy, c-format
+#: ../finch/gntconn.c:129
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -814,9 +827,9 @@ msgid ""
 msgstr ""
 "%s\n"
 "\n"
-"%s 将不会尝试重新连接账户，除非您纠正了错误然后重新启用账户。"
+"Finch 将不会尝试重新连接账户，除非您纠正了错误然后重新启用账户。"
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4368
 msgid "Re-enable Account"
 msgstr "重新启用账户"
 
@@ -824,30 +837,29 @@ msgstr "重新启用账户"
 msgid "No such command."
 msgstr "没有这样的命令。"
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "系统错误: 您给命令传送的参数个数不对。"
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "您的命令失败，原因未知。"
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "该命令只在聊天中可用，对话中无效。"
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "该命令只在对话中可用，聊天中无效。"
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "命令无法在此协议下工作。"
 
 #: ../finch/gntconv.c:168
-#, fuzzy
 msgid "Message was not sent, because you are not signed on."
-msgstr "消息未发出，因为发送的频率太高："
+msgstr "消息未发出，因为您尚未登入。"
 
 #: ../finch/gntconv.c:251
 #, c-format
@@ -859,7 +871,7 @@ msgstr "%s (%s -- %s)"
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
 #, c-format
 msgid ""
 "\n"
@@ -869,71 +881,64 @@ msgstr ""
 "%s 正在打字..."
 
 #: ../finch/gntconv.c:298
-#, fuzzy
 msgid "You have left this chat."
-msgstr "您在聊天中发言"
+msgstr "您已经离开了此聊天。"
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日志已启动。此会话中的后续消息将会被自动记录。"
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
+#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1424
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "记录已停止。此会话中的后续消息将不会被记录。"
 
-#: ../finch/gntconv.c:442
-#, fuzzy
+#: ../finch/gntconv.c:469
 msgid "Send To"
-msgstr "发送到(_S)"
+msgstr "发送到"
 
-#: ../finch/gntconv.c:486
-#, fuzzy
+#: ../finch/gntconv.c:513
 msgid "Conversation"
 msgstr "对话"
 
-#: ../finch/gntconv.c:492
-#, fuzzy
+#: ../finch/gntconv.c:519
 msgid "Clear Scrollback"
-msgstr "/对话(C)/清除回滚(_R)"
+msgstr "清除回滚"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "显示时间戳"
 
-#: ../finch/gntconv.c:512
-#, fuzzy
+#: ../finch/gntconv.c:539
 msgid "Add Buddy Pounce..."
-msgstr "添加好友千里眼"
+msgstr "添加好友千里眼..."
 
-#: ../finch/gntconv.c:527
-#, fuzzy
+#: ../finch/gntconv.c:554
 msgid "Enable Logging"
-msgstr "/选项(O)/允许记录(L)"
+msgstr "允许记录"
 
-#: ../finch/gntconv.c:533
-#, fuzzy
+#: ../finch/gntconv.c:560
 msgid "Enable Sounds"
-msgstr "启用声音:"
+msgstr "启用声音"
 
-#: ../finch/gntconv.c:739
+#: ../finch/gntconv.c:766
 msgid "<AUTO-REPLY> "
 msgstr "<自动回复> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:889
 msgid "List of users:\n"
 msgstr "用户列表:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "支持的调试选项有: version"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "没有这样的命令(在此环境中)。"
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1090 ../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"
@@ -941,59 +946,64 @@ msgstr ""
 "使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
 "此环境下可使用下列命令:\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7688
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;消息&gt;: 发送普通消息，就好像您未使用命令。"
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7691
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7694
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7697
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: 清除对话回滚。"
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7703
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
 
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1163
 msgid "users:  Show the list of users in the chat."
-msgstr ""
+msgstr "users: 在聊天中显示用户列表。"
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1168
 msgid "plugins: Show the plugins window."
 msgstr "plugins: 显示插件窗口。"
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1171
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: 显示好友列表。"
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1174
 msgid "accounts: Show the accounts window."
 msgstr "accounts：显示账户窗口。"
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1177
 msgid "debugwin: Show the debug window."
 msgstr ""
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1180
 msgid "prefs: Show the preference window."
 msgstr ""
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1183
 msgid "statuses: Show the savedstatuses window."
 msgstr ""
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
+#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "无法打开文件。"
+
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "调试窗口"
 
@@ -1001,16 +1011,15 @@ msgstr "调试窗口"
 #. * 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:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "清除"
 
-#: ../finch/gntdebug.c:262
-#, fuzzy
-msgid "Filter: "
-msgstr "过滤"
+#: ../finch/gntdebug.c:303
+msgid "Filter:"
+msgstr "过滤："
 
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "暂停"
 
@@ -1047,24 +1056,24 @@ msgstr "剩余"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/bonjour/bonjour.c:358
 #: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
 #: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/msn/msn.c:596 ../libpurple/protocols/msn/msn.c:603
+#: ../libpurple/protocols/novell/novell.c:2840
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/oscar/oscar.c:2715
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
+#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3302
+#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
 #: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "状态"
@@ -1094,21 +1103,21 @@ msgid "Failed"
 msgstr "已失败"
 
 #: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KB/秒"
 
 #: ../finch/gntft.c:431
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
+msgstr "文件已另存为 %s。"
 
 #: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
 #: ../pidgin/gtkft.c:1116
 msgid "Finished"
 msgstr "已完成"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:388
 msgid "Transferring"
 msgstr "文件传送"
 
@@ -1116,72 +1125,68 @@ msgstr "文件传送"
 msgid "Emails"
 msgstr "电子邮件"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "您有邮件了!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:518
 msgid "Sender"
 msgstr "发送方"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:525
 msgid "Subject"
 msgstr "主题"
 
-#: ../finch/gntnotify.c:201
+#: ../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) 有 %d 封新邮件。"
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr "新邮件"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:948
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的信息"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:949
 msgid "Buddy Information"
 msgstr "好友信息"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "继续"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "开聊"
 
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "加入"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "邀请"
 
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(无)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:76 ../finch/gntplugin.c:85
 msgid "ERROR"
 msgstr ""
 
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:76
 #, fuzzy
 msgid "loading plugin failed"
 msgstr "Ping 失败"
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:85
 msgid "unloading plugin failed"
 msgstr ""
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:130
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1198,19 +1203,41 @@ msgstr ""
 "网站: %s\n"
 "文件名: %s\n"
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:188
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "在您配置插件之前必须先装入它。"
 
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:236
 msgid "No configuration options for this plugin."
 msgstr "此插件无配置选项。"
 
-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:257
+msgid "Error loading plugin"
+msgstr "装入插件时出错"
+
+#: ../finch/gntplugin.c:258
+msgid "The selected file is not a valid plugin."
+msgstr ""
+
+#: ../finch/gntplugin.c:259
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+
+#: ../finch/gntplugin.c:322
+#, fuzzy
+msgid "Select plugin to install"
+msgstr "选择文件"
+
+#: ../finch/gntplugin.c:348
 msgid "You can (un)load plugins from the following list."
 msgstr "您可以卸载以下列表中的插件。"
 
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:399
+msgid "Install Plugin..."
+msgstr "安装插件..."
+
+#: ../finch/gntplugin.c:408
 msgid "Configure Plugin"
 msgstr "配置插件"
 
@@ -1219,8 +1246,8 @@ msgstr "配置插件"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:464 ../finch/gntplugin.c:471 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2069
 msgid "Preferences"
 msgstr "首选项"
 
@@ -1228,11 +1255,11 @@ msgstr "首选项"
 msgid "Please enter a buddy to pounce."
 msgstr "请输入要监视的好友。"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "编辑好友千里眼"
 
@@ -1250,7 +1277,7 @@ msgid "Buddy name:"
 msgstr "好友名称："
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "监视好友的行动..."
 
@@ -1295,7 +1322,7 @@ msgid "Sends a message"
 msgstr "发送消息"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "动作"
 
@@ -1323,7 +1350,7 @@ msgstr "播放声音"
 msgid "Pounce only when my status is not available"
 msgstr "仅当我的状态不可用时才监视"
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1288
 msgid "Recurring"
 msgstr "再现"
 
@@ -1333,89 +1360,86 @@ msgid "Cannot create pounce"
 msgstr "无法更改昵称"
 
 #: ../finch/gntpounce.c:619
-#, fuzzy
 msgid "You do not have any accounts."
-msgstr "您必须选择账户。"
+msgstr "您没有帐户。"
 
 #: ../finch/gntpounce.c:620
 msgid "You must create an account first before you can create a pounce."
 msgstr ""
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1103
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "您真的想要删除 %s 在 %s 上的千里眼吗？"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1332
 msgid "Buddy Pounces"
 msgstr "好友千里眼"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 开始向您打字(%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 在给您打字时停了下来(%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已登入(%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 发完呆了(%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 回来了(%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止了给您打字(%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1471
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已登出(%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1473
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 发起了呆(%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1475
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 走了。(%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1477
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 给您发送了消息。(%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
-#, c-format
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1478
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误！"
 
 #: ../finch/gntprefs.c:92
-#, fuzzy
 msgid "Based on keyboard use"
-msgstr "根据键盘或鼠标使用"
+msgstr "基于键盘使用"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
 msgid "From last sent message"
 msgstr "根据上次发送的消息"
 
 #: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "从不"
@@ -1449,45 +1473,41 @@ msgid "Log status change events"
 msgstr "记录状态更改事件"
 
 #: ../finch/gntprefs.c:207
-#, fuzzy
 msgid "Report Idle time"
-msgstr "报告发呆时间(_R)："
+msgstr "报告发呆时间"
 
 #: ../finch/gntprefs.c:208
-#, fuzzy
 msgid "Change status when idle"
-msgstr "发呆时更改状态(_I)"
+msgstr "发呆时更改状态"
 
 #: ../finch/gntprefs.c:209
-#, fuzzy
 msgid "Minutes before changing status"
-msgstr "更改状态前等几分钟(_M)："
+msgstr "更改状态前等几分钟"
 
 #: ../finch/gntprefs.c:210
-#, fuzzy
 msgid "Change status to"
-msgstr "将状态更改为(_S)："
+msgstr "将状态更改为"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "对话"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046
 msgid "Logging"
 msgstr "日志"
 
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:585
 msgid "Not implemented yet."
 msgstr "未实现。"
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1555
 #: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "保存文件..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1556
 #: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "打开文件..."
@@ -1532,60 +1552,54 @@ msgstr "别人在聊天中发言"
 msgid "Someone says your screen name in chat"
 msgstr "别人在聊天中提到您的名字"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:308
 msgid "GStreamer Failure"
 msgstr "GStreamer 失败"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:309
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer 初始化失败。"
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589
+#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874
 msgid "(default)"
-msgstr ""
+msgstr "(默认)"
 
 #: ../finch/gntsound.c:729
-#, fuzzy
 msgid "Select Sound File ..."
-msgstr "选择文件夹..."
+msgstr "选择声音文件..."
 
 #: ../finch/gntsound.c:904
-#, fuzzy
 msgid "Sound Preferences"
-msgstr "首选项"
+msgstr "声音首选项"
 
 #: ../finch/gntsound.c:915
-#, fuzzy
 msgid "Profiles"
 msgstr "个人资料"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
 msgid "Automatic"
 msgstr "自动"
 
 #: ../finch/gntsound.c:957
-#, fuzzy
 msgid "Console Beep"
 msgstr "控制台响铃"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
 msgid "Command"
 msgstr "命令"
 
 #: ../finch/gntsound.c:959
-#, fuzzy
 msgid "No Sound"
 msgstr "无声音"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
 msgid "Sound Method"
 msgstr "声音方式"
 
 #: ../finch/gntsound.c:966
-#, fuzzy
 msgid "Method: "
-msgstr "方式(_M)："
+msgstr "方式："
 
 #: ../finch/gntsound.c:973
 #, fuzzy, c-format
@@ -1597,27 +1611,26 @@ msgstr ""
 "(%s 代表文件名)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
 msgid "Sound Options"
 msgstr "声音选项"
 
 #: ../finch/gntsound.c:982
-#, fuzzy
 msgid "Sounds when conversation has focus"
-msgstr "对话获得焦点后发声(_F)"
+msgstr "对话获得焦点后发声"
 
 #: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "总是"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763
 msgid "Only when available"
 msgstr "仅当可用时"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
 msgid "Only when not available"
 msgstr "仅当不可用时"
 
@@ -1627,28 +1640,27 @@ msgid "Volume(0-100):"
 msgstr "音量："
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
 msgid "Event"
 msgstr "事件"
 
 #: ../finch/gntsound.c:1020
-#, fuzzy
 msgid "File"
-msgstr "已失败"
+msgstr "文件"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
 msgid "Test"
 msgstr "测试"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
 msgid "Reset"
 msgstr "重置"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
 msgid "Choose..."
 msgstr "选择..."
 
@@ -1668,7 +1680,7 @@ msgstr "已存状态"
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/novell/novell.c:1486
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "标题"
@@ -1686,9 +1698,9 @@ msgstr "类型"
 #. not independent
 #. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/bonjour/bonjour.c:270
+#: ../libpurple/protocols/bonjour/bonjour.c:277
+#: ../libpurple/protocols/bonjour/bonjour.c:360
 #: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
 #: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
@@ -1699,26 +1711,29 @@ msgstr "类型"
 #: ../libpurple/protocols/jabber/jabber.c:1601
 #: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/msn/msn.c:634 ../libpurple/protocols/msn/msn.c:641
+#: ../libpurple/protocols/msn/msn.c:648 ../libpurple/protocols/msn/msn.c:655
+#: ../libpurple/protocols/msn/msn.c:661 ../libpurple/protocols/msn/msn.c:667
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/novell/novell.c:2946
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/novell/novell.c:2958
+#: ../libpurple/protocols/oscar/oscar.c:5608
+#: ../libpurple/protocols/oscar/oscar.c:5826
+#: ../libpurple/protocols/oscar/oscar.c:5840
+#: ../libpurple/protocols/oscar/oscar.c:5856
+#: ../libpurple/protocols/oscar/oscar.c:5863
+#: ../libpurple/protocols/oscar/oscar.c:5870
 #: ../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:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
@@ -1772,9 +1787,9 @@ msgstr "保存并使用"
 
 #: ../finch/gntui.c:85
 msgid "Certificates"
-msgstr ""
+msgstr "证书"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
 msgid "Sounds"
 msgstr "声音"
 
@@ -1784,19 +1799,16 @@ msgstr "状态"
 
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "卸载插件时遇到了错误。"
+msgstr "装入插件时出错。"
 
 #: ../finch/plugins/gntclipboard.c:116
-#, fuzzy
 msgid "Couldn't find X display"
-msgstr "无法打开文件"
+msgstr "找不到 X 显示"
 
 #: ../finch/plugins/gntclipboard.c:122
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "无法打开文件"
+msgstr "找不到窗口"
 
 #: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
@@ -1877,16 +1889,16 @@ msgstr ""
 msgid "Toaster plugin"
 msgstr ""
 
-#: ../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>与 %s 在 %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 "历史插件请求登录"
 
-#: ../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"
@@ -1898,11 +1910,11 @@ msgstr ""
 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 "在新对话中显示显示最近记录的对话。"
 
-#: ../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."
@@ -1954,7 +1966,7 @@ msgid "Missing protocol plugin for %s"
 msgstr "缺少 %s 的协议插件"
 
 #: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkblist.c:4363
 msgid "Connection Error"
 msgstr "连接错误"
 
@@ -1999,16 +2011,16 @@ msgstr "设置用户信息"
 
 #: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2836
 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3246 ../pidgin/gtkblist.c:5716
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2018,17 +2030,17 @@ msgstr "好友"
 msgid "buddy list"
 msgstr "好友列表"
 
-#: ../libpurple/certificate.c:545
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr ""
 
-#: ../libpurple/certificate.c:550
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2036,40 +2048,39 @@ msgid ""
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
 msgstr ""
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
+#: ../libpurple/certificate.c:885
 msgid "Certificate Authorities"
 msgstr ""
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:1053
 msgid "SSL Peers Cache"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
+#: ../libpurple/certificate.c:1184
 #, fuzzy, c-format
 msgid "Accept certificate for %s?"
 msgstr "接受聊天邀请吗？"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
+#: ../libpurple/certificate.c:1190
 msgid "SSL Certificate Verification"
 msgstr ""
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
-#, fuzzy
+#: ../libpurple/certificate.c:1199
 msgid "Accept"
-msgstr "接受(_A)"
+msgstr "接受"
 
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1200 ../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
@@ -2077,15 +2088,15 @@ msgstr "接受(_A)"
 msgid "Reject"
 msgstr "拒绝"
 
-#: ../libpurple/certificate.c:1188
+#: ../libpurple/certificate.c:1201
 msgid "_View Certificate..."
-msgstr ""
+msgstr "查看证书(_V)..."
 
 #. Prompt the user to authenticate the certificate
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
+#: ../libpurple/certificate.c:1301
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
@@ -2094,14 +2105,14 @@ msgstr ""
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
+#: ../libpurple/certificate.c:1326
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr ""
 
-#: ../libpurple/certificate.c:1331
+#: ../libpurple/certificate.c:1344
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr ""
@@ -2111,30 +2122,29 @@ msgstr ""
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
-#, fuzzy
+#: ../libpurple/certificate.c:1352 ../libpurple/certificate.c:1421
 msgid "SSL Certificate Error"
-msgstr "写错误"
+msgstr "SSL 证书错误"
 
-#: ../libpurple/certificate.c:1340
+#: ../libpurple/certificate.c:1353
 #, fuzzy
 msgid "Invalid certificate chain"
 msgstr "无效的标题"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
+#: ../libpurple/certificate.c:1373
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
+#: ../libpurple/certificate.c:1396
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 
-#: ../libpurple/certificate.c:1408
+#: ../libpurple/certificate.c:1413
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2142,12 +2152,12 @@ msgid ""
 "signature."
 msgstr ""
 
-#: ../libpurple/certificate.c:1417
+#: ../libpurple/certificate.c:1422
 msgid "Invalid certificate authority signature"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1886
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2159,7 +2169,7 @@ msgid ""
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
+#: ../libpurple/certificate.c:1895
 #, fuzzy
 msgid "Certificate Information"
 msgstr "服务器信息"
@@ -2184,9 +2194,9 @@ msgid "+++ %s signed off"
 msgstr "+++ %s 已登出"
 
 #: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/protocols/jabber/buddy.c:2340
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:363
 msgid "Unknown error"
 msgstr "未知错误"
 
@@ -2261,7 +2271,7 @@ msgstr "获得名称失败: %s"
 msgid "Failed to get serv name: %s"
 msgstr "获取服务器名称失败：%s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
 
@@ -2277,7 +2287,7 @@ msgstr "无法创建新的解析器进程\n"
 msgid "Unable to send request to resolver process\n"
 msgstr "无法给解析器进程发送请求\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2286,8 +2296,8 @@ msgstr ""
 "解析 %s 出错：\n"
 "%s。"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "解析 %s 时出错: %d"
@@ -2302,16 +2312,15 @@ msgstr ""
 "%s"
 
 #: ../libpurple/dnsquery.c:578
-#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "从解析器进程读取时发生 EOF"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "线程创建失败: %s"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "未知原因"
 
@@ -2344,7 +2353,7 @@ msgstr ""
 
 #: ../libpurple/ft.c:253
 msgid "Directory is not writable."
-msgstr ""
+msgstr "目录不可写。"
 
 #: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
@@ -2411,7 +2420,6 @@ msgid "Transfer of file %s complete"
 msgstr "文件 %s 传送完成"
 
 #: ../libpurple/ft.c:685
-#, c-format
 msgid "File transfer complete"
 msgstr "文件传送完成"
 
@@ -2421,7 +2429,6 @@ msgid "You canceled the transfer of %s"
 msgstr "您取消了 %s 的传送"
 
 #: ../libpurple/ft.c:1108
-#, c-format
 msgid "File transfer cancelled"
 msgstr "文件传送已取消"
 
@@ -2661,7 +2668,6 @@ msgid "You are using %s, but this plugin requires %s."
 msgstr "您正在使用 %s，但插件需要 %s。"
 
 #: ../libpurple/plugin.c:380
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2740,14 +2746,14 @@ msgstr "保存(_S)"
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../libpurple/protocols/oscar/oscar.c:1456
+#: ../libpurple/protocols/oscar/oscar.c:2248
+#: ../libpurple/protocols/oscar/oscar.c:2297
+#: ../libpurple/protocols/oscar/oscar.c:5940
+#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/oscar.c:6221
+#: ../libpurple/protocols/oscar/oscar.c:6291 ../libpurple/request.h:1388
+#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -2786,8 +2792,8 @@ msgid ""
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1794
 msgid "Notes"
 msgstr "备注"
 
@@ -3006,110 +3012,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 "用户离线。"
 
-#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "自动响应发送："
 
-#: ../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 已登出。"
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "您已经断开与服务器的连接。"
 
-#: ../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 "您目前已被断开。除非您再次登录，否则无法收到消息。"
 
-#: ../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 "消息未发出，因为超过了最大长度。"
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "无法发送消息。"
 
 #. 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 ""
+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 "常规日志读取配置"
 
-#: ../libpurple/plugins/log_reader.c:2458
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "快速计算大小"
 
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "日志目录"
 
@@ -3119,19 +3133,19 @@ msgstr "日志目录"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "日志读取器"
 
 #. *< 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 "在日志查看器中包含其它即时通讯客户的日志。"
 
 #. * 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"
@@ -3209,9 +3223,9 @@ msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/novell/novell.c:1919
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
 #: ../libpurple/protocols/silc10/buddy.c:314
@@ -3221,9 +3235,9 @@ msgid "Yes"
 msgstr "是"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/novell/novell.c:1920
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
@@ -3330,8 +3344,8 @@ msgid "Tests to see that most things are working."
 msgstr "测试看看大多数功能是否正常。"
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr ""
 
@@ -3341,7 +3355,7 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3349,8 +3363,8 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
 msgid "Provides SSL support through GNUTLS."
 msgstr "提供通过 GNUTLS 的 SSL 支持。"
 
@@ -3360,7 +3374,7 @@ msgstr "提供通过 GNUTLS 的 SSL 支持。"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3368,8 +3382,8 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "提供通过 Mozilla NSS 的 SSL 支持。"
 
@@ -3453,50 +3467,57 @@ msgid ""
 "idle."
 msgstr "好友离开/返回或发呆/睡醒时在对话窗口给出通知。"
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "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 "提供装入 Tcl 插件的支持"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
+#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
 
+#: ../libpurple/protocols/bonjour/bonjour.c:107
+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 ""
+
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+#: ../libpurple/protocols/bonjour/bonjour.c:124
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "无法监听连入的 IM 连接\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
+#: ../libpurple/protocols/bonjour/bonjour.c:149
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "无法建立与本地 mDNS 服务器的连接。服务器是否在运行中？"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/bonjour/bonjour.c:365
+#: ../libpurple/protocols/bonjour/bonjour.c:670
 #: ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/jabber/jabber.c:942
 msgid "First name"
 msgstr "名"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/bonjour/bonjour.c:367
+#: ../libpurple/protocols/bonjour/bonjour.c:673
 #: ../libpurple/protocols/gg/gg.c:627
 #: ../libpurple/protocols/jabber/jabber.c:947
 msgid "Last name"
 msgstr "姓"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/bonjour/bonjour.c:371
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3505,16 +3526,15 @@ msgstr "姓"
 msgid "E-Mail"
 msgstr "电子邮件"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:374
+#: ../libpurple/protocols/bonjour/bonjour.c:679
 msgid "AIM Account"
 msgstr "AIM 账户"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
-#, fuzzy
+#: ../libpurple/protocols/bonjour/bonjour.c:377
+#: ../libpurple/protocols/bonjour/bonjour.c:682
 msgid "XMPP Account"
-msgstr "AIM 账户"
+msgstr "XMPP 账户"
 
 #. *< type
 #. *< ui_requirement
@@ -3526,16 +3546,16 @@ msgstr "AIM 账户"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:481
+#: ../libpurple/protocols/bonjour/bonjour.c:483
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 协议插件"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:624
 msgid "Purple Person"
 msgstr "Purple 联系人"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/bonjour/bonjour.c:676
 #: ../libpurple/protocols/gg/gg.c:477
 #: ../libpurple/protocols/jabber/jabber.c:932
 #: ../libpurple/protocols/silc/silc.c:770
@@ -3555,32 +3575,32 @@ msgid "%s has closed the conversation."
 msgstr "%s 已经关闭了对话。"
 
 #: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:662
+#: ../libpurple/protocols/bonjour/jabber.c:680
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "无法发送消息，无法开始对话。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:585
 msgid "Cannot open socket"
 msgstr "无法打开套接字"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:593
 msgid "Error setting socket options"
 msgstr "设置套接字选项出错"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:617
 msgid "Could not bind socket to port"
 msgstr "无法将套接字绑定到端口"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:625
 msgid "Could not listen on socket"
 msgstr "无法在套接字上监听"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
+#: ../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."
@@ -3678,8 +3698,8 @@ msgstr "请填入下列字段"
 #: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
 #: ../libpurple/protocols/gg/gg.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
@@ -3688,9 +3708,9 @@ msgstr "城市"
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1693
+#: ../libpurple/protocols/myspace/user.c:117
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../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
@@ -3703,14 +3723,14 @@ msgid "Male or female"
 msgstr "男或女"
 
 #: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "男"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3770,26 +3790,26 @@ msgid "Add to chat..."
 msgstr "添加到聊天..."
 
 #: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2833
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/oscar/oscar.c:5658
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "离线"
 
 #: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/novell/novell.c:2821
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "可用"
 
@@ -3798,32 +3818,31 @@ msgstr "可用"
 #. Away stuff
 #: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2824
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
+#: ../libpurple/protocols/oscar/oscar.c:4562
+#: ../libpurple/protocols/oscar/oscar.c:5686
 #: ../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:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1941
 #: ../pidgin/gtkstatusbox.c:1058
-#, c-format
 msgid "Away"
 msgstr "离开"
 
 #: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/oscar/oscar.c:2714
+#: ../libpurple/protocols/oscar/oscar.c:3714
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3834,7 +3853,7 @@ msgid "Birth Year"
 msgstr "出生年份"
 
 #: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/oscar/oscar.c:3926
 msgid "Unable to display the search results."
 msgstr "无法显示搜索结果。"
 
@@ -3878,7 +3897,7 @@ msgstr "您的好友列表存储于服务器上。"
 msgid "Connection failed."
 msgstr "连接失败。"
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:621
 msgid "Blocked"
 msgstr "被屏蔽"
 
@@ -4016,7 +4035,7 @@ msgstr "%s 的 MOTD"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
 #: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/myspace/myspace.c:2357
 msgid "Server has disconnected"
 msgstr "服务器已断开连接"
 
@@ -4042,14 +4061,14 @@ msgstr "IRC 昵称不能包含空格"
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
 #: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/msn/session.c:386
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:1290
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
+#: ../libpurple/protocols/simple/simple.c:1732
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "正连接"
@@ -4063,20 +4082,20 @@ msgstr "SSL 支持不可用"
 #. 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:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/myspace/myspace.c:318
+#: ../libpurple/protocols/simple/simple.c:465
+#: ../libpurple/protocols/simple/simple.c:1647
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
 #: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/myspace/myspace.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
 #: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../libpurple/protocols/myspace/myspace.c:2353
 msgid "Read error"
 msgstr "读取错误"
 
@@ -4116,22 +4135,22 @@ msgstr "错误更少的 IRC 协议插件"
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
+#: ../libpurple/protocols/msn/msn.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:6725
 #: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
+#: ../libpurple/protocols/simple/simple.c:1919
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "服务器"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:6728
 #: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
@@ -4203,7 +4222,7 @@ msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3715
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4302,77 +4321,77 @@ msgstr "加入 %s 需要邀请。"
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:798
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s: %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 (%s) 踢出"
 
-#: ../libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:826
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "由 %3$s 管理(%1$s %2$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 "无效的昵称"
 
-#: ../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."
 msgstr "您所选的昵称被服务器拒绝。其中可能包含无效的字符。"
 
-#: ../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."
 msgstr "您所选的账户名称被服务器拒绝。其中可能包含无效的字符。"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:978
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1020
 msgid "Error: invalid PONG from server"
 msgstr "错误: 服务器的 PONG 无效"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1022
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1113
 #, fuzzy, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "需要注册"
 
-#: ../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 "无法加入频道"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
+#: ../libpurple/protocols/irc/msgs.c:1148
 msgid "Nick or channel is temporarily unavailable."
 msgstr "昵称或频道暂时不可用。"
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1160
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
@@ -4468,7 +4487,7 @@ msgid "names [channel]:  List the users currently in a channel."
 msgstr "name [频道]: 列出频道中目前的用户。"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2304
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称。"
 
@@ -4563,21 +4582,21 @@ msgstr "whois [服务器] &lt;昵称&gt;: 获得用户信息。"
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whois [服务器] &lt;昵称&gt;: 获得用户信息。"
 
-#: ../libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 的回复时间: %lu 秒"
 
-#: ../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 "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:632
+#: ../libpurple/protocols/irc/parse.c:636 ../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."
@@ -4596,7 +4615,7 @@ msgstr "未知错误"
 msgid "Ad-Hoc Command Failed"
 msgstr "命令已禁用"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
+#: ../libpurple/protocols/jabber/adhoccommands.c:176
 #, fuzzy
 msgid "execute"
 msgstr "未期待"
@@ -4738,24 +4757,23 @@ msgstr "职务"
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/oscar/oscar.c:3764
 msgid "Birthday"
 msgstr "生日"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3314
 #: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "描述"
 
 #: ../libpurple/protocols/jabber/buddy.c:722
 #: ../libpurple/protocols/jabber/buddy.c:723
-#, fuzzy
 msgid "Edit XMPP vCard"
-msgstr "编辑 Jabber vCard"
+msgstr "编辑 XMPP vCard"
 
 #: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
@@ -4780,9 +4798,8 @@ msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:817
 #: ../libpurple/protocols/jabber/buddy.c:977
-#, fuzzy
 msgid "Service Discovery Info"
-msgstr "设置目录信息"
+msgstr "服务目录信息"
 
 #: ../libpurple/protocols/jabber/buddy.c:819
 #: ../libpurple/protocols/jabber/buddy.c:979
@@ -4835,9 +4852,8 @@ msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:837
 #: ../libpurple/protocols/jabber/buddy.c:997
-#, fuzzy
 msgid "XHTML-IM"
-msgstr "HTML"
+msgstr "XHTML-IM"
 
 #: ../libpurple/protocols/jabber/buddy.c:839
 #: ../libpurple/protocols/jabber/buddy.c:999
@@ -4865,9 +4881,8 @@ msgstr "好友状态通知"
 
 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
-#, fuzzy
 msgid "Software Version"
-msgstr "不支持的版本"
+msgstr "软件版本"
 
 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
@@ -4883,15 +4898,13 @@ msgstr "文件传送"
 
 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
-#, fuzzy
 msgid "User Mood"
-msgstr "用户模式"
+msgstr "用户心情"
 
 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
-#, fuzzy
 msgid "User Activity"
-msgstr "允许限制"
+msgstr "用户活动"
 
 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
@@ -5059,7 +5072,7 @@ msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2921
 msgid "Capabilities"
 msgstr "能力"
 
@@ -5086,8 +5099,8 @@ msgstr "中名"
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
 #: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5106,74 +5119,73 @@ msgstr "相片"
 msgid "Logo"
 msgstr "图符"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
+#: ../libpurple/protocols/jabber/buddy.c:1988
 #, fuzzy
 msgid "Log In"
 msgstr "已登入"
 
-#: ../libpurple/protocols/jabber/buddy.c:1989
+#: ../libpurple/protocols/jabber/buddy.c:1992
 #, fuzzy
 msgid "Log Out"
 msgstr "记录聊天"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/jabber/buddy.c:2038
 #: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "唠叨"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
+#: ../libpurple/protocols/jabber/buddy.c:2044
 #: ../libpurple/protocols/jabber/jabber.c:1622
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
+#: ../libpurple/protocols/oscar/oscar.c:5862
 #: ../libpurple/protocols/sametime/sametime.c:3297
-#, c-format
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/oscar/oscar.c:3726
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "下面是您搜索的结果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
+#: ../libpurple/protocols/jabber/buddy.c:2322
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5181,41 +5193,41 @@ msgstr ""
 "要查找联系人，请在给出的输入框中输入搜索条件。注意：您可以使用通配符(%)进行搜"
 "索"
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:2342
 msgid "Directory Query Failed"
 msgstr "目录查询失败"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2343
 msgid "Could not query the directory server."
 msgstr "无法查询目录服务器。"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "服务器指令：%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2384
 #, fuzzy
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "填入输入框可以搜索匹配的 Jabber 用户。"
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/novell/novell.c:1490
+#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3738
 msgid "E-Mail Address"
 msgstr "电子邮件地址"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2414
 #, fuzzy
 msgid "Search for XMPP users"
 msgstr "搜索用户"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2415
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
@@ -5227,24 +5239,24 @@ msgstr "搜索用户"
 msgid "Search"
 msgstr "搜索"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2430
 msgid "Invalid Directory"
 msgstr "无效的目录"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2447
 msgid "Enter a User Directory"
 msgstr "进入用户目录"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Select a user directory to search"
 msgstr "选择要搜索的用户目录"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2451
 msgid "Search Directory"
 msgstr "搜索目录"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/oscar/oscar.c:5346
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "房间(_R)："
@@ -5355,9 +5367,9 @@ msgid "Read Error"
 msgstr "读取错误"
 
 #: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5372,9 +5384,8 @@ msgstr "无法创建套接字"
 
 #: ../libpurple/protocols/jabber/jabber.c:575
 #: ../libpurple/protocols/jabber/jabber.c:1063
-#, fuzzy
 msgid "Invalid XMPP ID"
-msgstr "无效 ID"
+msgstr "无效 XMPP ID"
 
 #: ../libpurple/protocols/jabber/jabber.c:580
 msgid "Invalid XMPP ID. Domain must be set."
@@ -5423,8 +5434,8 @@ msgid "Already Registered"
 msgstr "已注册"
 
 #: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "State"
 msgstr "州/省"
 
@@ -5447,9 +5458,8 @@ msgid "Date"
 msgstr "日期"
 
 #: ../libpurple/protocols/jabber/jabber.c:987
-#, fuzzy
 msgid "Unregister"
-msgstr "注册"
+msgstr "取消注册"
 
 #: ../libpurple/protocols/jabber/jabber.c:994
 #, fuzzy
@@ -5509,7 +5519,7 @@ msgid "Initializing SSL/TLS"
 msgstr "初始化流"
 
 #: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:392
 msgid "Authenticating"
 msgstr "正在认证"
 
@@ -5522,7 +5532,7 @@ msgstr "重新初始化流"
 #: ../libpurple/protocols/jabber/jabber.c:1909
 #: ../libpurple/protocols/jabber/jabber.c:1945
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5656
 msgid "Not Authorized"
 msgstr "未认证"
 
@@ -5563,7 +5573,7 @@ msgstr "订阅"
 #: ../libpurple/protocols/jabber/jabber.c:1579
 #: ../libpurple/protocols/jabber/jabber.c:1602
 #: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
+#: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1212
 #: ../libpurple/protocols/silc10/buddy.c:1557
@@ -5692,7 +5702,7 @@ msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
 #: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6442
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
@@ -5700,7 +5710,7 @@ msgstr "设置用户信息..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
+#: ../libpurple/protocols/oscar/oscar.c:6453
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
@@ -5946,53 +5956,71 @@ msgstr "无法踢出用户 %s"
 msgid "Unable to ping user %s"
 msgstr "无法屏蔽用户 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+#: ../libpurple/protocols/jabber/jabber.c:2203
+#: ../libpurple/protocols/jabber/jabber.c:2214
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
+#: ../libpurple/protocols/jabber/jabber.c:2209
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
+#: ../libpurple/protocols/jabber/jabber.c:2240
 #, fuzzy, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "无法给 %s 发送文件，用户不支持文件传送"
 
-#: ../libpurple/protocols/jabber/jabber.c:2253
+#: ../libpurple/protocols/jabber/jabber.c:2262
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
+msgid "Buzz"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2263
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "%s 已经将您[%s]添加为好友"
+
+#: ../libpurple/protocols/jabber/jabber.c:2264
+#: ../libpurple/protocols/yahoo/yahoo.c:4123
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2296
 msgid "config:  Configure a chat room."
 msgstr "config: 配置聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "configure:  Configure a chat room."
 msgstr "configure: 配置聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2309
 msgid "part [room]:  Leave the room."
 msgstr "part [房间]: 离开聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2314
 msgid "register:  Register with a chat room."
 msgstr "register: 注册聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2320
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新话题]: 查看或更改话题。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2326
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2289
+#: ../libpurple/protocols/jabber/jabber.c:2332
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2338
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6000,29 +6028,29 @@ msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: 设置用户在房间"
 "中的角色。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:2344
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;用户&gt; [消息]: 邀请用户加入房间。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;房间&gt; [服务器]: 加入此服务器上的聊天聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2356
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;用户&gt; [房间]: 从房间中踢出一个用户。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
+#: ../libpurple/protocols/jabber/jabber.c:2361
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;用户&gt; &lt;消息&gt;: 向另外的好友发送私人消息。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2367
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+#: ../libpurple/protocols/jabber/jabber.c:2372
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 向联系人发送闪屏震动，以便引起他的注意"
 
@@ -6061,8 +6089,8 @@ msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/myspace/myspace.c:3279
+#: ../libpurple/protocols/simple/simple.c:1925
 msgid "Connect port"
 msgstr "连接端口"
 
@@ -6070,7 +6098,7 @@ msgstr "连接端口"
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
+#: ../libpurple/protocols/myspace/myspace.c:3276
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
@@ -6106,12 +6134,6 @@ msgstr "投递到 %s 的消息失败: %s"
 msgid "XMPP Message Error"
 msgstr "Jabber 消息错误"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s 已经将您[%s]添加为好友"
-
 #: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
@@ -6121,35 +6143,35 @@ msgstr " (代码 %s)"
 msgid "XML Parse error"
 msgstr "XML 分析错误"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:423
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:504
+#: ../libpurple/protocols/jabber/presence.c:505
 msgid "Create New Room"
 msgstr "创建新房间"
 
-#: ../libpurple/protocols/jabber/presence.c:510
+#: ../libpurple/protocols/jabber/presence.c:506
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正在创建新房间。您是想要进行配置，还是想要接受默认设置？"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:512
 msgid "_Configure Room"
 msgstr "配置房间(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:513
 msgid "_Accept Defaults"
 msgstr "接受默认值(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:555
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天 %s 出错"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天 %s 出错"
@@ -6190,23 +6212,23 @@ msgstr ""
 msgid "Select a Resource"
 msgstr "选择文件"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 #, fuzzy
 msgid "Edit User Mood"
 msgstr "用户模式"
 
-#: ../libpurple/protocols/jabber/usermood.c:181
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
 #, fuzzy
 msgid "Set"
 msgstr "设置(_S)"
 
-#: ../libpurple/protocols/jabber/usermood.c:191
+#: ../libpurple/protocols/jabber/usermood.c:209
 #, fuzzy
 msgid "Set Mood..."
 msgstr "发送消息..."
@@ -6227,7 +6249,7 @@ msgid ""
 "something appropriate."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usernick.c:99
+#: ../libpurple/protocols/jabber/usernick.c:100
 #, fuzzy
 msgid "Set Nickname..."
 msgstr "昵称"
@@ -6242,12 +6264,22 @@ msgstr "动作"
 msgid "Select an action"
 msgstr "选择文件"
 
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/contact.c:188
+#, fuzzy
+msgid "Unable to connect to contact server"
+msgstr "无法连接到服务器。"
+
+#: ../libpurple/protocols/msn/contact.c:948
+#, fuzzy
+msgid "Unable to retrieve MSN Address Book"
+msgstr "选择 Notes 地址簿"
+
+#: ../libpurple/protocols/msn/dialog.c:118
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "%s (%s) 的好友列表同步问题"
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6255,7 +6287,7 @@ msgid ""
 msgstr ""
 "本地列表中的 %s 位于组“%s”中，但未出现在服务器列表中。您是否想要添加此好友？"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6263,275 +6295,222 @@ msgid ""
 msgstr "本地列表中的 %s 未出现在服务器列表中。您是否想要添加此好友？"
 
 #: ../libpurple/protocols/msn/error.c:36
-#, c-format
 msgid "Unable to parse message"
 msgstr "无法处理消息"
 
 #: ../libpurple/protocols/msn/error.c:41
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "错误(可能是客户端的 bug)"
 
 #: ../libpurple/protocols/msn/error.c:46
-#, c-format
 msgid "Invalid e-mail address"
 msgstr "无效的电子邮件地址"
 
 #: ../libpurple/protocols/msn/error.c:49
-#, c-format
 msgid "User does not exist"
 msgstr "用户不存在"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "缺少全称域名"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, c-format
 msgid "Already logged in"
 msgstr "已登入"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, c-format
 msgid "Invalid screen name"
 msgstr "用户名无效"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, c-format
 msgid "Invalid friendly name"
 msgstr "友好的名称无效"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, c-format
 msgid "List full"
 msgstr "列表满"
 
 #: ../libpurple/protocols/msn/error.c:68
-#, c-format
 msgid "Already there"
 msgstr "已列出"
 
 #: ../libpurple/protocols/msn/error.c:72
-#, c-format
 msgid "Not on list"
 msgstr "未列出"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
 msgid "User is offline"
 msgstr "用户离线"
 
 #: ../libpurple/protocols/msn/error.c:78
-#, c-format
 msgid "Already in the mode"
 msgstr "已在模式中"
 
 #: ../libpurple/protocols/msn/error.c:82
-#, c-format
 msgid "Already in opposite list"
 msgstr "已在相对列表"
 
 #: ../libpurple/protocols/msn/error.c:86
-#, c-format
 msgid "Too many groups"
 msgstr "组太多"
 
 #: ../libpurple/protocols/msn/error.c:89
-#, c-format
 msgid "Invalid group"
 msgstr "无效的组"
 
 #: ../libpurple/protocols/msn/error.c:92
-#, c-format
 msgid "User not in group"
 msgstr "用户未在组中"
 
 #: ../libpurple/protocols/msn/error.c:95
-#, c-format
 msgid "Group name too long"
 msgstr "组名太长"
 
 #: ../libpurple/protocols/msn/error.c:98
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "无法删除零组"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "试图向不存在的组中添加联系人"
 
 #: ../libpurple/protocols/msn/error.c:107
-#, c-format
 msgid "Switchboard failed"
 msgstr "切换板失败"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, c-format
 msgid "Notify transfer failed"
 msgstr "通知传送失败"
 
 #: ../libpurple/protocols/msn/error.c:116
-#, c-format
 msgid "Required fields missing"
 msgstr "缺少必需域"
 
 #: ../libpurple/protocols/msn/error.c:120
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "FND 的次数太多"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
 msgid "Not logged in"
 msgstr "未登入"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "服务暂时不可用"
 
 #: ../libpurple/protocols/msn/error.c:131
-#, c-format
 msgid "Database server error"
 msgstr "数据库服务器错误"
 
 #: ../libpurple/protocols/msn/error.c:135
-#, c-format
 msgid "Command disabled"
 msgstr "命令已禁用"
 
 #: ../libpurple/protocols/msn/error.c:139
-#, c-format
 msgid "File operation error"
 msgstr "文件操作错误"
 
 #: ../libpurple/protocols/msn/error.c:143
-#, c-format
 msgid "Memory allocation error"
 msgstr "内存分配错误"
 
 #: ../libpurple/protocols/msn/error.c:147
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "给服务器发送的 CHL 值错误"
 
 #: ../libpurple/protocols/msn/error.c:152
-#, c-format
 msgid "Server busy"
 msgstr "服务器忙"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
-#, c-format
 msgid "Server unavailable"
 msgstr "服务器不可用"
 
 #: ../libpurple/protocols/msn/error.c:158
-#, c-format
 msgid "Peer notification server down"
 msgstr "点通知服务器维护中"
 
 #: ../libpurple/protocols/msn/error.c:162
-#, c-format
 msgid "Database connect error"
 msgstr "数据库连接错误"
 
 #: ../libpurple/protocols/msn/error.c:167
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "服务器即将维护"
 
 #: ../libpurple/protocols/msn/error.c:174
-#, c-format
 msgid "Error creating connection"
 msgstr "创建连接出错"
 
 #: ../libpurple/protocols/msn/error.c:179
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 参数未知或不允许"
 
 #: ../libpurple/protocols/msn/error.c:183
-#, c-format
 msgid "Unable to write"
 msgstr "无法写入"
 
 #: ../libpurple/protocols/msn/error.c:186
-#, c-format
 msgid "Session overload"
 msgstr "会话过载"
 
 #: ../libpurple/protocols/msn/error.c:190
-#, c-format
 msgid "User is too active"
 msgstr "用户太活跃"
 
 #: ../libpurple/protocols/msn/error.c:193
-#, c-format
 msgid "Too many sessions"
 msgstr "会话太多"
 
 #: ../libpurple/protocols/msn/error.c:196
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport 未验证"
 
 #: ../libpurple/protocols/msn/error.c:199
-#, c-format
 msgid "Bad friend file"
 msgstr "无效的好友文件"
 
 #: ../libpurple/protocols/msn/error.c:203
-#, c-format
 msgid "Not expected"
 msgstr "未期待"
 
 #: ../libpurple/protocols/msn/error.c:209
-#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "友好的名称更改太频繁"
 
 #: ../libpurple/protocols/msn/error.c:218
-#, c-format
 msgid "Server too busy"
 msgstr "服务器太忙"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
+#: ../libpurple/protocols/oscar/oscar.c:1383
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
 msgid "Authentication failed"
 msgstr "认证失败"
 
 #: ../libpurple/protocols/msn/error.c:225
-#, c-format
 msgid "Not allowed when offline"
 msgstr "离线时不允许"
 
 #: ../libpurple/protocols/msn/error.c:233
-#, c-format
 msgid "Not accepting new users"
 msgstr "不接受新用户"
 
 #: ../libpurple/protocols/msn/error.c:237
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "没有父母在的儿童 Passport"
 
 #: ../libpurple/protocols/msn/error.c:241
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport 账户未验证"
 
 #: ../libpurple/protocols/msn/error.c:244
-#, c-format
 msgid "Bad ticket"
 msgstr "无效的票证"
 
@@ -6563,31 +6542,31 @@ msgstr ""
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:285
 msgid "Set your friendly name."
 msgstr "设置您的友好名称。"
 
-#: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:286
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "这是其他的 MSN 好友看到的名字。"
 
-#: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:304
 msgid "Set your home phone number."
 msgstr "设置您的家庭电话号码。"
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:321
 msgid "Set your work phone number."
 msgstr "设置您的工作电话号码。"
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:338
 msgid "Set your mobile phone number."
 msgstr "设置您的移动电话号码。"
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:353
 msgid "Allow MSN Mobile pages?"
 msgstr "允许 MSN 移动寻呼吗？"
 
-#: ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:354
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6595,321 +6574,324 @@ msgstr ""
 "在您的允许之下，您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
 "想要允许还是禁止这一功能？"
 
-#: ../libpurple/protocols/msn/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:360
 msgid "Allow"
 msgstr "允许"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:361
 msgid "Disallow"
 msgstr "禁止"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:377
 msgid "This Hotmail account may not be active."
 msgstr "此 Hotmail 账户可能未激活。"
 
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:403
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:405
 msgid "Page"
 msgstr "寻呼"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "有你"
+#: ../libpurple/protocols/msn/msn.c:610 ../libpurple/protocols/msn/msn.c:635
+#: ../libpurple/protocols/msn/msn.c:642 ../libpurple/protocols/msn/msn.c:649
+#: ../libpurple/protocols/msn/msn.c:656 ../libpurple/protocols/msn/msn.c:662
+#: ../libpurple/protocols/msn/msn.c:668
+msgid "Current media"
+msgstr "当前媒体"
 
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/msn/msn.c:654 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2827
+#: ../libpurple/protocols/novell/novell.c:2957
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On the Phone"
 msgstr "接听电话"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:666
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Out to Lunch"
 msgstr "外出就餐"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:697
 msgid "Set Friendly Name..."
 msgstr "设置友好的名称..."
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:702
 msgid "Set Home Phone Number..."
 msgstr "设置家庭电话号码..."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:706
 msgid "Set Work Phone Number..."
 msgstr "设置工作电话号码..."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:710
 msgid "Set Mobile Phone Number..."
 msgstr "设置移动电话号码..."
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:716
 msgid "Enable/Disable Mobile Devices..."
 msgstr "启用/禁用移动设备..."
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:721
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允许/禁止移动寻呼..."
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:732
 msgid "Open Hotmail Inbox"
 msgstr "打开 Hotmail 收件箱"
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:756
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:766
+#: ../libpurple/protocols/novell/novell.c:3413
 msgid "Initiate _Chat"
 msgstr "发起聊天(_C)"
 
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:804
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。"
 
-#: ../libpurple/protocols/msn/msn.c:754
+#: ../libpurple/protocols/msn/msn.c:832
 msgid "Failed to connect to server."
 msgstr "连接到服务器失败。"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1619 ../libpurple/protocols/msn/msn.c:1962
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1685 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "常规"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/msn/msn.c:1692
+#: ../libpurple/protocols/myspace/user.c:113
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "年龄"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1694
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "职业"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1695
+#: ../libpurple/protocols/myspace/user.c:121
+#: ../libpurple/protocols/novell/novell.c:1480
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "位置"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1700 ../libpurple/protocols/msn/msn.c:1892
+#: ../libpurple/protocols/msn/msn.c:1898 ../libpurple/protocols/msn/msn.c:1905
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1706 ../libpurple/protocols/msn/msn.c:1826
+#: ../libpurple/protocols/msn/msn.c:1832 ../libpurple/protocols/msn/msn.c:1839
+#: ../libpurple/protocols/msn/msn.c:1847 ../libpurple/protocols/msn/msn.c:1854
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1723
 msgid "Social"
-msgstr ""
+msgstr "社会"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1725
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1726
 msgid "Interests"
 msgstr "兴趣"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1727
 msgid "Pets"
 msgstr "宠物"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1728
 msgid "Hometown"
 msgstr "家乡"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1729
 msgid "Places Lived"
 msgstr "住所"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1730
 msgid "Fashion"
 msgstr "时尚"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1731
 msgid "Humor"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1732
 msgid "Music"
 msgstr "音乐"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1733 ../libpurple/protocols/msn/msn.c:1914
+#: ../libpurple/protocols/msn/msn.c:1920
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1750
 msgid "Contact Info"
 msgstr "联系信息"
 
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1751
 msgid "Personal"
 msgstr "个人"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1754
 msgid "Significant Other"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1755
 msgid "Home Phone"
 msgstr "家庭电话"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1756
 msgid "Home Phone 2"
 msgstr "家庭电话 2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1758
 msgid "Personal Mobile"
 msgstr "个人手机"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1759
 msgid "Home Fax"
 msgstr "家庭传真"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1760
 msgid "Personal E-Mail"
 msgstr "个人电子邮件"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1761
 msgid "Personal IM"
 msgstr "个人 IM"
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1763
 msgid "Anniversary"
 msgstr "纪念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1779
 msgid "Work"
 msgstr "工作"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1781
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "职称"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1782
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Company"
 msgstr "公司"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "部门"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1784
 msgid "Profession"
 msgstr "职业"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1785
 msgid "Work Phone"
 msgstr "工作电话"
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1786
 msgid "Work Phone 2"
 msgstr "办公电话 2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1787
+#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Address"
 msgstr "办公地址"
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1788
 msgid "Work Mobile"
 msgstr "办公手机"
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1789
 msgid "Work Pager"
 msgstr "办公寻呼"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1790
 msgid "Work Fax"
 msgstr "办公传真"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1791
 msgid "Work E-Mail"
 msgstr "办公电子邮件"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1792
 msgid "Work IM"
 msgstr "办公 IM"
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Start Date"
 msgstr "开始日期"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1863 ../libpurple/protocols/msn/msn.c:1869
+#: ../libpurple/protocols/msn/msn.c:1876 ../libpurple/protocols/msn/msn.c:1883
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1928
 msgid "Last Updated"
 msgstr "上次更新"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1939
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "主页"
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:1963
 msgid "The user has not created a public profile."
 msgstr "用户尚未创建公开的个人资料。"
 
-#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:1964
 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 "
@@ -6918,13 +6900,13 @@ msgstr ""
 "MSN 报告找不到用户的个人资料。这可能是因为用户不存在，或者用户没有创建公开的"
 "个人资料。"
 
-#: ../libpurple/protocols/msn/msn.c:1864
+#: ../libpurple/protocols/msn/msn.c:1968
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr "在用户的个人资料中找不到任何信息。用户可能不存在。"
 
-#: ../libpurple/protocols/msn/msn.c:1872
+#: ../libpurple/protocols/msn/msn.c:1976
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "配置文件 URL"
@@ -6939,102 +6921,106 @@ msgstr "配置文件 URL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-#, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "AIM 协议插件"
+#: ../libpurple/protocols/msn/msn.c:2263 ../libpurple/protocols/msn/msn.c:2265
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Windows Live Messenger 协议插件"
 
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2300
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../libpurple/protocols/msn/msn.c:2199
+#: ../libpurple/protocols/msn/msn.c:2305
 #, fuzzy
 msgid "HTTP Method Server"
 msgstr "IPC 测试服务器"
 
-#: ../libpurple/protocols/msn/msn.c:2204
+#: ../libpurple/protocols/msn/msn.c:2310
 msgid "Show custom smileys"
 msgstr "显示自定义如下："
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2318
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：向用户发送闪屏震动，以便引起他的注意"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "无法连接"
+#: ../libpurple/protocols/msn/nexus.c:137
+#, fuzzy
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "失败: 身份验证失败"
+
+#: ../libpurple/protocols/msn/nexus.c:275
+#, fuzzy
+msgid "Windows Live ID authentication Failed"
+msgstr "失败: 身份验证失败"
 
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/notification.c:185
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s 不是有效的组名。"
 
-#: ../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:933
+#: ../libpurple/protocols/msn/session.c:371
 msgid "Unknown error."
 msgstr "未知错误。"
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:194
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%2$s(%3$s) 上的 %1$s"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:511
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s 刚刚给您发送了闪屏振动！"
+
+#: ../libpurple/protocols/msn/notification.c:838
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "未知错误"
+
+#: ../libpurple/protocols/msn/notification.c:839
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "无法添加用户"
+
+#: ../libpurple/protocols/msn/notification.c:899
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "无法在 %s(%s) 上添加用户"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:903
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "无法在 %s(%s) 上屏蔽用户"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:907
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "无法允许 %s(%s) 上的拥护"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:915
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "无法添加 %s，原因是您的好友列表已满。"
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:924
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s 不是有效的通行证账户。"
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:929
 msgid "Service Temporarily Unavailable."
 msgstr "服务暂时不可用。"
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1265
 msgid "Unable to rename group"
 msgstr "无法重命名组"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1320
 msgid "Unable to delete group"
 msgstr "无法删除组"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1934
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7056,6 +7042,30 @@ msgstr[0] ""
 "\n"
 "维护完成后，您将能够成功登入。"
 
+#: ../libpurple/protocols/msn/oim.c:141
+#, fuzzy
+msgid "Unable to connect to OIM server"
+msgstr "无法连接到服务器。"
+
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../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 "无法连接"
+
 #: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "写入错误"
@@ -7073,56 +7083,56 @@ msgstr ""
 "%s 服务器的连接错误：\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:338
 msgid "Our protocol is not supported by the server."
 msgstr "服务器不支持此协议。"
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:342
 msgid "Error parsing HTTP."
 msgstr "分析 HTTP 出错。"
 
-#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/msn/session.c:346
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "您在其它位置用此用户名登入了。"
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:351
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN 服务器临时不可用。请稍候再试一次。"
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:356
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 服务器目前维护中。"
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:361
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "无法通过身份验证: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
+#: ../libpurple/protocols/msn/session.c:366
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "您的 MSN 好友列表临时不可用。请稍候再试一次。"
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msn/session.c:389
 msgid "Handshaking"
 msgstr "握手"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:390
 msgid "Starting authentication"
 msgstr "开始身份验证"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:391
 msgid "Getting cookie"
 msgstr "获得 cookie"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:393
 msgid "Sending cookie"
 msgstr "发送 cookie"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:394
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
@@ -7173,22 +7183,25 @@ msgstr "消息未发出，因为切换板发生了错误："
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "消息未发出，因为发生了未知错误："
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:243
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s 已将您添加为好友。"
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s 已经将您从好友名单中删除。"
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "无法添加“%s”。"
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
 msgid "The screen name specified is invalid."
 msgstr "指定的用户名无效。"
 
@@ -7215,214 +7228,211 @@ msgstr ""
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:1806
 msgid "MySpaceIM Error"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:349
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:350
 msgid "Reading challenge"
-msgstr "读取错误"
+msgstr "读取挑战"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
+#: ../libpurple/protocols/myspace/myspace.c:356
 #, fuzzy
 msgid "Unexpected challenge length from server"
 msgstr "服务器的挑战无效"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
+#: ../libpurple/protocols/myspace/myspace.c:360
 #, fuzzy
 msgid "Logging in"
 msgstr "日志"
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
+#: ../libpurple/protocols/myspace/myspace.c:1289
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr ""
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
+#: ../libpurple/protocols/myspace/myspace.c:1331
 #, fuzzy
 msgid "New mail messages"
 msgstr "发送消息"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
+#: ../libpurple/protocols/myspace/myspace.c:1332
 msgid "New blog comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1333
 msgid "New profile comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:1334
 msgid "New friend requests!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1335
 msgid "New picture comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
+#: ../libpurple/protocols/myspace/myspace.c:1363
 msgid "MySpace"
 msgstr ""
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1543
+#: ../libpurple/protocols/myspace/myspace.c:1546
 #: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "已连接"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
+#: ../libpurple/protocols/myspace/myspace.c:1557
+#: ../libpurple/protocols/myspace/myspace.c:1559
 #, fuzzy
 msgid "No username set"
 msgstr "无名称"
 
-#: ../libpurple/protocols/myspace/myspace.c:1555
+#: ../libpurple/protocols/myspace/myspace.c:1558
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1782
+#: ../libpurple/protocols/myspace/myspace.c:1785
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "进程返回了错误代码 %d"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:1977
+#: ../libpurple/protocols/myspace/myspace.c:2011
 #, fuzzy
 msgid "Failed to add buddy"
 msgstr "在聊天中加入好友失败"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:1977
 #, fuzzy
 msgid "'addbuddy' command failed."
 msgstr "从文件装入好友列表..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2011
+#: ../libpurple/protocols/myspace/myspace.c:2248
 #, fuzzy
 msgid "persist command failed"
 msgstr "切换板失败"
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
+#: ../libpurple/protocols/myspace/myspace.c:2116
 #, c-format
 msgid "No such user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
+#: ../libpurple/protocols/myspace/myspace.c:2117
 #, fuzzy
 msgid "User lookup"
 msgstr "用户房间"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2229
+#: ../libpurple/protocols/myspace/myspace.c:2248
+#: ../libpurple/protocols/myspace/myspace.c:2270
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "在聊天中加入好友失败"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2229
 msgid "'delbuddy' command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2270
 #, fuzzy
 msgid "blocklist command failed"
 msgstr "切换板失败"
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
+#: ../libpurple/protocols/myspace/myspace.c:2316
 #, fuzzy
 msgid "Invalid input condition"
 msgstr "完成连接"
 
 #. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
+#: ../libpurple/protocols/myspace/myspace.c:2334
+#: ../libpurple/protocols/myspace/myspace.c:2365
 #, fuzzy
 msgid "Read buffer full"
 msgstr "队列满"
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
+#: ../libpurple/protocols/myspace/myspace.c:2403
 #, fuzzy
 msgid "Unparseable message"
 msgstr "无法处理消息"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
+#: ../libpurple/protocols/myspace/myspace.c:2472
 #, fuzzy, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "无法连接到主机"
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
+#: ../libpurple/protocols/myspace/myspace.c:2643
 #, fuzzy
 msgid "IM Friends"
 msgstr "即时消息窗口(_I)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
+#: ../libpurple/protocols/myspace/myspace.c:2743
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
+#: ../libpurple/protocols/myspace/myspace.c:2744
 #, fuzzy
 msgid "Add contacts from server"
 msgstr "服务器的响应无效。"
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:2796
+#: ../libpurple/protocols/myspace/myspace.c:2861
 msgid "Add friends from MySpace.com"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
+#: ../libpurple/protocols/myspace/myspace.c:2797
 #, fuzzy
 msgid "Importing friends failed"
 msgstr "无效的好友文件"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2853
 msgid "Find people..."
 msgstr "查找好友..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
+#: ../libpurple/protocols/myspace/myspace.c:2856
 #, fuzzy
 msgid "Change IM name..."
 msgstr "更改密码..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3158
 msgid "myim URL handler"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
+#: ../libpurple/protocols/myspace/myspace.c:3159
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
+#: ../libpurple/protocols/myspace/myspace.c:3160
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
+#: ../libpurple/protocols/myspace/myspace.c:3283
 msgid "Show display name in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
+#: ../libpurple/protocols/myspace/myspace.c:3286
 msgid "Show headline in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:3291
 msgid "Send emoticons"
-msgstr "声音选项"
+msgstr "发送表情"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:3296
 msgid "Screen resolution (dots per inch)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
+#: ../libpurple/protocols/myspace/myspace.c:3299
 #, fuzzy
 msgid "Base font size (points)"
 msgstr "较大字体"
@@ -7433,174 +7443,197 @@ msgstr "较大字体"
 msgid "User"
 msgstr "用户"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/myspace/user.c:104
+#: ../libpurple/protocols/oscar/oscar.c:2979
 msgid "Profile"
 msgstr "个人资料"
 
-#: ../libpurple/protocols/myspace/user.c:124
+#: ../libpurple/protocols/myspace/user.c:126
 #, fuzzy
 msgid "Headline"
 msgstr "昵称(_H)："
 
-#: ../libpurple/protocols/myspace/user.c:129
+#: ../libpurple/protocols/myspace/user.c:131
 #, fuzzy
 msgid "Song"
 msgstr "声音"
 
-#: ../libpurple/protocols/myspace/user.c:134
+#: ../libpurple/protocols/myspace/user.c:139
 msgid "Total Friends"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
+#: ../libpurple/protocols/myspace/user.c:157
 #, fuzzy
 msgid "Client Version"
 msgstr "关闭对话"
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. 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:44
+#: ../libpurple/protocols/myspace/zap.c:51
 #, fuzzy, c-format
 msgid "%s has zapped you!"
 msgstr "%s 已经将您[%s]添加为好友"
 
-#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "Zapping %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:54
 msgid "Whack"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:54
 #, fuzzy, c-format
 msgid "%s has whacked you!"
 msgstr "%s 已经将您[%s]添加为好友"
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "Whacking %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#. 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
 #, fuzzy
 msgid "Torch"
 msgstr "话题"
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/zap.c:59
 #, fuzzy, c-format
 msgid "%s has torched you!"
 msgstr "用户已经屏蔽了您"
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#: ../libpurple/protocols/myspace/zap.c:62
 #, fuzzy, c-format
 msgid "%s has smooched you!"
 msgstr "%s 已登入。"
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "Smooching %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:65
 msgid "Hug"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:65
 #, fuzzy, c-format
 msgid "%s has hugged you!"
 msgstr "%s 已登入。"
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "Hugging %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:68
 #, fuzzy
 msgid "Slap"
 msgstr "打盹"
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#: ../libpurple/protocols/myspace/zap.c:68
 #, fuzzy, c-format
 msgid "%s has slapped you!"
 msgstr "%s 已经将您[%s]添加为好友"
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "Slapping %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:71
 #, fuzzy
 msgid "Goose"
 msgstr "已走"
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#: ../libpurple/protocols/myspace/zap.c:71
 #, fuzzy, c-format
 msgid "%s has goosed you!"
 msgstr "%s 走了。"
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#: ../libpurple/protocols/myspace/zap.c:71
 #, fuzzy, c-format
 msgid "Goosing %s..."
 msgstr "查阅 %s"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#. 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
 msgid "High-five"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:76
 #, fuzzy, c-format
 msgid "%s has high-fived you!"
 msgstr "%s 已登入。"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "High-fiving %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#. 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
 msgid "Punk"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, fuzzy, c-format
 msgid "%s has punk'd you!"
 msgstr "%s 已登入。"
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "Punking %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#. 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
 msgid "Raspberry"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, fuzzy, c-format
 msgid "%s has raspberried you!"
 msgstr "%s 已登入。"
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "Raspberrying %s..."
 msgstr ""
@@ -7735,107 +7768,107 @@ msgstr "未知错误: 0x%X"
 msgid "Login failed (%s)."
 msgstr "登录失败(%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:249
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "无法发送消息。无法获得用户的详细信息(%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:398
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "无法将 %s 添加到您的好友列表中(%s)。"
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:424
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "无法发送消息(%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:495
+#: ../libpurple/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "无法邀请用户(%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:534
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "无法给 %s 发送消息。无法创建会议(%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:539
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "无法发送消息。无法创建会议(%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:586
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr "无法将用户 %s 在服务器端移动到文件夹 %s。创建文件夹出错(%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:634
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "无法将 %s 添加到您的好友列表。在服务器端创建文件夹出错(%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:707
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "无法获得用户 %s 的详细信息(%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:753
+#: ../libpurple/protocols/novell/novell.c:899
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "无法将用户添加到您的隐私列表中(%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:800
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "无法将“%s”添加到您的好友列表中(%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:853
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "无法将 %s 添加到您的许可列表中(%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:921
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "无法将 %s 从隐私列表中删除(%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:944
+#: ../libpurple/protocols/novell/novell.c:1649
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "无法更改服务器端的隐私设置(%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "无法创建会议(%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1123
+#: ../libpurple/protocols/novell/novell.c:1694
 msgid "Error communicating with server. Closing connection."
 msgstr "与服务器通讯出错。关闭连接。"
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "电话号码"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "个人称谓"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "邮箱"
 
-#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/novell/novell.c:1504
 #: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "用户 ID"
@@ -7846,41 +7879,41 @@ msgstr "用户 ID"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1517
 msgid "Full name"
 msgstr "全名"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1639
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 会议 %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
+#: ../libpurple/protocols/novell/novell.c:1670
 msgid "Unable to make SSL connection to server."
 msgstr "无法通过 SSL 连接到服务器。"
 
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1722
 msgid "Authenticating..."
 msgstr "正在认证..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1734
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1737
 msgid "Waiting for response..."
 msgstr "正在等候响应..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1872
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "已经邀请 %s 加入此对话。"
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1900
 msgid "Invitation to Conversation"
 msgstr "对话邀请"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1901
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7891,16 +7924,15 @@ msgstr ""
 "\n"
 "发出时间: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1903
 msgid "Would you like to join the conversation?"
 msgstr "您是否想要加入对话？"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2017
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已被注销，因为您已从其它计算机上登录。"
 
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2074
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7910,18 +7942,17 @@ msgstr "%s 显示为离线，因此未接受到您刚刚发出的消息。"
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2172
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2200
 msgid "Error. SSL support is not installed."
 msgstr "出错。SSL 支持未安装。"
 
-#: ../libpurple/protocols/novell/novell.c:2504
-#, c-format
+#: ../libpurple/protocols/novell/novell.c:2509
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
@@ -7935,33 +7966,33 @@ msgstr "此会议已关筹。不会再送出消息。"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3523
+#: ../libpurple/protocols/novell/novell.c:3525
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 协议插件"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3550
 msgid "Server address"
 msgstr "服务器地址"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3554
 msgid "Server port"
 msgstr "服务器端口"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../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 "服务器关闭了连接。"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../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"
@@ -7970,10 +8001,10 @@ msgstr ""
 "失去与服务器的连接：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../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 "在与服务器的连接中收到了无效的数据。"
 
@@ -8008,36 +8039,43 @@ msgid "ICQ Protocol Plugin"
 msgstr "ICQ 协议插件"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "编码"
 
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "远程用户关闭了连接。"
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "远程用户拒绝了您的请求。"
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "失去与远程用户的连接：<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "无法建立与远程用户的连接。"
 
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "二人世界已建立"
 
+#: ../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 ""
+
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -8155,8 +8193,8 @@ msgid ""
 msgstr "(转换此信息出错。与您对话的好友可能正在使用存在问题的客户端。)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2391
+#: ../pidgin/gtkutils.c:2421
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "好友图标"
@@ -8178,7 +8216,7 @@ msgid "Chat"
 msgstr "聊天"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:6064
 msgid "Get File"
 msgstr "获取文件"
 
@@ -8251,49 +8289,43 @@ msgid "Camera"
 msgstr "相机"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5834
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5869
 msgid "Not Available"
 msgstr "不可用"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5855
 msgid "Occupied"
 msgstr "琐事缠身"
 
 #: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
 msgid "Web Aware"
 msgstr "网上留意"
 
 #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
-#, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
 msgid "Invisible"
 msgstr "隐身"
 
 #: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
 msgid "Online"
 msgstr "在线"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128
 msgid "IP Address"
 msgstr "IP 地址"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Warning Level"
 msgstr "警告级别"
 
@@ -8332,39 +8364,39 @@ msgstr "连接已建立，已发送 cookie"
 msgid "Finalizing connection"
 msgstr "完成连接"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:1262
+#, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must be a valid email address, or start with a letter "
 "and contain only letters, numbers and spaces, or contain only numbers."
 msgstr ""
-"无法登入: 无法以 %s 登入，原因是用户名无效。用户名必须以字母开头，其中只能包"
-"含字母、数字和空格，或者只包含数字。"
+"无法登入: 无法以 %s 登入，原因是用户名无效。用户名必须是有效的电子邮件地址，或者以字母开头，且只能包含字母、数"
+"字和空格，或者只包含数字。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "用户名无效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/oscar/oscar.c:1355
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1048
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1360
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1364
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/oscar/oscar.c:1369
+#: ../libpurple/protocols/oscar/oscar.c:1380
 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."
@@ -8372,44 +8404,44 @@ msgstr ""
 "您连接和断开得太频繁。请等十分钟，然后再试一次。如果您继续重试，您等的时间可"
 "能会更长。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#: ../libpurple/protocols/oscar/oscar.c:1374
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1413
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1417
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1439
 msgid "The SecurID key entered is invalid."
 msgstr "输入的 SecurID 密钥无效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Enter SecurID"
 msgstr "输入 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1453
 msgid "Enter the 6 digit number from the digital display."
 msgstr "输入所显示的六位数字。"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:1455
+#: ../libpurple/protocols/oscar/oscar.c:2247
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:5939
+#: ../libpurple/protocols/oscar/oscar.c:6220 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1494
+#: ../libpurple/protocols/oscar/oscar.c:1537
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8417,53 +8449,53 @@ msgid ""
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:1540
 msgid "Unable to get a valid AIM login hash."
 msgstr "无法获取有效的 AIM 登录码。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您即将被断开。请检查 %s 上的更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1628
 msgid "Unable to get a valid login hash."
 msgstr "无法获取有效的登录码。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1658
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1714
 msgid "Unable to initialize connection"
 msgstr "无法初始化连接"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2205
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2245
 msgid "Authorization Request Message:"
 msgstr "认证请求消息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2246
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友！"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:2287
+#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:5315
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2294
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2422
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8473,17 +8505,17 @@ msgstr ""
 "用户 %u 拒绝了您将他/她加为好友的请求，原因如下：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2423
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2430
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2438
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8496,7 +8528,7 @@ msgstr ""
 "发出人: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2446
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8509,7 +8541,7 @@ msgstr ""
 "发出人：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2454
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8522,36 +8554,36 @@ msgstr ""
 "内容是：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2475
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友：%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2481
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友？"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2486 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "添加(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2487
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2611
 #, 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] "您错过了 %2$s 的 %1$hu 条消息，原因是这些消息无效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2620
 #, 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] "您错过了 %2$s 的 %1$hu 条消息，原因是这些消息太大。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2629
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8559,72 +8591,72 @@ msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息，原因是达到了等级限制。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2638
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息，原因是他/她太可恶了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2647
 #, 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] "您错过了 %2$s 的 %1$hu 条消息，原因是您太可恶了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2656
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息，原因未知。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2811
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "无法发送消息: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2816
+#: ../libpurple/protocols/oscar/oscar.c:2880
 msgid "Unknown reason."
 msgstr "未知原因。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
+#: ../libpurple/protocols/oscar/oscar.c:2814
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "无法给 %s 发送消息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2880
 #, c-format
 msgid "User information not available: %s"
 msgstr "用户信息不可用：%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2911
 msgid "Online Since"
 msgstr "上线时间"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2916
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "注册时间"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2951
 msgid "Available Message"
 msgstr "可用消息"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3059
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
+#: ../libpurple/protocols/oscar/oscar.c:3247
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息，原因是其中包含了无效的字符。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3411
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8632,145 +8664,144 @@ msgstr ""
 "您试图的最后一次操作未执行，原因是您已经得到了速度极限。请等 10 秒，然后再试"
 "一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3494
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3744
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3798
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3819
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Division"
 msgstr "部门"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Position"
 msgstr "职务"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3833
 msgid "Web Page"
 msgstr "网页"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3836
 msgid "Work Information"
 msgstr "工作信息"
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3932
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "下列用户名已经和 %s 关联"
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3937
 msgid "Screen name"
 msgstr "用户名"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3963
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:3984
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3986
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4017
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "错误 0x%04x：无法格式化用户名，原因是请求的用户名与原始用户名不符。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "错误 0x%04x：无法格式化用户名，原因是用户名无效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "错误 0x%04x：无法格式化用户名，原因是请求的用户名太长。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4029
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "错误 0x%04x：无法更改电子邮件地址，原因是此用户名已经有被推后的请求。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4032
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr "错误 0x%04x：无法更改电子邮件地址，原因是给定的地址关联的用户名太多。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4035
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "错误 0x%04x：无法更改电子邮件地址，原因是给定的地址无效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x：未知错误。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4048
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4050
 msgid "Account Info"
 msgstr "账户信息"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
+#: ../libpurple/protocols/oscar/oscar.c:4233
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像，您必须连接为二人世界。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
+#: ../libpurple/protocols/oscar/oscar.c:4504
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4505
 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 "
@@ -8779,8 +8810,8 @@ msgstr ""
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定；请在您完全连接后"
 "再试一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4519
+#, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -8789,11 +8820,11 @@ msgid_plural ""
 "truncated for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。程序为您自动截断了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4524
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4569
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -8803,31 +8834,31 @@ msgid_plural ""
 "truncated for you."
 msgstr[0] "已经超过了离开消息的最大长度 %d 字节。程序自动为您截断了消息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4574
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4647
+#, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
 "must be a valid email address, or start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
-"无法添加好友 %s，原因是用户名无效。用户名必须以字母开头，其中只能包含字母、数"
-"字和空格，或者只包含数字。该好友将从您的好友列表中删除。"
+"无法添加好友 %s，原因是用户名无效。用户名必须是有效的电子邮件地址，或者以字母开头，且只能包含字母、数"
+"字和空格，或者只包含数字。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4649
+#: ../libpurple/protocols/oscar/oscar.c:5101
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4768
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
+#: ../libpurple/protocols/oscar/oscar.c:4769
 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."
@@ -8835,15 +8866,15 @@ msgstr ""
 "暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失，可能稍等几小时就"
 "能用了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+#: ../libpurple/protocols/oscar/oscar.c:4951
+#: ../libpurple/protocols/oscar/oscar.c:4953
+#: ../libpurple/protocols/oscar/oscar.c:5181
+#: ../libpurple/protocols/oscar/oscar.c:5182
+#: ../libpurple/protocols/oscar/oscar.c:5187
 msgid "Orphans"
 msgstr "孤儿"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5099
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8851,39 +8882,39 @@ msgid ""
 msgstr ""
 "无法将 %s 加为好友，原因是您的好友太多。请删除其中一个好友，然后再试一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5099
+#: ../libpurple/protocols/oscar/oscar.c:5114
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5113
 #, fuzzy, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "您的命令失败，原因未知。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5230
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr "用户 %s 允许您将他/她加为好友。您是否想要添加？"
 
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5238
 msgid "Authorization Given"
 msgstr "给出的认证"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5311
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5312
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5315
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8893,115 +8924,115 @@ msgstr ""
 "用户 %s 拒绝了您将其加入好友列表的请求，原因如下：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5316
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5352
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "交换(_E)："
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5392
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5461
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5623
+#: ../libpurple/protocols/oscar/oscar.c:5628
 msgid "Away Message"
 msgstr "离开消息"
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5628
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(正获取)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5828
 msgid "iTunes Music Store Link"
-msgstr ""
+msgstr "iTunes 音乐商店链接"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5936
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友注释"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5937
 msgid "Buddy Comment:"
 msgstr "好友注释："
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5984
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5988
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
 "由于这样将暴露您的 IP 地址，所以可能带来潜在的隐私风险。您是否想要继续？"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:5994
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "连接(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:6029
 msgid "Get AIM Info"
 msgstr "获得 AIM 信息"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6035
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6043
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6056
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6078
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6137
 msgid "Require authorization"
 msgstr "请求认证"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6140
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6145
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隐私选项"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6218
 msgid "Change Address To:"
 msgstr "将地址更改为："
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6264
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6267
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6268
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9009,73 +9040,73 @@ msgstr ""
 "如果您想要向这些好友重新请求认证，只需用鼠标右键单击这些好友，然后单击“重新请"
 "求认证”。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6285
 msgid "Find Buddy by E-Mail"
 msgstr "按电子邮件查找好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6287
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6290
 msgid "_Search"
 msgstr "搜索(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6448
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6459
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6463
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6473
 msgid "Set Privacy Options..."
 msgstr "显示隐私选项..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6480
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6484
 msgid "Display Currently Registered E-Mail Address"
 msgstr "显示当前注册的电子邮件地址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6488
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "更改当前注册的电子邮件地址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6495
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6501
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "按电子邮件搜索好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6506
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
+#: ../libpurple/protocols/oscar/oscar.c:6574
 msgid "Use recent buddies group"
 msgstr "使用最近的好友组"
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../libpurple/protocols/oscar/oscar.c:6577
 msgid "Show how long you have been idle"
 msgstr "显示您发了多长时间呆"
 
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../libpurple/protocols/oscar/oscar.c:6732
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9083,27 +9114,26 @@ msgstr ""
 "总是使用 ICQ 代理服务器\n"
 "(较慢，但不会暴露您的 IP 地址)"
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
 
-#: ../libpurple/protocols/oscar/peer.c:782
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "正在试图连接到 %s:%hu。"
 
-#: ../libpurple/protocols/oscar/peer.c:856
-#, c-format
+#: ../libpurple/protocols/oscar/peer.c:858
 msgid "Attempting to connect via proxy server."
 msgstr "正在试图通过代理服务器连接。"
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
+#: ../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 "
@@ -9264,28 +9294,28 @@ msgstr "猪"
 msgid "Other"
 msgstr "其它"
 
-#: ../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 "修改我的信息"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "更新我的信息"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "您的信息已更新"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/buddy_info.c:601
+#, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
 "%s."
-msgstr "自定义头像目前不支持。请选择以下的头像"
+msgstr "自定义头像目前不支持。请从 %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 "无效的 QQ 头像"
 
@@ -9310,7 +9340,6 @@ msgid "Sorry, you are not my type..."
 msgstr "抱歉，我不接受好友..."
 
 #: ../libpurple/protocols/qq/buddy_opt.c:277
-#, fuzzy
 msgid "Add buddy with auth request failed"
 msgstr "添加好友，但身份验证失败"
 
@@ -9321,7 +9350,6 @@ msgstr "您成功删除了好友"
 
 #. TODO: Does the user really need to be notified about this?
 #: ../libpurple/protocols/qq/buddy_opt.c:338
-#, fuzzy
 msgid "You have successfully removed yourself from your friend's buddy list"
 msgstr "您成功将您从别人的好友列表中删除"
 
@@ -9351,7 +9379,7 @@ msgid "Send"
 msgstr "发送"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:418
-#, fuzzy, c-format
+#, c-format
 msgid "You have added %d to buddy list"
 msgstr "您已经将 %d 添加为好友"
 
@@ -9388,7 +9416,6 @@ msgid "QQ Qun"
 msgstr "QQ 群"
 
 #: ../libpurple/protocols/qq/group.c:120
-#, fuzzy
 msgid "Please enter external group ID"
 msgstr "请输入外部群 ID"
 
@@ -9397,7 +9424,7 @@ msgid "You can only search for permanent QQ groups\n"
 msgstr "您只能搜索永久 QQ 群\n"
 
 #: ../libpurple/protocols/qq/group_im.c:126
-#, fuzzy, c-format
+#, c-format
 msgid "User %d requested to join group %d"
 msgstr "用户 %d 申请加入 %d 群"
 
@@ -9431,31 +9458,30 @@ msgstr "同意"
 #: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
-msgstr ""
+msgstr "您加入 %d 群的请求已经被管理员 %d 拒绝"
 
 #: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
-msgstr ""
+msgstr "您加入 %d 群的请求已经被管理员 %d 批准"
 
 #: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
-msgstr ""
+msgstr "您[%d]已离开群“%d”"
 
 #: ../libpurple/protocols/qq/group_im.c:291
-#, fuzzy, c-format
+#, c-format
 msgid "You [%d] have been added to group \"%d\""
-msgstr "您被 %s 添加为好友"
+msgstr "您[%d]已被加入群“%d”"
 
 #: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "您已经将此群添加到好友"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-#, fuzzy
 msgid "I am not a member"
-msgstr "我不是群成员"
+msgstr "我不是成员"
 
 #: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
@@ -9478,7 +9504,6 @@ msgid "This group does not allow others to join"
 msgstr "此群不允许其他人加入"
 
 #: ../libpurple/protocols/qq/group_join.c:233
-#, fuzzy
 msgid "You have successfully left the group"
 msgstr "您已经成功退出了该群"
 
@@ -9487,19 +9512,16 @@ msgid "QQ Group Auth"
 msgstr "QQ 群认证"
 
 #: ../libpurple/protocols/qq/group_join.c:258
-#, fuzzy
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr "您的身份验证操作已经被 QQ 服务器接受"
 
 #: ../libpurple/protocols/qq/group_join.c:329
-#, fuzzy
 msgid "You entered a group ID outside the acceptable range"
 msgstr "您输入的群号超出了可接受的范围"
 
 #: ../libpurple/protocols/qq/group_join.c:360
-#, fuzzy
 msgid "Are you sure you want to leave this Qun?"
-msgstr "您真的想要删除 %s 吗？"
+msgstr "您真的想要离开此群吗？"
 
 #: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
@@ -9521,22 +9543,18 @@ msgstr "群操作错误"
 #. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
 #: ../libpurple/protocols/qq/sys_msg.c:87
-#, fuzzy
 msgid "Do you want to approve the request?"
 msgstr "您是否想要同意请求?"
 
 #: ../libpurple/protocols/qq/group_opt.c:137
-#, fuzzy
 msgid "Enter your reason:"
 msgstr "输入您的原因："
 
 #: ../libpurple/protocols/qq/group_opt.c:235
-#, fuzzy
 msgid "You have successfully modified Qun member"
 msgstr "您成功修改了群成员"
 
 #: ../libpurple/protocols/qq/group_opt.c:305
-#, fuzzy
 msgid "You have successfully modified Qun information"
 msgstr "您成功修改了群信息"
 
@@ -9557,21 +9575,18 @@ msgid "System Message"
 msgstr "系统消息"
 
 #: ../libpurple/protocols/qq/im.c:576
-#, fuzzy
 msgid "Failed to send IM."
-msgstr "获得名称失败: %s"
+msgstr "发送消息失败"
 
 #: ../libpurple/protocols/qq/keep_alive.c:87
-#, fuzzy
 msgid "Keep alive error"
-msgstr "读取错误"
+msgstr "保持在线错误"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-#, fuzzy
 msgid "Error requesting login token"
-msgstr "创建连接出错"
+msgstr "请求登录令牌出错"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:488
 msgid "Unable to login, check debug log"
 msgstr "无法登录，请检查调试日志"
 
@@ -9589,14 +9604,12 @@ msgid "Unknown-%d"
 msgstr "未知-%d"
 
 #: ../libpurple/protocols/qq/qq.c:211
-#, fuzzy
 msgid "TCP Address"
-msgstr "IP 地址"
+msgstr "TCP 地址"
 
 #: ../libpurple/protocols/qq/qq.c:213
-#, fuzzy
 msgid "UDP Address"
-msgstr "IP 地址"
+msgstr "UDP 地址"
 
 #: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
@@ -9651,9 +9664,8 @@ msgid "Login Information"
 msgstr "登录信息"
 
 #: ../libpurple/protocols/qq/qq.c:533
-#, fuzzy
 msgid "Set My Information"
-msgstr "服务器信息"
+msgstr "设定我的信息"
 
 #: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
@@ -9664,14 +9676,12 @@ msgid "Show Login Information"
 msgstr "显示登录信息"
 
 #: ../libpurple/protocols/qq/qq.c:560
-#, fuzzy
 msgid "Leave this QQ Qun"
 msgstr "退出此 QQ 群"
 
 #: ../libpurple/protocols/qq/qq.c:584
-#, fuzzy
 msgid "Block this buddy"
-msgstr "关闭此标签"
+msgstr "屏蔽此好友"
 
 #. *< type
 #. *< ui_requirement
@@ -9950,7 +9960,7 @@ msgstr "邀请会议..."
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4434
 msgid "Topic:"
 msgstr "话题："
 
@@ -9973,7 +9983,7 @@ msgstr "Meanwhile 连接设置"
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4368
 msgid "Connect"
 msgstr "连接"
 
@@ -10024,10 +10034,6 @@ msgid ""
 "entry has been removed from your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "无法添加用户"
-
 #: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
@@ -10087,7 +10093,7 @@ msgstr "无法添加组"
 
 #: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
-msgstr ""
+msgstr "可能的匹配"
 
 #: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
@@ -10106,9 +10112,8 @@ msgid "Select Notes Address Book"
 msgstr "选择 Notes 地址簿"
 
 #: ../libpurple/protocols/sametime/sametime.c:5437
-#, fuzzy
 msgid "Unable to add group: group not found"
-msgstr "无法从网络读取套接字"
+msgstr "无法从添加组：组未找到"
 
 #: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
@@ -10140,7 +10145,7 @@ msgid ""
 "buttons below."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:762
 msgid "Search Results"
 msgstr "搜索结果"
 
@@ -10707,7 +10712,6 @@ msgstr "<br><b>频道话题:</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>频道模式:</b> "
 
@@ -10746,7 +10750,6 @@ msgstr "频道公钥列表"
 
 #: ../libpurple/protocols/silc/chat.c:435
 #: ../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 "
@@ -10940,9 +10943,8 @@ msgid "Error during file transfer"
 msgstr "文件传送时出错"
 
 #: ../libpurple/protocols/silc/ft.c:87
-#, fuzzy
 msgid "Remote disconnected"
-msgstr "%s 已断开连接"
+msgstr "远程已断开连接"
 
 #: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
@@ -10953,14 +10955,12 @@ msgid "Key agreement failed"
 msgstr "密钥协议失败"
 
 #: ../libpurple/protocols/silc/ft.c:114
-#, fuzzy
 msgid "Connection timed out"
 msgstr "连接超时"
 
 #: ../libpurple/protocols/silc/ft.c:118
-#, fuzzy
 msgid "Creating connection failed"
-msgstr "连接失败"
+msgstr "创建连接失败"
 
 #: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
@@ -10987,9 +10987,8 @@ msgid "Cannot send file"
 msgstr "无法发送文件"
 
 #: ../libpurple/protocols/silc/ops.c:57
-#, fuzzy
 msgid "Error occurred"
-msgstr "错误 "
+msgstr "发生了错误 "
 
 #: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
 #: ../libpurple/protocols/silc/ops.c:551
@@ -11167,9 +11166,8 @@ msgid "Cannot get room list"
 msgstr "无法获取房间列表"
 
 #: ../libpurple/protocols/silc/ops.c:1468
-#, fuzzy
 msgid "Network is empty"
-msgstr "网络统计"
+msgstr "网络为空"
 
 #: ../libpurple/protocols/silc/ops.c:1512
 #: ../libpurple/protocols/silc10/ops.c:1507
@@ -11260,9 +11258,8 @@ msgid "WATCH"
 msgstr ""
 
 #: ../libpurple/protocols/silc/ops.c:1648
-#, fuzzy
 msgid "Cannot watch user"
-msgstr "无法添加您自己"
+msgstr "无法监视您自己"
 
 #: ../libpurple/protocols/silc/ops.c:1724
 #: ../libpurple/protocols/silc/ops.c:1775
@@ -11366,9 +11363,8 @@ msgid "Connecting to SILC Server"
 msgstr "连接到 SILC 服务器"
 
 #: ../libpurple/protocols/silc/silc.c:352
-#, fuzzy, c-format
 msgid "Could not load SILC key pair"
-msgstr "无法装入 SILC 密钥对: %s"
+msgstr "无法装入 SILC 密钥对"
 
 #: ../libpurple/protocols/silc/silc.c:366
 #: ../libpurple/protocols/silc10/silc.c:355
@@ -11386,9 +11382,8 @@ msgid "Cannot initialize SILC protocol"
 msgstr "无法初始化 SILC 协议"
 
 #: ../libpurple/protocols/silc/silc.c:445
-#, fuzzy
 msgid "Error loading SILC key pair"
-msgstr "创建 SILC 密钥对..."
+msgstr "装入 SILC 密钥对出错"
 
 #: ../libpurple/protocols/silc/silc.c:739
 #: ../libpurple/protocols/silc10/silc.c:650
@@ -11396,8 +11391,7 @@ msgid "Your Current Mood"
 msgstr "您目前的心情"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643
 msgid "Normal"
 msgstr "普通"
 
@@ -11460,9 +11454,8 @@ msgid "Your VCard File"
 msgstr "您的 VCard 文件"
 
 #: ../libpurple/protocols/silc/silc.c:812
-#, fuzzy
 msgid "Timezone (UTC)"
-msgstr "时区"
+msgstr "时区(UTC)"
 
 #: ../libpurple/protocols/silc/silc.c:816
 #: ../libpurple/protocols/silc/silc.c:817
@@ -11783,7 +11776,7 @@ msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全网际实时会议(SILC)协议"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038
 msgid "Network"
 msgstr "网络"
 
@@ -11980,52 +11973,42 @@ msgid "No server statistics available"
 msgstr "没有可用的服务器统计"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失败: 版本不匹配，请升级您的客户端"
 
 #: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失败: 远程不信任或不支持您的公钥"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失败: 远程不支持提议的 KE 组"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失败: 远程不支持提议的密码算法"
 
 #: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失败: 远程不支持提议的 PKCS"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失败: 远程不支持提议的散列函数"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失败: 远程不支持 HMAC"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "失败: 签名不正确"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "失败: 无效的 cookie"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
 msgid "Failure: Authentication failed"
 msgstr "失败: 身份验证失败"
 
@@ -12047,36 +12030,35 @@ msgid "Could not load SILC key pair: %s"
 msgstr "无法装入 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:417
 msgid "Could not write"
 msgstr "无法写入"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:439
+#: ../libpurple/protocols/simple/simple.c:1545
 msgid "Could not connect"
 msgstr "无法连接"
 
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1062
 msgid "Unknown server response."
-msgstr "未知原因。"
+msgstr "未知的服务器响应。"
 
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1621
+#: ../libpurple/protocols/simple/simple.c:1634
+#: ../libpurple/protocols/simple/simple.c:1685
 msgid "Could not create listen socket"
 msgstr "无法创建监听套接字"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1602
 msgid "Couldn't resolve host"
 msgstr "无法解析主机"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1693
 msgid "Could not resolve hostname"
 msgstr "无法解析主机名"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1710
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 用户名不能包含空格或 @ 符号"
 
@@ -12088,40 +12070,38 @@ msgstr "SIP 用户名不能包含空格或 @ 符号"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 协议插件"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1894
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 协议插件"
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:1922
 msgid "Publish status (note: everyone may watch you)"
 msgstr "公布状态(注意: 所有人都可以看到您)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:1928
 msgid "Use UDP"
 msgstr "使用 UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1930
 msgid "Use proxy"
 msgstr "使用代理"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:1932
 msgid "Proxy"
 msgstr "代理"
 
-#: ../libpurple/protocols/simple/simple.c:1911
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1934
 msgid "Auth User"
-msgstr "AP 用户"
+msgstr "认证用户"
 
-#: ../libpurple/protocols/simple/simple.c:1913
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1936
 msgid "Auth Domain"
-msgstr "自动"
+msgstr "认证域"
 
 #: ../libpurple/protocols/toc/toc.c:139
 #, c-format
@@ -12164,7 +12144,6 @@ msgid "Warning of %s not allowed."
 msgstr "不允许对 %s 发出警告。"
 
 #: ../libpurple/protocols/toc/toc.c:503
-#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "丢失了一条消息，您超过了服务器速度限制。"
 
@@ -12189,47 +12168,38 @@ msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您错过了来自 %s 的消息，原因是发送太快。"
 
 #: ../libpurple/protocols/toc/toc.c:518
-#, c-format
 msgid "Failure."
 msgstr "失败。"
 
 #: ../libpurple/protocols/toc/toc.c:521
-#, c-format
 msgid "Too many matches."
 msgstr "匹配太多。"
 
 #: ../libpurple/protocols/toc/toc.c:524
-#, c-format
 msgid "Need more qualifiers."
 msgstr "需要更多条件。"
 
 #: ../libpurple/protocols/toc/toc.c:527
-#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "目录服务暂时不可用。"
 
 #: ../libpurple/protocols/toc/toc.c:530
-#, c-format
 msgid "E-mail lookup restricted."
 msgstr "电子邮件查阅被限制。"
 
 #: ../libpurple/protocols/toc/toc.c:533
-#, c-format
 msgid "Keyword ignored."
 msgstr "关键字被忽略。"
 
 #: ../libpurple/protocols/toc/toc.c:536
-#, c-format
 msgid "No keywords."
 msgstr "无关键字。"
 
 #: ../libpurple/protocols/toc/toc.c:539
-#, c-format
 msgid "User has no directory information."
 msgstr "用户没有目录信息。"
 
 #: ../libpurple/protocols/toc/toc.c:543
-#, c-format
 msgid "Country not supported."
 msgstr "国家不被支持。"
 
@@ -12239,22 +12209,18 @@ msgid "Failure unknown: %s."
 msgstr "未知失败: %s。"
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, c-format
 msgid "Incorrect screen name or password."
 msgstr "昵称或密码不对。"
 
 #: ../libpurple/protocols/toc/toc.c:552
-#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "服务暂时不可用。"
 
 #: ../libpurple/protocols/toc/toc.c:555
-#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "您的警告级别太高，无法登入。"
 
 #: ../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."
@@ -12292,8 +12258,8 @@ msgstr "TOC 从暂停中恢复。您现在可以再次发送消息了。"
 msgid "Password Change Successful"
 msgstr "密码更改成功"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5925
+#: ../pidgin/gtkblist.c:6281
 msgid "_Group:"
 msgstr "组(_G)："
 
@@ -12352,41 +12318,41 @@ msgstr "%s 请求您发送文件"
 msgid "TOC Protocol Plugin"
 msgstr "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 ""
+msgstr "%s 向您发送了摄像头邀请，但尚不支持。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系统消息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "认证拒绝消息："
 
-#: ../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 "
 "following reason: %s."
 msgstr "%s 拒绝了您将其加为好友的请求，原因如下：%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 拒绝您将他/她加入好友。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12396,11 +12362,11 @@ msgstr ""
 "Yahoo 服务器请求使用未识别的认证方式。您可能无法成功登入 Yahoo。请检查 %s 上"
 "的更新。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12408,57 +12374,57 @@ msgid ""
 msgstr ""
 "您试图忽略 %s，但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "忽略好友？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "您的账户已锁定，请登录到 Yahoo! 网站。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
 msgid "Received unexpected HTTP response from server."
 msgstr "从服务器收到了意外的 HTTP 响应。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
+#: ../libpurple/protocols/yahoo/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
+#, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr ""
-"失去与服务器的连接：\n"
+"失去与 %s 的连接：\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
 #, fuzzy, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12467,116 +12433,105 @@ msgstr ""
 "无法建立与服务器：\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not at Desk"
 msgstr "不在桌前"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Not in Office"
 msgstr "不在办公室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "On Vacation"
 msgstr "度假中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
 msgid "Appear Online"
 msgstr "显示为在线"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
 msgid "Appear Permanently Offline"
 msgstr "显示为临时离线"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 #, fuzzy
 msgid "Presence"
 msgstr "首选项"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
 msgid "Appear Offline"
 msgstr "显示为离线"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Don't Appear Permanently Offline"
 msgstr "不显示临时离线"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
 #, fuzzy
 msgid "Presence Settings"
 msgstr "使用环境设置"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Activate which ID?"
 msgstr "激活哪个 ID？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Join whom in chat?"
 msgstr "将谁加入聊天？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Join User in Chat..."
 msgstr "在聊天中加入用户..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Open Inbox"
-msgstr "打开 Hotmail 收件箱"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr ""
+msgstr "打开收件箱"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4143
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: 列出 Yahoo 网络上的房间"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4151
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -12590,56 +12545,56 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
 #: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4362
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4385
 msgid "Yahoo Japan"
 msgstr "Yahoo 日本"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4388
 msgid "Pager server"
 msgstr "寻呼服务器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4391
 msgid "Japan Pager server"
 msgstr "日本寻呼服务器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "File transfer server"
 msgstr "文件传送服务器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan file transfer server"
 msgstr "日本文件传送服务器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Chat room locale"
 msgstr "聊天房间语系"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略会议和聊天室邀请"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "Chat room list URL"
 msgstr "聊天房间列表 URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天服务器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4423
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天端口"
 
@@ -12983,8 +12938,8 @@ msgstr "域"
 msgid "Exposure"
 msgstr "暴露"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
+#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -12993,28 +12948,28 @@ msgstr ""
 "无法创建套接字：\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
-#, fuzzy, c-format
+#: ../libpurple/proxy.c:662
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "无法发送消息: %s"
+msgstr "无法从 HTTP 代理分析响应：%s\n"
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../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 "HTTP 代理服务器连接错误 %d"
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "访问被禁止: HTTP 代理服务器禁止端口 %d 流过。"
 
-#: ../libpurple/proxy.c:1012
+#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "解析 %s 出错"
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "无法解析主机名"
 
@@ -13055,14 +13010,14 @@ msgstr "%s 现在叫做 %s。\n"
 #: ../libpurple/server.c:302
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "正在请求 %s 的注意..."
 
 #: ../libpurple/server.c:347
 #, c-format
 msgid "%s has requested your attention!"
-msgstr ""
+msgstr "%s 请求了您的注意！"
 
-#: ../libpurple/server.c:796
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13071,19 +13026,18 @@ msgstr ""
 "%s 邀请了 %s 加入聊天室 %s:\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀请了 %s 加入聊天室 %s\n"
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗？"
 
 #: ../libpurple/sslconn.c:164
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "连接失败"
+msgstr "SSL 连接失败"
 
 #: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
@@ -13091,24 +13045,22 @@ msgstr "SSL 握手失败"
 
 #: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
-msgstr ""
+msgstr "SSL 远端返回的证书无效"
 
 #: ../libpurple/sslconn.c:171
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "未知错误"
+msgstr "未知的 SSL 错误"
 
 #: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "取消设置"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
-#, fuzzy
+#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "请勿打扰"
 
 #: ../libpurple/status.c:159
-#, fuzzy
 msgid "Extended away"
 msgstr "远远离开"
 
@@ -13121,125 +13073,140 @@ msgstr "移动"
 msgid "%s changed status from %s to %s"
 msgstr "%s 将状态从 %s 更改为 %s"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:612
+#, fuzzy, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s 将状态从 %s 更改为 %s"
+
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is now %s"
 msgstr "%s 现在 %s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:625
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) 现在 %s"
+
+#: ../libpurple/status.c:631
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s 不再 %s 了"
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:633
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) 不再 %s 了"
+
+#: ../libpurple/status.c:1244
 #, c-format
 msgid "%s became idle"
 msgstr "%s 发起了呆"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1261
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 发完呆了"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1324
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 发起了呆"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1326
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 发完呆了"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:701
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2706
 #, c-format
 msgid "Error Reading %s"
 msgstr "读取 %s 出错"
 
-#: ../libpurple/util.c:2723
+#: ../libpurple/util.c:2707
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr "读取您的 %s 时遇到了错误。该文件未装入，旧文件被移动到 %s~ 中了。"
 
-#: ../libpurple/util.c:3223
+#: ../libpurple/util.c:3207
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3210
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3236
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3248
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 天"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3256
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小时"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小时"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3536
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
+msgstr "无法打开 %s：重定向的次数太多"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3573 ../libpurple/util.c:3869
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "无法连接到 %s"
 
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3696
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3731
 #, fuzzy, c-format
 msgid "Error reading from %s: %s"
 msgstr "从套接字读取时出错。"
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3762
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "写入 %s 出错：%s"
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3787
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "无法连接到 %s: %s"
@@ -13256,11 +13223,11 @@ msgstr "Pidgin 互联网通讯程序"
 msgid "Send instant messages over multiple protocols"
 msgstr "通过多种协议发送即时消息"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "方向"
 
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "托盘的方向。"
 
@@ -13270,24 +13237,20 @@ msgid "Login Options"
 msgstr "登入选项"
 
 #: ../pidgin/gtkaccount.c:428
-#, fuzzy
 msgid "Pro_tocol:"
-msgstr "协议："
+msgstr "协议(_T)："
 
 #: ../pidgin/gtkaccount.c:439
-#, fuzzy
 msgid "Screen _name:"
-msgstr "用户名："
+msgstr "用户名(_N)："
 
 #: ../pidgin/gtkaccount.c:529
-#, fuzzy
 msgid "_Local alias:"
-msgstr "本地别名："
+msgstr "本地别名(_L)："
 
 #: ../pidgin/gtkaccount.c:533
-#, fuzzy
 msgid "Remember pass_word"
-msgstr "记住密码"
+msgstr "记住密码(_W)"
 
 #. Build the user options frame.
 #: ../pidgin/gtkaccount.c:591
@@ -13295,15 +13258,13 @@ msgid "User Options"
 msgstr "用户选项"
 
 #: ../pidgin/gtkaccount.c:604
-#, fuzzy
 msgid "New _mail notifications"
-msgstr "新邮件通知"
+msgstr "新邮件通知(_M)"
 
 #. Buddy icon
 #: ../pidgin/gtkaccount.c:609
-#, fuzzy
 msgid "Use this buddy _icon for this account:"
-msgstr "此账户使用此好友图标："
+msgstr "此账户使用此好友图标(_I)："
 
 #. Build the protocol options frame.
 #: ../pidgin/gtkaccount.c:731
@@ -13335,7 +13296,7 @@ msgstr "SOCKS 4"
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
@@ -13357,15 +13318,15 @@ msgstr "明日复明日"
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
 msgid "Proxy _type:"
 msgstr "代理类型(_T)："
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
 msgid "_Host:"
 msgstr "主机(_H)："
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
 msgid "_Port:"
 msgstr "端口(_P)："
 
@@ -13373,44 +13334,43 @@ msgstr "端口(_P)："
 msgid "_Username:"
 msgstr "用户名(_U)："
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
 msgid "Pa_ssword:"
 msgstr "密码(_S)："
 
 #: ../pidgin/gtkaccount.c:1195
-#, fuzzy
 msgid "Unable to save new account"
-msgstr "无法创建连接"
+msgstr "无法保存新帐户"
 
 #: ../pidgin/gtkaccount.c:1196
 msgid "An account already exists with the specified criteria."
-msgstr ""
+msgstr "已经存在指定条件的帐户。"
 
-#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1474
 msgid "Add Account"
 msgstr "添加账户"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1493
 msgid "_Basic"
 msgstr "基本(_B)"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1500
 msgid "Create this new account on the server"
-msgstr ""
+msgstr "在服务器上创建此新帐户"
 
-#: ../pidgin/gtkaccount.c:1515
+#: ../pidgin/gtkaccount.c:1516
 msgid "_Advanced"
 msgstr "高级(_A)"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1974 ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:2002
 msgid "Protocol"
 msgstr "协议"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2202
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13432,250 +13392,270 @@ msgstr ""
 "如果您想要回到此窗口以便添加、编辑或删除帐户，可以从好友列表中窗口中选择<b>帐"
 "户->添加/编辑</b>"
 
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "加入聊天"
+#: ../pidgin/gtkblist.c:524
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "您已经有名为 %s 的 %d 位联系人。您是否想要合并？"
+
+#: ../pidgin/gtkblist.c:525
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr "合并联系人将会使得这些联系人在好友列表中只显示单一的一项，并且使用单一的对话窗口。"
+"如果您想再解散合并后的联系人，可以从联系人的快捷菜单中选择“展开”"
+
+#: ../pidgin/gtkblist.c:527
+msgid "_Merge"
+msgstr "合并(_M)"
 
-#: ../pidgin/gtkblist.c:788
+#: ../pidgin/gtkblist.c:945
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6242
+#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "账户(_A)："
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "屏蔽(_B)"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1245
 msgid "Un_block"
 msgstr "取消屏蔽(_B)"
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1288
+msgid "Move to"
+msgstr "移至"
+
+#: ../pidgin/gtkblist.c:1328
 msgid "Get _Info"
 msgstr "资料(_I)"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "发送文件"
+#: ../pidgin/gtkblist.c:1337
+msgid "_Send File..."
+msgstr "发送文件(_S)..."
 
-#: ../pidgin/gtkblist.c:1155
-#, fuzzy
-msgid "Add Buddy _Pounce"
-msgstr "添加好友千里眼"
+#: ../pidgin/gtkblist.c:1344
+msgid "Add Buddy _Pounce..."
+msgstr "添加好友千里眼(_P)..."
 
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353
+#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1359
+msgid "Hide when offline"
+msgstr "离线时隐藏"
+
+#: ../pidgin/gtkblist.c:1359
+msgid "Show when offline"
+msgstr "离线时显示"
+
+#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382
+#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "添加好友(_B)"
+#: ../pidgin/gtkblist.c:1434
+msgid "Add _Buddy..."
+msgstr "添加好友(_B)..."
 
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "添加聊天(_H)"
+#: ../pidgin/gtkblist.c:1437
+msgid "Add C_hat..."
+msgstr "添加聊天(_H)..."
 
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1440
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1442
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
 #: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1464
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1466
+msgid "Persistent"
+msgstr "永久"
+
+#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1532
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
+#: ../pidgin/gtkblist.c:4929 ../pidgin/gtkblist.c:4942
 msgid "/Tools/Mute Sounds"
 msgstr "/工具(T)/静音(S)"
 
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
+#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4919
+#: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3067
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3070
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3071
 msgid "/Buddies/View User _Log..."
 msgstr "/好友(B)/查看用户日志(_L)..."
 
-#: ../pidgin/gtkblist.c:2875
-#, fuzzy
-msgid "/Buddies/Show"
-msgstr "/好友(_B)"
+#: ../pidgin/gtkblist.c:3073
+msgid "/Buddies/Sh_ow"
+msgstr "/好友(B)/显示(_O)"
 
-#: ../pidgin/gtkblist.c:2876
-#, fuzzy
+#: ../pidgin/gtkblist.c:3074
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/好友(B)/显示离线好友(_O)"
+msgstr "/好友(B)/显示(O)/离线好友(_O)"
 
-#: ../pidgin/gtkblist.c:2877
-#, fuzzy
+#: ../pidgin/gtkblist.c:3075
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/好友(B)/显示空组(_E)"
+msgstr "/好友(B)/显示(O)/空组(_E)"
 
-#: ../pidgin/gtkblist.c:2878
-#, fuzzy
+#: ../pidgin/gtkblist.c:3076
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/好友(B)/显示好友详细资料(_D)"
+msgstr "/好友(B)/显示(O)/好友详细资料(_D)"
 
-#: ../pidgin/gtkblist.c:2879
-#, fuzzy
+#: ../pidgin/gtkblist.c:3077
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/好友(B)/显示发呆时间(_T)"
+msgstr "/好友(B)/显示(O)/发呆时间(_T)"
 
-#: ../pidgin/gtkblist.c:2880
-#, fuzzy
+#: ../pidgin/gtkblist.c:3078
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/好友(B)/显示空组(_E)"
+msgstr "/好友(B)/显示(O)/协议图标(_P)"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:3079
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友(B)/好友排序(_S)"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3081
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3082
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3083
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3085
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3088
 msgid "/_Accounts"
 msgstr "/账户(_A)"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/账户(A)/添加\\/编辑"
+#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6943
+msgid "/Accounts/Manage"
+msgstr "/账户(A)/管理"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3092
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:3093
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: ../pidgin/gtkblist.c:2896
-#, fuzzy
+#: ../pidgin/gtkblist.c:3094
 msgid "/Tools/_Certificates"
-msgstr "/工具(T)/首选项(_E)"
+msgstr "/工具(T)/证书(_C)"
 
-#: ../pidgin/gtkblist.c:2897
+#: ../pidgin/gtkblist.c:3095
 msgid "/Tools/Plu_gins"
 msgstr "/工具(T)/插件(_G)"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3096
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3097
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3099
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3100
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3101
 msgid "/Tools/System _Log"
 msgstr "/工具(T)/系统日志(_L)"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3103
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具(T)/静音(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3105
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3106
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3107
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3140
 #, c-format
 msgid ""
 "\n"
@@ -13684,169 +13664,161 @@ msgstr ""
 "\n"
 "<b>账户：</b>%s"
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3218
 msgid "Buddy Alias"
 msgstr "好友别名"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3247
 msgid "Logged In"
 msgstr "已登入"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3293
 msgid "Last Seen"
 msgstr "上次见面"
 
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3314
 msgid "Spooky"
-msgstr ""
+msgstr "健谈"
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3316
 msgid "Awesome"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3318
 msgid "Rockin'"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3453
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:3657
+#, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "发呆中 (%d小时%02d分) "
+msgstr "发呆中 (%d天%d小时%02d分)"
 
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3659
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "发呆中 (%d小时%02d分) "
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3661
 #, c-format
 msgid "Idle %dm"
 msgstr "发呆 %d分"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3814
 msgid "/Buddies/New Instant Message..."
-msgstr "/好友(B)/新即时消息..."
+msgstr "/好友(B)/新即时消息(M)..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3815 ../pidgin/gtkblist.c:3848
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友(B)/加入聊天(C)..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3816
 msgid "/Buddies/Get User Info..."
-msgstr "/好友(B)/获取用户信息..."
+msgstr "/好友(B)/获取用户信息(I)..."
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3817
 msgid "/Buddies/Add Buddy..."
-msgstr "/好友(B)/添加好友..."
+msgstr "/好友(B)/添加好友(A)..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3818 ../pidgin/gtkblist.c:3851
 msgid "/Buddies/Add Chat..."
-msgstr "/好友(B)/添加聊天..."
+msgstr "/好友(B)/添加聊天(H)..."
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3819
 msgid "/Buddies/Add Group..."
-msgstr "/好友(B)/添加组..."
+msgstr "/好友(B)/添加组(G)..."
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3854
 msgid "/Tools/Privacy"
 msgstr "/工具(T)/隐私(I)"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3857
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3989 ../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] "来自 %2$s 的 %1$d 条未读消息\n"
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:4149
 msgid "Manually"
 msgstr "手动"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "按字母序"
-
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:4152
 msgid "By status"
 msgstr "按状态"
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4153
 msgid "By log size"
 msgstr "按日志大小"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4358 ../pidgin/gtkconn.c:180
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 已断开连接"
 
-#: ../pidgin/gtkblist.c:4067
+#: ../pidgin/gtkblist.c:4393
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 已经断开连接：%s</span>"
 
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4545
 msgid "<b>Username:</b>"
 msgstr "<b>用户名：</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4552
 msgid "<b>Password:</b>"
 msgstr "<b>密码：</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4563
 msgid "_Login"
 msgstr "登录(_L)"
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4646
 msgid "/Accounts"
 msgstr "/账户(A)"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4660
+#, 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 size='larger' weight='bold'>欢迎使用 %s!</span>\n"
 "\n"
-"您没有启用帐户。请通过<b>帐户->添加编辑</b>打开<b>帐户</b>窗口，从中启用您的"
+"您没有启用帐户。请通过<b>帐户->管理</b>打开<b>帐户</b>窗口，从中启用您的"
 "即时通讯帐户。当您启用帐户之后，才可以登录、设定状态、和朋友交谈。"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
-#, fuzzy
+#: ../pidgin/gtkblist.c:4923
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/好友(B)/显示离线好友(O)"
+msgstr "/好友(B)/显示(O)//离线好友(O)"
 
-#: ../pidgin/gtkblist.c:4600
-#, fuzzy
+#: ../pidgin/gtkblist.c:4926
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/好友(B)/显示空组(E)"
+msgstr "/好友(B)/显示(O)//空组(E)"
 
-#: ../pidgin/gtkblist.c:4606
-#, fuzzy
+#: ../pidgin/gtkblist.c:4932
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/好友(B)/显示好友详细资料(D)"
+msgstr "/好友(B)/显示(O)//好友详细资料(D)"
 
-#: ../pidgin/gtkblist.c:4609
-#, fuzzy
+#: ../pidgin/gtkblist.c:4935
 msgid "/Buddies/Show/Idle Times"
-msgstr "/好友(B)/显示发呆时间(T)"
+msgstr "/好友(B)/显示(O)/发呆时间(T)"
 
-#: ../pidgin/gtkblist.c:4612
-#, fuzzy
+#: ../pidgin/gtkblist.c:4938
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/好友(B)/显示空组(E)"
+msgstr "/好友(B)/显示(O)/协议图标(P)"
 
-#: ../pidgin/gtkblist.c:5507
+#: ../pidgin/gtkblist.c:5850
 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. "
@@ -13855,76 +13827,86 @@ msgstr ""
 "您想要将谁加为好友？请输入他/她的用户名。您还可为好友输入别名和昵称。只要可能"
 "的话，别名将会替代用户名显示。\n"
 
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:5873
+msgid "A_ccount:"
+msgstr "账户(_C)："
+
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
-#, fuzzy
+#: ../pidgin/gtkblist.c:5885
 msgid "_Screen name:"
-msgstr "用户名："
+msgstr "用户名(_S)："
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
-#, fuzzy
+#: ../pidgin/gtkblist.c:5907 ../pidgin/gtkblist.c:6263
 msgid "A_lias:"
-msgstr "别名："
+msgstr "别名(_L)："
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:6175
 msgid "This protocol does not support chat rooms."
 msgstr "此协议不支持聊天室。"
 
-#: ../pidgin/gtkblist.c:5842
+#: ../pidgin/gtkblist.c:6191
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: ../pidgin/gtkblist.c:5883
+#: ../pidgin/gtkblist.c:6232
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "您想要将聊天加入您的好友列表，请输入该聊天的别名和对应信息。\n"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6291
+msgid "Autojoin when account becomes online."
+msgstr "帐户在线时自动加入。"
+
+#: ../pidgin/gtkblist.c:6292
+msgid "Hide chat when the window is closed."
+msgstr "窗口关闭时隐藏聊天。"
+
+#: ../pidgin/gtkblist.c:6318
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6963
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/账户(A)/"
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:6987
 msgid "_Edit Account"
 msgstr "编辑账户(_E)"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#: ../pidgin/gtkblist.c:7000 ../pidgin/gtkconv.c:3143
 msgid "No actions available"
 msgstr "没有可用的操作"
 
-#: ../pidgin/gtkblist.c:6654
+#: ../pidgin/gtkblist.c:7008
 msgid "_Disable"
 msgstr "禁用(_D)"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:7020
 msgid "Enable Account"
 msgstr "启用账户"
 
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:7026
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帐户(A)/启用帐户"
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7075
 msgid "/Tools"
 msgstr "/工具(T)"
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:7145
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友(B)/好友排序(S)"
 
 #. Widget creation function
 #: ../pidgin/gtkcertmgr.c:530
-#, fuzzy
 msgid "SSL Servers"
-msgstr "服务器"
+msgstr "SSL 服务器"
 
-#: ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkconn.c:181
 #, c-format
 msgid ""
 "%s\n"
@@ -13936,393 +13918,380 @@ msgstr ""
 "\n"
 "%s 将不会尝试重新连接账户，除非您纠正了错误然后重新启用账户。"
 
-#: ../pidgin/gtkconv.c:482
-#, fuzzy
+#: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
-msgstr "未知命令"
+msgstr "未知命令。"
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "该好友不在此聊天的协议中。"
 
-#: ../pidgin/gtkconv.c:774
+#: ../pidgin/gtkconv.c:816
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您目前登入的协议中没有一个可以邀请好友的。"
 
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
+#: ../pidgin/gtkconv.c:899
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁？请输入他/她的名字，以及可选的邀请消息。"
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr "好友(_B)："
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1194
 #: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "消息(_M)："
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "无法打开文件。"
-
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>与 %s 的谈话</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "保存对话"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "查找"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "搜索文字(_S)："
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: ../pidgin/gtkconv.c:1625
+#: ../pidgin/gtkconv.c:1679
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "获得离开消息"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
 msgstr "上次说道"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "无法将图标文件保存到磁盘。"
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "保存图标"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "动画"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr "设置自定义图标..."
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2799
 msgid "Remove Custom Icon"
 msgstr "删除自定义图标"
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
-msgstr ""
+msgstr "全部显示"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/对话(C)/清除回滚(_R)"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr "/对话(C)/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr "/对话(C)/取消屏蔽(_U)..."
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: ../pidgin/gtkconv.c:2920
-#, fuzzy
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/对话(C)/邀请(V)..."
+msgstr "/对话(C)/插入链接(_K)..."
 
-#: ../pidgin/gtkconv.c:2922
-#, fuzzy
+#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/对话(C)/邀请(V)..."
+msgstr "/对话(C)/插入图像(_E)..."
 
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
 msgstr "/选项(O)/显示时间戳(_I)"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3131
 msgid "/Conversation/More"
 msgstr "/对话(C)/更多(O)"
 
-#: ../pidgin/gtkconv.c:3117
-#, fuzzy
+#: ../pidgin/gtkconv.c:3187
 msgid "/Options"
-msgstr "/选项(_O)"
+msgstr "/选项(O)"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3222 ../pidgin/gtkconv.c:3254
 msgid "/Conversation"
 msgstr "/对话(C)"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3262
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3268
 msgid "/Conversation/Send File..."
 msgstr "/对话(C)/发送文件(N)..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3272
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3278
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3282
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3288
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3292
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3296
 msgid "/Conversation/Unblock..."
 msgstr "/对话(C)/取消屏蔽(U)..."
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3300
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3304
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: ../pidgin/gtkconv.c:3240
-#, fuzzy
+#: ../pidgin/gtkconv.c:3310
 msgid "/Conversation/Insert Link..."
-msgstr "/对话(C)/邀请(V)..."
+msgstr "/对话(C)/插入链接(K)..."
 
-#: ../pidgin/gtkconv.c:3244
-#, fuzzy
+#: ../pidgin/gtkconv.c:3314
 msgid "/Conversation/Insert Image..."
-msgstr "/对话(C)/邀请(V)..."
+msgstr "/对话(C)/插入图像(E)..."
 
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3320
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3336
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Timestamps"
 msgstr "/选项(O)/显示时间戳(I)"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3416 ../pidgin/gtkconv.c:3458
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3461
 msgid "User has typed something and stopped"
 msgstr "用户打了几个字，停了一下"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-#, fuzzy
-msgid "_Send To"
-msgstr "发送到(_S)"
+#: ../pidgin/gtkconv.c:3645 ../pidgin/gtkconv.c:8181
+msgid "S_end To"
+msgstr "发送到(_E)"
 
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:4357
 msgid "_Send"
 msgstr "发送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4470
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5844 ../pidgin/gtkconv.c:5965
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6572 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "正打字"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6576
 msgid "Stopped Typing"
 msgstr "停止打字"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6579
 msgid "Nick Said"
 msgstr "昵称说"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6582 ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "未读消息"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6588
 msgid "New Event"
 msgstr "新事件"
 
-#: ../pidgin/gtkconv.c:7572
-#, fuzzy
+#: ../pidgin/gtkconv.c:7700
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear: 清除对话回滚。"
+msgstr "clear: 清除全部对话回滚。"
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7863
 msgid "Confirm close"
 msgstr "确认关闭"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7895
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您有未读取的消息。您确定真的想要关闭窗口吗？"
 
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8514
 msgid "Close other tabs"
 msgstr "关闭其它标签"
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8520
 msgid "Close all tabs"
 msgstr "关闭全部标签"
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8528
 msgid "Detach this tab"
 msgstr "此标签漂移"
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8534
 msgid "Close this tab"
 msgstr "关闭此标签"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:9031
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9633
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9635
 msgid "Separate IM and Chat windows"
 msgstr "分离即时消息和聊天窗口"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9637 ../pidgin/gtkprefs.c:1417
 msgid "New window"
 msgstr "新建窗口"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9639
 msgid "By group"
 msgstr "按组"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9641
 msgid "By account"
 msgstr "按账户"
 
@@ -14436,9 +14405,8 @@ msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
 #: ../pidgin/gtkdialogs.c:115
-#, fuzzy
 msgid "XMPP developer"
-msgstr "开发者"
+msgstr "XMPP 开发者"
 
 #: ../pidgin/gtkdialogs.c:116
 msgid "original author"
@@ -14559,7 +14527,7 @@ msgstr "古吉拉特语"
 
 #: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati Language Team"
-msgstr ""
+msgstr "古吉拉特语团队"
 
 #: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
 msgid "Hebrew"
@@ -14574,9 +14542,8 @@ msgid "Hungarian"
 msgstr "匈牙利语"
 
 #: ../pidgin/gtkdialogs.c:176
-#, fuzzy
 msgid "Indonesian"
-msgstr "马其顿语"
+msgstr "印度尼西亚语"
 
 #: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
 msgid "Italian"
@@ -14592,14 +14559,12 @@ msgid "Georgian"
 msgstr "乔治亚语"
 
 #: ../pidgin/gtkdialogs.c:179
-#, fuzzy
 msgid "Ubuntu Georgian Translators"
-msgstr "当前翻译者"
+msgstr "Ubuntu 乔治亚语翻译者"
 
 #: ../pidgin/gtkdialogs.c:180
-#, fuzzy
 msgid "Kannada"
-msgstr "屏蔽"
+msgstr ""
 
 #: ../pidgin/gtkdialogs.c:180
 msgid "Kannada Translation team"
@@ -14732,7 +14697,7 @@ msgstr "简体中文"
 #: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
 #: ../pidgin/gtkdialogs.c:217
 msgid "Hong Kong Chinese"
-msgstr ""
+msgstr "香港地区中文"
 
 #: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
 #: ../pidgin/gtkdialogs.c:270
@@ -14763,7 +14728,6 @@ msgid ""
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:418
-#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin<BR><BR>"
 
@@ -14780,9 +14744,8 @@ msgid "Retired Developers"
 msgstr "退休开发者"
 
 #: ../pidgin/gtkdialogs.c:468
-#, fuzzy
 msgid "Retired Crazy Patch Writers"
-msgstr "疯狂补丁编写者"
+msgstr "退休的疯狂补丁编写者"
 
 #: ../pidgin/gtkdialogs.c:483
 msgid "Artists"
@@ -14800,6 +14763,16 @@ msgstr "先前翻译者"
 msgid "Debugging Information"
 msgstr "调试信息"
 
+#: ../pidgin/gtkdialogs.c:754 ../pidgin/gtkdialogs.c:893
+#: ../pidgin/gtkdialogs.c:974
+msgid "_Name"
+msgstr "名称(_N)"
+
+#: ../pidgin/gtkdialogs.c:759 ../pidgin/gtkdialogs.c:898
+#: ../pidgin/gtkdialogs.c:979
+msgid "_Account"
+msgstr "账户(_A)"
+
 #: ../pidgin/gtkdialogs.c:906
 msgid "Get User Info"
 msgstr "获取用户信息"
@@ -14924,32 +14897,31 @@ msgstr "删除聊天"
 msgid "_Remove Chat"
 msgstr "删除聊天(_R)"
 
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "用鼠标右键单击可查看更多未读消息...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "更改状态"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
 msgstr "显示好友列表"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "新消息..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
+#: ../pidgin/gtkdocklet.c:728
+msgid "Blink on New Message"
 msgstr "有新信息时闪烁"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "退出"
 
@@ -15043,7 +15015,7 @@ msgstr "继续(_R)"
 msgid "Paste as Plain _Text"
 msgstr "粘贴为纯文本(_T)"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "_Reset formatting"
 msgstr "重置格式(_R)"
 
@@ -15122,7 +15094,6 @@ msgid "Save Image"
 msgstr "保存图像"
 
 #: ../pidgin/gtkimhtml.c:3522
-#, c-format
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
@@ -15160,7 +15131,7 @@ msgstr "请输入您想要插入链接的 URL。"
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1263
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -15182,19 +15153,17 @@ msgstr "此主题没有可用的表情。"
 msgid "Smile!"
 msgstr "表情"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1220
 msgid "_Font"
-msgstr "字体"
+msgstr "字体(_F)"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1054
-#, fuzzy
 msgid "Group Items"
-msgstr "群号"
+msgstr "项目成组"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Ungroup Items"
-msgstr ""
+msgstr "项目解组"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
@@ -15210,139 +15179,120 @@ msgstr "下划线"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1091
 msgid "Strikethrough"
-msgstr ""
+msgstr "删除线"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Increase Font Size"
-msgstr ""
+msgstr "增加字体大小"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Decrease Font Size"
-msgstr ""
+msgstr "减少字体大小"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1096
-#, fuzzy
 msgid "Font Face"
 msgstr "字体"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1097
-#, fuzzy
 msgid "Background Color"
 msgstr "背景颜色"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1098
-#, fuzzy
 msgid "Foreground Color"
-msgstr "字体颜色"
+msgstr "前景颜色"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1100
-#, fuzzy
 msgid "Reset Formatting"
 msgstr "重置格式"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1103
-#, fuzzy
 msgid "Insert IM Image"
 msgstr "插入图像"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1104
-#, fuzzy
 msgid "Insert Smiley"
 msgstr "插入表情"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1180
 msgid "<b>_Bold</b>"
-msgstr "<b>密码：</b>"
+msgstr "<b>粗体(_B)</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<i>_Italic</i>"
-msgstr " <i>(ircop)</i>"
+msgstr " <i>斜体(_I)</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<u>_Underline</u>"
-msgstr "下划线"
+msgstr "<u>下划线(_U)</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
+msgstr "<span strikethrough='true'>删除线</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<span size='larger'>_Larger</span>"
 msgstr ""
-"<span size='larger' weight='bold'>保存图像出错</span>\n"
-"\n"
-"%s"
+"<span size='larger'>较大(_L)</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "_Normal"
-msgstr "普通"
+msgstr "普通(_N)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
+msgstr "<span size='smaller'>较小(_S)</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "_Font face"
-msgstr "字体"
+msgstr "字体(_F)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "Foreground _color"
-msgstr "字体颜色"
+msgstr "前景颜色(_C)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "Bac_kground color"
-msgstr "背景颜色"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-#, fuzzy
-msgid "_Smiley"
-msgstr "表情"
+msgstr "背景颜色(_K)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1276
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1271
 msgid "_Image"
-msgstr "保存图像"
+msgstr "图像(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1277
 msgid "_Link"
-msgstr "登录(_L)"
+msgstr "链接(_L)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+#: ../pidgin/gtkimhtmltoolbar.c:1283
 msgid "_Horizontal rule"
-msgstr ""
+msgstr "水平线(_H)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1305
+msgid "_Smile!"
+msgstr "表情(_S)"
 
 #: ../pidgin/gtklog.c:293
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
-msgstr "您真的想要删除 %s 吗？"
+msgstr "您真的想要永久删除自 %2$s 起与 %1$s 的对话日志吗？"
 
 #: ../pidgin/gtklog.c:304
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
-msgstr "您真的想要删除 %s 吗？"
+msgstr "您真的想要永久删除自 %2$s 起在 %1$s 的对话日志吗？"
 
 #: ../pidgin/gtklog.c:309
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
-msgstr "您真的想要删除选中的已存状态吗？"
+msgstr "您真的想要永久删除自 %s 起的系统日志吗？"
 
 #: ../pidgin/gtklog.c:453
 #, c-format
@@ -15388,17 +15338,17 @@ msgstr "浏览日志文件夹(_B)"
 msgid "Total log size:"
 msgstr "总计日志大小："
 
-#: ../pidgin/gtklog.c:709
+#: ../pidgin/gtklog.c:710
 #, c-format
 msgid "Conversations in %s"
 msgstr "与 %s 的对话"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:718 ../pidgin/gtklog.c:785
 #, c-format
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:810
 msgid "System Log"
 msgstr "系统日志"
 
@@ -15420,6 +15370,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"
@@ -15432,10 +15383,10 @@ msgstr ""
 "  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户，用逗号分隔)\n"
 "  -v, --version       显示当前版本并退出\n"
 
-#: ../pidgin/gtkmain.c:512
+#: ../pidgin/gtkmain.c:516
 #, 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"
@@ -15456,10 +15407,9 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
-#, fuzzy
+#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
 msgid "Pidgin"
-msgstr "猪"
+msgstr "Pidgin"
 
 #: ../pidgin/gtknotify.c:349
 msgid "Open All Messages"
@@ -15469,34 +15419,34 @@ msgstr "打开全部消息"
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:545
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: ../pidgin/gtknotify.c:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>您有 %d 封新邮件。</b>"
+#: ../pidgin/gtknotify.c:569
+#, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
+msgstr[0] "<b>%d 封新邮件。</b>"
 
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:997
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "浏览器命令“%s”无效。"
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:999 ../pidgin/gtknotify.c:1011
+#: ../pidgin/gtknotify.c:1024 ../pidgin/gtknotify.c:1152
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1009 ../pidgin/gtknotify.c:1022
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "调用“%s”出错：%s"
 
-#: ../pidgin/gtknotify.c:1145
+#: ../pidgin/gtknotify.c:1153
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令，但未设置命令。"
@@ -15548,104 +15498,102 @@ msgid "Select a file"
 msgstr "选择文件"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "监视对象"
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "好友名称(_B)："
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "登出(_F)"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "离开(_W)"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "回来(_U)"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "发起了呆(_I)"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "发完了呆(_D)"
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "开始打字(_T)"
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "输入时暂停(_A)"
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "停止打字(_Y)"
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "发送消息(_M)"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "打开即时消息窗口(_N)"
 
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "弹出通知(_P)"
 
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "发送消息(_M)"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "执行命令(_X)"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "播放声音(_L)"
 
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "浏览(_E)..."
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "浏览(_O)..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "预览(_V)"
 
-#: ../pidgin/gtkpounce.c:798
-#, fuzzy
+#: ../pidgin/gtkpounce.c:805
 msgid "P_ounce only when my status is not Available"
 msgstr "仅当我的状态不可用时才监视(_O)"
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:810
 msgid "_Recurring"
 msgstr "再现(_R)"
 
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1253
 msgid "Pounce Target"
 msgstr "监视目标"
 
 #: ../pidgin/gtkprefs.c:386
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-#, fuzzy
 msgid "Default"
-msgstr "GNOME 默认"
+msgstr "默认"
 
 #: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
@@ -15653,7 +15601,7 @@ msgstr "表情主题解包失败。"
 
 #: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
-msgstr ""
+msgstr "安装主题"
 
 #: ../pidgin/gtkprefs.c:697
 msgid ""
@@ -15685,7 +15633,7 @@ msgstr "对话窗口隐藏"
 msgid "_Hide new IM conversations:"
 msgstr "隐藏新的 IM 对话(_H):"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
 msgid "When away"
 msgstr "离开时"
 
@@ -15738,178 +15686,177 @@ msgstr "新建对话(_E)："
 msgid "Show _formatting on incoming messages"
 msgstr "收到的消息显示格式(_F)"
 
-#: ../pidgin/gtkprefs.c:998
-#, fuzzy
-msgid "Show _detailed information"
-msgstr "显示登录信息"
+#: ../pidgin/gtkprefs.c:997
+msgid "Close IMs immediately when the tab is closed"
+msgstr "关闭标签时立即结束聊天"
 
 #: ../pidgin/gtkprefs.c:1000
+msgid "Show _detailed information"
+msgstr "显示详细信息(_D)"
+
+#: ../pidgin/gtkprefs.c:1002
 msgid "Enable buddy ic_on animation"
 msgstr "启用好友图标动画(_O)"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1009
 msgid "_Notify buddies that you are typing to them"
 msgstr "提醒好友您正在打字给他们(_N)"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1012
 msgid "Highlight _misspelled words"
 msgstr "突出显示拼错的单词(_M)"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1016
 msgid "Use smooth-scrolling"
 msgstr "使用平滑滚动"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1019
 msgid "F_lash window when IMs are received"
 msgstr "收到信息时闪烁窗口(_L)"
 
-#: ../pidgin/gtkprefs.c:1019
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1021
 msgid "Minimi_ze new conversation windows"
-msgstr "升起对话窗口(_A)"
+msgstr "最小化对话窗口(_Z)"
 
-#: ../pidgin/gtkprefs.c:1023
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1025
 msgid "Font"
 msgstr "字体"
 
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:1027
 msgid "Use document font from _theme"
-msgstr ""
+msgstr "使用主题中的文档字体(_T)"
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:1029
 msgid "Use font from _theme"
-msgstr ""
+msgstr "使用主题中的字体(_T)"
 
-#: ../pidgin/gtkprefs.c:1029
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1031
 msgid "Conversation _font:"
-msgstr "对话项"
+msgstr "对话字体(_F)："
 
-#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:1045
 msgid "Default Formatting"
 msgstr "默认格式"
 
-#: ../pidgin/gtkprefs.c:1062
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1064
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr "当您使用的协议支持格式时，您送出的信息将会显示为这样。"
 
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1130
 msgid "ST_UN server:"
 msgstr "STUN 服务器(_U)："
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1142
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例：stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1146
 msgid "_Autodetect IP address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1155
 msgid "Public _IP:"
 msgstr "公网 _IP："
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "Ports"
 msgstr "端口"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1190
 msgid "_Start port:"
 msgstr "起始端口(_S)："
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1197
 msgid "_End port:"
 msgstr "终止端口(_E)："
 
-#: ../pidgin/gtkprefs.c:1203
+#: ../pidgin/gtkprefs.c:1205
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkprefs.c:1209
 msgid "No proxy"
 msgstr "无代理"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1265
 msgid "_User:"
 msgstr "用户(_U)："
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
 msgid "GNOME Default"
 msgstr "GNOME 默认"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1337
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1338
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1339
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1348
 msgid "Manual"
 msgstr "手动"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1401
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1405
 msgid "_Browser:"
 msgstr "浏览器(_B)："
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "_Open link in:"
 msgstr "打开链接的方式(_O)："
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1416
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1418
 msgid "New tab"
 msgstr "新建标签"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1432
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -15918,69 +15865,63 @@ msgstr ""
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log _format:"
 msgstr "日志格式(_F)："
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1477
 msgid "Log all _instant messages"
 msgstr "记录所有即时消息(_I)"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1481
 msgid "Log all _status changes to system log"
 msgstr "将全部状态都记录到系统日志中(_S)"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1627
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
+#: ../pidgin/gtkprefs.c:1637
 msgid "Quietest"
 msgstr "最小"
 
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
+#: ../pidgin/gtkprefs.c:1639
 msgid "Quieter"
 msgstr "较小"
 
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
+#: ../pidgin/gtkprefs.c:1641
 msgid "Quiet"
 msgstr "小"
 
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
+#: ../pidgin/gtkprefs.c:1645
 msgid "Loud"
 msgstr "大"
 
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
+#: ../pidgin/gtkprefs.c:1647
 msgid "Louder"
 msgstr "较大"
 
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
+#: ../pidgin/gtkprefs.c:1649
 msgid "Loudest"
 msgstr "最大"
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1715
 msgid "_Method:"
 msgstr "方式(_M)："
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1717
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1724
 msgid "No sounds"
 msgstr "无声音"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1732
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -15989,82 +15930,81 @@ msgstr ""
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1759
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1761
 msgid "Enable sounds:"
 msgstr "启用声音:"
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1772
 msgid "Volume:"
 msgstr "音量："
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1852
 msgid "Play"
 msgstr "播放"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "_Report idle time:"
 msgstr "报告发呆时间(_R)："
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:1934
 msgid "Based on keyboard or mouse use"
 msgstr "根据键盘或鼠标使用"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:1943
 msgid "_Auto-reply:"
 msgstr "自动回复(_A)："
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1947
 msgid "When both away and idle"
 msgstr "离开和发呆时"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:1953
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1955
 msgid "Change status when _idle"
 msgstr "发呆时更改状态(_I)"
 
-#: ../pidgin/gtkprefs.c:1957
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1959
 msgid "_Minutes before becoming idle:"
 msgstr "更改状态前等几分钟(_M)："
 
-#: ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:1967
 msgid "Change _status to:"
 msgstr "将状态更改为(_S)："
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:1988
 msgid "Status at Startup"
 msgstr "启动时的状态"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:1990
 msgid "Use status from last _exit at startup"
 msgstr "启动时使用上次退出时的状态(_E)"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:1996
 msgid "Status to a_pply at startup:"
 msgstr "启动时应用的状态(_P)："
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2034
 msgid "Interface"
 msgstr "界面"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2036
 msgid "Smiley Themes"
 msgstr "表情主题"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2043
 msgid "Browser"
 msgstr "浏览器"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2047
 msgid "Status / Idle"
 msgstr "状态/发呆"
 
@@ -16232,68 +16172,67 @@ msgstr "%s 的状态"
 msgid "Waiting for network connection"
 msgstr "正在等待网络连接"
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkutils.c:633
 msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1400 ../pidgin/gtkutils.c:1423
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "装入 %s 时发生了下列错误: %s。"
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1403 ../pidgin/gtkutils.c:1425
 msgid "Failed to load image"
 msgstr "装入图像失败"
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1499
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "无法发送文件夹 %s。"
 
-#: ../pidgin/gtkutils.c:1499
-#, fuzzy, c-format
+#: ../pidgin/gtkutils.c:1500
+#, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
-msgstr "%s 无法传送文件夹。您需要选择需要传送的单个文件"
+msgstr "%s 无法传送文件夹。您需要选择需要传送的单个文件。"
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1534 ../pidgin/gtkutils.c:1546
+#: ../pidgin/gtkutils.c:1553
 msgid "You have dragged an image"
 msgstr "您拖曳了图像"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1535
 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."
 msgstr ""
 "您可以通过文件传送发送此图像，将其嵌入到此消息中，或者将其用作此用户的头像。"
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1541 ../pidgin/gtkutils.c:1561
 msgid "Set as buddy icon"
 msgstr "设置为好友头像"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
 msgid "Send image file"
 msgstr "发送图像文件"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1562
 msgid "Insert in message"
 msgstr "在消息中插入"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1547
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您是否想要将其设置为此用户的头像？"
 
-#: ../pidgin/gtkutils.c:1551
-#, fuzzy
+#: ../pidgin/gtkutils.c:1554
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"您可以通过文件传送发送此图像，将其嵌入到此消息中，或者将其用作此用户的头像。"
+"您可以通过文件传送发送此图像，或者将其用作此用户的头像。"
 
-#: ../pidgin/gtkutils.c:1552
+#: ../pidgin/gtkutils.c:1555
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16304,11 +16243,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:1610
+#: ../pidgin/gtkutils.c:1614
 msgid "Cannot send launcher"
 msgstr "无法发送启动器"
 
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1614
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -16316,7 +16255,7 @@ msgstr ""
 "您拖曳的是桌面启动器。在大多数情况下，您可能想要发送此启动器所指向的文件，而"
 "非启动器自身。"
 
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:2349
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16327,29 +16266,29 @@ msgstr ""
 "<b>文件大小:</b> %s\n"
 "<b>图像大小:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2645
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr ""
+msgstr "文件“%s”对于 %s 来说太大，请试用较小的图像。\n"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2647
 msgid "Icon Error"
 msgstr "图标错误"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2648
 msgid "Could not set icon"
 msgstr "无法设定图标"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2748
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "打开文件“%s”：%s"
 
-#: ../pidgin/gtkutils.c:2793
+#: ../pidgin/gtkutils.c:2797
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
+msgstr "装入图像“%s”失败：原因位置，可能是图像文件已损坏"
 
 #: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
@@ -16384,9 +16323,8 @@ msgid "_Open Mail"
 msgstr "打开邮件(_O)"
 
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
-#, fuzzy
 msgid "Pidgin smileys"
-msgstr "Pidgwin 选项"
+msgstr "Pidgin 表情"
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
@@ -16394,12 +16332,11 @@ msgstr ""
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
-msgstr ""
+msgstr "选择此选项将禁用图形化表情。"
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
-#, fuzzy
 msgid "none"
-msgstr "(无)"
+msgstr "无"
 
 #: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
@@ -16548,7 +16485,7 @@ msgstr "已发消息"
 msgid "Received Messages"
 msgstr "收到的消息"
 
-#: ../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 "选择 %s 的颜色"
@@ -16578,7 +16515,7 @@ msgstr "交谈放置"
 msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
-msgstr ""
+msgstr "请注意：“新建对话”的\"首选项必须设定为“按对话次数”。"
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
@@ -16812,7 +16749,7 @@ msgid ""
 "<b>Buddy Note</b>: %s"
 msgstr "好友备注"
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "历史"
 
@@ -17062,45 +16999,36 @@ msgstr "超级链接颜色"
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 水平分隔"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "对话项"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "对话历史"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "日志查看器"
-
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "请求对话框"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "提醒对话框"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "选择颜色"
 
-#: ../pidgin/plugins/pidginrc.c:300
-#, c-format
+#: ../pidgin/plugins/pidginrc.c:294
 msgid "Select Interface Font"
 msgstr "选择界面字体"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "选择 %s 的字体"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "GTK+ 界面字体"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ 文字快捷方式主题"
 
@@ -17124,36 +17052,36 @@ msgstr "GTK+ 文字快捷方式主题"
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "界面颜色"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "部件大小"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "字体"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
-msgstr ""
+msgstr "Gtkrc 文件工具"
 
-#: ../pidgin/plugins/pidginrc.c:502
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "将设置写入 %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "重新读取 gtkrc 文件"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:538
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ 主题控制"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "提供对常用 gtkrc 设置的访问。"
 
@@ -17166,7 +17094,6 @@ msgid "Lets you send raw input to text-based protocols."
 msgstr "允许您发送原样输入基于文本的协议。"
 
 #: ../pidgin/plugins/raw.c:178
-#, fuzzy
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -17175,18 +17102,18 @@ msgstr ""
 "键可以发送。看看调试窗口。"
 
 #: ../pidgin/plugins/relnot.c:71
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
 "from <a href=\"%s\">%s</a><hr>"
-msgstr "您正在使用 %s 版本 %s。当前版本为 %s。<hr>"
+msgstr "您正在使用 %s 版本 %s。当前版本为 %s。您可以从 <a href=\"%s\">%s</a> 获取新版本。<hr>"
 
 #: ../pidgin/plugins/relnot.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr ""
-"<b>更新记录:</b>\n"
-"%s<br><br>"
+"<b>更新记录:</b><br>"
+"%s"
 
 #: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
@@ -17287,7 +17214,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 "好友点点通"
 
@@ -17295,7 +17222,7 @@ msgstr "好友点点通"
 #. *< 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 "好友列表的水平滚动版本。"
 
@@ -17330,9 +17257,8 @@ msgid "Timestamp Format Options"
 msgstr "时间戳格式选项"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, fuzzy, c-format
 msgid "_Force 24-hour time format"
-msgstr "强制(传统 %s) 24小时制时间格式(_F)"
+msgstr "强制24小时制时间格式(_F)"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -17483,9 +17409,8 @@ msgid "_Flash window when chat messages are received"
 msgstr "收到聊天信息时闪烁窗口(_F)"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:371
-#, fuzzy
 msgid "Windows Pidgin Options"
-msgstr "Pidgwin 选项"
+msgstr "Windows Pidgin 选项"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
@@ -17543,332 +17468,3 @@ msgstr "发送和接受原始 XMPP 节。"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "此插件用于调试 XMPP 服务器或客户端。"
 
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "显示离线好友"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "端口"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "按状态"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "按日志大小"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "无法连接到服务器。"
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "选择 Notes 地址簿"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "当前令牌"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Novell GroupWise Messenger 协议插件"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "失败: 身份验证失败"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s 刚刚给您发送了闪屏振动！"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "未知错误"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "无法连接到服务器。"
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s 将状态从 %s 更改为 %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s 现在 %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s 不再 %s 了"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "消息(_M)："
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "传送(_S)"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "添加好友千里眼(_P)"
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "离线时不允许"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "离线时不允许"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "添加好友"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "添加聊天"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "波斯语"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/账户(A)"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "账户："
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "发送到(_S)"
-
-#~ msgid "Toggle offline buddies"
-#~ msgstr "切换离线好友"
-
-#~ msgid ""
-#~ "%s was disconnected due to the following error:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "由于下列错误 %s 已经断开:\n"
-#~ "%s"
-
-#~ msgid "Commands are not supported yet. Message was NOT sent."
-#~ msgstr "命令尚未支持。消息未送出。"
-
-#~ msgid "Timestamps"
-#~ msgstr "时间戳"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Autoreply"
-#~ msgstr "自动回复"
-
-#~ msgid "Set autoreply message for %s"
-#~ msgstr "设定 %s 的自动回复消息"
-
-#~ msgid "Set Autoreply Message"
-#~ msgstr "设定自动回复消息"
-
-#~ msgid "Set _Autoreply Message"
-#~ msgstr "设定自动回复消息(_A)"
-
-#~ msgid "Autoreply message"
-#~ msgstr "自动回复消息"
-
-#~ msgid "Send autoreply messages when"
-#~ msgstr "发送自动回复消息的情况"
-
-#~ msgid "When my account is _away"
-#~ msgstr "当我的账户离开时(_A)"
-
-#~ msgid "When my account is _idle"
-#~ msgstr "当我的帐户发呆时(_I)"
-
-#~ msgid "_Default reply"
-#~ msgstr "默认回复(_D)"
-
-#~ msgid "Status message"
-#~ msgstr "状态消息"
-
-#~ msgid "Ma_ximum count"
-#~ msgstr "最多次数(_X)"
-
-#~ msgid ""
-#~ "I am currently not available. Please leave your message, and I will get "
-#~ "back to you as soon as possible."
-#~ msgstr "我目前不在。请给我留言，我会尽快给您回复。"
-
-#~ msgid "Jabber Account"
-#~ msgstr "Jabber 账户"
-
-#~ msgid "Cannot join %s:"
-#~ msgstr "无法加入 %s："
-
-#~ msgid "Server couldn't authenticate you without a password"
-#~ msgstr "在不提供密码的情况下服务器无法通过您的身份验证"
-
-#~ msgid "Search for Jabber users"
-#~ msgstr "搜索 Jabber 用户"
-
-#~ msgid "Invalid Jabber ID"
-#~ msgstr "无效的 Jabber ID"
-
-#~ msgid "Change Jabber Password"
-#~ msgstr "更改 Jabber 密码"
-
-#~ msgid "Jabber Protocol Plugin"
-#~ msgstr "Jabber 协议插件"
-
-#~ msgid "You have just sent a Nudge!"
-#~ msgstr "您刚刚发送了闪屏振动!"
-
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "%s 的用户信息不可用："
-
-#~ msgid "Rate limiting error."
-#~ msgstr "速度限制错误。"
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "您已经登出了，原因未知。"
-
-#~ msgid ""
-#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
-#~ "for this is that you have the maximum number of allowed buddies in your "
-#~ "buddy list."
-#~ msgstr ""
-#~ "无法添加好友 %s，原因未知。最可能的原因是您的好友列表中好友的数目已经达到"
-#~ "了所允许的最大值。"
-
-#~ msgid "_Connect"
-#~ msgstr "连接(_C)"
-
-#~ msgid "Are you sure to exit this Qun?"
-#~ msgstr "您真的想要退出此群吗？"
-
-#~ msgid "Go ahead"
-#~ msgstr "继续"
-
-#~ msgid "Server ACK"
-#~ msgstr "服务器响应"
-
-#~ msgid "Send IM fail\n"
-#~ msgstr "发送对话失败\n"
-
-#~ msgid "Keep alive error, seems connection lost!"
-#~ msgstr "保持在线出错，连接已丢失!"
-
-#~ msgid "Request login token error!"
-#~ msgstr "请求登录令牌出错!"
-
-#~ msgid "%s Address"
-#~ msgstr "%s 地址"
-
-#~ msgid "QQ: Available"
-#~ msgstr "QQ: 在线"
-
-#~ msgid "QQ: Away"
-#~ msgstr "QQ: 离开"
-
-#~ msgid "QQ: Invisible"
-#~ msgstr "QQ: 隐身"
-
-#~ msgid "QQ: Offline"
-#~ msgstr "QQ: 离线"
-
-#~ msgid "Modify My Information"
-#~ msgstr "修改我的信息"
-
-#~ msgid "Login in TCP"
-#~ msgstr "以 TCP 方式登录"
-
-#~ msgid "Login Hidden"
-#~ msgstr "隐身登录"
-
-#~ msgid "Socket send error"
-#~ msgstr "套接字发送错误"
-
-#~ msgid "Connection refused"
-#~ msgstr "连接被拒绝"
-
-#~ msgid "Would like to add him?"
-#~ msgstr "您是否想要添加他？"
-
-#~ msgid "Reject watching by other users"
-#~ msgstr "拒绝其他用户监视"
-
-#~ msgid "Block invites"
-#~ msgstr "屏蔽邀请"
-
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "拒绝在线状态属性请求"
-
-#~ msgid "%s just sent you a Buzz!"
-#~ msgstr "%s 刚刚给您发送了闪屏振动！"
-
-#~ msgid "You have just sent a Buzz!"
-#~ msgstr "您刚刚发送了闪屏振动!"
-
-#~ msgid "Unavailable"
-#~ msgstr "不可用"
-
-#~ msgid "Alias..."
-#~ msgstr "别名..."
-
-#~ msgid "/Tools/Buddy Pounces"
-#~ msgstr "/工具(T)/好友千里眼(P)"
-
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "/选项(O)/显示好友图标(_I)"
-
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/选项(O)/显示好友图标(I)"
-
-#~ msgid "Jabber developer"
-#~ msgstr "Jabber 开发者"
-
-#~ msgid "Slovack"
-#~ msgstr "斯洛伐克语"
-
-#~ msgid ""
-#~ "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidwin<BR><BR>"
-
-#~ msgid "Smaller font size"
-#~ msgstr "较小字体"
-
-#~ msgid "Insert link"
-#~ msgstr "插入链接"
-
-#~ msgid "Insert image"
-#~ msgstr "插入图像"
-
-#~ msgid "Show buddy _icons"
-#~ msgstr "显示好友图标(_I)"
-
-#~ msgid ""
-#~ "You can send this image as a file transfer or embed it into this message, "
-#~ "or use it as the buddy icon for this user."
-#~ msgstr ""
-#~ "您可以通过文件传送发送此图像，将其嵌入到此消息中，或者将其用作此用户的好友"
-#~ "图标。"
-
-#~ msgid "GtkTreeView Expander Size"
-#~ msgstr "GtkTreeView 扩展柄大小"
-
-#~ msgid "GtkTreeView Indent Expanders"
-#~ msgstr "GtkTreeView 缩进扩展柄"
-
-#~ msgid "Tools"
-#~ msgstr "工具"
-
-#~ msgid ""
-#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
-#~ "pidgin.im</a>."
-#~ msgstr ""
-#~ "您可以从下面的地址获得版本 %s:<br><a href=\"http://pidgin.sourceforge.net/"
-#~ "\">http://pidgin.im</a>。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0908d4e2a2..4f286016a3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,7 +3,7 @@
 # Copyright (C) 2003-2007, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.489 2007/09/14 04:05:55 acli Exp $
+# $InternalId: zh_TW.po,v 1.514 2007/10/23 06:03:34 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -49,15 +49,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.2.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2007-09-13 14:52+0800\n"
+"POT-Creation-Date: 2007-10-21 03:21-0400\n"
+"PO-Revision-Date: 2007-10-23 01:55-0400\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>, Paladin R. Liu "
 "<paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #  NOTE Untranslated
@@ -93,7 +93,7 @@ msgstr ""
 "  -v, --version       顯示版本訊息並離開\n"
 
 #  NOTE 第二、三個 %s 係目錄名稱（不是程式名）
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -104,11 +104,11 @@ msgstr ""
 "並透過 http://developer.pidgin.im 回報這個錯誤。"
 
 #: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:235 ../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:2029
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
 #: ../libpurple/protocols/jabber/jabber.c:1515
@@ -144,8 +144,8 @@ msgstr "未有安裝任何協定模組。"
 msgid "(You probably forgot to 'make install'.)"
 msgstr "（大概是忘記了執行「make install」了。）"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1474 ../pidgin/gtkblist.c:4367
 msgid "Modify Account"
 msgstr "修改帳號"
 
@@ -176,32 +176,32 @@ msgstr "別名："
 #: ../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:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntblist.c:2287
+#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:472 ../finch/gntpounce.c:459
+#: ../finch/gntpounce.c:667 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
+#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
 #: ../libpurple/account.c:1013 ../libpurple/account.c:1263
 #: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
 #: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
 #: ../libpurple/protocols/gg/gg.c:884
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/buddy.c:2416
+#: ../libpurple/protocols/jabber/buddy.c:2452
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:1008
 #: ../libpurple/protocols/jabber/jabber.c:1017
 #: ../libpurple/protocols/jabber/jabber.c:1737
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../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/oscar/oscar.c:6148
+#: ../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
@@ -234,29 +234,29 @@ msgstr "別名："
 #: ../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:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1909
+#: ../pidgin/gtkaccount.c:2496 ../pidgin/gtkblist.c:6321
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:772
+#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
+#: ../pidgin/gtkdialogs.c:1023 ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1158 ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1253 ../pidgin/gtkdialogs.c:1280
 #: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1108
 #: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
 #: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
 #: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "取消"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:472 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
 #: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
 #: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
@@ -264,8 +264,8 @@ msgstr "取消"
 msgid "Save"
 msgstr "儲存"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1901
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s？"
@@ -278,14 +278,14 @@ msgstr "刪除帳號"
 #: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
 #: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../pidgin/gtkaccount.c:1908 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1107 ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "刪除"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2326 ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "帳號清單"
 
@@ -295,15 +295,16 @@ msgstr "以下列表的帳號可隨意啟用、停用。"
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2372
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:713
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2495
+#: ../pidgin/gtkblist.c:6320 ../pidgin/gtkconv.c:1713
 #: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "加入"
@@ -313,35 +314,35 @@ msgstr "加入"
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2442
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他（她）的好友 %s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2494
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單？"
 
 #  NOTE: 最頭的 %s%s%s%s 是對方帳號，或帳號括弧別名（第二、四個 %s 是括弧）
 #  NOTE: 最尾的 %s%s 是空白或「: 訊息」，基本上可以不理會（也不能怎樣理會）
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2552
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "使用者 %s%s%s%s 想要將 %s 加入他（她）的好友清單%s%s。"
 
 #: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2575
+#: ../pidgin/gtkaccount.c:2581
 msgid "Authorize buddy?"
 msgstr "給予認證？"
 
 #: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Authorize"
 msgstr "給予認證"
 
 #: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
 msgid "Deny"
 msgstr "拒絕"
 
@@ -365,19 +366,19 @@ msgstr "所指定的帳號目前沒有連線。"
 msgid "Error adding buddy"
 msgstr "新增好友途中發生了錯誤"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2903
+#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "帳號"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
+#: ../libpurple/protocols/msn/msn.c:1509
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1022
+#: ../pidgin/gtkdialogs.c:1046 ../pidgin/gtkdialogs.c:1068
 #: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "別名"
@@ -387,10 +388,11 @@ msgid "Group"
 msgstr "群組"
 
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:2210 ../finch/gntblist.c:2274 ../finch/gntnotify.c:174
+#: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3206
+#: ../pidgin/gtknotify.c:511 ../pidgin/gtkpounce.c:1275
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "帳號"
 
@@ -403,7 +405,7 @@ msgstr "帳號"
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5826
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "新增好友"
@@ -413,16 +415,17 @@ msgstr "新增好友"
 msgid "Please enter buddy information."
 msgstr "請輸入好友的資訊。"
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "聊天"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
+#: ../finch/gntblist.c:407 ../finch/gntblist.c:2205
+#: ../libpurple/protocols/jabber/jabber.c:924
 #: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
+#: ../libpurple/protocols/msn/msn.c:1690 ../libpurple/protocols/msn/msn.c:1755
+#: ../libpurple/protocols/msn/msn.c:1782
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
 #: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -434,7 +437,7 @@ msgstr "名稱"
 msgid "Auto-join"
 msgstr "自動加入"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6208
 msgid "Add Chat"
 msgstr "新增聊天室"
 
@@ -457,7 +460,7 @@ msgstr "那個群組已經存在"
 # TODO 請覆查核實：是「加入」抑或「新增」?
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6317
 msgid "Add Group"
 msgstr "加入群組"
 
@@ -485,15 +488,15 @@ msgid "Edit Settings"
 msgstr "修改設定"
 
 # XXX 20070518
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "資訊"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "讀取中..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:534
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -504,10 +507,10 @@ msgid "Add Buddy Pounce"
 msgstr "加入好友狀態捕捉"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
 #: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "傳送檔案"
 
@@ -552,14 +555,14 @@ msgid "Confirm Remove"
 msgstr "確認移除"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:276
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "移除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2422 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4610
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "好友清單"
@@ -581,15 +584,15 @@ msgstr "切換標記"
 #: ../libpurple/protocols/gg/gg.c:2207
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2399
 #: ../libpurple/protocols/jabber/jabber.c:937
 #: ../libpurple/protocols/jabber/jabber.c:1544
 #: ../libpurple/protocols/jabber/jabber.c:1567
 #: ../libpurple/protocols/jabber/jabber.c:1590
 #: ../libpurple/protocols/jabber/jabber.c:1613
 #: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/msn/msn.c:1517 ../libpurple/protocols/msn/msn.c:1693
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -599,21 +602,21 @@ msgstr "切換標記"
 #: ../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:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3230
 msgid "Nickname"
 msgstr "暱稱"
 
 #. Idle stuff
 #: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/bonjour/bonjour.c:354
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2927
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258
+#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927
 msgid "Idle"
 msgstr "閒置"
 
@@ -645,39 +648,28 @@ msgstr ""
 "<b>最後見到：</b>%s前"
 
 # XXX check
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:582
 #: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "新增..."
 
 # NOTE 這是很差的原文，指「已儲存」(Saved) 的「狀態」:P
 # NOTE 上下文有一些常用(?)的狀態及「新增」（新增一個狀態），彈出的視窗也有「新增」，可能應該叫「狀態一覽」或者「狀態清單」一類的……
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:583
 #: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "狀態清單..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:343 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "模組清單"
 
-# NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "名稱(_N)"
-
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "帳號(_A)"
-
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:766
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:768
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
@@ -685,15 +677,15 @@ msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
+#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
 #: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
 #: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
 #: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
 #: ../libpurple/protocols/jabber/jabber.c:1736
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../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/oscar/oscar.c:6147
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -710,45 +702,73 @@ msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 #: ../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:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4366
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:771
+#: ../pidgin/gtkdialogs.c:910 ../pidgin/gtkdialogs.c:1002
 #: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "確定"
 
+#: ../finch/gntblist.c:2270
+msgid "Channel"
+msgstr "頻道"
+
+# TODO 看起來應該為加一個新的聊天室，並把聊天室歸類到某個群組。
+# NOTE 譯文更動 by Paladin
+#: ../finch/gntblist.c:2282 ../pidgin/gtkblist.c:924
+msgid "Join a Chat"
+msgstr "加入聊天室"
+
+#: ../finch/gntblist.c:2284
+msgid "Please enter the name of the chat you want to join."
+msgstr "請輸入您想要加入的聊天室的名稱。"
+
+#: ../finch/gntblist.c:2286 ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "加入"
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:797
 msgid "Options"
 msgstr "選項"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2330
 msgid "Send IM..."
 msgstr "送出即時訊息..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "顯示空的好的群組"
+#: ../finch/gntblist.c:2334
+msgid "Join Chat..."
+msgstr "加入聊天室..."
 
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "顯示離線好友"
+#: ../finch/gntblist.c:2338
+msgid "Show"
+msgstr "顯示"
+
+#: ../finch/gntblist.c:2343
+msgid "Empty groups"
+msgstr "空的群組"
 
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "依照狀態排列"
+#: ../finch/gntblist.c:2349
+msgid "Offline buddies"
+msgstr "離線好友"
 
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "依照字母排列"
+#: ../finch/gntblist.c:2355
+msgid "Sort"
+msgstr "排序"
+
+#: ../finch/gntblist.c:2360
+msgid "By Status"
+msgstr "依照狀態"
 
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "依照日誌大小排列"
+#: ../finch/gntblist.c:2364 ../pidgin/gtkblist.c:4151
+msgid "Alphabetically"
+msgstr "依照字母"
+
+#: ../finch/gntblist.c:2368
+msgid "By Log Size"
+msgstr "依照日誌大小"
 
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
@@ -841,7 +861,7 @@ msgid "Certificate Manager"
 msgstr "憑證管理"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:666
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
@@ -850,32 +870,32 @@ msgstr "主機名稱"
 # XXX「Info」的作用似乎係取得使用者資訊，但不肯定，看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 # XXX 注：現在 (2.0.0b4) 不是了，除錯視窗的「過濾程度」竟有「Info」（資訊）級別……
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
 #: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "資訊"
 
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
+#: ../finch/gntplugin.c:211 ../finch/gntplugin.c:403 ../finch/gntpounce.c:738
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
 #: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2469
 #: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "關閉"
 
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s 結束連線。"
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
@@ -887,7 +907,7 @@ msgstr ""
 "\n"
 "在您更正這個錯誤並重新啟動這個帳號前，Finch 將不會再試著重新連線。"
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4368
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
@@ -895,23 +915,23 @@ msgstr "重新啟動帳號"
 msgid "No such command."
 msgstr "無此指令。"
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "語法錯誤：輸入的參數少於指令所需的參數數量。"
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "指令執行失敗，原因不明。"
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "這個指令只在聊天室內有效，在即時訊息中無效。"
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "這個指令只在即時訊息中有效，在聊天室內無效。"
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
@@ -930,7 +950,7 @@ msgstr "%s (%s -- %s)"
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
 #, c-format
 msgid ""
 "\n"
@@ -943,61 +963,61 @@ msgstr ""
 msgid "You have left this chat."
 msgstr "您離開了聊天室。"
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
+#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1424
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
 
-#: ../finch/gntconv.c:442
+#: ../finch/gntconv.c:469
 msgid "Send To"
 msgstr "傳送到"
 
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:513
 msgid "Conversation"
 msgstr "交談"
 
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:519
 msgid "Clear Scrollback"
 msgstr "清空交談內容"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "顯示時間戳記"
 
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:539
 msgid "Add Buddy Pounce..."
 msgstr "加入好友狀態捕捉..."
 
-#: ../finch/gntconv.c:527
+#: ../finch/gntconv.c:554
 msgid "Enable Logging"
 msgstr "開始記錄日誌"
 
-#: ../finch/gntconv.c:533
+#: ../finch/gntconv.c:560
 msgid "Enable Sounds"
 msgstr "啟動音效"
 
-#: ../finch/gntconv.c:739
+#: ../finch/gntconv.c:766
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:889
 msgid "List of users:\n"
 msgstr "使用者列表：\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有：version"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "沒有這個指令（可在這裏使用）"
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1090 ../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"
@@ -1005,60 +1025,65 @@ msgstr ""
 "要獲得某一指令的說明，輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏，可用的指令有：\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7688
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;：將指定的訊息當成一般訊息正常送出，而非當為指令處理。"
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7691
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;：模仿IRC，執行一個動作。"
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7694
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;：向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7697
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear：清空交談的回捲緩衝區"
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7703
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;：顯示某一指令的說明。"
 
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1163
 msgid "users:  Show the list of users in the chat."
 msgstr "users：顯示這個聊天室內的使用者。"
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1168
 msgid "plugins: Show the plugins window."
 msgstr "plugins：顯示「模組」視窗"
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1171
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist：顯示好友清單。"
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1174
 msgid "accounts: Show the accounts window."
 msgstr "accounts：顯示帳號清單。"
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1177
 msgid "debugwin: Show the debug window."
 msgstr "debugwin：顯示除錯視窗"
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1180
 msgid "prefs: Show the preference window."
 msgstr "prefs：顯示「偏好設定」視窗"
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1183
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses：「狀態清單」視窗"
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
+#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "無法開啟檔案。"
+
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "除錯視窗"
 
@@ -1066,15 +1091,15 @@ msgstr "除錯視窗"
 #. * 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:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "清除"
 
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
+#: ../finch/gntdebug.c:303
+msgid "Filter:"
 msgstr "過濾器："
 
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "暫停"
 
@@ -1111,24 +1136,24 @@ msgstr "剩餘"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/bonjour/bonjour.c:358
 #: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
 #: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/msn/msn.c:597 ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/novell/novell.c:2840
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/oscar/oscar.c:2715
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
+#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3302
+#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
 #: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "狀態"
@@ -1174,7 +1199,7 @@ msgstr "成功存檔至 %s。"
 msgid "Finished"
 msgstr "已完成"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:388
 msgid "Transferring"
 msgstr "傳輸中"
 
@@ -1183,73 +1208,69 @@ msgid "Emails"
 msgstr "電子郵件"
 
 # XXX 要覆查
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "您收到郵件！"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:518
 msgid "Sender"
 msgstr "發信人"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:525
 msgid "Subject"
 msgstr "主題"
 
-#: ../finch/gntnotify.c:201
+#: ../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) 有 %d 封新郵件。"
 msgstr[1] "%s (%s) 有 %d 封新郵件。"
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr "新郵件"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:948
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的資訊"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:949
 msgid "Buddy Information"
 msgstr "好友資訊"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "繼續"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "即時訊息"
 
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "加入"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "邀請"
 
 # TODO 要覆查 - 20061028
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(沒有名字)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:76 ../finch/gntplugin.c:85
 msgid "ERROR"
 msgstr "錯誤"
 
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:76
 msgid "loading plugin failed"
 msgstr "模組載入失敗"
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:85
 msgid "unloading plugin failed"
 msgstr "模組卸載失敗"
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:130
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1266,19 +1287,40 @@ msgstr ""
 "網站：%s\n"
 "檔名：%s\n"
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:188
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "設定模組前，請先載入模組。"
 
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:236
 msgid "No configuration options for this plugin."
 msgstr "此模組並無選項可供設定。"
 
-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:257
+msgid "Error loading plugin"
+msgstr "載入模組途中遭遇錯誤"
+
+#: ../finch/gntplugin.c:258
+msgid "The selected file is not a valid plugin."
+msgstr "所指定的檔案不是有效的模組。"
+
+#: ../finch/gntplugin.c:259
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr "請開啟「除錯視窗」檢視確實的錯誤訊息。"
+
+#: ../finch/gntplugin.c:322
+msgid "Select plugin to install"
+msgstr "請選擇希望安裝的模組"
+
+#: ../finch/gntplugin.c:348
 msgid "You can (un)load plugins from the following list."
 msgstr "您可透過以下列表載入或卸載模組。"
 
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:399
+msgid "Install Plugin..."
+msgstr "安裝模組..."
+
+#: ../finch/gntplugin.c:408
 msgid "Configure Plugin"
 msgstr "設定模組"
 
@@ -1287,8 +1329,8 @@ msgstr "設定模組"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:464 ../finch/gntplugin.c:471 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2069
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -1296,11 +1338,11 @@ msgstr "偏好設定"
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
@@ -1318,7 +1360,7 @@ msgid "Buddy name:"
 msgstr "好友名稱："
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "捕捉狀態..."
 
@@ -1363,7 +1405,7 @@ msgid "Sends a message"
 msgstr "送出一個訊息"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "執行動作"
 
@@ -1391,7 +1433,7 @@ msgstr "播放音效"
 msgid "Pounce only when my status is not available"
 msgstr "只在我的狀態不為「上線」時啟用"
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1288
 msgid "Recurring"
 msgstr "重覆發生"
 
@@ -1407,69 +1449,68 @@ msgstr "未有設定任何帳號"
 msgid "You must create an account first before you can create a pounce."
 msgstr "新增好友狀態捕捉前，必須先新增一個帳號。"
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1103
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "您確定您要刪除對 %2$s 的 %1$s 捕捉？"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1332
 msgid "Buddy Pounces"
 msgstr "好友狀態捕捉"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 暫停輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1471
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1473
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 變更狀態為閒置 (%s)"
 
 # XXX This string is very problematic. The other person might have changed to any non-available
 # XXX status like "Busy" (not necessarily "Away"), and "已經離開" seems misleading. - 20061123
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1475
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1477
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給您。 (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
-#, c-format
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1478
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題！"
 
@@ -1477,12 +1518,12 @@ msgstr "未知的捕捉事件。請回報這個問題！"
 msgid "Based on keyboard use"
 msgstr "以鍵盤的使用為基準"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
 #: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "從不"
@@ -1532,25 +1573,25 @@ msgid "Change status to"
 msgstr "更改狀態為"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "交談"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046
 msgid "Logging"
 msgstr "日誌"
 
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:585
 msgid "Not implemented yet."
 msgstr "該功能尚未實作"
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1555
 #: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1556
 #: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "開啟檔案..."
@@ -1595,16 +1636,16 @@ msgstr "其他人進入聊天室"
 msgid "Someone says your screen name in chat"
 msgstr "有人在聊天室中提到您的名字"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:308
 msgid "GStreamer Failure"
 msgstr "GStreamer 錯誤"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:309
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer 初始化失敗。"
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589
+#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874
 msgid "(default)"
 msgstr "(預設)"
 
@@ -1620,7 +1661,7 @@ msgstr "音效設定"
 msgid "Profiles"
 msgstr "個人資料"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
 msgid "Automatic"
 msgstr "自動"
 
@@ -1628,7 +1669,7 @@ msgstr "自動"
 msgid "Console Beep"
 msgstr "嗶一聲"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
 msgid "Command"
 msgstr "指令"
 
@@ -1636,7 +1677,7 @@ msgstr "指令"
 msgid "No Sound"
 msgstr "無音效"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
 msgid "Sound Method"
 msgstr "音效播放方式"
 
@@ -1654,7 +1695,7 @@ msgstr ""
 "(請以 %s 代表檔名)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
 msgid "Sound Options"
 msgstr "音效選項"
 
@@ -1663,17 +1704,17 @@ msgid "Sounds when conversation has focus"
 msgstr "當交談取得輸入焦點發出音效"
 
 #: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "務必"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763
 msgid "Only when available"
 msgstr "上線而非離開期間"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
 msgid "Only when not available"
 msgstr "離開期間"
 
@@ -1682,11 +1723,11 @@ msgid "Volume(0-100):"
 msgstr "音量(0-100)："
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
 msgid "Event"
 msgstr "事件"
 
@@ -1694,15 +1735,15 @@ msgstr "事件"
 msgid "File"
 msgstr "檔案"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
 msgid "Test"
 msgstr "測試"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
 msgid "Reset"
 msgstr "重置"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
 msgid "Choose..."
 msgstr "選擇..."
 
@@ -1724,7 +1765,7 @@ msgstr "狀態清單"
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/novell/novell.c:1486
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "職銜"
@@ -1743,9 +1784,9 @@ msgstr "格式"
 #. not independent
 #. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/bonjour/bonjour.c:270
+#: ../libpurple/protocols/bonjour/bonjour.c:277
+#: ../libpurple/protocols/bonjour/bonjour.c:360
 #: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
 #: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
@@ -1756,26 +1797,29 @@ msgstr "格式"
 #: ../libpurple/protocols/jabber/jabber.c:1601
 #: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/msn/msn.c:635 ../libpurple/protocols/msn/msn.c:642
+#: ../libpurple/protocols/msn/msn.c:649 ../libpurple/protocols/msn/msn.c:656
+#: ../libpurple/protocols/msn/msn.c:662 ../libpurple/protocols/msn/msn.c:668
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../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:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/novell/novell.c:2946
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/novell/novell.c:2958
+#: ../libpurple/protocols/oscar/oscar.c:5608
+#: ../libpurple/protocols/oscar/oscar.c:5826
+#: ../libpurple/protocols/oscar/oscar.c:5840
+#: ../libpurple/protocols/oscar/oscar.c:5856
+#: ../libpurple/protocols/oscar/oscar.c:5863
+#: ../libpurple/protocols/oscar/oscar.c:5870
 #: ../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:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
@@ -1831,7 +1875,7 @@ msgstr "儲存並使用"
 msgid "Certificates"
 msgstr "憑證"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
 msgid "Sounds"
 msgstr "音效"
 
@@ -1849,9 +1893,8 @@ msgid "Couldn't find X display"
 msgstr "找不到 X Display 的設定"
 
 #: ../finch/plugins/gntclipboard.c:122
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "無法開啟檔案"
+msgstr "無法找到視窗"
 
 #: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
@@ -1935,16 +1978,16 @@ msgstr "GntGf"
 msgid "Toaster plugin"
 msgstr "多士爐式彈出通知模組"
 
-#: ../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>與 %s 於 %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 "使用歷史記錄模組，先要啟用日誌功能"
 
-#: ../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"
@@ -1959,11 +2002,11 @@ msgstr ""
 msgid "GntHistory"
 msgstr "歷史記錄"
 
-#: ../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 "顯示最近所記錄的交談到新的交談視窗中"
 
-#: ../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."
@@ -1976,7 +2019,7 @@ msgstr ""
 #. Translator Note: The "backlog" is the conversation buffer/history.
 #: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr ""
+msgstr "lastlog：在交談的回捲緩衝區搜尋字串。"
 
 #: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
@@ -2014,7 +2057,7 @@ msgid "Missing protocol plugin for %s"
 msgstr "找不到 %s 的協定模組"
 
 #: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkblist.c:4363
 msgid "Connection Error"
 msgstr "連線錯誤"
 
@@ -2067,16 +2110,16 @@ msgstr "設定使用者資訊"
 # XXX - Ambrose 20061123
 #: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2836
 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3250 ../pidgin/gtkblist.c:5716
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2086,18 +2129,18 @@ msgstr "好友"
 msgid "buddy list"
 msgstr "好友清單"
 
-#: ../libpurple/certificate.c:545
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr "（並不相符）"
 
 #  XXX 這是暫譯 - acli 20070913
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr "%s 出示了以下隨用即棄的憑證："
 
-#: ../libpurple/certificate.c:550
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2108,40 +2151,40 @@ msgstr ""
 
 #  XXX 這是暫譯 - acli 20070913
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
 msgstr "核實即棄憑證"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
+#: ../libpurple/certificate.c:885
 msgid "Certificate Authorities"
 msgstr "憑證機構"
 
 #  TODO Untranslated - acli 20070913
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:1053
 msgid "SSL Peers Cache"
 msgstr "SSL Peer 快取"
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
+#: ../libpurple/certificate.c:1184
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "接受 %s 的憑證嗎？"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
+#: ../libpurple/certificate.c:1190
 msgid "SSL Certificate Verification"
 msgstr "核實 SSL 憑證"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
+#: ../libpurple/certificate.c:1199
 msgid "Accept"
 msgstr "接受"
 
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1200 ../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
@@ -2149,7 +2192,7 @@ msgstr "接受"
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../libpurple/certificate.c:1188
+#: ../libpurple/certificate.c:1201
 msgid "_View Certificate..."
 msgstr "檢視憑證(_V)"
 
@@ -2158,7 +2201,7 @@ msgstr "檢視憑證(_V)"
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
+#: ../libpurple/certificate.c:1301
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
@@ -2169,14 +2212,14 @@ msgstr ""
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
+#: ../libpurple/certificate.c:1326
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr "「%s」出示的憑證是自簽的，無法自動進行核實。"
 
-#: ../libpurple/certificate.c:1331
+#: ../libpurple/certificate.c:1344
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "「%s」出示的憑證鍊是無效的。"
@@ -2186,28 +2229,29 @@ msgstr "「%s」出示的憑證鍊是無效的。"
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+#: ../libpurple/certificate.c:1352 ../libpurple/certificate.c:1421
 msgid "SSL Certificate Error"
 msgstr "SSL 憑證錯誤"
 
-#: ../libpurple/certificate.c:1340
+#: ../libpurple/certificate.c:1353
 msgid "Invalid certificate chain"
 msgstr "無效的憑證鏈"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
+#: ../libpurple/certificate.c:1373
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
+"無法核實這張憑證，因為您沒有根憑證機構憑證 (root certificate) 的資料庫。"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
+#: ../libpurple/certificate.c:1396
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
+msgstr "這張憑證聲稱由一所 Pidgin 不認識的根憑證機構簽發。"
 
-#: ../libpurple/certificate.c:1408
+#: ../libpurple/certificate.c:1413
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2217,12 +2261,12 @@ msgstr ""
 "「%s」出示的憑證鍊聲稱它是由某憑證機構簽發，但實際上卻沒有該憑證機構的有效簽"
 "章。"
 
-#: ../libpurple/certificate.c:1417
+#: ../libpurple/certificate.c:1422
 msgid "Invalid certificate authority signature"
 msgstr "憑證機構的簽章是無效的"
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1886
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2240,7 +2284,7 @@ msgstr ""
 "失效日期：%s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
+#: ../libpurple/certificate.c:1895
 msgid "Certificate Information"
 msgstr "憑證資訊"
 
@@ -2250,7 +2294,7 @@ msgstr "註冊錯誤"
 
 #: ../libpurple/connection.c:180
 msgid "Unregistration Error"
-msgstr "未註冊錯誤"
+msgstr "移除註冊錯誤"
 
 #: ../libpurple/connection.c:350
 #, c-format
@@ -2263,9 +2307,9 @@ msgid "+++ %s signed off"
 msgstr "+++ %s 登出"
 
 #: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/protocols/jabber/buddy.c:2340
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:363
 msgid "Unknown error"
 msgstr "未知錯誤"
 
@@ -2342,7 +2386,7 @@ msgstr "無法取得名稱：%s"
 msgid "Failed to get serv name: %s"
 msgstr "無法取得伺服器名稱：%s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "因下列原因，Purple 的 D-BUS 伺服器未有執行"
 
@@ -2359,7 +2403,7 @@ msgstr "無法建立解析程序\n"
 msgid "Unable to send request to resolver process\n"
 msgstr "無法送出訊息給解析程序\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2368,8 +2412,8 @@ msgstr ""
 "解析 %s 途中發生了錯誤：\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "解析 %s 途中發生了錯誤：%d"
@@ -2384,16 +2428,15 @@ msgstr ""
 "%s"
 
 #: ../libpurple/dnsquery.c:578
-#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "由解析程序讀取時碰到檔案結尾"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "無法建立執行緒：%s"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "原因不明"
 
@@ -2494,7 +2537,6 @@ msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
 #: ../libpurple/ft.c:685
-#, c-format
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
@@ -2504,7 +2546,6 @@ msgid "You canceled the transfer of %s"
 msgstr "你取消了 %s 的傳送"
 
 #: ../libpurple/ft.c:1108
-#, c-format
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
@@ -2746,7 +2787,6 @@ msgid "You are using %s, but this plugin requires %s."
 msgstr "您目前使用的是 %s，但這模組需要 %s。"
 
 #: ../libpurple/plugin.c:380
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "這個模組未有定義它的 ID。"
 
@@ -2826,14 +2866,14 @@ msgstr "儲存(_S)"
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../libpurple/protocols/oscar/oscar.c:1456
+#: ../libpurple/protocols/oscar/oscar.c:2248
+#: ../libpurple/protocols/oscar/oscar.c:2297
+#: ../libpurple/protocols/oscar/oscar.c:5940
+#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/oscar.c:6221
+#: ../libpurple/protocols/oscar/oscar.c:6291 ../libpurple/request.h:1388
+#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -2890,8 +2930,8 @@ msgstr ""
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "（只發生在未與傳送者進行交談的情況下）"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1766
+#: ../libpurple/protocols/msn/msn.c:1796
 msgid "Notes"
 msgstr "備註"
 
@@ -3125,44 +3165,44 @@ 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 "使用者是離線的。"
 
-#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "自動回應送出："
 
-#: ../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 已經登出。"
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "一個或多個訊息可能傳送失敗。"
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "您已經停止與伺服器的連線。"
 
-#: ../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 "您目前是離線狀態。在您重新登入前，將無法收到任何訊息。"
 
-#: ../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 "由於達到長度上限，所以訊息無法送出。"
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "訊息無法送出。"
 
@@ -3170,68 +3210,76 @@ msgstr "訊息無法送出。"
 #. 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 "基本的日誌讀取設定"
 
-#: ../libpurple/plugins/log_reader.c:2458
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "快速計算日誌大小"
 
 #  XXX 譯文計有「啟發式XX」、「經驗法則」、「發現技法」、「探索法」、「探究法」等（後兩者似乎只限用於數學）
 #  XXX 這裏的「name heuristics」是指一些幫助 Pidgin「估計」帳號身分的經驗性規則；單從字義判斷，合用的譯文只有「經驗法則」
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "匹配帳號時使用經驗法則 (heuristics)"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "日誌目錄"
 
@@ -3241,20 +3289,20 @@ msgstr "日誌目錄"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "日誌檢視器"
 
 #. *< 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 "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 
 # XXX 譯文有待改進（第二段） - 20061025
 #. * 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"
@@ -3336,9 +3384,9 @@ msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "您可以在「好友狀態捕捉」的對話視窗中編輯或刪除狀態捕捉"
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:623
+#: ../libpurple/protocols/novell/novell.c:1919
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
 #: ../libpurple/protocols/silc10/buddy.c:314
@@ -3348,9 +3396,9 @@ msgid "Yes"
 msgstr "是"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:623
+#: ../libpurple/protocols/novell/novell.c:1920
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
@@ -3459,10 +3507,10 @@ msgid "Tests to see that most things are working."
 msgstr "用來測試是否大部份的東西都能正常運作。"
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "X.509 憑證"
 
 #. *< type
 #. *< ui_requirement
@@ -3470,7 +3518,7 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3478,8 +3526,8 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
 msgid "Provides SSL support through GNUTLS."
 msgstr "透過 GNUTLS 提供 SSL 的支援。"
 
@@ -3489,7 +3537,7 @@ msgstr "透過 GNUTLS 提供 SSL 的支援。"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3497,8 +3545,8 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
 
@@ -3582,15 +3630,15 @@ msgid ""
 "idle."
 msgstr "在交談視窗中顯示好友離開或是由離開（閒置）返回的通知訊息。"
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "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 "提供讀入 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"
@@ -3598,36 +3646,44 @@ msgstr ""
 "找不到 ActiveTCL；如果打算使用 TCL 寫成的模組，請到 http://www.activestate."
 "com 下載及安裝 ActiveTCL。\n"
 
+# FIXME 沒有譯「toolkit」- 20071023 acli
+#: ../libpurple/protocols/bonjour/bonjour.c:107
+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 "找不到 Apple 的 Bonjour For Windows toolkit，詳情請到網址 http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging 查閱 FAQ 部分。"
+
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+#: ../libpurple/protocols/bonjour/bonjour.c:124
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "無法接收連入的即時訊息連線\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
+#: ../libpurple/protocols/bonjour/bonjour.c:149
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "無法與近端的 mDNS 伺服器建立連線。它在執行中嗎？"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/bonjour/bonjour.c:365
+#: ../libpurple/protocols/bonjour/bonjour.c:670
 #: ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/jabber/jabber.c:942
 msgid "First name"
 msgstr "名"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/bonjour/bonjour.c:367
+#: ../libpurple/protocols/bonjour/bonjour.c:673
 #: ../libpurple/protocols/gg/gg.c:627
 #: ../libpurple/protocols/jabber/jabber.c:947
 msgid "Last name"
 msgstr "姓"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/bonjour/bonjour.c:371
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3636,13 +3692,13 @@ msgstr "姓"
 msgid "E-Mail"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:374
+#: ../libpurple/protocols/bonjour/bonjour.c:679
 msgid "AIM Account"
 msgstr "AIM 帳號"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:377
+#: ../libpurple/protocols/bonjour/bonjour.c:682
 msgid "XMPP Account"
 msgstr "XMPP 帳號"
 
@@ -3656,18 +3712,18 @@ msgstr "XMPP 帳號"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:481
+#: ../libpurple/protocols/bonjour/bonjour.c:483
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 協定模組"
 
 #  XXX 這原文很奇怪 - ambrose 20070414
 #  NOTE 對應 evolution PO 檔之譯法，詳見上面「Local Addressbook」條
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:624
 msgid "Purple Person"
 msgstr "連絡人"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/bonjour/bonjour.c:676
 #: ../libpurple/protocols/gg/gg.c:477
 #: ../libpurple/protocols/jabber/jabber.c:932
 #: ../libpurple/protocols/silc/silc.c:770
@@ -3688,32 +3744,32 @@ msgid "%s has closed the conversation."
 msgstr "%s 已經關閉這個交談。"
 
 #: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:662
+#: ../libpurple/protocols/bonjour/jabber.c:680
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息，交談無法開始。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:585
 msgid "Cannot open socket"
 msgstr "無法開啟Socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:593
 msgid "Error setting socket options"
 msgstr "設定 Socket 選項時錯誤"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:617
 msgid "Could not bind socket to port"
 msgstr "無法聯結 Socket 到通訊埠"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:625
 msgid "Could not listen on socket"
 msgstr "無法監聽 Socket"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
+#: ../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."
@@ -3812,8 +3868,8 @@ msgstr "請輸入以下的欄位"
 #: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
 #: ../libpurple/protocols/gg/gg.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
@@ -3822,9 +3878,9 @@ msgstr "城市"
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1695
+#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../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
@@ -3837,14 +3893,14 @@ msgid "Male or female"
 msgstr "男性或女性"
 
 #: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "男"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3904,26 +3960,26 @@ msgid "Add to chat..."
 msgstr "新增到聊天室..."
 
 #: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2833
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/oscar/oscar.c:5658
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "離線"
 
 #: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/novell/novell.c:2821
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "上線"
 
@@ -3932,32 +3988,31 @@ msgstr "上線"
 #. Away stuff
 #: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2824
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
+#: ../libpurple/protocols/oscar/oscar.c:4562
+#: ../libpurple/protocols/oscar/oscar.c:5686
 #: ../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:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1941
 #: ../pidgin/gtkstatusbox.c:1058
-#, c-format
 msgid "Away"
 msgstr "離開"
 
 #: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/oscar/oscar.c:2714
+#: ../libpurple/protocols/oscar/oscar.c:3714
 msgid "UIN"
 msgstr "帳號"
 
 #: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3968,7 +4023,7 @@ msgid "Birth Year"
 msgstr "出生年"
 
 #: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/oscar/oscar.c:3926
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
@@ -4013,7 +4068,7 @@ msgstr "您的好友清單已被存放於伺服器上。"
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:622
 msgid "Blocked"
 msgstr "封鎖"
 
@@ -4151,7 +4206,7 @@ msgstr "%s 的是日訊息"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
 #: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/myspace/myspace.c:2361
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
@@ -4177,14 +4232,14 @@ msgstr "IRC 暱稱不可含有空白字元"
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
 #: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/msn/session.c:386
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:1290
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
+#: ../libpurple/protocols/simple/simple.c:1732
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "連線中"
@@ -4199,21 +4254,21 @@ msgstr "沒有 SSL 支援"
 #. 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:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/myspace/myspace.c:318
+#: ../libpurple/protocols/simple/simple.c:465
+#: ../libpurple/protocols/simple/simple.c:1647
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
 #: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/myspace/myspace.c:2474
+#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
 #: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../libpurple/protocols/myspace/myspace.c:2357
 msgid "Read error"
 msgstr "讀取錯誤"
 
@@ -4253,22 +4308,22 @@ msgstr "較好的 IRC 協定模組"
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
+#: ../libpurple/protocols/msn/msn.c:2293
+#: ../libpurple/protocols/oscar/oscar.c:6725
 #: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
+#: ../libpurple/protocols/simple/simple.c:1919
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "伺服器"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2298
+#: ../libpurple/protocols/oscar/oscar.c:6728
 #: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
@@ -4343,7 +4398,7 @@ msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3715
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4447,78 +4502,78 @@ msgstr "只有被邀請者才可加入 %s。"
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:798
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出：(%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 踢出 (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:826
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %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 "暱稱無效"
 
-#: ../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."
 msgstr "伺服器拒絕了您所指定的暱稱，暱稱中大概含有無效字元。"
 
-#: ../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."
 msgstr "伺服器拒絕了您所指定的帳號名稱，名稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:978
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1020
 msgid "Error: invalid PONG from server"
 msgstr "錯誤：來自伺服器的 PONG 無效"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1022
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲：%lu秒"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1113
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "無法加入 %s：必須註冊。"
 
-#: ../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 "無法加入頻道"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#: ../libpurple/protocols/irc/msgs.c:1145
+#: ../libpurple/protocols/irc/msgs.c:1148
 msgid "Nick or channel is temporarily unavailable."
 msgstr "暫時無法使用該個暱稱或頻道。"
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1160
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
@@ -4623,7 +4678,7 @@ msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [頻道]：列出目前在頻道中的使用者清單。"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2304
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;：改變您的暱稱。"
 
@@ -4732,21 +4787,21 @@ msgstr "whois [伺服器名稱] &lt;暱稱&gt;：取得使用者資訊。"
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;暱稱&gt;：取得已離線的使用者的資訊。"
 
-#: ../libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時：%lu 秒"
 
-#: ../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 "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:632
+#: ../libpurple/protocols/irc/parse.c:636 ../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."
@@ -4762,11 +4817,11 @@ msgstr "未知錯誤"
 #: ../libpurple/protocols/jabber/adhoccommands.c:139
 #: ../libpurple/protocols/jabber/adhoccommands.c:140
 msgid "Ad-Hoc Command Failed"
-msgstr ""
+msgstr "臨時指令失敗"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
+#: ../libpurple/protocols/jabber/adhoccommands.c:176
 msgid "execute"
-msgstr ""
+msgstr "執行"
 
 #: ../libpurple/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
@@ -4907,15 +4962,15 @@ msgstr "職責"
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/oscar/oscar.c:3764
 msgid "Birthday"
 msgstr "生日"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3314
 #: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "描述"
@@ -4931,7 +4986,7 @@ msgid ""
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
-# NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式（例：gaim）
+# NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式（例：Pidgin）
 #: ../libpurple/protocols/jabber/buddy.c:795
 #: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
@@ -4942,37 +4997,40 @@ msgstr "用戶端"
 msgid "Operating System"
 msgstr "作業系統"
 
+# NOTE 這是功能名稱（直譯）
 #: ../libpurple/protocols/jabber/buddy.c:815
 #: ../libpurple/protocols/jabber/buddy.c:975
 msgid "Last Activity"
-msgstr ""
+msgstr "最近活動"
 
 #: ../libpurple/protocols/jabber/buddy.c:817
 #: ../libpurple/protocols/jabber/buddy.c:977
 msgid "Service Discovery Info"
 msgstr "服務探尋資訊"
 
+#  FIXME acli 2070914
 #: ../libpurple/protocols/jabber/buddy.c:819
 #: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Items"
-msgstr ""
+msgstr "服務探尋項目"
 
+# NOTE 這是功能名稱（直譯）
 #: ../libpurple/protocols/jabber/buddy.c:821
 #: ../libpurple/protocols/jabber/buddy.c:981
-#, fuzzy
 msgid "Extended Stanza Addressing"
-msgstr "地址(續)"
+msgstr "延伸段落定址"
 
+# NOTE 這是功能名稱
 #: ../libpurple/protocols/jabber/buddy.c:823
 #: ../libpurple/protocols/jabber/buddy.c:983
 msgid "Multi-User Chat"
-msgstr ""
+msgstr "多用戶聊天"
 
+# NOTE 這是功能名稱（直譯）
 #: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/jabber/buddy.c:985
-#, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
-msgstr "這個使用者沒有他的相關資訊。"
+msgstr "多用戶聊天延伸上線狀態資訊"
 
 # NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm
 #: ../libpurple/protocols/jabber/buddy.c:827
@@ -4982,9 +5040,8 @@ msgstr "帶內位元組串流"
 
 #: ../libpurple/protocols/jabber/buddy.c:829
 #: ../libpurple/protocols/jabber/buddy.c:989
-#, fuzzy
 msgid "Ad-Hoc Commands"
-msgstr "指令"
+msgstr "臨時指令"
 
 #: ../libpurple/protocols/jabber/buddy.c:831
 #: ../libpurple/protocols/jabber/buddy.c:991
@@ -5009,9 +5066,8 @@ msgstr "XHTML-IM"
 
 #: ../libpurple/protocols/jabber/buddy.c:839
 #: ../libpurple/protocols/jabber/buddy.c:999
-#, fuzzy
 msgid "In-Band Registration"
-msgstr "註冊錯誤"
+msgstr "帶內註冊"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
 #: ../libpurple/protocols/jabber/buddy.c:1001
@@ -5025,9 +5081,8 @@ msgstr "使用者化身"
 
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-#, fuzzy
 msgid "Chat State Notifications"
-msgstr "好友狀態通知"
+msgstr "聊天狀態通知"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
@@ -5055,15 +5110,15 @@ msgstr "使用者情緒"
 # XXX may be wrong
 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
-#, fuzzy
 msgid "User Activity"
-msgstr "使用者數目上限"
+msgstr "使用者活動狀態"
 
+#  NOTE 直譯：個體能力
+#  FIXME 譯文有待改進 - acli 20070918
 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
-#, fuzzy
 msgid "Entity Capabilities"
-msgstr "相容性"
+msgstr "個體能力"
 
 #  FIXME 這聽來不對 - acli 20070913
 #: ../libpurple/protocols/jabber/buddy.c:859
@@ -5073,21 +5128,24 @@ msgstr "加密工作階段協商"
 
 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-#, fuzzy
 msgid "User Tune"
-msgstr "使用者"
+msgstr "使用者樂曲"
 
+#  NOTE「Roster」指「名冊」，但Open Source software似乎一般譯「好友清單」、「成員列表」等
+#  FIXME 譯文有待改進 - acli 20070918
 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
-#, fuzzy
 msgid "Roster Item Exchange"
-msgstr "要交換密鑰之即時訊息"
+msgstr "好友清單項目交換"
 
+#  NOTE 參見 http://jabber.org/protocol/reach
+#  NOTE「Reachability Address」指即時通訊以外的通訊方式所用的「位址」（例如電話號碼）
+#  NOTE 直譯：可抵達性位址
+#  XXX 是否譯「其他通訊方法」較好？但要先看上下文 - acli 20070918
 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-#, fuzzy
 msgid "Reachability Address"
-msgstr "電子郵件"
+msgstr "可抵達性位址"
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
@@ -5178,9 +5236,8 @@ msgstr "Ping"
 
 #: ../libpurple/protocols/jabber/buddy.c:899
 #: ../libpurple/protocols/jabber/buddy.c:1059
-#, fuzzy
 msgid "Stanza Encryption"
-msgstr "Trillian 加密"
+msgstr "段落加密"
 
 #: ../libpurple/protocols/jabber/buddy.c:901
 #: ../libpurple/protocols/jabber/buddy.c:1061
@@ -5217,11 +5274,11 @@ msgstr "簡化加密工作階段協商"
 #: ../libpurple/protocols/jabber/buddy.c:913
 #: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Hop Check"
-msgstr ""
+msgstr "中繼段檢查"
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2921
 msgid "Capabilities"
 msgstr "相容性"
 
@@ -5255,8 +5312,8 @@ msgstr "英文別名"
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
 #: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5276,20 +5333,20 @@ msgstr "照片"
 msgid "Logo"
 msgstr "標誌"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
@@ -5298,52 +5355,51 @@ msgstr "要求或重新要求認證"
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
+#: ../libpurple/protocols/jabber/buddy.c:1988
 msgid "Log In"
 msgstr "登入"
 
-#: ../libpurple/protocols/jabber/buddy.c:1989
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log Out"
 msgstr "登出"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/jabber/buddy.c:2038
 #: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "想聊天"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
+#: ../libpurple/protocols/jabber/buddy.c:2044
 #: ../libpurple/protocols/jabber/jabber.c:1622
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
+#: ../libpurple/protocols/oscar/oscar.c:5862
 #: ../libpurple/protocols/sametime/sametime.c:3297
-#, c-format
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/oscar/oscar.c:3726
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "以下為搜尋結果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
+#: ../libpurple/protocols/jabber/buddy.c:2322
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5351,39 +5407,39 @@ msgstr ""
 "請在適用欄位填寫搜尋條件，以便搜尋想找的聯絡人。注意：所有欄位均支援以萬用字"
 "元 (%) 搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:2342
 msgid "Directory Query Failed"
 msgstr "查詢目錄伺服器失敗"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2343
 msgid "Could not query the directory server."
 msgstr "無法查詢目錄伺服器"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "伺服器指令：%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2384
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "填入一個或多個欄位，以搜尋XMPP使用者。"
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/novell/novell.c:1490
+#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3738
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2414
 msgid "Search for XMPP users"
 msgstr "搜尋XMPP使用者"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2415
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
@@ -5396,24 +5452,24 @@ msgid "Search"
 msgstr "搜尋"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2430
 msgid "Invalid Directory"
 msgstr "無效目錄"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2447
 msgid "Enter a User Directory"
 msgstr "進入使用者目錄。"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Select a user directory to search"
 msgstr "選擇一個使用者目錄以進行搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2451
 msgid "Search Directory"
 msgstr "搜尋目錄"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/oscar/oscar.c:5346
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "聊天室(_R)："
@@ -5533,9 +5589,9 @@ msgid "Read Error"
 msgstr "讀取錯誤"
 
 #: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5598,8 +5654,8 @@ msgid "Already Registered"
 msgstr "已經註冊"
 
 #: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "State"
 msgstr "省／州"
 
@@ -5677,7 +5733,7 @@ msgid "Initializing SSL/TLS"
 msgstr "SSL/TLS 初始中"
 
 #: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:392
 msgid "Authenticating"
 msgstr "認證中"
 
@@ -5690,7 +5746,7 @@ msgstr "串流重新初始中"
 #: ../libpurple/protocols/jabber/jabber.c:1909
 #: ../libpurple/protocols/jabber/jabber.c:1945
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5656
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -5743,7 +5799,7 @@ msgstr "認證狀態"
 #: ../libpurple/protocols/jabber/jabber.c:1579
 #: ../libpurple/protocols/jabber/jabber.c:1602
 #: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
+#: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1212
 #: ../libpurple/protocols/silc10/buddy.c:1557
@@ -5751,6 +5807,7 @@ msgstr "認證狀態"
 msgid "Mood"
 msgstr "心情"
 
+# XXX 要覆查 - acli 20070914
 #: ../libpurple/protocols/jabber/jabber.c:1534
 #: ../libpurple/protocols/jabber/jabber.c:1557
 #: ../libpurple/protocols/jabber/jabber.c:1580
@@ -5791,14 +5848,14 @@ msgstr "專輯名稱"
 msgid "Tune Genre"
 msgstr "樂曲種類"
 
+# XXX 譯文有待改進
 #: ../libpurple/protocols/jabber/jabber.c:1539
 #: ../libpurple/protocols/jabber/jabber.c:1562
 #: ../libpurple/protocols/jabber/jabber.c:1585
 #: ../libpurple/protocols/jabber/jabber.c:1608
 #: ../libpurple/protocols/jabber/jabber.c:1631
-#, fuzzy
 msgid "Tune Comment"
-msgstr "好友說明"
+msgstr "樂曲註釋"
 
 # NOTE 參見 http://www.xmpp.org/extensions/xep-0118.html
 # FIXME 
@@ -5839,9 +5896,8 @@ msgstr "樂曲網址"
 #: ../libpurple/protocols/jabber/jabber.c:1591
 #: ../libpurple/protocols/jabber/jabber.c:1614
 #: ../libpurple/protocols/jabber/jabber.c:1637
-#, fuzzy
 msgid "Allow Buzz"
-msgstr "允許"
+msgstr "允許「嗶」功能"
 
 #: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Password Changed"
@@ -5870,7 +5926,7 @@ msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
 #: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6442
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
@@ -5878,7 +5934,7 @@ msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
+#: ../libpurple/protocols/oscar/oscar.c:6453
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
@@ -6187,48 +6243,67 @@ msgstr "無法踢出使用者 %s"
 msgid "Unable to ping user %s"
 msgstr "無法 Ping 使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+#: ../libpurple/protocols/jabber/jabber.c:2203
+#: ../libpurple/protocols/jabber/jabber.c:2214
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+msgstr "無法「嗶」使用者 %s ，因為沒有有關對方的任何資料。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
+#: ../libpurple/protocols/jabber/jabber.c:2209
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+msgstr "無法「嗶」使用者 %s ，因為對方目前可能離線。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:2240
+#, c-format
 msgid "Unable to buzz, because the user %s does not support it."
-msgstr "無法播放音效，因為所選取的檔案 (%s) 不存在。"
+msgstr "無法「嗶」使用者 %s ，因為對方的用戶端不支援這個功能。"
+
+#: ../libpurple/protocols/jabber/jabber.c:2262
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
+msgid "Buzz"
+msgstr "嗶！"
+
+#: ../libpurple/protocols/jabber/jabber.c:2263
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s「嗶」了您一聲"
 
-#: ../libpurple/protocols/jabber/jabber.c:2253
+# XXX 這是暫譯 - acli 20070913
+#: ../libpurple/protocols/jabber/jabber.c:2264
+#: ../libpurple/protocols/yahoo/yahoo.c:4123
+#, c-format
+msgid "Buzzing %s..."
+msgstr "正在給 %s 一個嗶..."
+
+#: ../libpurple/protocols/jabber/jabber.c:2296
 msgid "config:  Configure a chat room."
 msgstr "config：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "configure:  Configure a chat room."
 msgstr "configure：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2309
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]：離開聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2314
 msgid "register:  Register with a chat room."
 msgstr "register：加入一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2320
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]：檢視或修改聊天主題"
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2326
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [聊天室]：禁止某使用者進入聊天室"
 
 #  XXX 暫譯「（會員）等級」 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:2289
+#: ../libpurple/protocols/jabber/jabber.c:2332
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6237,7 +6312,7 @@ msgstr ""
 "在這聊天室內的等級"
 
 #  NOTE 譯文改動 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2338
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6245,29 +6320,29 @@ msgstr ""
 "role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
 "這聊天室內的身份。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:2344
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]：邀請使用者進入聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;聊天室&gt; [伺服器]：加入位於這個伺服器的一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2356
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]：將使用者從聊天室中踢出。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
+#: ../libpurple/protocols/jabber/jabber.c:2361
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;使用者&gt; &lt;訊息&gt;：傳送私人訊息給另一個使用者"
+msgstr "msg &lt;使用者&gt; &lt;訊息&gt;：傳送私人訊息給另一個使用者。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2367
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
+msgstr "ping &lt;jid&gt;：Ping 一個使用者/組件/伺服器。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+#: ../libpurple/protocols/jabber/jabber.c:2372
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 給好友一個「嗶」引他（她）注意"
 
@@ -6305,8 +6380,8 @@ msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文，在未經加密的串流上進行認證"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/myspace/myspace.c:3283
+#: ../libpurple/protocols/simple/simple.c:1925
 msgid "Connect port"
 msgstr "連線埠"
 
@@ -6314,7 +6389,7 @@ msgstr "連線埠"
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
+#: ../libpurple/protocols/myspace/myspace.c:3280
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
@@ -6349,12 +6424,6 @@ msgstr "無法傳送訊息到 %s：%s"
 msgid "XMPP Message Error"
 msgstr "XMPP 訊息錯誤"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
-
 #: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
@@ -6364,35 +6433,35 @@ msgstr " (代碼 %s)"
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:423
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:504
+#: ../libpurple/protocols/jabber/presence.c:505
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: ../libpurple/protocols/jabber/presence.c:510
+#: ../libpurple/protocols/jabber/presence.c:506
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正要建立一個新的聊天室，您要設定它，還是使用預設值？"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:512
 msgid "_Configure Room"
 msgstr "設定聊天室(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:513
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:555
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天室 %s 發生錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
@@ -6436,21 +6505,21 @@ msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
 msgid "Select a Resource"
 msgstr "選擇一個 Resource"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
 msgstr "編輯使用者情緒"
 
-#: ../libpurple/protocols/jabber/usermood.c:181
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
-msgstr ""
+msgstr "請從列表選擇您目前的情緒。"
 
-#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "設定"
 
-#: ../libpurple/protocols/jabber/usermood.c:191
+#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
 msgstr "設定情緒..."
 
@@ -6467,9 +6536,9 @@ msgstr "請為您自己設定新的暱稱。"
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
-msgstr ""
+msgstr "這是您好友清單上的全部好友都會看得見的，請作出適當的選擇"
 
-#: ../libpurple/protocols/jabber/usernick.c:99
+#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
 msgstr "設定暱稱..."
 
@@ -6482,14 +6551,23 @@ msgstr "動作"
 msgid "Select an action"
 msgstr "選擇一個動作"
 
+# XXX 直譯「好友伺服器」好像不太妥
+#: ../libpurple/protocols/msn/contact.c:163
+msgid "Unable to connect to contact server"
+msgstr "無法連線到好友資訊伺服器。"
+
+#: ../libpurple/protocols/msn/contact.c:923
+msgid "Unable to retrieve MSN Address Book"
+msgstr "無法讀取 MSN 通訊錄"
+
 # XXX 暫譯
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/dialog.c:118
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "為 %s (%s) 的好友清單進行同步化途中出現問題"
 
 # XXX 暫譯
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6499,7 +6577,7 @@ msgstr ""
 "的好友清單嗎？"
 
 # XXX 暫譯
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6508,275 +6586,223 @@ msgstr ""
 "%s 在本地端的好友清單，郤不在伺服器上；您要新增這個好友至伺服器的好友清單嗎？"
 
 #: ../libpurple/protocols/msn/error.c:36
-#, c-format
 msgid "Unable to parse message"
 msgstr "無法解析訊息"
 
 # NOTE MSN 錯誤訊息要參閱 http://www.hypothetic.org/docs/msn2/reference/error_list.php
 #: ../libpurple/protocols/msn/error.c:41
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "語法錯誤（可能是用戶端的 Bug）"
 
 #: ../libpurple/protocols/msn/error.c:46
-#, c-format
 msgid "Invalid e-mail address"
-msgstr "無效的電子郵件位址"
+msgstr "電子郵件位址無效"
 
 #: ../libpurple/protocols/msn/error.c:49
-#, c-format
 msgid "User does not exist"
 msgstr "使用者不存在"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "沒給予完整領域名稱 (FQDN)"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, c-format
 msgid "Already logged in"
 msgstr "已經登入"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, c-format
 msgid "Invalid screen name"
 msgstr "帳號無效。"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, c-format
 msgid "Invalid friendly name"
 msgstr "暱稱無效"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, c-format
 msgid "List full"
 msgstr "好友清單已滿"
 
 #: ../libpurple/protocols/msn/error.c:68
-#, c-format
 msgid "Already there"
 msgstr "已經在清單裡"
 
 #: ../libpurple/protocols/msn/error.c:72
-#, c-format
 msgid "Not on list"
 msgstr "不在清單中"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
 msgid "User is offline"
 msgstr "使用者是離線的"
 
 #: ../libpurple/protocols/msn/error.c:78
-#, c-format
 msgid "Already in the mode"
 msgstr "已經在這個模式中"
 
 #: ../libpurple/protocols/msn/error.c:82
-#, c-format
 msgid "Already in opposite list"
 msgstr "已經在相對的清單中"
 
 #: ../libpurple/protocols/msn/error.c:86
-#, c-format
 msgid "Too many groups"
 msgstr "太多群組"
 
 #: ../libpurple/protocols/msn/error.c:89
-#, c-format
 msgid "Invalid group"
-msgstr "無效的群組"
+msgstr "群組無效"
 
 #: ../libpurple/protocols/msn/error.c:92
-#, c-format
 msgid "User not in group"
 msgstr "使用者不在群組內"
 
 #: ../libpurple/protocols/msn/error.c:95
-#, c-format
 msgid "Group name too long"
 msgstr "群組名稱過長"
 
 #: ../libpurple/protocols/msn/error.c:98
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "無法移除「零」號群組"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "嘗試將一個使用者加入不存在的群組"
 
 #: ../libpurple/protocols/msn/error.c:107
-#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard 失敗"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, c-format
 msgid "Notify transfer failed"
 msgstr "傳送通知失敗"
 
 #: ../libpurple/protocols/msn/error.c:116
-#, c-format
 msgid "Required fields missing"
 msgstr "找不到所需要的欄位"
 
 #: ../libpurple/protocols/msn/error.c:120
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "FND 的結果有太多匹配"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
 msgid "Not logged in"
 msgstr "尚未登入"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #: ../libpurple/protocols/msn/error.c:128
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "暫時無法使用服務"
 
 #: ../libpurple/protocols/msn/error.c:131
-#, c-format
 msgid "Database server error"
 msgstr "資料庫錯誤"
 
 #  XXX 暫譯
 #: ../libpurple/protocols/msn/error.c:135
-#, c-format
 msgid "Command disabled"
 msgstr "指令被停用"
 
 #: ../libpurple/protocols/msn/error.c:139
-#, c-format
 msgid "File operation error"
 msgstr "檔案操作錯誤"
 
 #: ../libpurple/protocols/msn/error.c:143
-#, c-format
 msgid "Memory allocation error"
 msgstr "記憶體分配錯誤"
 
 #: ../libpurple/protocols/msn/error.c:147
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "錯誤的 CHL 值傳送到了伺服器"
 
 #: ../libpurple/protocols/msn/error.c:152
-#, c-format
 msgid "Server busy"
 msgstr "伺服器忙碌"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
-#, c-format
 msgid "Server unavailable"
 msgstr "伺服器目前不提供服務"
 
 #: ../libpurple/protocols/msn/error.c:158
-#, c-format
 msgid "Peer notification server down"
 msgstr "點對點通知伺服器暫停服務"
 
 #: ../libpurple/protocols/msn/error.c:162
-#, c-format
 msgid "Database connect error"
 msgstr "資料庫連結錯誤"
 
 #: ../libpurple/protocols/msn/error.c:167
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "伺服器將暫停服務"
 
 #: ../libpurple/protocols/msn/error.c:174
-#, c-format
 msgid "Error creating connection"
 msgstr "連線開啟錯誤"
 
 #: ../libpurple/protocols/msn/error.c:179
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 參數是未知或是不允許的"
 
 #: ../libpurple/protocols/msn/error.c:183
-#, c-format
 msgid "Unable to write"
 msgstr "無法寫入"
 
 #: ../libpurple/protocols/msn/error.c:186
-#, c-format
 msgid "Session overload"
 msgstr "工作階段超載"
 
 #: ../libpurple/protocols/msn/error.c:190
-#, c-format
 msgid "User is too active"
 msgstr "使用者太過活躍"
 
 #: ../libpurple/protocols/msn/error.c:193
-#, c-format
 msgid "Too many sessions"
 msgstr "太多工作階段"
 
 #: ../libpurple/protocols/msn/error.c:196
-#, c-format
 msgid "Passport not verified"
 msgstr "護照帳號尚未經過驗證"
 
 #: ../libpurple/protocols/msn/error.c:199
-#, c-format
 msgid "Bad friend file"
 msgstr "好友檔案無效"
 
 # NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
 #: ../libpurple/protocols/msn/error.c:203
-#, c-format
 msgid "Not expected"
 msgstr "沒有預期的無效參數"
 
 #: ../libpurple/protocols/msn/error.c:209
-#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "暱稱的變更過於急速"
 
 #: ../libpurple/protocols/msn/error.c:218
-#, c-format
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
+#: ../libpurple/protocols/oscar/oscar.c:1383
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
 msgid "Authentication failed"
 msgstr "認證失敗"
 
 #: ../libpurple/protocols/msn/error.c:225
-#, c-format
 msgid "Not allowed when offline"
 msgstr "在離線時不允許這個指令"
 
 #: ../libpurple/protocols/msn/error.c:233
-#, c-format
 msgid "Not accepting new users"
 msgstr "不接受新的使用者"
 
 #: ../libpurple/protocols/msn/error.c:237
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "未經家長同意下使用兒童護照"
 
 #: ../libpurple/protocols/msn/error.c:241
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "護照帳號尚未經過驗證"
 
@@ -6784,7 +6810,6 @@ msgstr "護照帳號尚未經過驗證"
 #  NOTE MSN 錯誤代號 928
 #  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
 #: ../libpurple/protocols/msn/error.c:244
-#, c-format
 msgid "Bad ticket"
 msgstr "無效的 ticket"
 
@@ -6800,7 +6825,7 @@ msgstr "MSN 錯誤：%s\n"
 
 #: ../libpurple/protocols/msn/msn.c:130
 msgid "Nudge"
-msgstr ""
+msgstr "呼叫"
 
 #: ../libpurple/protocols/msn/msn.c:131
 #, c-format
@@ -6810,40 +6835,40 @@ msgstr "%s 呼叫您！"
 #: ../libpurple/protocols/msn/msn.c:132
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "呼叫 %s 中..."
 
 #: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:286
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo；使用者可以輸入任何的新暱稱，
 # NOTE 即使和使用者的帳號毫無關係，似乎也是有效的
 # XXX 這看來是一個鈙述句，事實上是對使用者發出的請求／問題
-#: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:287
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:305
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:339
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:354
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼？"
 
-#: ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:355
 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?"
@@ -6851,323 +6876,329 @@ msgstr ""
 "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話，或是其他的行動"
 "裝置上呢？"
 
-#: ../libpurple/protocols/msn/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:361
 msgid "Allow"
 msgstr "允許"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:362
 msgid "Disallow"
 msgstr "不允許"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:378
 msgid "This Hotmail account may not be active."
 msgstr "這個Hotmail帳號可能尚未被啟動。"
 
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:404
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:406
 msgid "Page"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "你在他（她）的好友清單裏"
-
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+# NOTE from #pidgin, on 20070920:
+# NOTE (20時05分52秒) wing: what does "Current Media" in the new msn code mean?
+# NOTE (20時07分19秒) rekkanoryo: wing: it's more or less "Now Playing"
+#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:636
+#: ../libpurple/protocols/msn/msn.c:643 ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:657 ../libpurple/protocols/msn/msn.c:663
+#: ../libpurple/protocols/msn/msn.c:669
+msgid "Current media"
+msgstr "正在播放"
+
+#: ../libpurple/protocols/msn/msn.c:648 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/msn/msn.c:655 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2827
+#: ../libpurple/protocols/novell/novell.c:2957
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:661
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On the Phone"
 msgstr "電話中"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Out to Lunch"
 msgstr "外出用餐"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "Set Friendly Name..."
 msgstr "設定暱稱..."
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:703
 msgid "Set Home Phone Number..."
 msgstr "設定住家電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:707
 msgid "Set Work Phone Number..."
 msgstr "設定工作電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:711
 msgid "Set Mobile Phone Number..."
 msgstr "設定行動電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:717
 msgid "Enable/Disable Mobile Devices..."
 msgstr "開啟 / 關閉行動裝置..."
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:722
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:733
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:757
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:767
+#: ../libpurple/protocols/novell/novell.c:3413
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
 # XXX 暫譯
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:805
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援，請安裝一個受支援的 SSL 程式庫。"
 
-#: ../libpurple/protocols/msn/msn.c:754
+#: ../libpurple/protocols/msn/msn.c:833
 msgid "Failed to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1621 ../libpurple/protocols/msn/msn.c:1964
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1687 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "一般"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/msn/msn.c:1694
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "年齡"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1696
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1697
+#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/novell/novell.c:1480
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1702 ../libpurple/protocols/msn/msn.c:1894
+#: ../libpurple/protocols/msn/msn.c:1900 ../libpurple/protocols/msn/msn.c:1907
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1708 ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1834 ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:1849 ../libpurple/protocols/msn/msn.c:1856
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1725
 msgid "Social"
 msgstr "社交"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1727
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1728
 msgid "Interests"
 msgstr "興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1729
 msgid "Pets"
 msgstr "寵物"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1730
 msgid "Hometown"
 msgstr "故鄉"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1731
 msgid "Places Lived"
 msgstr "居住過的地方"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1732
 msgid "Fashion"
 msgstr "時尚"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1733
 msgid "Humor"
 msgstr "幽默"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1734
 msgid "Music"
 msgstr "音樂"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1735 ../libpurple/protocols/msn/msn.c:1916
+#: ../libpurple/protocols/msn/msn.c:1922
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1752
 msgid "Contact Info"
 msgstr "聯絡資訊"
 
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1753
 msgid "Personal"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1756
 msgid "Significant Other"
 msgstr "另一半"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1757
 msgid "Home Phone"
 msgstr "住家電話"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1758
 msgid "Home Phone 2"
 msgstr "住家電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1759
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Home Address"
 msgstr "住家地址"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1760
 msgid "Personal Mobile"
 msgstr "個人行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1761
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1762
 msgid "Personal E-Mail"
 msgstr "個人電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1763
 msgid "Personal IM"
 msgstr "個人即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1765
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1781
 msgid "Work"
 msgstr "工作資料"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "職銜"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Company"
 msgstr "公司名稱"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "所屬部門"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1786
 msgid "Profession"
 msgstr "專業"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1787
 msgid "Work Phone"
 msgstr "商務電話"
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1788
 msgid "Work Phone 2"
 msgstr "商務電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1790
 msgid "Work Mobile"
 msgstr "商務行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1791
 msgid "Work Pager"
 msgstr "商務呼叫器"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1792
 msgid "Work Fax"
 msgstr "商務傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Work E-Mail"
 msgstr "商務電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1794
 msgid "Work IM"
 msgstr "商務即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1795
 msgid "Start Date"
 msgstr "開始日期"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1865 ../libpurple/protocols/msn/msn.c:1871
+#: ../libpurple/protocols/msn/msn.c:1878 ../libpurple/protocols/msn/msn.c:1885
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1930
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1941
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "網頁"
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:1965
 msgid "The user has not created a public profile."
 msgstr "這個使用者未有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:1966
 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 "
@@ -7176,14 +7207,14 @@ msgstr ""
 "MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在；亦有可能使"
 "用者存在，但沒有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1864
+#: ../libpurple/protocols/msn/msn.c:1970
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 "在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存在。"
 
-#: ../libpurple/protocols/msn/msn.c:1872
+#: ../libpurple/protocols/msn/msn.c:1978
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "個人資料網址"
@@ -7198,110 +7229,113 @@ msgstr "個人資料網址"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "MSN 協定模組"
+#: ../libpurple/protocols/msn/msn.c:2265 ../libpurple/protocols/msn/msn.c:2267
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Windows Live Messenger 協定模組"
 
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2302
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../libpurple/protocols/msn/msn.c:2199
-#, fuzzy
+# XXX 譯文有待改進 - acli 20070918
+#: ../libpurple/protocols/msn/msn.c:2307
 msgid "HTTP Method Server"
-msgstr "IPC 測試伺服器"
+msgstr "HTTP 方式專用伺服器"
 
-#: ../libpurple/protocols/msn/msn.c:2204
+#: ../libpurple/protocols/msn/msn.c:2312
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2320
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：呼叫使用者，引起他們的注意"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "無法連線"
+#: ../libpurple/protocols/msn/nexus.c:137
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Windows Live ID 認證：無法連線"
 
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/nexus.c:272
+msgid "Windows Live ID authentication Failed"
+msgstr "Windows Live ID 認證失敗"
+
+#: ../libpurple/protocols/msn/notification.c:185
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s 不是一個有效的群組。"
 
-#: ../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:371
 msgid "Unknown error."
 msgstr "未知錯誤。"
 
 # NOTE: 第二個 %s 為使用者名稱，第三個 %s 為通訊協定名稱
 # NOTE: 第一個 %s 似乎係錯誤訊息摘要（整個字串為視窗標題）
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:194
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%2$s (%3$s)：%1$s"
 
+#: ../libpurple/protocols/msn/notification.c:509
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s 在呼叫您！"
+
+#: ../libpurple/protocols/msn/notification.c:836
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "不明錯誤（代碼 %d）"
+
+#: ../libpurple/protocols/msn/notification.c:837
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "無法新增使用者"
+
 #  TODO 請覆查，譯文有待改進
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:897
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "%s (%s) 新增使用者失敗"
 
 #  TODO 請覆查，譯文有待改進
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:901
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "%s (%s) 拒絕使用者失敗"
 
 #  TODO 請覆查，譯文有待改進
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:905
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "%s (%s) 允許使用者失敗"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:913
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "因為好友清單已滿，以致無法新增 %s"
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:922
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s 不是一個有效的 Passport 帳號"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:927
 msgid "Service Temporarily Unavailable."
 msgstr "暫時無法提供服務"
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1263
 msgid "Unable to rename group"
 msgstr "無法更改群組名稱"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1318
 msgid "Unable to delete group"
 msgstr "無法移除群組"
 
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1934
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7328,6 +7362,29 @@ msgstr[1] ""
 "\n"
 "當維護工作結束，您將可以再度登入。"
 
+#: ../libpurple/protocols/msn/oim.c:142
+msgid "Unable to connect to OIM server"
+msgstr "無法連線到 OIM 伺服器。"
+
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../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 "無法連線"
+
 #: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "寫入錯誤"
@@ -7347,58 +7404,58 @@ msgstr ""
 "%s 伺服器傳來一個連線錯誤：\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:338
 msgid "Our protocol is not supported by the server."
 msgstr "這個伺服器不支援我們使用的通訊協定。"
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:342
 msgid "Error parsing HTTP."
 msgstr "解析 HTTP 途中發生錯誤。"
 
-#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/msn/session.c:346
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
 
 #  XXX
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:351
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "暫時無法使用 MSN 使服器，請過一會後重試。"
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:356
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 伺服器將暫時關閉。"
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:361
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "無法認證：%s"
 
-#: ../libpurple/protocols/msn/session.c:325
+#: ../libpurple/protocols/msn/session.c:366
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "暫時無法取得您的好友清單，請過一會後重試。"
 
 # See cnscode.org.tw
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msn/session.c:389
 msgid "Handshaking"
 msgstr "交握中"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:390
 msgid "Starting authentication"
 msgstr "認證開始中"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:391
 msgid "Getting cookie"
 msgstr "取得 Cookie 中"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:393
 msgid "Sending cookie"
 msgstr "傳送 Cookie 中"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:394
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
@@ -7414,27 +7471,27 @@ msgstr "電話中"
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:398
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "送出訊息逾時，可能沒有送出訊息："
 
-#: ../libpurple/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:406
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "隱身時無法送出訊息："
 
-#: ../libpurple/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:410
 msgid "Message could not be sent because the user is offline:"
 msgstr "因為使用者目前離線，所以無法送出訊息："
 
-#: ../libpurple/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:414
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "因為連線發生錯誤，所以訊息無法送出："
 
-#: ../libpurple/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:418
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "因為我們傳送訊息的速度太快，所以訊息無法送出："
 
-#: ../libpurple/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:422
 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:"
@@ -7442,31 +7499,34 @@ msgstr ""
 "因為無法與伺服器建立工作階段，所以訊息無法送出（這大概是伺服器出現了問題，請"
 "幾分鐘後重試）："
 
-#: ../libpurple/protocols/msn/switchboard.c:431
+#: ../libpurple/protocols/msn/switchboard.c:429
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "因為 Switchboard 發生錯誤，所以訊息無法送出"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:437
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "因為發生不明的錯誤，訊息可能沒有送出："
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:243
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s 將您加入他（她）的好友清單。"
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s 將您從他（她）的好友清單中移除。"
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "無法新增「%s」。"
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
 msgid "The screen name specified is invalid."
 msgstr "您所輸入的帳號無效。"
 
@@ -7485,7 +7545,7 @@ msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
-"無法載入 MySpaceIM 模組。請升級至有 RC4 支援的 libpurple（即 2.0.1 版為以"
+"無法載入 MySpaceIM 模組。請升級至有 RC4 支援的 libpurple（即 2.0.1 版或以"
 "上）。"
 
 #: ../libpurple/protocols/myspace/myspace.c:286
@@ -7497,53 +7557,52 @@ msgstr "MySpace 恕不支援長於 %d 個字元的密碼，而您的密碼已是
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:1810
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM 錯誤"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/myspace/myspace.c:349
+#: ../libpurple/protocols/myspace/myspace.c:350
 msgid "Reading challenge"
 msgstr "讀取驗證挑戰中"
 
 # XXX 好像有些怪，譯文有待改進
-#: ../libpurple/protocols/myspace/myspace.c:355
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:356
 msgid "Unexpected challenge length from server"
 msgstr "伺服器送來的驗證挑戰有意料之外的長度"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
+#: ../libpurple/protocols/myspace/myspace.c:360
 msgid "Logging in"
 msgstr "登入中"
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
+#: ../libpurple/protocols/myspace/myspace.c:1293
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
-msgstr "與伺服器失去連線（%d 秒內收不到任何數據）"
+msgstr "與伺服器失去連線（%d 秒內收不到任何資料）"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
+#: ../libpurple/protocols/myspace/myspace.c:1335
 msgid "New mail messages"
 msgstr "有新郵件"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
+#: ../libpurple/protocols/myspace/myspace.c:1336
 msgid "New blog comments"
 msgstr "網誌有新留言"
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1337
 msgid "New profile comments"
 msgstr "個人資料網頁有新留言"
 
 #  FIXME 譯文很不通順 - acli 20070913
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:1338
 msgid "New friend requests!"
 msgstr "有新的交友要求！"
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1339
 msgid "New picture comments"
 msgstr "相片集有新留言"
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "MySpace"
 msgstr "MySpace"
 
@@ -7551,17 +7610,17 @@ 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:1543
+#: ../libpurple/protocols/myspace/myspace.c:1550
 #: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "已連結"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
+#: ../libpurple/protocols/myspace/myspace.c:1561
+#: ../libpurple/protocols/myspace/myspace.c:1563
 msgid "No username set"
 msgstr "未有設定使用者名稱"
 
-#: ../libpurple/protocols/myspace/myspace.c:1555
+#: ../libpurple/protocols/myspace/myspace.c:1562
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
@@ -7569,132 +7628,134 @@ msgstr ""
 "請到 http://editprofile.myspace.com/index.cfm?fuseaction=profile.username 選"
 "擇一個使用者名稱後，再嘗試重新登入。"
 
-#: ../libpurple/protocols/myspace/myspace.c:1782
+#: ../libpurple/protocols/myspace/myspace.c:1789
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "通訊協定錯誤，代碼 %d：%s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:1981
+#: ../libpurple/protocols/myspace/myspace.c:2015
 msgid "Failed to add buddy"
 msgstr "無法新增好友"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:1981
 msgid "'addbuddy' command failed."
 msgstr "「addbuddy」指令失敗。"
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2015
+#: ../libpurple/protocols/myspace/myspace.c:2252
 msgid "persist command failed"
 msgstr "「persist」指令失敗"
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
+#: ../libpurple/protocols/myspace/myspace.c:2120
 #, c-format
 msgid "No such user: %s"
 msgstr "無此使用者：%s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
+#: ../libpurple/protocols/myspace/myspace.c:2121
 msgid "User lookup"
 msgstr "搜尋使用者"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2233
+#: ../libpurple/protocols/myspace/myspace.c:2252
+#: ../libpurple/protocols/myspace/myspace.c:2274
 msgid "Failed to remove buddy"
 msgstr "無法移除使用者"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2233
 msgid "'delbuddy' command failed"
 msgstr "「delbuddy」指令失敗"
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2274
 msgid "blocklist command failed"
 msgstr "「blocklist」指令失敗"
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
-#, fuzzy
+#  NOTE「condition」可能為「條件」或「狀況」
+#  NOTE 原始碼內這字串是指「cond != PURPLE_INPUT_READ && cond != PURPLE_INPUT_WRITE」
+#  NOTE 所以應是「狀況」而非「條件」
+#: ../libpurple/protocols/myspace/myspace.c:2320
 msgid "Invalid input condition"
-msgstr "完成連線"
+msgstr "輸入狀況無效"
 
 #. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
+#: ../libpurple/protocols/myspace/myspace.c:2338
+#: ../libpurple/protocols/myspace/myspace.c:2369
 msgid "Read buffer full"
 msgstr "讀取用的暫存區滿了"
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
+#: ../libpurple/protocols/myspace/myspace.c:2407
 msgid "Unparseable message"
 msgstr "無法解析訊息"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
+#: ../libpurple/protocols/myspace/myspace.c:2476
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "無法連到伺服器：%s (%d)"
 
 #  NOTE 這是群組名稱
-#: ../libpurple/protocols/myspace/myspace.c:2642
+#: ../libpurple/protocols/myspace/myspace.c:2647
 msgid "IM Friends"
 msgstr "即時訊息的好友"
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
+#: ../libpurple/protocols/myspace/myspace.c:2747
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr "從伺服器新增或更新了 %d 個好友（包括已在好友清單上的好友）"
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
+#: ../libpurple/protocols/myspace/myspace.c:2748
 msgid "Add contacts from server"
 msgstr "從伺服器加入聯絡人"
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:2800
+#: ../libpurple/protocols/myspace/myspace.c:2865
 msgid "Add friends from MySpace.com"
 msgstr "從 MySpace.com 新增好友"
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
+#: ../libpurple/protocols/myspace/myspace.c:2801
 msgid "Importing friends failed"
 msgstr "匯入好友失敗"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
+#: ../libpurple/protocols/myspace/myspace.c:2857
 msgid "Find people..."
 msgstr "尋找好友..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
+#: ../libpurple/protocols/myspace/myspace.c:2860
 msgid "Change IM name..."
 msgstr "變更即時通訊名稱..."
 
 #  NOTE 這似乎是視窗標題
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3162
 msgid "myim URL handler"
 msgstr "myim 網址處理器"
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
+#: ../libpurple/protocols/myspace/myspace.c:3163
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr "無法找可以開啟這個 myim 網址的 MySpaceIM 帳號。"
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
+#: ../libpurple/protocols/myspace/myspace.c:3164
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "請啟用合適的 MySpaceIM 帳號後再重試。"
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
+#: ../libpurple/protocols/myspace/myspace.c:3287
 msgid "Show display name in status text"
 msgstr "在狀態列顯示暱稱"
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
+#: ../libpurple/protocols/myspace/myspace.c:3290
 msgid "Show headline in status text"
 msgstr "在狀態列顯示標題"
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
+#: ../libpurple/protocols/myspace/myspace.c:3295
 msgid "Send emoticons"
 msgstr "傳送表情圖示"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:3300
 msgid "Screen resolution (dots per inch)"
 msgstr "熒幕解像度（DPI）"
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
+#: ../libpurple/protocols/myspace/myspace.c:3303
 msgid "Base font size (points)"
 msgstr "基礎字體大小(點)"
 
@@ -7704,176 +7765,200 @@ msgstr "基礎字體大小(點)"
 msgid "User"
 msgstr "使用者"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/oscar/oscar.c:2979
 msgid "Profile"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/myspace/user.c:124
+#: ../libpurple/protocols/myspace/user.c:128
 msgid "Headline"
 msgstr "頭條消息"
 
-#: ../libpurple/protocols/myspace/user.c:129
+#: ../libpurple/protocols/myspace/user.c:133
 msgid "Song"
 msgstr "歌曲"
 
-#: ../libpurple/protocols/myspace/user.c:134
+#: ../libpurple/protocols/myspace/user.c:141
 msgid "Total Friends"
 msgstr "好友總數"
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
+#: ../libpurple/protocols/myspace/user.c:159
 msgid "Client Version"
 msgstr "客戶端版本"
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. 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 "電"
+msgstr "放電"
 
-#: ../libpurple/protocols/myspace/zap.c:44
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
+msgstr "%s 電了您一下！"
 
-#: ../libpurple/protocols/myspace/zap.c:44
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
 msgid "Zapping %s..."
-msgstr "呼叫 %s"
+msgstr "向 %s 放電中..."
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:54
 msgid "Whack"
-msgstr "摑"
+msgstr "打人"
 
-#: ../libpurple/protocols/myspace/zap.c:45
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:54
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
+msgstr "%s 打了您一下！"
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "Whacking %s..."
-msgstr "摑 %s 中..."
+msgstr "打 %s 中..."
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy
+#. 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 "主題"
+msgstr "放火"
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
 msgid "%s has torched you!"
-msgstr "該使用者拒絕了您"
+msgstr "%s 燒了您！"
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr "燒 %s 中..."
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
 msgstr "親吻"
 
-#: ../libpurple/protocols/myspace/zap.c:47
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:62
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s 已經登入。"
+msgstr "%s 親吻了您！"
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "Smooching %s..."
 msgstr "親吻 %s 中..."
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:65
 msgid "Hug"
 msgstr "擁抱"
 
-#: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:65
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s 已經登入。"
+msgstr "%s 擁抱了您！"
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "Hugging %s..."
 msgstr "擁抱 %s 中..."
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:68
 msgid "Slap"
-msgstr "斯洛伐克文"
+msgstr "摑掌"
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:68
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
+msgstr "%s 摑了您一巴掌！"
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "摑 %s 中..."
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:71
 msgid "Goose"
 msgstr "掐屁股"
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has goosed you!"
 msgstr "%s 掐了您的屁股！"
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Goosing %s..."
 msgstr "掐 %s 的屁股中..."
 
 #  TODO Untranslated
-#: ../libpurple/protocols/myspace/zap.c:51
+#. 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
 msgid "High-five"
 msgstr "High-five"
 
 #  TODO Untranslated
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "%s high-five 了您！"
 
 #  TODO Untranslated
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "High-fiving %s..."
 msgstr "High-five %s 中..."
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#. 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
 msgid "Punk"
-msgstr ""
+msgstr "整蠱"
 
-#: ../libpurple/protocols/myspace/zap.c:52
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:81
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s 已經登入。"
+msgstr "%s 整蠱了您！"
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "Punking %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:53
+msgstr "整蠱 %s 中..."
+
+# NOTE「Raspberry」在這裏是指一種噴口水發出古怪聲音的動作
+# NOTE 實例請見 http://vids.myspace.com/index.cfm?fuseaction=vids.individual&VideoID=2903093
+# NOTE 中文翻譯員在2007年9月24日一致決定，暫且翻成「出怪聲」
+#. 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
 msgid "Raspberry"
-msgstr ""
+msgstr "出怪聲"
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "%s has raspberried you!"
-msgstr ""
+msgstr "%s 向你出怪聲！"
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "向 %s 出怪聲中..."
 
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
@@ -8009,109 +8094,109 @@ msgid "Login failed (%s)."
 msgstr "登入失敗 (%s)。"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:249
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "無法送出訊息。無法取得使用者的細節 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:398
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "無法把 %s 加至您的好友清單 (%s)。"
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:424
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "無法送出訊息 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:495
+#: ../libpurple/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "無法邀請使用者 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:534
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "無法送出訊息至 %s。無法建立會議 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:539
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "無法送出訊息。無法建立會議 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:586
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr "無法在伺服器上的清單把使用者 %s 移至目錄 %s。建立目錄時發生錯誤 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:634
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "無法新增 %s 至好友清單。在伺服器上的清單建立目錄時發生錯誤 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:707
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "無法取得使用者 %s 的細節 (%s)。"
 
 #  FIXME 譯文有待改進
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:753
+#: ../libpurple/protocols/novell/novell.c:899
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "無法把使用者加至您的隱私清單 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:800
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "無法把 %s 加至您的拒絕清單 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:853
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "無法把 %s 加至您的允許清單 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:921
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "無法把 %s 移除自您的隱私清單 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:944
+#: ../libpurple/protocols/novell/novell.c:1649
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "無法在伺服器端修改隱私設定 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "無法建立會議 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1123
+#: ../libpurple/protocols/novell/novell.c:1694
 msgid "Error communicating with server. Closing connection."
 msgstr "和伺服器間的通訊發生錯誤。關閉連線。"
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "電話號碼"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "個人職銜"
 
 #  NOTE 似乎無中文譯文
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "Mail Stop"
 
-#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/novell/novell.c:1504
 #: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "使用者ID"
@@ -8122,43 +8207,43 @@ msgstr "使用者ID"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1517
 msgid "Full name"
 msgstr "全名"
 
 #  NOTE「GroupWise」是軟件名稱，正式中文名大概不會是「群組」...
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1639
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 會議 %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
+#: ../libpurple/protocols/novell/novell.c:1670
 msgid "Unable to make SSL connection to server."
 msgstr "無法使用 SSL 協定連線到伺服器。"
 
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1722
 msgid "Authenticating..."
 msgstr "認證中..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1734
 msgid "Unable to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1737
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1872
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "邀請了 %s 加入這個交談。"
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1900
 msgid "Invitation to Conversation"
 msgstr "邀請加入交談"
 
 #  NOTE「Sent」係指發出邀請時的時間
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1901
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8169,17 +8254,16 @@ msgstr ""
 "\n"
 "時間：%s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1903
 msgid "Would you like to join the conversation?"
 msgstr "您要加入個這交談嗎？"
 
 # XXX 暫譯
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2017
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已經被登出，因為您已在其他電腦上登入。"
 
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2074
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8189,18 +8273,17 @@ msgstr "%s 目前似乎離線，所以不會收到您剛才送出的訊息。"
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2172
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2200
 msgid "Error. SSL support is not installed."
 msgstr "錯誤：沒有安裝 SSL 支援。"
 
-#: ../libpurple/protocols/novell/novell.c:2504
-#, c-format
+#: ../libpurple/protocols/novell/novell.c:2509
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
@@ -8214,33 +8297,33 @@ msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3523
+#: ../libpurple/protocols/novell/novell.c:3525
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 協定模組"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3550
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3554
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../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 "伺服器關閉連線。"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../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"
@@ -8249,10 +8332,10 @@ msgstr ""
 "與伺服器之間的連線突然中斷:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../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 "連線至伺服器時收到無效的資料。"
 
@@ -8287,36 +8370,45 @@ msgid "ICQ Protocol Plugin"
 msgstr "ICQ 協定模組"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "編碼"
 
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "遠端使用者關閉了連線。"
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "遠端使用者拒絕了您的要求。"
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "與遠端使用者的連線突然中斷：<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "在與遠端使用者的連線上收到無交的資料。"
 
-#: ../libpurple/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "無法與遠端使用者建立連線。"
 
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "即時訊息已經建立"
 
+#: ../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 嘗試向您傳送一個 %s 的檔案，但透過即時訊息直接傳送檔案時，這個用戶端只容許"
+"不大於 %s 的檔案，因此，請嘗試改用普通的「檔案傳輸」功能傳送檔案。\n"
+
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -8444,8 +8536,8 @@ msgstr ""
 "用有問題的用戶端程式。）"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2391
+#: ../pidgin/gtkutils.c:2421
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "好友圖示"
@@ -8468,7 +8560,7 @@ msgid "Chat"
 msgstr "聊天"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:6064
 msgid "Get File"
 msgstr "接收檔案"
 
@@ -8553,50 +8645,44 @@ msgid "Camera"
 msgstr "照相機"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5834
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5869
 msgid "Not Available"
 msgstr "長時間離開"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5855
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
 #: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
 #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
-#, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
 msgid "Invisible"
 msgstr "隱身"
 
 #: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
 msgid "Online"
 msgstr "上線"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128
 msgid "IP Address"
 msgstr "IP 位址"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Warning Level"
 msgstr "警告等級"
 
@@ -8635,7 +8721,7 @@ msgstr "連線已建立，並已送出 Cookie"
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
+#: ../libpurple/protocols/oscar/oscar.c:1262
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8645,31 +8731,31 @@ msgstr ""
 "無法登入：無法以 %s 身份登入，因為這個帳號是無效的。帳號必須為有效電郵地址；"
 "或者以英文字母起始，並只含英文字母、數字及空白；或者只由數字組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "帳號無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/oscar/oscar.c:1355
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1048
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1360
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1364
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/oscar/oscar.c:1369
+#: ../libpurple/protocols/oscar/oscar.c:1380
 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."
@@ -8677,44 +8763,44 @@ msgstr ""
 "您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線，那麼您的等待時間將會更加的延長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#: ../libpurple/protocols/oscar/oscar.c:1374
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1413
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1417
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1439
 msgid "The SecurID key entered is invalid."
 msgstr "您所輸入的 SecurID 碼無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1453
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:1455
+#: ../libpurple/protocols/oscar/oscar.c:2247
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:5939
+#: ../libpurple/protocols/oscar/oscar.c:6220 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1494
+#: ../libpurple/protocols/oscar/oscar.c:1537
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8723,53 +8809,53 @@ msgstr ""
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:1540
 msgid "Unable to get a valid AIM login hash."
 msgstr "無法取得有效的 AIM 登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1628
 msgid "Unable to get a valid login hash."
 msgstr "無法取得有效的登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1658
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1714
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2205
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求，好讓我可以將您加入我的好友清單中。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2245
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2246
 msgid "Please authorize me!"
 msgstr "請通過我的認證！"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:2287
+#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:5315
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2294
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2422
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8779,17 +8865,17 @@ msgstr ""
 "使用者 %u 因為下列原因，拒絕了您將其加入好友清單的要求：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2423
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2430
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2438
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8802,7 +8888,7 @@ msgstr ""
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2446
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8815,7 +8901,7 @@ msgstr ""
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2454
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8828,38 +8914,38 @@ msgstr ""
 "訊息為：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2475
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊：%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2481
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他（她）加入到您的好友名單中嗎？"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2486 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2487
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2611
 #, 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] "您遺失了 %hu 個由 %s 送來的訊息，因為它是無效的。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2620
 #, 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] "您遺失了 %hu 個由 %s 送來的訊息，因為它太大了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們太大了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2629
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8869,21 +8955,21 @@ msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它傳送的速度
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感，直譯「邪惡」好像行不通，下同
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2638
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2647
 #, 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] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2656
 #, 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."
@@ -8891,55 +8977,55 @@ msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2811
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息：%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2816
+#: ../libpurple/protocols/oscar/oscar.c:2880
 msgid "Unknown reason."
 msgstr "原因不明。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
+#: ../libpurple/protocols/oscar/oscar.c:2814
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s："
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2880
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊：%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2911
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順？
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2916
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2951
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3059
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
+#: ../libpurple/protocols/oscar/oscar.c:3247
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息，因為它包含了無效字元。」"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3411
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8947,111 +9033,110 @@ msgstr ""
 "您最近做的一個動作無法完成，因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3494
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3744
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3798
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3819
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Division"
 msgstr "部門"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Position"
 msgstr "職位"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3833
 msgid "Web Page"
 msgstr "網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3836
 msgid "Work Information"
 msgstr "工作資訊"
 
 # XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3932
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "下列是 %s 的帳號"
 msgstr[1] "下列是 %s 的帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3937
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3963
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:3984
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3986
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4017
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號與原本的不同。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為它是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號太長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4029
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "錯誤 0x%04x：無法改變電子郵件地址，因為這個帳號尚有要求等待處理。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4032
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9059,37 +9144,37 @@ msgid ""
 msgstr ""
 "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4035
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x：未知錯誤。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4048
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4050
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
+#: ../libpurple/protocols/oscar/oscar.c:4233
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像；要傳送即時訊息影像，必須與對方直接連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
+#: ../libpurple/protocols/oscar/oscar.c:4504
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4505
 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 "
@@ -9098,7 +9183,7 @@ msgstr ""
 "您在未登入完成前要求修改您的個人資訊，所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4519
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9109,11 +9194,11 @@ msgid_plural ""
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4524
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4569
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9124,11 +9209,11 @@ msgid_plural ""
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4574
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:4647
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9139,17 +9224,17 @@ msgstr ""
 "效電郵地址；或者必須以英文字母為開頭，同時由「英文字母」、「數字」和「空白」"
 "所組成，或者單純以「數字」組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4649
+#: ../libpurple/protocols/oscar/oscar.c:5101
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4768
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
+#: ../libpurple/protocols/oscar/oscar.c:4769
 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."
@@ -9157,15 +9242,15 @@ msgstr ""
 "AIM 伺服器暫時無法送出您的好友清單。不過這個好友清單並沒有遺失，可能可以在幾"
 "個小時後取得。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+#: ../libpurple/protocols/oscar/oscar.c:4951
+#: ../libpurple/protocols/oscar/oscar.c:4953
+#: ../libpurple/protocols/oscar/oscar.c:5181
+#: ../libpurple/protocols/oscar/oscar.c:5182
+#: ../libpurple/protocols/oscar/oscar.c:5187
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5099
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9174,17 +9259,17 @@ msgstr ""
 "因為您的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5099
+#: ../libpurple/protocols/oscar/oscar.c:5114
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5113
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "無法把 %s 加入好友清單，原因不明。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5230
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9194,23 +9279,23 @@ msgstr ""
 "呢？"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5238
 msgid "Authorization Given"
 msgstr "給予認證"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5311
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了您將他（她）加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5312
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5315
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9220,32 +9305,32 @@ msgstr ""
 "使用者 %s 因為下列原因，拒絕了您將他（她）加入好友清單的要求：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5316
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同，暫時不予理會
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5352
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "頻道號碼(_E)："
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5392
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5461
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像；AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5623
+#: ../libpurple/protocols/oscar/oscar.c:5628
 msgid "Away Message"
 msgstr "離開訊息"
 
 # XXX 好像不對，又好像沒問題
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5628
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
@@ -9253,90 +9338,90 @@ msgstr " <i>(搜尋中)</i>"
 #  NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message?
 #  NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status
 #  XXX 所以這應該是有問題的譯文，但暫時想不到怎樣改善 - ambrose 20070415
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5828
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5936
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5937
 msgid "Buddy Comment:"
 msgstr "好友說明："
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5984
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5988
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr "這樣將會曝露出您的 IP 位址，因此可能會有隱私上的風險。您想要繼續嗎？"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:5994
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:6029
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6035
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6043
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6056
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6078
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
 # NOTE Require意為「需要」，不是「要求」
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6137
 msgid "Require authorization"
 msgstr "需要認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6140
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "允許其他使用者在網路上查看您目前的狀態（會導致您收到垃圾訊息！）"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6145
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6218
 msgid "Change Address To:"
 msgstr "變更地址為："
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6264
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6267
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6268
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9344,74 +9429,74 @@ msgstr ""
 "您可以重新要求這些好友的認證，只要在好友清單中以滑鼠右鍵點擊他們，然後選擇"
 "「要求重新認證」。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6285
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6287
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6290
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6448
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (透過網頁)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6459
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6463
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
 #  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6473
 msgid "Set Privacy Options..."
 msgstr "設定隱私選項..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6480
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6484
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6488
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6495
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6501
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6506
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
+#: ../libpurple/protocols/oscar/oscar.c:6574
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」群組"
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../libpurple/protocols/oscar/oscar.c:6577
 msgid "Show how long you have been idle"
 msgstr "顯示您閒置多久時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../libpurple/protocols/oscar/oscar.c:6732
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9419,27 +9504,26 @@ msgstr ""
 "務必使用 ICQ 的代理伺服器來進行檔案傳輸\n"
 "（較慢，但不會暴露您的 IP 位址）"
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "正在要求 %s 連線至此處 (%s:%hu)，以便建立即時訊息。"
 
-#: ../libpurple/protocols/oscar/peer.c:782
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "正在嘗試連線至 %s；%hu。"
 
-#: ../libpurple/protocols/oscar/peer.c:856
-#, c-format
+#: ../libpurple/protocols/oscar/peer.c:858
 msgid "Attempting to connect via proxy server."
 msgstr "正在嘗試透過 Proxy 伺服器連線。"
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
+#: ../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 "
@@ -9602,28 +9686,28 @@ msgstr "豬"
 msgid "Other"
 msgstr "其他"
 
-#: ../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 "修改好友資訊"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "更新好友資訊"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "成功修改了您的好友資訊。"
 
-#: ../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 "
 "%s."
 msgstr "自訂的表情圖案暫時未獲支援，請自 %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 "無效的 QQ 表情"
 
@@ -9891,17 +9975,15 @@ msgstr "系統訊息"
 msgid "Failed to send IM."
 msgstr "送出即時訊息失敗。"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
 #: ../libpurple/protocols/qq/keep_alive.c:87
-#, fuzzy
 msgid "Keep alive error"
-msgstr "讀取錯誤"
+msgstr "Keep Alive 錯誤"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Error requesting login token"
 msgstr "取得 Login Token 錯誤"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:488
 msgid "Unable to login, check debug log"
 msgstr "無法登入，請檢查除錯記錄"
 
@@ -10298,7 +10380,7 @@ msgstr "邀請進入會議室"
 msgid "Send TEST Announcement"
 msgstr "送出測試通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4434
 msgid "Topic:"
 msgstr "主題："
 
@@ -10325,7 +10407,7 @@ msgstr "Meanwhile 連線設定"
 msgid "No Sametime Community Server Specified"
 msgstr "未指定 Sametime 社群伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4368
 msgid "Connect"
 msgstr "連線"
 
@@ -10380,10 +10462,6 @@ msgstr ""
 "「%s」與您在 Sametime 社群中的任何使用者帳號不符。它將從您的好友清單中被移"
 "除。"
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "無法新增使用者"
-
 #: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
@@ -10501,7 +10579,7 @@ msgstr ""
 "「%s」可能指下列任何一個使用者。您可使用下面的按紐，把他（她）們新增至好友清"
 "單內，或向他（她）們發出訊息。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:762
 msgid "Search Results"
 msgstr "搜尋結果"
 
@@ -11073,7 +11151,6 @@ msgstr "<br><b>頻道主題：</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>頻道模式：</b>"
 
@@ -11112,7 +11189,6 @@ msgstr "頻道公鑰清單"
 
 #: ../libpurple/protocols/silc/chat.c:435
 #: ../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 "
@@ -11736,7 +11812,6 @@ msgid "Connecting to SILC Server"
 msgstr "連線至 SILC 伺服器中"
 
 #: ../libpurple/protocols/silc/silc.c:352
-#, c-format
 msgid "Could not load SILC key pair"
 msgstr "無法讀取 SILC 密鑰對"
 
@@ -11765,8 +11840,7 @@ msgid "Your Current Mood"
 msgstr "您目前的心情"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643
 msgid "Normal"
 msgstr "正常"
 
@@ -12159,7 +12233,7 @@ msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038
 msgid "Network"
 msgstr "網路"
 
@@ -12361,54 +12435,44 @@ msgid "No server statistics available"
 msgstr "伺服器沒有統計資料"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗：版本不符，請更新您的用戶端程式"
 
 #: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失敗：遠端不信任／不支援您的公鑰"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失敗：遠端不支援建議中的密鑰交換群組 (KE group)"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失敗：遠端不支援建議中的加密方式 (cipher)"
 
 #  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
 #: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失敗：遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失敗：遠端不支援建議中的雜湊函數 (hash function)"
 
 #  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
 #: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失敗：遠端不支援建議中的身份驗證代碼 (HMAC)"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "失敗：錯誤的簽章"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "失敗：無效的 Cookie"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
 msgid "Failure: Authentication failed"
 msgstr "失敗：認證失敗"
 
@@ -12431,36 +12495,35 @@ msgid "Could not load SILC key pair: %s"
 msgstr "無法讀取 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:417
 msgid "Could not write"
 msgstr "無法寫入"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:439
+#: ../libpurple/protocols/simple/simple.c:1545
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1062
 msgid "Unknown server response."
-msgstr "未知伺服器錯誤。"
+msgstr "不明的伺服器回應。"
 
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1621
+#: ../libpurple/protocols/simple/simple.c:1634
+#: ../libpurple/protocols/simple/simple.c:1685
 msgid "Could not create listen socket"
 msgstr "無法建立 Socket 監聽"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1602
 msgid "Couldn't resolve host"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1693
 msgid "Could not resolve hostname"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1710
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字元或「@」符號"
 
@@ -12472,36 +12535,36 @@ msgstr "SIP 的帳號不可含有空白字元或「@」符號"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1894
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:1922
 msgid "Publish status (note: everyone may watch you)"
 msgstr "刊登狀態（請注意：任何人都能看到您）"
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:1928
 msgid "Use UDP"
 msgstr "使用 UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1930
 msgid "Use proxy"
 msgstr "使用 Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:1932
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:1934
 msgid "Auth User"
 msgstr "認證使用者"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:1936
 msgid "Auth Domain"
 msgstr "認證域名"
 
@@ -12547,7 +12610,6 @@ msgid "Warning of %s not allowed."
 msgstr "不允許對 %s 發出警告。"
 
 #: ../libpurple/protocols/toc/toc.c:503
-#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "訊息被丟棄，因為您達到了伺服器所限制的發送速度。"
 
@@ -12572,49 +12634,40 @@ msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您遺失了一個由 %s 送來的訊息，因為它傳送的速度太快。"
 
 #: ../libpurple/protocols/toc/toc.c:518
-#, c-format
 msgid "Failure."
 msgstr "失敗。"
 
 #: ../libpurple/protocols/toc/toc.c:521
-#, c-format
 msgid "Too many matches."
 msgstr "匹配太多。"
 
 #: ../libpurple/protocols/toc/toc.c:524
-#, c-format
 msgid "Need more qualifiers."
 msgstr "需輸入更多檢索條件。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #: ../libpurple/protocols/toc/toc.c:527
-#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "暫時無法使用目錄服務。"
 
 #: ../libpurple/protocols/toc/toc.c:530
-#, c-format
 msgid "E-mail lookup restricted."
 msgstr "禁止 E-Mail 檢查。"
 
 #: ../libpurple/protocols/toc/toc.c:533
-#, c-format
 msgid "Keyword ignored."
 msgstr "關鍵字已被忽略。"
 
 #: ../libpurple/protocols/toc/toc.c:536
-#, c-format
 msgid "No keywords."
 msgstr "沒有關鍵字。"
 
 #: ../libpurple/protocols/toc/toc.c:539
-#, c-format
 msgid "User has no directory information."
 msgstr "這個使用者沒有他的相關資訊。"
 
 #: ../libpurple/protocols/toc/toc.c:543
-#, c-format
 msgid "Country not supported."
 msgstr "這個國家不被支援。"
 
@@ -12624,24 +12677,20 @@ msgid "Failure unknown: %s."
 msgstr "未知的失敗原因：%s。"
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, c-format
 msgid "Incorrect screen name or password."
 msgstr "錯誤的帳號或密碼"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #: ../libpurple/protocols/toc/toc.c:552
-#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "暫時無法使用該項服務。"
 
 #: ../libpurple/protocols/toc/toc.c:555
-#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "您目前登入系統的警告等級太高，以致無法登入。"
 
 #: ../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."
@@ -12679,8 +12728,8 @@ msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息�
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5925
+#: ../pidgin/gtkblist.c:6281
 msgid "_Group:"
 msgstr "群組(_G)："
 
@@ -12740,27 +12789,27 @@ msgstr "%s 要求您傳送檔案給他（她）。"
 msgid "TOC Protocol Plugin"
 msgstr "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 送來了一個視像聊天的邀請，但目前還沒有視像聊天的支援。"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "無法送出您的 Yahoo! 訊息。"
 
 # XXX 暫譯
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "拒絕認證訊息："
 
-#: ../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 "
@@ -12769,16 +12818,16 @@ msgstr ""
 "使用者 %s 因為下列原因，剛剛拒絕了您先前將他（她）新增至您的好友清單的要求：%"
 "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 剛剛拒絕了您先前將他（她）新增至您的好友清單的要求。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12788,11 +12837,11 @@ msgstr ""
 "Yahoo 伺服器要求了使用一種不明的認證方式，因此很可能不會成功登入 Yahoo。請到 "
 "%s 檢查有沒有更新的版本。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12801,49 +12850,49 @@ msgstr ""
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他（她）從您的好友清單中移除，並"
 "隨即忽略他（她），請按一下「是」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "忽略使用者？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!，官方網站上可能已經修正這個錯誤。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
 msgid "Received unexpected HTTP response from server."
 msgstr "伺服器發出了奇怪的 HTTP 回應。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
+#: ../libpurple/protocols/yahoo/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12852,7 +12901,7 @@ msgstr ""
 "與 %s 之間的連線突然中斷:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12861,28 +12910,28 @@ msgstr ""
 "無法與 %s 建立連線:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not at Desk"
 msgstr "不在座位"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Not in Office"
 msgstr "不在辦公室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -12890,96 +12939,86 @@ msgstr "走出去了"
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
 msgid "Appear Online"
 msgstr "報稱上線"
 
 # NOTE Yahoo 官方譯「永遠顯示離線」，說白一點其實即是（針對某人）「長期隠身」
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
 msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Presence"
 msgstr "上線狀態"
 
 # NOTE 下次登入時不報稱離線，所以加「暫時」字眼
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
 msgid "Appear Offline"
 msgstr "暫時報稱離線"
 
 #  NOTE 這是清單內的一個指令
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
 msgid "Presence Settings"
 msgstr "上線狀態設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Activate which ID?"
 msgstr "啟用哪一個 ID？"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Join whom in chat?"
 msgstr "加入誰的聊天室？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Join User in Chat..."
 msgstr "加入好友目前所在的聊天室..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Open Inbox"
 msgstr "開啟收件匣"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr "嗶！"
-
-# XXX 這是暫譯 - acli 20070913
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr "正在給 %s 一個嗶..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt聊天室&gt;：加入位於 Yahoo! 網路的一個聊天室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4143
 msgid "list: List rooms on the Yahoo network"
 msgstr "list：列出Yahoo網路上的聊天室清單"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4151
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 要求使用者開始 Doodle Session"
 
@@ -12993,57 +13032,57 @@ msgstr "doodle: 要求使用者開始 Doodle Session"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
 #: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4362
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4385
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4388
 msgid "Pager server"
 msgstr "傳呼伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4391
 msgid "Japan Pager server"
 msgstr "傳呼伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "File transfer server"
 msgstr "檔案傳輸伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan file transfer server"
 msgstr "檔案傳輸伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
 #  XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Chat room locale"
 msgstr "聊天室區域 (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4423
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
@@ -13426,8 +13465,8 @@ msgstr "域名"
 msgid "Exposure"
 msgstr "現身程度"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
+#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13436,28 +13475,28 @@ msgstr ""
 "無法建立 Socket：\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "無法解析 HTTP 代理伺服應的回應：%s\n"
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../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 "HTTP 代理伺服器連線錯誤 %d"
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "拒絕存取：HTTP 代理伺服器禁止通訊埠 %d 的資料傳送。"
 
-#: ../libpurple/proxy.c:1012
+#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "解析 %s 途中發生了錯誤"
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "無法解析主機"
 
@@ -13499,14 +13538,14 @@ msgstr "%s 改變暱稱為 %s。\n"
 #: ../libpurple/server.c:302
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "要求 %s 的注意中..."
 
 #: ../libpurple/server.c:347
 #, c-format
 msgid "%s has requested your attention!"
-msgstr "%s 引起了您的注意！"
+msgstr "%s 要求您注意！"
 
-#: ../libpurple/server.c:796
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13515,12 +13554,12 @@ msgstr ""
 "%s 邀請 %s 到聊天室「%s」：\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀請了 %s 到聊天室「%s」：\n"
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎？"
 
@@ -13548,7 +13587,8 @@ msgstr "未知的 SSL 錯誤"
 msgid "Unset"
 msgstr "取消設定"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "請勿打擾"
 
@@ -13565,48 +13605,63 @@ msgstr "使用行動裝置"
 msgid "%s changed status from %s to %s"
 msgstr "%s 從「%s」狀態改變為「%s」"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:612
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) 從「%s」狀態改變為「%s」"
+
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is now %s"
 msgstr "%s 目前為%s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:625
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) 目前為%s"
+
+#: ../libpurple/status.c:631
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s 不再%s"
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:633
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) 不再%s"
+
+#: ../libpurple/status.c:1244
 #, c-format
 msgid "%s became idle"
 msgstr "%s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1261
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 不再閒置"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1324
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1326
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 不再閒置"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:701
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2706
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
 # NOTE 「They」是什麼呢？譯成「它們」的話，「它們」又是什麼呢？寫長一點好了。
-#: ../libpurple/util.c:2723
+#: ../libpurple/util.c:2707
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13614,84 +13669,84 @@ msgid ""
 msgstr ""
 "在解析您的%s時發生錯誤。檔案內的資料並沒有被讀入，同時舊檔案已移至 %s~。"
 
-#: ../libpurple/util.c:3223
+#: ../libpurple/util.c:3207
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3210
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3236
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3248
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3256
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小時"
 msgstr[1] "%s %d 小時"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 msgstr[1] "%s %d 分"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3536
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "無法打開 %s：重新導向的次數超過了上限"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3573 ../libpurple/util.c:3869
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "無法連線到「%s」"
 
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3696
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr "無法為讀入「%s」取得足夠的記憶體，網站的伺服器可能懷有惡意。"
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3731
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "讀入 %s 途中發生錯誤：%s"
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3762
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "寫入 %s 途中發生了錯誤：%s"
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3787
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s：%s"
@@ -13708,12 +13763,12 @@ msgstr "Pidgin 網路即時通"
 msgid "Send instant messages over multiple protocols"
 msgstr "透過多種通訊協定發送即時訊息"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "方向"
 
 #  NOTE: stolen from eggcups' zh_TW.po
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "系統匣方向"
 
@@ -13786,7 +13841,7 @@ msgstr "SOCKS 4"
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -13808,15 +13863,15 @@ msgstr "鴛鴦蝴蝶也看得見耶"
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T)："
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
 msgid "_Host:"
 msgstr "主機位址(_H)："
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
 msgid "_Port:"
 msgstr "通訊埠(_P)："
 
@@ -13824,7 +13879,7 @@ msgstr "通訊埠(_P)："
 msgid "_Username:"
 msgstr "使用者(_U)："
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
 msgid "Pa_ssword:"
 msgstr "密碼(_S)："
 
@@ -13836,31 +13891,31 @@ msgstr "無法儲存新帳號"
 msgid "An account already exists with the specified criteria."
 msgstr "已有一個乎合指定條件的帳號。"
 
-#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1474
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1493
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1500
 msgid "Create this new account on the server"
 msgstr "在伺服器上建立這個新帳號"
 
-#: ../pidgin/gtkaccount.c:1515
+#: ../pidgin/gtkaccount.c:1516
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1974 ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "啟動"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:2002
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2202
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13882,246 +13937,277 @@ msgstr ""
 "您如果希望新增、修改或刪除帳號，只要透過好友清單上的「帳號->新增／編輯」指"
 "令，即可返回這個畫面。"
 
-# TODO 看起來應該為加一個新的聊天室，並把聊天室歸類到某個群組。
-# NOTE 譯文更動 by Paladin
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "加入聊天室"
+#: ../pidgin/gtkblist.c:524
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "您目前有 %d 個稱為「%s」的好友，您要把這個好友合併嗎？"
+msgstr[1] "您目前有 %d 個稱為「%s」的好友，您要把這些好友合併嗎？"
 
-#: ../pidgin/gtkblist.c:788
+#: ../pidgin/gtkblist.c:525
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+"合併後，這些好友在好友清單將只出現一次，通訊時也會共用一個交談視窗。如果希望"
+"把這些好友再次分開，在好友清單中以滑鼠右鍵點擊好友名稱，再選擇「展開」即可。"
+
+#: ../pidgin/gtkblist.c:527
+msgid "_Merge"
+msgstr "合併(_M)"
+
+#: ../pidgin/gtkblist.c:945
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6242
+#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "帳號(_A)："
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1245
 msgid "Un_block"
 msgstr "解除封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1288
+msgid "Move to"
+msgstr "移至"
+
+#: ../pidgin/gtkblist.c:1328
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "傳送檔案"
+#: ../pidgin/gtkblist.c:1337
+msgid "_Send File..."
+msgstr "傳送檔案(_S)..."
 
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "加入好友狀態捕捉(_P)"
+#: ../pidgin/gtkblist.c:1344
+msgid "Add Buddy _Pounce..."
+msgstr "加入好友狀態捕捉(_P)..."
 
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353
+#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1359
+msgid "Hide when offline"
+msgstr "離線時隱藏"
+
+#: ../pidgin/gtkblist.c:1359
+msgid "Show when offline"
+msgstr "離線時顯示"
+
+#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382
+#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "新增一個好友(_B)"
+#: ../pidgin/gtkblist.c:1434
+msgid "Add _Buddy..."
+msgstr "新增好友(_B)..."
 
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "新增一個聊天室(_H)"
+#: ../pidgin/gtkblist.c:1437
+msgid "Add C_hat..."
+msgstr "新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1440
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1442
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
 #: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1464
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+# NOTE clarified by rekkanoryo on 20070920 in #pidgin:
+# NOTE (20時19分49秒) wing: another question... what exactly does "Persistent" in gtkblist.c:1466 refer to?
+# NOTE (20時37分09秒) rekkanoryo: wing: if you select that option, then close the chat, you don't actually leave.  History builds, and when you double-click the chat in the buddy list again, it opens complete with all the history
+#: ../pidgin/gtkblist.c:1466
+msgid "Persistent"
+msgstr "保持連線"
+
+#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1532
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
+#: ../pidgin/gtkblist.c:4929 ../pidgin/gtkblist.c:4942
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
 # XXX 暫譯
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
+#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4919
+#: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3067
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3070
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3071
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../pidgin/gtkblist.c:2875
-msgid "/Buddies/Show"
-msgstr "/好友/顯示"
+#: ../pidgin/gtkblist.c:3073
+msgid "/Buddies/Sh_ow"
+msgstr "/好友/顯示(_O)"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:3074
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/好友/顯示/離線好友(_O)"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:3075
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/好友/顯示/空白群組(_E)"
 
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:3076
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/好友/顯示/好友細節(_D)"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:3077
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/好友/顯示/閒置時間(_T)"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:3078
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/好友/顯示/通訊協定圖示(_P)"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:3079
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3081
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3082
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3083
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3085
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3088
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/帳號(_A)/新增\\/編輯"
+#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6943
+msgid "/Accounts/Manage"
+msgstr "/帳號/管理"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3092
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:3093
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:2896
+#: ../pidgin/gtkblist.c:3094
 msgid "/Tools/_Certificates"
 msgstr "/工具/憑證(_C)"
 
-#: ../pidgin/gtkblist.c:2897
+#: ../pidgin/gtkblist.c:3095
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3096
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3097
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3099
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3100
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3101
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3103
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3105
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3106
 msgid "/Help/Online _Help"
 msgstr "/說明/線上說明(_H)"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3107
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3140
 #, c-format
 msgid ""
 "\n"
@@ -14130,167 +14216,164 @@ msgstr ""
 "\n"
 "<b>帳號：</b>%s"
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3218
 msgid "Buddy Alias"
 msgstr "好友別名"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3247
 msgid "Logged In"
 msgstr "已登入"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3293
 msgid "Last Seen"
 msgstr "上次登入"
 
 # XXX「Spooky」一般來說只是「恐怖」，不一定是「幽靈似的」才算「Spooky」
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3314
 msgid "Spooky"
 msgstr "幽靈似的"
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3316
 msgid "Awesome"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3318
 msgid "Rockin'"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3453
+#: ../pidgin/gtkblist.c:3657
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "閒置 %d 日 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3659
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3661
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3814
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3815 ../pidgin/gtkblist.c:3848
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3816
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3817
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3818 ../pidgin/gtkblist.c:3851
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3819
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增群組..."
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3854
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3857
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3989 ../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 個由 %s 發出的未讀取訊息\n"
 msgstr[1] "%d 個由 %s 發出的未讀取訊息\n"
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:4149
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "依照字母"
-
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:4152
 msgid "By status"
 msgstr "依照狀態"
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4153
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4358 ../pidgin/gtkconn.c:180
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../pidgin/gtkblist.c:4067
+#: ../pidgin/gtkblist.c:4393
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 結束連線：%s</span>"
 
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4545
 msgid "<b>Username:</b>"
 msgstr "<b>使用者名稱：</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4552
 msgid "<b>Password:</b>"
 msgstr "<b>密碼：</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4563
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4646
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4660
+#, 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'>歡迎使用 %s!</span>\n"
 "\n"
-"您未有啟動任何帳號，請透過好友清單上的「帳號->新增」指令，到「帳號清單」啟動"
+"您未有啟動任何帳號，請透過好友清單上的「帳號->管理」指令，到「帳號清單」啟動"
 "帳號。帳號一經啟動，就隨時可以登入或變更狀態；這樣，您就可以跟您的好友通訊"
 "了！"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
+#: ../pidgin/gtkblist.c:4923
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/好友/顯示/離線好友"
 
-#: ../pidgin/gtkblist.c:4600
+#: ../pidgin/gtkblist.c:4926
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/好友/顯示/空群組"
 
-#: ../pidgin/gtkblist.c:4606
+#: ../pidgin/gtkblist.c:4932
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/好友/顯示/好友細節"
 
-#: ../pidgin/gtkblist.c:4609
+#: ../pidgin/gtkblist.c:4935
 msgid "/Buddies/Show/Idle Times"
 msgstr "/好友/顯示/閒置時間"
 
-#: ../pidgin/gtkblist.c:4612
+#: ../pidgin/gtkblist.c:4938
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/好友/顯示/通訊協定圖示"
 
-#: ../pidgin/gtkblist.c:5507
+#: ../pidgin/gtkblist.c:5850
 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. "
@@ -14299,69 +14382,82 @@ msgstr ""
 "請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱，而這個設定將會"
 "在好友清單中顯示。\n"
 
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:5873
+msgid "A_ccount:"
+msgstr "帳號(_C)："
+
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
+#: ../pidgin/gtkblist.c:5885
 msgid "_Screen name:"
 msgstr "帳號(_S)："
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+#: ../pidgin/gtkblist.c:5907 ../pidgin/gtkblist.c:6263
 msgid "A_lias:"
 msgstr "別名(_L)："
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:6175
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../pidgin/gtkblist.c:5842
+#: ../pidgin/gtkblist.c:6191
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: ../pidgin/gtkblist.c:5883
+#: ../pidgin/gtkblist.c:6232
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "請輸入別名，或者關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6291
+msgid "Autojoin when account becomes online."
+msgstr "帳號上線後隨即自動加入。"
+
+#: ../pidgin/gtkblist.c:6292
+msgid "Hide chat when the window is closed."
+msgstr "關閉視窗時只將聊天隱藏。"
+
+#: ../pidgin/gtkblist.c:6318
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 # XXX
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6963
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:6987
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
 #  NOTE 這不是「不允許」而是「沒有」，尤其是在新的「模組相關指令」清單，
 #  NOTE 譯成「不允許」會非常怪
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#: ../pidgin/gtkblist.c:7000 ../pidgin/gtkconv.c:3143
 msgid "No actions available"
 msgstr "沒有相關指令"
 
 # #NOTE 和下一個「Enable Account」對應。
-#: ../pidgin/gtkblist.c:6654
+#: ../pidgin/gtkblist.c:7008
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:7020
 msgid "Enable Account"
 msgstr "啟動帳號"
 
 # XXX
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:7026
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帳號/啟動帳號"
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7075
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:7145
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
@@ -14370,7 +14466,7 @@ msgstr "/好友/好友清單排序"
 msgid "SSL Servers"
 msgstr "SSL 伺服器"
 
-#: ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkconn.c:181
 #, c-format
 msgid ""
 "%s\n"
@@ -14381,216 +14477,211 @@ msgstr ""
 "%s\n"
 "在您更正這個錯誤並重新啟動這個帳號前，%s 將不會再試著重新連線。"
 
-#: ../pidgin/gtkconv.c:482
+#: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
 msgstr "未知的指令"
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
 # XXX 暫譯
-#: ../pidgin/gtkconv.c:774
+#: ../pidgin/gtkconv.c:816
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。"
 
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
+#: ../pidgin/gtkconv.c:899
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱，以及邀請的訊息。"
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr "好友(_B)："
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1194
 #: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "訊息(_M)："
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "無法開啟檔案。"
-
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "搜尋"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "搜尋(_S)："
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
 #  NOTE「Ignore」原譯「忽略使用者」，但 gtkprefs.c 中的「Ignore」
 #  NOTE 乃「忽略格式」的意思，故只能譯成「忽略」
-#: ../pidgin/gtkconv.c:1625
+#: ../pidgin/gtkconv.c:1679
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
 msgstr "上次提到"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "動畫"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
 #  NOTE 這是Right-Click圖示時顯示的指令，譯「As」為「為」會很奇怪
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr "自定圖示..."
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2799
 msgid "Remove Custom Icon"
 msgstr "移除自定圖示"
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
 msgstr "全部顯示"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr "/交談/解除封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
 msgstr "/選項/顯示時間戳記(_M)"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3131
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3187
 msgid "/Options"
 msgstr "/選項"
 
@@ -14599,173 +14690,173 @@ msgstr "/選項"
 #. 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:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3222 ../pidgin/gtkconv.c:3254
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3262
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3268
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3272
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3278
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3282
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3288
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3292
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3296
 msgid "/Conversation/Unblock..."
 msgstr "/交談/解除封鎖..."
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3300
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3304
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../pidgin/gtkconv.c:3240
+#: ../pidgin/gtkconv.c:3310
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: ../pidgin/gtkconv.c:3244
+#: ../pidgin/gtkconv.c:3314
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3320
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3336
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/選項/顯示格式工具列"
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3416 ../pidgin/gtkconv.c:3458
 msgid "User is typing..."
 msgstr "對方正在輸入..."
 
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3461
 msgid "User has typed something and stopped"
 msgstr "對方輸入了一些東西，不過暫停了"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
-msgstr "傳送到(_S)"
+#: ../pidgin/gtkconv.c:3645 ../pidgin/gtkconv.c:8181
+msgid "S_end To"
+msgstr "傳送到(_E)"
 
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:4357
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4470
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5844 ../pidgin/gtkconv.c:5965
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6572 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6576
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6579
 msgid "Nick Said"
 msgstr "暱稱被提及"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6582 ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6588
 msgid "New Event"
 msgstr "新事件"
 
 # XXX
-#: ../pidgin/gtkconv.c:7572
+#: ../pidgin/gtkconv.c:7700
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear：清空所有交談的回捲緩衝區"
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7863
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7895
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎？"
 
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8514
 msgid "Close other tabs"
 msgstr "關閉其他分頁"
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8520
 msgid "Close all tabs"
 msgstr "關閉所有分頁"
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8528
 msgid "Detach this tab"
 msgstr "分離這個分頁"
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8534
 msgid "Close this tab"
 msgstr "關閉這個分頁"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:9031
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9633
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9635
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9637 ../pidgin/gtkprefs.c:1417
 msgid "New window"
 msgstr "新視窗"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9639
 msgid "By group"
 msgstr "依群組"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9641
 msgid "By account"
 msgstr "依帳號"
 
@@ -14905,9 +14996,10 @@ msgstr "南非荷蘭文"
 msgid "Arabic"
 msgstr "阿拉伯文"
 
+#  NOTE「Latin」係指譯文以「拉丁字母」（而非西里爾字母）書寫，中譯可以省略 - acli 20070918
 #: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "白俄羅斯文"
 
 #: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 #: ../pidgin/gtkdialogs.c:227
@@ -15085,9 +15177,8 @@ msgid "Kurdish"
 msgstr "庫德文"
 
 #: ../pidgin/gtkdialogs.c:185
-#, fuzzy
 msgid "Lao"
-msgstr "獅子座"
+msgstr "寮國文"
 
 #: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
 #: ../pidgin/gtkdialogs.c:253
@@ -15253,7 +15344,6 @@ msgstr ""
 "式恕不提供任何保用。<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:418
-#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
@@ -15297,54 +15387,65 @@ msgstr "前任譯者"
 msgid "Debugging Information"
 msgstr "除錯專用資訊"
 
-#: ../pidgin/gtkdialogs.c:906
+# NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
+#: ../pidgin/gtkdialogs.c:753 ../pidgin/gtkdialogs.c:892
+#: ../pidgin/gtkdialogs.c:973
+msgid "_Name"
+msgstr "名稱(_N)"
+
+#: ../pidgin/gtkdialogs.c:758 ../pidgin/gtkdialogs.c:897
+#: ../pidgin/gtkdialogs.c:978
+msgid "_Account"
+msgstr "帳號(_A)"
+
+#: ../pidgin/gtkdialogs.c:905
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../pidgin/gtkdialogs.c:908
+#: ../pidgin/gtkdialogs.c:907
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:997
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:999
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號或別名。"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1019
 msgid "Alias Contact"
 msgstr "為這組好友加上別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1042
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkdialogs.c:1044
 msgid "Alias Buddy"
 msgstr "為這個好友加上別名"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1066
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1105
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15360,32 +15461,32 @@ msgstr[1] ""
 "作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1113
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1116
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
 # TODO 譯文有待改進 - 20061025
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1147
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "您正試著將群組 %s 與 %s 合併，新群組以後者命名。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1154
 msgid "Merge Groups"
 msgstr "合併群組"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1157
 msgid "_Merge Groups"
 msgstr "合併群組(_M)"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1207
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15393,72 +15494,71 @@ msgid ""
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1210
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1213
 msgid "_Remove Group"
 msgstr "移除群組(_R)"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1246
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1249
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1252
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1273
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1277
+#: ../pidgin/gtkdialogs.c:1276
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1279
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "按右鍵以讀取未讀訊息...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "變更狀態"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
 msgstr "顯示好友清單"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "新訊息..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
+#: ../pidgin/gtkdocklet.c:728
+msgid "Blink on New Message"
 msgstr "有新訊息時閃動"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "結束程式"
 
@@ -15555,44 +15655,44 @@ msgid "_Resume"
 msgstr "恢復(_R)"
 
 #  NOTE Nautilus譯「貼上文本」，Abiword譯「未格式化貼上」，聽來都有些怪
-#: ../pidgin/gtkimhtml.c:816
+#: ../pidgin/gtkimhtml.c:817
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:834 ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "_Reset formatting"
 msgstr "清除格式化(_R)"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1374
 msgid "Hyperlink color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1375
 msgid "Color to draw hyperlinks."
 msgstr "顯示連結時所用的顏色。"
 
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1378
 msgid "Hyperlink prelight color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1378
+#: ../pidgin/gtkimhtml.c:1379
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "當滑鼠經過連結時的連結顏色。"
 
-#: ../pidgin/gtkimhtml.c:1598
+#: ../pidgin/gtkimhtml.c:1599
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1611
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1621
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3369
+#: ../pidgin/gtkimhtml.c:3371
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15603,7 +15703,7 @@ msgstr ""
 "暫且當成 PNG 檔處理。"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3372
+#: ../pidgin/gtkimhtml.c:3374
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15613,7 +15713,7 @@ msgstr ""
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3403
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15624,7 +15724,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3406
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15635,12 +15735,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3484 ../pidgin/gtkimhtml.c:3496
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
+#: ../pidgin/gtkimhtml.c:3524
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
@@ -15678,7 +15777,7 @@ msgstr "請輸入您所要插入的 URL。"
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1263
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -15701,14 +15800,14 @@ msgstr "這個表情主題不含任何表情。"
 msgid "Smile!"
 msgstr "笑一個！"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
+#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1220
 msgid "_Font"
 msgstr "字型(_F)"
 
+# XXX 暫譯
 #: ../pidgin/gtkimhtmltoolbar.c:1054
-#, fuzzy
 msgid "Group Items"
-msgstr "群組 ID："
+msgstr "建立群組"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Ungroup Items"
@@ -15764,73 +15863,68 @@ msgstr "插入影像"
 msgid "Insert Smiley"
 msgstr "插入表情"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1180
 msgid "<b>_Bold</b>"
 msgstr "<b>粗體(_B)</b>"
 
 # NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型，「斜體」其實是誤譯，但已根深蒂固，不可能改正
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<i>_Italic</i>"
 msgstr "<i>斜體(_I)</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<u>_Underline</u>"
 msgstr "<u>底線(_U)</u>"
 
 #  NOTE 這看來是一般PO檔的譯法（印刷術語看來也沒有既有譯法）
-#: ../pidgin/gtkimhtmltoolbar.c:1182
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>刪除線</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<span size='larger'>_Larger</span>"
-msgstr ""
-"<span size='larger' weight='bold'>儲存影像途中發生錯誤</span>\n"
-"\n"
-"%s"
+msgstr "<span size='larger'>放大(_L)</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "_Normal"
 msgstr "正常(_N)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>縮小(_S)</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "_Font face"
 msgstr "字型(_F)"
 
 #  XXX 譯「文字顏色」會否較好？ - acli 20070614
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "Foreground _color"
 msgstr "前景顏色(_C)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "Bac_kground color"
 msgstr "背景顏色(_K)"
 
-#  XXX
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-msgid "_Smiley"
-msgstr "笑一個！(_S)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
+#: ../pidgin/gtkimhtmltoolbar.c:1271
 msgid "_Image"
 msgstr "影像(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
+#: ../pidgin/gtkimhtmltoolbar.c:1277
 msgid "_Link"
 msgstr "連結(_L)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+#: ../pidgin/gtkimhtmltoolbar.c:1283
 msgid "_Horizontal rule"
 msgstr "橫線(_H)"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1305
+msgid "_Smile!"
+msgstr "笑一個(_S)！"
+
 #  XXX 不通順 - ambrose 20070415
 #: ../pidgin/gtklog.c:293
 #, c-format
@@ -15901,17 +15995,17 @@ msgstr "瀏覽日誌目錄(_B)"
 msgid "Total log size:"
 msgstr "全部日誌大小："
 
-#: ../pidgin/gtklog.c:709
+#: ../pidgin/gtklog.c:710
 #, c-format
 msgid "Conversations in %s"
 msgstr "於 %s 的交談"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:718 ../pidgin/gtklog.c:785
 #, c-format
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:810
 msgid "System Log"
 msgstr "系統日誌"
 
@@ -15923,7 +16017,7 @@ msgstr "%s %s。執行「%s -h」以獲得更進一步的資訊。\n"
 #  FIXME
 #  NOTE hard-code 了一個「Pidgin」在譯文裏，但刪掉會有點困難（令文句難明），故暫時保留，待想到怎樣刪掉才算
 #: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -15935,6 +16029,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"
@@ -15947,12 +16042,13 @@ msgstr ""
 "  -n, --nologin       不自動登入\n"
 "  -l, --login[=NAME]  自動登入 (透過 NAME 參數來指定要使用\n"
 "哪些帳號，並使用逗號分隔) \n"
+"  --display=DISPLAY   使用指定的 X display\n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../pidgin/gtkmain.c:512
+#: ../pidgin/gtkmain.c:516
 #, 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"
@@ -15974,7 +16070,7 @@ msgstr ""
 #  TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
@@ -15986,36 +16082,36 @@ msgstr "開啟所有訊息"
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有郵件！</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:545
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新郵件。"
 msgstr[1] "%s 有 %d 封新郵件。"
 
-#: ../pidgin/gtknotify.c:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>您有 %d 封新郵件。</b>"
-msgstr[1] "<b>您有 %d 封新郵件。</b>"
+#: ../pidgin/gtknotify.c:569
+#, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
+msgstr[0] "<b>%d 封新郵件。</b>"
+msgstr[1] "<b>%d 封新郵件。</b>"
 
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:997
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:999 ../pidgin/gtknotify.c:1011
+#: ../pidgin/gtknotify.c:1024 ../pidgin/gtknotify.c:1152
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1009 ../pidgin/gtknotify.c:1022
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "啟動 \"%s\" 時發生錯誤：%s"
 
-#: ../pidgin/gtknotify.c:1145
+#: ../pidgin/gtknotify.c:1153
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」，卻未有設定指令。"
@@ -16067,95 +16163,95 @@ msgid "Select a file"
 msgstr "選擇檔案"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "捕捉誰的狀態"
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "好友名稱(_B)："
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "登出(_F)"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "離開(_W)"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "返回(_U)"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "閒置(_I)"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "不再閒置(_D)"
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "開始輸入(_T)"
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "暫停輸入(_A)"
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "停止輸入(_Y)"
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "送出一個訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "開啟即時訊息視窗(_N)"
 
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "彈出通知(_P)"
 
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "瀏覽(_E)..."
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "瀏覽(_O)..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#: ../pidgin/gtkpounce.c:798
+#: ../pidgin/gtkpounce.c:805
 msgid "P_ounce only when my status is not Available"
 msgstr "只在我的狀態不為「上線」時啟用(_O)"
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:810
 msgid "_Recurring"
 msgstr "重覆發生(_R)"
 
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1253
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
@@ -16206,7 +16302,7 @@ msgstr "隱藏即時訊息交談視窗"
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H)："
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
 msgid "When away"
 msgstr "離開期間"
 
@@ -16259,178 +16355,183 @@ msgstr "新交談(_E)："
 msgid "Show _formatting on incoming messages"
 msgstr "顯示所收訊息的格式化(_F)"
 
+#  TODO 要覆查 - acli 20070918
+#: ../pidgin/gtkprefs.c:997
+msgid "Close IMs immediately when the tab is closed"
+msgstr "關閉分頁時隨即關閉分頁內所有的即時通訊"
+
 #  TODO 要覆查 - acli 20070912
-#: ../pidgin/gtkprefs.c:998
+#: ../pidgin/gtkprefs.c:1000
 msgid "Show _detailed information"
 msgstr "顯示詳細資訊(_D)"
 
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:1002
 msgid "Enable buddy ic_on animation"
 msgstr "啟動好友圖示動畫(_O)"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1009
 msgid "_Notify buddies that you are typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_N)"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1012
 msgid "Highlight _misspelled words"
 msgstr "標示出拼錯的字(_M)"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1016
 msgid "Use smooth-scrolling"
 msgstr "使用平滑捲軸"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1019
 msgid "F_lash window when IMs are received"
 msgstr "收到即時訊息後閃動視窗(_F)"
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1021
 msgid "Minimi_ze new conversation windows"
 msgstr "最小化所有新交談視窗(_Z)"
 
-#: ../pidgin/gtkprefs.c:1023
+#: ../pidgin/gtkprefs.c:1025
 msgid "Font"
 msgstr "字型"
 
 #  XXX 要覆查 - acli 20070614
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:1027
 msgid "Use document font from _theme"
 msgstr "使用主題指定的文件字型(_T)"
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:1029
 msgid "Use font from _theme"
 msgstr "使用主題指定的字型(_T)"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1031
 msgid "Conversation _font:"
 msgstr "交談用的字型(_F)："
 
-#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:1045
 msgid "Default Formatting"
 msgstr "預設格式"
 
 # NOTE 這不是說明文，而是樣本本身，玩死人了 :P
-#: ../pidgin/gtkprefs.c:1062
+#: ../pidgin/gtkprefs.c:1064
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
 "這是一個樣本。假如您使用的協定支援格式化，送出訊息的式樣將會類似這段文字。"
 
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1130
 msgid "ST_UN server:"
 msgstr "STUN 伺服器(_U)："
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1142
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例：stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1146
 msgid "_Autodetect IP address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1155
 msgid "Public _IP:"
 msgstr "公共IP (_I)："
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "Ports"
 msgstr "通訊埠"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1190
 msgid "_Start port:"
 msgstr "啟始通訊埠(_S)："
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1197
 msgid "_End port:"
 msgstr "結束通訊埠(_E)："
 
-#: ../pidgin/gtkprefs.c:1203
+#: ../pidgin/gtkprefs.c:1205
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
 # NOTE 理由同前，不用「毋須」，改為「不使用」
-#: ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkprefs.c:1209
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1265
 msgid "_User:"
 msgstr "使用者(_U)："
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
 msgid "GNOME Default"
 msgstr "GNOME預設"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1337
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1338
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1339
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1348
 msgid "Manual"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1401
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1405
 msgid "_Browser:"
 msgstr "瀏覽器(_B)："
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O)："
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1416
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1418
 msgid "New tab"
 msgstr "新分頁"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1432
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16439,69 +16540,63 @@ msgstr ""
 "使用者自定(_M)：\n"
 "(請以 %s 代表網址)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log _format:"
 msgstr "日誌格式(_F)："
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1477
 msgid "Log all _instant messages"
 msgstr "記錄所有即時訊息(_I)"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1481
 msgid "Log all _status changes to system log"
 msgstr "記錄所有狀態改變至系統日誌(_S)"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1627
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
+#: ../pidgin/gtkprefs.c:1637
 msgid "Quietest"
 msgstr "最小聲"
 
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
+#: ../pidgin/gtkprefs.c:1639
 msgid "Quieter"
 msgstr "再小聲"
 
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
+#: ../pidgin/gtkprefs.c:1641
 msgid "Quiet"
 msgstr "小聲"
 
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
+#: ../pidgin/gtkprefs.c:1645
 msgid "Loud"
 msgstr "大聲"
 
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
+#: ../pidgin/gtkprefs.c:1647
 msgid "Louder"
 msgstr "再大聲"
 
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
+#: ../pidgin/gtkprefs.c:1649
 msgid "Loudest"
 msgstr "最大聲"
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1715
 msgid "_Method:"
 msgstr "播放方式(_M)："
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1717
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1724
 msgid "No sounds"
 msgstr "無音效"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1732
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16510,82 +16605,82 @@ msgstr ""
 "音效指令(_C)：\n"
 "(請以 %s 代表檔名)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1759
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1761
 msgid "Enable sounds:"
 msgstr "啟動音效："
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1772
 msgid "Volume:"
 msgstr "音量："
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1852
 msgid "Play"
 msgstr "播放"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:1934
 msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:1943
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應："
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1947
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:1953
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1955
 msgid "Change status when _idle"
 msgstr "閒置時更改狀態(_I)"
 
 # NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:1959
 msgid "_Minutes before becoming idle:"
 msgstr "閒置多少分鐘更改狀態(_M)："
 
-#: ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:1967
 msgid "Change _status to:"
 msgstr "更改狀態為(_S)："
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:1988
 msgid "Status at Startup"
 msgstr "啟動時狀態"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:1990
 msgid "Use status from last _exit at startup"
 msgstr "使用上次結束前的狀態"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:1996
 msgid "Status to a_pply at startup:"
 msgstr "啟動時套用的狀態："
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2034
 msgid "Interface"
 msgstr "介面"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2036
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2043
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2047
 msgid "Status / Idle"
 msgstr "狀態／閒置"
 
@@ -16755,37 +16850,37 @@ msgstr "狀態：%s"
 msgid "Waiting for network connection"
 msgstr "等待網路連線..."
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkutils.c:633
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1400 ../pidgin/gtkutils.c:1423
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "載入 %s 時發生以下錯誤：%s"
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1403 ../pidgin/gtkutils.c:1425
 msgid "Failed to load image"
 msgstr "讀取影像失敗"
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1499
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../pidgin/gtkutils.c:1499
+#: ../pidgin/gtkutils.c:1500
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr "%s 沒有辦法傳送目錄，您需要個別傳送目錄內的檔案。"
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1534 ../pidgin/gtkutils.c:1546
+#: ../pidgin/gtkutils.c:1553
 msgid "You have dragged an image"
 msgstr "您拖曳了一個影像"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1535
 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."
@@ -16793,23 +16888,23 @@ msgstr ""
 "您可以透過檔案傳輸、插入訊息，或者把它當成是你的好友圖示等方式，來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1541 ../pidgin/gtkutils.c:1561
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
 msgid "Send image file"
 msgstr "傳送影像檔"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1562
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1547
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您要把它設為這個使用者的好友圖示嗎？"
 
-#: ../pidgin/gtkutils.c:1551
+#: ../pidgin/gtkutils.c:1554
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -16817,7 +16912,7 @@ msgstr ""
 "您可以透過檔案傳輸，或者把它當成是你的好友圖示等方式，來傳送影像檔給這個使用"
 "者。"
 
-#: ../pidgin/gtkutils.c:1552
+#: ../pidgin/gtkutils.c:1555
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16830,17 +16925,17 @@ 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:1610
+#: ../pidgin/gtkutils.c:1614
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1614
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr "您拖曳了一個啟動器；您大概想傳送啟動器要啟動的檔案，而不是啟動器本身。"
 
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:2349
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16851,25 +16946,25 @@ msgstr ""
 "<b>檔案大小：</b> %s\n"
 "<b>圖像尺寸：</b> %d×%d"
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2645
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 對 %s 來說太大了。請試試小一點的影象。\n"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2647
 msgid "Icon Error"
 msgstr "圖像錯誤"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2648
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2748
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案「%s」：%s"
 
-#: ../pidgin/gtkutils.c:2793
+#: ../pidgin/gtkutils.c:2797
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -16907,10 +17002,12 @@ msgstr "修改(_M)"
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
+# NOTE 這是「Default」表情主題的說明
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
-msgstr "Pidgin 表情圖示"
+msgstr "為 Pidgin 特別設計的表情圖示"
 
+# NOTE 這是「none」表情主題的標題（太奇怪了，這是沒有圖示的主題喎）
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr ""
@@ -16919,7 +17016,7 @@ msgstr ""
 msgid "Selecting this disables graphical emoticons."
 msgstr "不使用表情圖示，選擇這個主題即可。"
 
-# NOTE 這個「none」是指「沒有（不使用）圖示」
+# NOTE 這個「none」是「none」表情主題（不使用圖示）的主題名稱(?!)
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "無"
@@ -17085,7 +17182,7 @@ msgstr "送出訊息"
 msgid "Received Messages"
 msgstr "收到訊息"
 
-#: ../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 "為%s選擇顏色"
@@ -17369,7 +17466,7 @@ msgstr ""
 "\n"
 "<b>好友備註</b>：%s"
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "歷史記錄"
 
@@ -17629,46 +17726,37 @@ msgstr "超連結顏色"
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 水平間隔距離"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "交談視窗的輸入欄位"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "交談歷史"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "日誌檢視器"
-
 #  XXX 這譯文絶對有問題，但想不到怎樣譯較好 - ambrose 20070415
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "對話視窗 (Request Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "通知視窗 (Notify Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "選擇顏色"
 
-#: ../pidgin/plugins/pidginrc.c:300
-#, c-format
+#: ../pidgin/plugins/pidginrc.c:294
 msgid "Select Interface Font"
 msgstr "選擇介面字型"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "為%s選擇字型"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "GTK+介面字型"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
@@ -17692,36 +17780,36 @@ msgstr ""
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "介面顏色"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Widget 大小"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "字型"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc檔專用工具"
 
-#: ../pidgin/plugins/pidginrc.c:502
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "將設定寫入%s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "重新讀取gtkrc檔案"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:538
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ 佈景主題設定"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "提供一般 gtkrc 設定的存取"
 
@@ -17862,7 +17950,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 "好友跑馬燈"
 
@@ -17870,7 +17958,7 @@ msgstr "好友跑馬燈"
 #. *< 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 "好友清單的水平捲動版本"
 
@@ -17905,7 +17993,6 @@ msgid "Timestamp Format Options"
 msgstr "時間戳記格式選項"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
 msgid "_Force 24-hour time format"
 msgstr "強制使用24小時制時間格式(_F)"
 
@@ -18121,116 +18208,45 @@ msgstr "送出、讀取未加工的 XMPP 段落。"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
-#, fuzzy
-#~ msgid "Show"
-#~ msgstr "全部顯示"
-
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "顯示離線好友"
+#~ msgid "Sort by status"
+#~ msgstr "依照狀態排列"
 
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "通訊埠"
+#~ msgid "Sort alphabetically"
+#~ msgstr "依照字母排列"
 
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "依照狀態"
+#~ msgid "Sort by log size"
+#~ msgstr "依照日誌大小排列"
 
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "依照日誌大小"
+#~ msgid "Add Buddy _Pounce"
+#~ msgstr "加入好友狀態捕捉(_P)"
 
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "無法連線到伺服器。"
+#~ msgid "Add a _Buddy"
+#~ msgstr "新增一個好友(_B)"
 
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "選擇 Notes 通訊錄"
+#~ msgid "Add a C_hat"
+#~ msgstr "新增一個聊天室(_H)"
 
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "目前密碼"
+#~ msgid "_Send To"
+#~ msgstr "傳送到(_S)"
 
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Novell GroupWise Messenger 協定模組"
+#~ msgid "Has you"
+#~ msgstr "你在他（她）的好友清單裏"
 
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "無法以正常程序認證！"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s 在呼叫您！"
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN 協定模組"
 
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "未知錯誤"
+#~ msgid "/Accounts/Add\\/Edit"
+#~ msgstr "/帳號(_A)/新增\\/編輯"
 
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "無法連線到伺服器。"
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s 從「%s」狀態改變為「%s」"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s 目前為%s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s 不再%s"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "訊息(_M)："
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "傳送檔案(_S)"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "加入好友狀態捕捉..."
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "在離線時不允許這個指令"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "在離線時不允許這個指令"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "新增好友"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "新增聊天室"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "波斯文"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/帳號"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "帳號："
+#  XXX
+#~ msgid "_Smiley"
+#~ msgstr "笑一個！(_S)"
 
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "傳送到"
+#~ msgid "Conversation History"
+#~ msgstr "交談歷史"
 
-#, fuzzy
-#~ msgid "_Smile!"
-#~ msgstr "笑一個！"
+#~ msgid "Log Viewer"
+#~ msgstr "日誌檢視器"
 
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "您剛送出了一個呼叫！"
@@ -18955,10 +18971,6 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgid "C_hat Messages:"
 #~ msgstr "聊天訊息(_H)："
 
-#, fuzzy
-#~ msgid "When my nick is said"
-#~ msgstr "當我的帳號是閒置時(_I)"
-
 #~ msgid "Displays an icon for Gaim in the system tray."
 #~ msgstr "在系統工作匣中顯示 Gaim 的圖示。"
 
@@ -19182,9 +19194,6 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgid "Saved Status..."
 #~ msgstr "儲存狀態..."
 
-#~ msgid "Join A Chat..."
-#~ msgstr "加入聊天室..."
-
 #~ msgid "(+%d more)"
 #~ msgstr "（以及另外 %d 個）"
 
@@ -19226,6 +19235,5 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgstr "隱藏 IP 位址"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#, fuzzy
 #~ msgid "Web aware"
 #~ msgstr "允許其他使用者在網路上查看您目前的狀態"