diff po/lo.po @ 20696:2a5206e40e8c

I hate merging po files.

--- a/po/lo.po	Fri Sep 28 20:30:26 2007 +0000
+++ b/po/lo.po	Fri Sep 28 20:32:15 2007 +0000
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: ../libpurple/certificate.c:543
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-25 03:21-0400\n"
+"POT-Creation-Date: 2007-09-28 14:39-0500\n"
 "PO-Revision-Date: 2007-09-28 09:52+0700\n"
 "Last-Translator: Anousak Souphavanh <[e-mail]>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -16,12 +17,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../finch/finch.c:64
-#: ../finch/finch.c:300
-#: ../finch/finch.c:329
-#: ../finch/finch.c:417
+#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
+#: ../finch/finch.c:418
 msgid "Finch"
 msgstr ""
 
@@ -43,129 +40,110 @@
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 
-#: ../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 ""
-
-#: ../finch/gntaccount.c:123
-#: ../finch/gntaccount.c:483
-#: ../finch/gntblist.c:299
-#: ../finch/gntblist.c:432
-#: ../finch/gntblist.c:445
-#: ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233
-#: ../finch/gntstatus.c:300
-#: ../finch/gntstatus.c:309
-#: ../libpurple/protocols/jabber/buddy.c:1464
+#: ../finch/finch.c:328 ../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 ""
+
+#: ../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
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1515
 #: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576
-#: ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "ຜິດພາດ"
 
-#: ../finch/gntaccount.c:123
+#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr ""
 
-#: ../finch/gntaccount.c:124
+#: ../finch/gntaccount.c:125
 msgid "Screenname of an account must be non-empty."
 msgstr ""
 
-#: ../finch/gntaccount.c:436
+#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr ""
 
-#: ../finch/gntaccount.c:446
+#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr ""
 
-#: ../finch/gntaccount.c:484
-msgid "There's no protocol plugins installed."
-msgstr ""
-
 #: ../finch/gntaccount.c:485
+msgid "There's no protocol plugins installed."
+msgstr ""
+
+#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr ""
 
-#: ../finch/gntaccount.c:495
-#: ../pidgin/gtkaccount.c:1468
-#: ../pidgin/gtkblist.c:4025
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
+#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
 msgid "Modify Account"
 msgstr ""
 
-#: ../finch/gntaccount.c:495
+#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr ""
 
-#: ../finch/gntaccount.c:520
-#: ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr ""
 
-#: ../finch/gntaccount.c:528
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../finch/gntaccount.c:529
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Screen name:"
 msgstr ""
 
-#: ../finch/gntaccount.c:541
+#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr ""
 
-#: ../finch/gntaccount.c:551
+#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr ""
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:574
-#: ../finch/gntaccount.c:637
-#: ../finch/gntaccount.c:883
-#: ../finch/gntblist.c:343
-#: ../finch/gntblist.c:420
-#: ../finch/gntblist.c:455
-#: ../finch/gntblist.c:802
-#: ../finch/gntblist.c:1004
-#: ../finch/gntblist.c:1100
-#: ../finch/gntblist.c:2221
-#: ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:458
-#: ../finch/gntpounce.c:666
-#: ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1054
-#: ../finch/gntstatus.c:144
-#: ../finch/gntstatus.c:484
-#: ../finch/gntstatus.c:609
-#: ../libpurple/account.c:984
-#: ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269
-#: ../libpurple/conversation.c:1173
-#: ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:502
-#: ../libpurple/protocols/gg/gg.c:661
-#: ../libpurple/protocols/gg/gg.c:798
-#: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1826
-#: ../libpurple/protocols/jabber/buddy.c:1862
+#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
+#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
+#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c: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
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259
-#: ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293
-#: ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6044
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/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/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
@@ -199,226 +177,165 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1028
-#: ../libpurple/protocols/yahoo/yahoo.c:3472
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
-#: ../pidgin/gtkaccount.c:1903
-#: ../pidgin/gtkaccount.c:2497
-#: ../pidgin/gtkblist.c:5927
-#: ../pidgin/gtkdialogs.c:750
-#: ../pidgin/gtkdialogs.c:888
-#: ../pidgin/gtkdialogs.c:980
-#: ../pidgin/gtkdialogs.c:1000
-#: ../pidgin/gtkdialogs.c:1024
-#: ../pidgin/gtkdialogs.c:1046
-#: ../pidgin/gtkdialogs.c:1094
-#: ../pidgin/gtkdialogs.c:1135
-#: ../pidgin/gtkdialogs.c:1191
-#: ../pidgin/gtkdialogs.c:1230
-#: ../pidgin/gtkdialogs.c:1257
-#: ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:327
-#: ../pidgin/gtkplugin.c:288
-#: ../pidgin/gtkpounce.c:1100
-#: ../pidgin/gtkprivacy.c:562
-#: ../pidgin/gtkprivacy.c:578
-#: ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
-#: ../pidgin/gtkrequest.c:270
-#: ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1573
+#: ../libpurple/protocols/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
 msgid "Cancel"
 msgstr ""
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:578
-#: ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1051
-#: ../finch/gntstatus.c:487
-#: ../finch/gntstatus.c:597
-#: ../libpurple/account.c:1268
-#: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587
-#: ../pidgin/gtkdebug.c:748
-#: ../pidgin/gtkrequest.c:276
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
+#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
+#: ../pidgin/gtkrequest.c:277
 msgid "Save"
 msgstr ""
 
-#: ../finch/gntaccount.c:631
-#: ../pidgin/gtkaccount.c:1895
-#: ../pidgin/gtksavedstatuses.c:332
-#: ../pidgin/gtkstatusbox.c:1567
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
-#: ../finch/gntaccount.c:634
+#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr ""
 
 #. Delete button
-#: ../finch/gntaccount.c:636
-#: ../finch/gntaccount.c:706
-#: ../finch/gntpounce.c:665
-#: ../finch/gntpounce.c:728
-#: ../finch/gntstatus.c:143
-#: ../finch/gntstatus.c:209
-#: ../pidgin/gtkaccount.c:1902
-#: ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1099
-#: ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343
-#: ../pidgin/gtkstatusbox.c:1572
+#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
+#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
 msgid "Delete"
 msgstr ""
 
-#: ../finch/gntaccount.c:668
-#: ../finch/gntblist.c:2118
-#: ../finch/gntui.c:81
-#: ../pidgin/gtkaccount.c:2320
-#: ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr ""
 
-#: ../finch/gntaccount.c:674
+#: ../finch/gntaccount.c:675
 msgid "You can enable/disable accounts from the following list."
 msgstr ""
 
 #. Add button
-#: ../finch/gntaccount.c:697
-#: ../finch/gntaccount.c:882
-#: ../finch/gntblist.c:342
-#: ../finch/gntblist.c:420
-#: ../finch/gntblist.c:455
-#: ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:712
-#: ../finch/gntstatus.c:198
-#: ../libpurple/protocols/gg/gg.c:878
-#: ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/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
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599
-#: ../pidgin/gtkaccount.c:2496
-#: ../pidgin/gtkblist.c:5926
-#: ../pidgin/gtkconv.c:1624
-#: ../pidgin/gtkrequest.c:274
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
+#: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr ""
 
 #. Modify button
-#: ../finch/gntaccount.c:702
-#: ../finch/gntpounce.c:720
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
 msgid "Modify"
 msgstr ""
 
-#: ../finch/gntaccount.c:805
-#: ../pidgin/gtkaccount.c:2443
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr ""
 
-#: ../finch/gntaccount.c:878
-#: ../pidgin/gtkaccount.c:2495
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr ""
 
-#: ../finch/gntaccount.c:938
-#: ../pidgin/gtkaccount.c:2553
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr ""
 
-#: ../finch/gntaccount.c:963
-#: ../finch/gntaccount.c:966
-#: ../finch/gntaccount.c:993
-#: ../pidgin/gtkaccount.c:2576
-#: ../pidgin/gtkaccount.c:2582
+#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr ""
 
-#: ../finch/gntaccount.c:970
-#: ../finch/gntaccount.c:997
-#: ../pidgin/gtkaccount.c:2577
-#: ../pidgin/gtkaccount.c:2583
+#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr ""
 
-#: ../finch/gntaccount.c:971
-#: ../finch/gntaccount.c:998
-#: ../pidgin/gtkaccount.c:2578
-#: ../pidgin/gtkaccount.c:2584
+#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr ""
 
-#: ../finch/gntblist.c:288
+#: ../finch/gntblist.c:289
 msgid "You must provide a screename for the buddy."
 msgstr ""
 
-#: ../finch/gntblist.c:290
+#: ../finch/gntblist.c:291
 msgid "You must provide a group."
 msgstr ""
 
-#: ../finch/gntblist.c:292
+#: ../finch/gntblist.c:293
 msgid "You must select an account."
 msgstr ""
 
-#: ../finch/gntblist.c:294
+#: ../finch/gntblist.c:295
 msgid "The selected account is not online."
 msgstr ""
 
-#: ../finch/gntblist.c:299
+#: ../finch/gntblist.c:300
 msgid "Error adding buddy"
 msgstr ""
 
-#: ../finch/gntblist.c:324
-#: ../libpurple/protocols/oscar/oscar.c:2858
-#: ../pidgin/gtkaccount.c:1976
-#: ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr ""
 
-#: ../finch/gntblist.c:327
-#: ../finch/gntblist.c:409
-#: ../finch/gntblist.c:1249
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
+#: ../libpurple/protocols/msn/msn.c:1395
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207
-#: ../pidgin/gtkdialogs.c:999
-#: ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1045
-#: ../pidgin/gtkrequest.c:277
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
+#: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr ""
 
-#: ../finch/gntblist.c:330
-#: ../finch/gntblist.c:412
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
 msgid "Group"
 msgstr ""
 
-#: ../finch/gntblist.c:334
-#: ../finch/gntblist.c:400
-#: ../finch/gntblist.c:1304
-#: ../finch/gntnotify.c:173
-#: ../finch/gntstatus.c:575
-#: ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2988
-#: ../pidgin/gtknotify.c:488
-#: ../pidgin/gtkpounce.c:1267
-#: ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
+#: ../finch/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
 msgid "Account"
 msgstr ""
 
-#: ../finch/gntblist.c:340
-#: ../finch/gntblist.c:851
+#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -427,203 +344,182 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3317
-#: ../pidgin/gtkblist.c:5433
+#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr ""
 
-#: ../finch/gntblist.c:340
+#: ../finch/gntblist.c:341
 msgid "Please enter buddy information."
 msgstr ""
 
-#: ../finch/gntblist.c:369
-#: ../libpurple/blist.c:1190
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
 msgid "Chats"
 msgstr ""
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:406
-#: ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553
-#: ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
-#: ../libpurple/protocols/qq/buddy_info.c:44
-#: ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:617
+#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
+#: ../libpurple/protocols/jabber/jabber.c:927
+#: ../libpurple/protocols/msn/msn.c: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
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr ""
 
-#: ../finch/gntblist.c:415
-#: ../finch/gntblist.c:818
+#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
 msgid "Auto-join"
 msgstr ""
 
-#: ../finch/gntblist.c:418
-#: ../finch/gntblist.c:853
-#: ../pidgin/gtkblist.c:5812
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
 msgid "Add Chat"
 msgstr ""
 
-#: ../finch/gntblist.c:419
+#: ../finch/gntblist.c:420
 msgid "You can edit more information from the context menu later."
 msgstr ""
 
-#: ../finch/gntblist.c:432
-#: ../finch/gntblist.c:445
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
 msgid "Error adding group"
 msgstr ""
 
-#: ../finch/gntblist.c:433
+#: ../finch/gntblist.c:434
 msgid "You must give a name for the group to add."
 msgstr ""
 
-#: ../finch/gntblist.c:446
+#: ../finch/gntblist.c:447
 msgid "A group with the name already exists."
 msgstr ""
 
-#: ../finch/gntblist.c:453
-#: ../finch/gntblist.c:855
+#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484
-#: ../pidgin/gtkblist.c:5923
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
 msgid "Add Group"
 msgstr ""
 
-#: ../finch/gntblist.c:453
+#: ../finch/gntblist.c:454
 msgid "Enter the name of the group"
 msgstr ""
 
-#: ../finch/gntblist.c:801
-msgid "Edit Chat"
-msgstr ""
-
-#: ../finch/gntblist.c:801
-msgid "Please Update the necessary fields."
-msgstr ""
-
 #: ../finch/gntblist.c:802
-#: ../finch/gntstatus.c:204
+msgid "Edit Chat"
+msgstr ""
+
+#: ../finch/gntblist.c:802
+msgid "Please Update the necessary fields."
+msgstr ""
+
+#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr ""
 
-#: ../finch/gntblist.c:827
+#: ../finch/gntblist.c:828
 msgid "Edit Settings"
 msgstr ""
 
-#: ../finch/gntblist.c:863
-#: ../pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Information"
 msgstr ""
 
-#: ../finch/gntblist.c:863
-#: ../pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Retrieving..."
 msgstr ""
 
-#: ../finch/gntblist.c:903
-#: ../finch/gntconv.c:436
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr ""
 
-#: ../finch/gntblist.c:907
+#: ../finch/gntblist.c:908
 msgid "Add Buddy Pounce"
 msgstr ""
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:914
-#: ../finch/gntconv.c:448
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:653
-#: ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1572
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1607
 msgid "Send File"
 msgstr ""
 
-#: ../finch/gntblist.c:918
+#: ../finch/gntblist.c:919
 msgid "View Log"
 msgstr ""
 
-#: ../finch/gntblist.c:999
+#: ../finch/gntblist.c:1000
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr ""
 
-#: ../finch/gntblist.c:1001
-#: ../finch/gntblist.c:1249
+#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
 msgid "Rename"
 msgstr ""
 
-#: ../finch/gntblist.c:1001
-msgid "Set Alias"
-msgstr ""
-
 #: ../finch/gntblist.c:1002
+msgid "Set Alias"
+msgstr ""
+
+#: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
 msgstr ""
 
-#: ../finch/gntblist.c:1078
+#: ../finch/gntblist.c:1079
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 
-#: ../finch/gntblist.c:1086
+#: ../finch/gntblist.c:1087
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
 
-#: ../finch/gntblist.c:1091
+#: ../finch/gntblist.c:1092
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr ""
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1094
+#: ../finch/gntblist.c:1095
 msgid "Confirm Remove"
 msgstr ""
 
-#: ../finch/gntblist.c:1099
-#: ../finch/gntblist.c:1251
-#: ../finch/gntft.c:226
-#: ../pidgin/gtkconv.c:1621
-#: ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtkstatusbox.c:263
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
+#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr ""
 
 #. Buddy List
-#: ../finch/gntblist.c:1225
-#: ../finch/gntblist.c:2306
-#: ../finch/gntprefs.c:257
-#: ../finch/gntui.c:82
-#: ../pidgin/gtkblist.c:4269
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr ""
 
-#: ../finch/gntblist.c:1256
+#: ../finch/gntblist.c:1257
 msgid "Place tagged"
 msgstr ""
 
-#: ../finch/gntblist.c:1261
+#: ../finch/gntblist.c:1262
 msgid "Toggle Tag"
 msgstr ""
 
 #. General
-#: ../finch/gntblist.c:1297
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045
-#: ../libpurple/protocols/gg/gg.c:1118
-#: ../libpurple/protocols/gg/gg.c:2202
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1627
-#: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:2207
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1247
+#: ../libpurple/protocols/jabber/buddy.c: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
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -633,110 +529,93 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066
-#: ../pidgin/gtkblist.c:3012
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
 msgid "Nickname"
 msgstr ""
 
 #. Idle stuff
-#: ../finch/gntblist.c:1319
-#: ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:333
-#: ../libpurple/protocols/jabber/buddy.c:647
-#: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516
-#: ../libpurple/protocols/msn/state.c:32
+#: ../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
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3071
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710
-#: ../pidgin/gtkblist.c:3040
-#: ../pidgin/gtkblist.c:3445
-#: ../pidgin/gtkprefs.c:1920
+#: ../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
 msgid "Idle"
 msgstr ""
 
-#: ../finch/gntblist.c:1333
+#: ../finch/gntblist.c:1334
 msgid "On Mobile"
 msgstr ""
 
-#: ../finch/gntblist.c:1414
+#: ../finch/gntblist.c:1415
 #, c-format
 msgid ""
 "Online: %d\n"
 "Total: %d"
 msgstr ""
 
-#: ../finch/gntblist.c:1423
+#: ../finch/gntblist.c:1424
 #, c-format
 msgid "Account: %s (%s)"
 msgstr ""
 
-#: ../finch/gntblist.c:1435
+#: ../finch/gntblist.c:1436
 #, c-format
 msgid ""
 "\n"
 "Last Seen: %s ago"
 msgstr ""
 
-#: ../finch/gntblist.c:1701
-#: ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr ""
 
-#: ../finch/gntblist.c:1708
-#: ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr ""
 
-#: ../finch/gntblist.c:2086
-#: ../finch/gntplugin.c:254
-#: ../finch/gntui.c:86
-#: ../pidgin/gtkdocklet.c:523
-#: ../pidgin/gtkplugin.c:530
+#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr ""
 
-#: ../finch/gntblist.c:2202
-#: ../pidgin/gtkdialogs.c:731
-#: ../pidgin/gtkdialogs.c:869
-#: ../pidgin/gtkdialogs.c:950
+#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
+#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
 msgid "_Name"
 msgstr ""
 
-#: ../finch/gntblist.c:2207
-#: ../pidgin/gtkdialogs.c:736
-#: ../pidgin/gtkdialogs.c:874
-#: ../pidgin/gtkdialogs.c:955
+#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
+#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
 msgid "_Account"
 msgstr ""
 
-#: ../finch/gntblist.c:2215
-#: ../pidgin/gtkdialogs.c:744
+#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
 msgid "New Instant Message"
 msgstr ""
 
-#: ../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 ""
-
-#: ../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
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+
+#. 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
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -753,224 +632,332 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1027
-#: ../libpurple/protocols/yahoo/yahoo.c:3471
-#: ../libpurple/protocols/yahoo/yahoo.c:3482
-#: ../pidgin/gtkblist.c:4024
-#: ../pidgin/gtkdialogs.c:749
-#: ../pidgin/gtkdialogs.c:887
-#: ../pidgin/gtkdialogs.c:979
-#: ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c: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
 msgid "OK"
 msgstr ""
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2240
-#: ../finch/gntpounce.c:446
-#: ../pidgin/gtkpounce.c:789
+#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
 msgid "Options"
 msgstr ""
 
-#: ../finch/gntblist.c:2246
+#: ../finch/gntblist.c:2247
 msgid "Send IM..."
 msgstr ""
 
-#: ../finch/gntblist.c:2250
+#: ../finch/gntblist.c:2251
 msgid "Show empty groups"
 msgstr ""
 
-#: ../finch/gntblist.c:2256
+#: ../finch/gntblist.c:2257
 msgid "Show offline buddies"
 msgstr ""
 
-#: ../finch/gntblist.c:2262
+#: ../finch/gntblist.c:2263
 msgid "Sort by status"
 msgstr ""
 
-#: ../finch/gntblist.c:2266
+#: ../finch/gntblist.c:2267
 msgid "Sort alphabetically"
 msgstr ""
 
-#: ../finch/gntblist.c:2270
+#: ../finch/gntblist.c:2271
 msgid "Sort by log size"
 msgstr ""
 
-#: ../finch/gntconn.c:110
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+msgid "Certificate Import"
+msgstr ""
+
+#: ../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
+msgid "Select a PEM certificate"
+msgstr ""
+
+#: ../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
+#, c-format
+msgid "Certificate for %s"
+msgstr ""
+
+#: ../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 ""
+
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
+#: ../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
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../pidgin/gtkrequest.c:273
+msgid "Close"
+msgstr ""
+
+#: ../finch/gntconn.c:124
 #, c-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../finch/gntconn.c:113
+#: ../finch/gntconn.c:127
 #, c-format
 msgid "%s disconnected."
 msgstr ""
 
-#: ../finch/gntconn.c:114
+#: ../finch/gntconn.c:128
 #, c-format
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
-msgstr ""
-
-#: ../finch/gntconv.c:118
-msgid "No such command."
-msgstr ""
-
-#: ../finch/gntconv.c:122
-#: ../pidgin/gtkconv.c:465
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr ""
-
-#: ../finch/gntconv.c:127
-#: ../pidgin/gtkconv.c:471
-msgid "Your command failed for an unknown reason."
-msgstr ""
-
-#: ../finch/gntconv.c:132
-#: ../pidgin/gtkconv.c:478
-msgid "That command only works in chats, not IMs."
-msgstr ""
-
-#: ../finch/gntconv.c:135
-#: ../pidgin/gtkconv.c:481
-msgid "That command only works in IMs, not chats."
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+
+#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+msgid "Re-enable Account"
 msgstr ""
 
 #: ../finch/gntconv.c:139
-#: ../pidgin/gtkconv.c:486
+msgid "No such command."
+msgstr ""
+
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr ""
+
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+msgid "Your command failed for an unknown reason."
+msgstr ""
+
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+msgid "That command only works in chats, not IMs."
+msgstr ""
+
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+msgid "That command only works in IMs, not chats."
+msgstr ""
+
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
 msgid "That command doesn't work on this protocol."
 msgstr ""
 
-#: ../finch/gntconv.c:147
+#: ../finch/gntconv.c:168
 msgid "Message was not sent, because you are not signed on."
 msgstr ""
 
-#: ../finch/gntconv.c:230
+#: ../finch/gntconv.c:251
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr ""
 
-#: ../finch/gntconv.c:253
+#: ../finch/gntconv.c:274
 #, c-format
 msgid "%s [%s]"
 msgstr ""
 
-#: ../finch/gntconv.c:258
-#: ../finch/gntconv.c:677
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
 #, c-format
 msgid ""
 "\n"
 "%s is typing..."
 msgstr ""
 
-#: ../finch/gntconv.c:277
+#: ../finch/gntconv.c:298
 msgid "You have left this chat."
 msgstr ""
 
-#: ../finch/gntconv.c:371
+#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+
+#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+
+#: ../finch/gntconv.c:442
 msgid "Send To"
 msgstr ""
 
-#: ../finch/gntconv.c:415
+#: ../finch/gntconv.c:486
 msgid "Conversation"
 msgstr ""
 
-#: ../finch/gntconv.c:421
+#: ../finch/gntconv.c:492
 msgid "Clear Scrollback"
 msgstr ""
 
-#: ../finch/gntconv.c:425
-#: ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr ""
 
-#: ../finch/gntconv.c:441
+#: ../finch/gntconv.c:512
 msgid "Add Buddy Pounce..."
 msgstr ""
 
-#: ../finch/gntconv.c:643
+#: ../finch/gntconv.c:527
+msgid "Enable Logging"
+msgstr ""
+
+#: ../finch/gntconv.c:533
+msgid "Enable Sounds"
+msgstr ""
+
+#: ../finch/gntconv.c:739
 msgid "<AUTO-REPLY> "
 msgstr ""
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:765
+#: ../finch/gntconv.c:861
 msgid "List of users:\n"
 msgstr ""
 
-#: ../finch/gntconv.c:910
-#: ../pidgin/gtkconv.c:308
+#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
 msgid "Supported debug options are:  version"
 msgstr ""
 
-#: ../finch/gntconv.c:945
-#: ../pidgin/gtkconv.c:357
+#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
 msgid "No such command (in this context)."
 msgstr ""
 
-#: ../finch/gntconv.c:948
-#: ../pidgin/gtkconv.c:360
+#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
 
-#: ../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."
-msgstr ""
-
-#: ../finch/gntconv.c:1009
-#: ../pidgin/gtkconv.c:7323
+#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+
+#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 
-#: ../finch/gntconv.c:1012
-#: ../pidgin/gtkconv.c:7326
-msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
-msgstr ""
-
-#: ../finch/gntconv.c:1015
-#: ../pidgin/gtkconv.c:7329
+#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+
+#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
 msgid "clear: Clears the conversation scrollback."
 msgstr ""
 
-#: ../finch/gntconv.c:1018
-#: ../pidgin/gtkconv.c:7335
+#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 
-#: ../finch/gntconv.c:1021
+#: ../finch/gntconv.c:1135
 msgid "users:  Show the list of users in the chat."
 msgstr ""
 
-#: ../finch/gntconv.c:1026
+#: ../finch/gntconv.c:1140
 msgid "plugins: Show the plugins window."
 msgstr ""
 
-#: ../finch/gntconv.c:1029
+#: ../finch/gntconv.c:1143
 msgid "buddylist: Show the buddylist."
 msgstr ""
 
-#: ../finch/gntconv.c:1032
+#: ../finch/gntconv.c:1146
 msgid "accounts: Show the accounts window."
 msgstr ""
 
-#: ../finch/gntconv.c:1035
+#: ../finch/gntconv.c:1149
 msgid "debugwin: Show the debug window."
 msgstr ""
 
-#: ../finch/gntconv.c:1038
+#: ../finch/gntconv.c:1152
 msgid "prefs: Show the preference window."
 msgstr ""
 
-#: ../finch/gntconv.c:1041
+#: ../finch/gntconv.c:1155
 msgid "statuses: Show the savedstatuses window."
 msgstr ""
 
-#: ../finch/gntdebug.c:234
-#: ../finch/gntui.c:84
-#: ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr ""
 
@@ -978,242 +965,186 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:255
-#: ../pidgin/gtkdebug.c:753
+#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr ""
 
-#: ../finch/gntdebug.c:261
+#: ../finch/gntdebug.c:262
 msgid "Filter: "
 msgstr ""
 
-#: ../finch/gntdebug.c:265
-#: ../pidgin/gtkdebug.c:762
+#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr ""
 
-#: ../finch/gntft.c:117
-#: ../pidgin/gtkft.c:228
+#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr ""
 
 #. Create the window.
-#: ../finch/gntft.c:122
-#: ../finch/gntft.c:195
-#: ../finch/gntui.c:85
-#: ../pidgin/gtkft.c:233
-#: ../pidgin/gtkft.c:761
+#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
+#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
 msgid "File Transfers"
 msgstr ""
 
-#: ../finch/gntft.c:200
-#: ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr ""
 
-#: ../finch/gntft.c:200
-#: ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr ""
 
-#: ../finch/gntft.c:200
-#: ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr ""
 
-#: ../finch/gntft.c:200
+#: ../finch/gntft.c:201
 msgid "Speed"
 msgstr ""
 
-#: ../finch/gntft.c:200
-#: ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr ""
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:200
-#: ../finch/gntstatus.c:546
-#: ../finch/gntstatus.c:575
-#: ../libpurple/protocols/bonjour/bonjour.c:337
-#: ../libpurple/protocols/gg/gg.c:1034
-#: ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../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
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2670
-#: ../libpurple/protocols/oscar/oscar.c:3750
+#: ../libpurple/protocols/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/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3222
-#: ../pidgin/gtkblist.c:3084
-#: ../pidgin/gtkblist.c:3097
-#: ../pidgin/gtkblist.c:3099
-#: ../pidgin/gtksavedstatuses.c:998
-#: ../pidgin/gtksavedstatuses.c:1143
+#: ../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
 msgid "Status"
 msgstr ""
 
-#: ../finch/gntft.c:210
+#: ../finch/gntft.c:211
 msgid "Close this window when all transfers finish"
 msgstr ""
 
-#: ../finch/gntft.c:217
+#: ../finch/gntft.c:218
 msgid "Clear finished transfers"
 msgstr ""
 
-#: ../finch/gntft.c:231
+#: ../finch/gntft.c:232
 msgid "Stop"
 msgstr ""
 
-#. 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 ""
-
-#: ../finch/gntft.c:304
-#: ../pidgin/gtkft.c:168
-#: ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-#: ../finch/gntft.c:371
-#: ../pidgin/gtkft.c:165
-#: ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr ""
 
-#: ../finch/gntft.c:373
-#: ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr ""
 
-#: ../finch/gntft.c:419
-#: ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr ""
 
-#: ../finch/gntft.c:430
-#, c-format
-msgid "The file was saved as %s."
-msgstr ""
-
 #: ../finch/gntft.c:431
-#: ../finch/gntft.c:432
-#: ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1115
+#, c-format
+msgid "The file was saved as %s."
+msgstr ""
+
+#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
+#: ../pidgin/gtkft.c:1116
 msgid "Finished"
 msgstr ""
 
-#: ../finch/gntft.c:436
-#: ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr ""
 
-#: ../finch/gntnotify.c:164
+#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr ""
 
-#: ../finch/gntnotify.c:170
-#: ../finch/gntnotify.c:224
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
 msgid "You have mail!"
 msgstr ""
 
-#: ../finch/gntnotify.c:173
-#: ../pidgin/gtknotify.c:495
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
 msgid "Sender"
 msgstr ""
 
-#: ../finch/gntnotify.c:173
-#: ../pidgin/gtknotify.c:502
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
 msgid "Subject"
 msgstr ""
 
-#: ../finch/gntnotify.c:200
+#: ../finch/gntnotify.c:201
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../finch/gntnotify.c:224
-#: ../pidgin/gtknotify.c:340
+#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr ""
 
-#: ../finch/gntnotify.c:289
-#: ../pidgin/gtknotify.c:908
+#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
 msgid "Info for %s"
 msgstr ""
 
-#: ../finch/gntnotify.c:290
-#: ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:909
+#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:941
 msgid "Buddy Information"
 msgstr ""
 
-#: ../finch/gntnotify.c:376
-#: ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr ""
 
-#: ../finch/gntnotify.c:382
-#: ../pidgin/gtkconv.c:1600
-#: ../pidgin/gtkdebug.c:834
-msgid "Info"
-msgstr ""
-
-#: ../finch/gntnotify.c:385
-#: ../pidgin/gtkconv.c:1561
+#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
 msgid "IM"
 msgstr ""
 
-#: ../finch/gntnotify.c:388
+#: ../finch/gntnotify.c:389
 msgid "Join"
 msgstr ""
 
-#: ../finch/gntnotify.c:391
-#: ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr ""
 
-#: ../finch/gntnotify.c:394
+#: ../finch/gntnotify.c:395
 msgid "(none)"
 msgstr ""
 
-#: ../finch/gntplugin.c:74
-#: ../finch/gntplugin.c:83
+#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
 msgid "ERROR"
 msgstr ""
 
-#: ../finch/gntplugin.c:74
+#: ../finch/gntplugin.c:75
 msgid "loading plugin failed"
 msgstr ""
 
-#: ../finch/gntplugin.c:83
+#: ../finch/gntplugin.c:84
 msgid "unloading plugin failed"
 msgstr ""
 
-#: ../finch/gntplugin.c:128
+#: ../finch/gntplugin.c:129
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1224,19 +1155,19 @@
 "Filename: %s\n"
 msgstr ""
 
-#: ../finch/gntplugin.c:186
+#: ../finch/gntplugin.c:187
 msgid "Plugin need to be loaded before you can configure it."
 msgstr ""
 
-#: ../finch/gntplugin.c:234
+#: ../finch/gntplugin.c:235
 msgid "No configuration options for this plugin."
 msgstr ""
 
-#: ../finch/gntplugin.c:259
+#: ../finch/gntplugin.c:260
 msgid "You can (un)load plugins from the following list."
 msgstr ""
 
-#: ../finch/gntplugin.c:314
+#: ../finch/gntplugin.c:315
 msgid "Configure Plugin"
 msgstr ""
 
@@ -1245,414 +1176,362 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:370
-#: ../finch/gntplugin.c:377
-#: ../finch/gntprefs.c:263
-#: ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:524
-#: ../pidgin/gtkprefs.c:2062
+#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
 msgid "Preferences"
 msgstr ""
 
-#: ../finch/gntpounce.c:182
-#: ../pidgin/gtkpounce.c:255
+#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr ""
 
-#: ../finch/gntpounce.c:327
-#: ../pidgin/gtkpounce.c:516
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: ../finch/gntpounce.c:327
-#: ../pidgin/gtkpounce.c:516
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "Edit Buddy Pounce"
 msgstr ""
 
-#: ../finch/gntpounce.c:332
+#: ../finch/gntpounce.c:333
 msgid "Pounce Who"
 msgstr ""
 
 #. Account:
-#: ../finch/gntpounce.c:335
-#: ../finch/gntstatus.c:455
+#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr ""
 
-#: ../finch/gntpounce.c:357
+#: ../finch/gntpounce.c:358
 msgid "Buddy name:"
 msgstr ""
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373
-#: ../pidgin/gtkpounce.c:584
+#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
 msgid "Pounce When Buddy..."
 msgstr ""
 
-#: ../finch/gntpounce.c:375
-msgid "Signs on"
-msgstr ""
-
 #: ../finch/gntpounce.c:376
-msgid "Signs off"
+msgid "Signs on"
 msgstr ""
 
 #: ../finch/gntpounce.c:377
-msgid "Goes away"
+msgid "Signs off"
 msgstr ""
 
 #: ../finch/gntpounce.c:378
-msgid "Returns from away"
+msgid "Goes away"
 msgstr ""
 
 #: ../finch/gntpounce.c:379
-msgid "Becomes idle"
+msgid "Returns from away"
 msgstr ""
 
 #: ../finch/gntpounce.c:380
-msgid "Is no longer idle"
+msgid "Becomes idle"
 msgstr ""
 
 #: ../finch/gntpounce.c:381
-msgid "Starts typing"
+msgid "Is no longer idle"
 msgstr ""
 
 #: ../finch/gntpounce.c:382
-msgid "Pauses while typing"
+msgid "Starts typing"
 msgstr ""
 
 #: ../finch/gntpounce.c:383
-msgid "Stops typing"
+msgid "Pauses while typing"
 msgstr ""
 
 #: ../finch/gntpounce.c:384
+msgid "Stops typing"
+msgstr ""
+
+#: ../finch/gntpounce.c:385
 msgid "Sends a message"
 msgstr ""
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:413
-#: ../pidgin/gtkpounce.c:645
+#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
 msgid "Action"
 msgstr ""
 
-#: ../finch/gntpounce.c:415
-msgid "Open an IM window"
-msgstr ""
-
 #: ../finch/gntpounce.c:416
-msgid "Pop up a notification"
+msgid "Open an IM window"
 msgstr ""
 
 #: ../finch/gntpounce.c:417
-msgid "Send a message"
+msgid "Pop up a notification"
 msgstr ""
 
 #: ../finch/gntpounce.c:418
-msgid "Execute a command"
+msgid "Send a message"
 msgstr ""
 
 #: ../finch/gntpounce.c:419
+msgid "Execute a command"
+msgstr ""
+
+#: ../finch/gntpounce.c:420
 msgid "Play a sound"
 msgstr ""
 
-#: ../finch/gntpounce.c:447
+#: ../finch/gntpounce.c:448
 msgid "Pounce only when my status is not available"
 msgstr ""
 
-#: ../finch/gntpounce.c:449
-#: ../pidgin/gtkpounce.c:1280
+#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
 msgid "Recurring"
 msgstr ""
 
-#: ../finch/gntpounce.c:617
-msgid "Cannot create pounce"
-msgstr ""
-
 #: ../finch/gntpounce.c:618
-msgid "You do not have any accounts."
+msgid "Cannot create pounce"
 msgstr ""
 
 #: ../finch/gntpounce.c:619
+msgid "You do not have any accounts."
+msgstr ""
+
+#: ../finch/gntpounce.c:620
 msgid "You must create an account first before you can create a pounce."
 msgstr ""
 
-#: ../finch/gntpounce.c:661
-#: ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr ""
 
-#: ../finch/gntpounce.c:695
-#: ../finch/gntui.c:83
-#: ../pidgin/gtkpounce.c:1324
+#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
 msgid "Buddy Pounces"
 msgstr ""
 
-#: ../finch/gntpounce.c:809
-#: ../pidgin/gtkpounce.c:1451
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:811
-#: ../pidgin/gtkpounce.c:1453
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:813
-#: ../pidgin/gtkpounce.c:1455
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:815
-#: ../pidgin/gtkpounce.c:1457
+#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:817
-#: ../pidgin/gtkpounce.c:1459
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:819
-#: ../pidgin/gtkpounce.c:1461
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:821
-#: ../pidgin/gtkpounce.c:1463
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:823
-#: ../pidgin/gtkpounce.c:1465
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:825
-#: ../pidgin/gtkpounce.c:1467
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:827
-#: ../pidgin/gtkpounce.c:1469
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr ""
 
-#: ../finch/gntpounce.c:828
-#: ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
-#: ../finch/gntprefs.c:91
+#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr ""
 
-#: ../finch/gntprefs.c:93
-#: ../pidgin/gtkprefs.c:1925
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
 msgid "From last sent message"
 msgstr ""
 
-#: ../finch/gntprefs.c:95
-#: ../pidgin/gtkprefs.c:897
-#: ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1924
-#: ../pidgin/gtkprefs.c:1938
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
+#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr ""
 
-#: ../finch/gntprefs.c:183
-msgid "Show Idle Time"
-msgstr ""
-
 #: ../finch/gntprefs.c:184
+msgid "Show Idle Time"
+msgstr ""
+
+#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr ""
 
-#: ../finch/gntprefs.c:191
+#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr ""
 
-#: ../finch/gntprefs.c:197
-msgid "Log format"
-msgstr ""
-
 #: ../finch/gntprefs.c:198
-msgid "Log IMs"
+msgid "Log format"
 msgstr ""
 
 #: ../finch/gntprefs.c:199
-msgid "Log chats"
+msgid "Log IMs"
 msgstr ""
 
 #: ../finch/gntprefs.c:200
+msgid "Log chats"
+msgstr ""
+
+#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr ""
 
-#: ../finch/gntprefs.c:206
-msgid "Report Idle time"
-msgstr ""
-
 #: ../finch/gntprefs.c:207
-msgid "Change status when idle"
+msgid "Report Idle time"
 msgstr ""
 
 #: ../finch/gntprefs.c:208
-msgid "Minutes before changing status"
+msgid "Change status when idle"
 msgstr ""
 
 #: ../finch/gntprefs.c:209
+msgid "Minutes before changing status"
+msgstr ""
+
+#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr ""
 
 #. Conversations
-#: ../finch/gntprefs.c:258
-#: ../pidgin/gtkprefs.c:992
-#: ../pidgin/gtkprefs.c:2028
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr ""
 
-#: ../finch/gntprefs.c:259
-#: ../pidgin/gtkprefs.c:1464
-#: ../pidgin/gtkprefs.c:2039
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
 msgid "Logging"
 msgstr ""
 
-#: ../finch/gntrequest.c:563
+#: ../finch/gntrequest.c:583
 msgid "Not implemented yet."
 msgstr ""
 
-#: ../finch/gntrequest.c:635
-#: ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
+#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr ""
 
-#: ../finch/gntrequest.c:635
-#: ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
+#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr ""
 
-#: ../finch/gntsound.c:94
-#: ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
 msgid "Buddy logs in"
 msgstr ""
 
-#: ../finch/gntsound.c:95
-#: ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
 msgid "Buddy logs out"
 msgstr ""
 
-#: ../finch/gntsound.c:96
-#: ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
 msgid "Message received"
 msgstr ""
 
-#: ../finch/gntsound.c:97
-#: ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message received begins conversation"
 msgstr ""
 
-#: ../finch/gntsound.c:98
-#: ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Message sent"
 msgstr ""
 
-#: ../finch/gntsound.c:99
-#: ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person enters chat"
 msgstr ""
 
-#: ../finch/gntsound.c:100
-#: ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "Person leaves chat"
 msgstr ""
 
-#: ../finch/gntsound.c:101
-#: ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "You talk in chat"
 msgstr ""
 
-#: ../finch/gntsound.c:102
-#: ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
 msgid "Others talk in chat"
 msgstr ""
 
-#: ../finch/gntsound.c:104
-#: ../pidgin/gtksound.c:74
+#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
 msgid "Someone says your screen name in chat"
 msgstr ""
 
-#: ../finch/gntsound.c:357
-#: ../pidgin/gtksound.c:310
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
 msgid "GStreamer Failure"
 msgstr ""
 
-#: ../finch/gntsound.c:358
-#: ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
 msgid "GStreamer failed to initialize."
 msgstr ""
 
-#: ../finch/gntsound.c:712
-#: ../finch/gntsound.c:798
-#: ../pidgin/gtkprefs.c:1584
-#: ../pidgin/gtkprefs.c:1673
-#: ../pidgin/gtkprefs.c:1867
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
+#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
 msgid "(default)"
 msgstr ""
 
-#: ../finch/gntsound.c:725
+#: ../finch/gntsound.c:729
 msgid "Select Sound File ..."
 msgstr ""
 
-#: ../finch/gntsound.c:900
+#: ../finch/gntsound.c:904
 msgid "Sound Preferences"
 msgstr ""
 
-#: ../finch/gntsound.c:911
+#: ../finch/gntsound.c:915
 msgid "Profiles"
 msgstr ""
 
-#: ../finch/gntsound.c:950
-#: ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
 msgid "Automatic"
 msgstr ""
 
-#: ../finch/gntsound.c:953
-msgid "Console Beep"
-msgstr ""
-
-#: ../finch/gntsound.c:954
-#: ../pidgin/gtkprefs.c:1716
-msgid "Command"
-msgstr ""
-
-#: ../finch/gntsound.c:955
-msgid "No Sound"
-msgstr ""
-
 #: ../finch/gntsound.c:957
-#: ../pidgin/gtkprefs.c:1707
+msgid "Console Beep"
+msgstr ""
+
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+msgid "Command"
+msgstr ""
+
+#: ../finch/gntsound.c:959
+msgid "No Sound"
+msgstr ""
+
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
 msgid "Sound Method"
 msgstr ""
 
-#: ../finch/gntsound.c:962
+#: ../finch/gntsound.c:966
 msgid "Method: "
 msgstr ""
 
-#: ../finch/gntsound.c:969
+#: ../finch/gntsound.c:973
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1660,94 +1539,80 @@
 msgstr ""
 
 #. Sound options
-#: ../finch/gntsound.c:977
-#: ../pidgin/gtkprefs.c:1751
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
 msgid "Sound Options"
 msgstr ""
 
-#: ../finch/gntsound.c:978
+#: ../finch/gntsound.c:982
 msgid "Sounds when conversation has focus"
 msgstr ""
 
-#: ../finch/gntsound.c:986
-#: ../pidgin/gtkprefs.c:896
-#: ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1758
-#: ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
+#: ../pidgin/gtkprefs.c:1763 ../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:987
-#: ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
 msgid "Only when available"
 msgstr ""
 
-#: ../finch/gntsound.c:988
-#: ../pidgin/gtkprefs.c:1757
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
 msgid "Only when not available"
 msgstr ""
 
-#: ../finch/gntsound.c:995
+#: ../finch/gntsound.c:999
 msgid "Volume(0-100):"
 msgstr ""
 
 #. Sound events
-#: ../finch/gntsound.c:1014
-#: ../pidgin/gtkprefs.c:1793
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
 msgid "Sound Events"
 msgstr ""
 
-#: ../finch/gntsound.c:1016
-#: ../pidgin/gtkprefs.c:1852
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
 msgid "Event"
 msgstr ""
 
-#: ../finch/gntsound.c:1016
+#: ../finch/gntsound.c:1020
 msgid "File"
 msgstr ""
 
-#: ../finch/gntsound.c:1035
-#: ../pidgin/gtkprefs.c:1871
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
 msgid "Test"
 msgstr ""
 
-#: ../finch/gntsound.c:1038
-#: ../pidgin/gtkprefs.c:1875
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
 msgid "Reset"
 msgstr ""
 
-#: ../finch/gntsound.c:1041
-#: ../pidgin/gtkprefs.c:1879
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
 msgid "Choose..."
 msgstr ""
 
-#: ../finch/gntstatus.c:137
+#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr ""
 
-#: ../finch/gntstatus.c:140
+#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr ""
 
-#: ../finch/gntstatus.c:175
-#: ../pidgin/gtksavedstatuses.c:596
+#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr ""
 
-#: ../finch/gntstatus.c:182
-#: ../finch/gntstatus.c:538
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:973
+#: ../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
-#: ../pidgin/gtksavedstatuses.c:499
+#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr ""
 
-#: ../finch/gntstatus.c:182
-#: ../pidgin/gtksavedstatuses.c:514
+#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr ""
 
@@ -1759,37 +1624,31 @@
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:182
-#: ../finch/gntstatus.c:563
-#: ../finch/gntstatus.c:575
-#: ../libpurple/protocols/bonjour/bonjour.c:249
+#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
 #: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:339
-#: ../libpurple/protocols/gg/gg.c:1072
-#: ../libpurple/protocols/gg/gg.c:1574
-#: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/gg/gg.c:1602
-#: ../libpurple/protocols/gg/gg.c:1608
-#: ../libpurple/protocols/gg/gg.c:1617
-#: ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
-#: ../libpurple/protocols/myspace/myspace.c:269
+#: ../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/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5504
-#: ../libpurple/protocols/oscar/oscar.c:5722
-#: ../libpurple/protocols/oscar/oscar.c:5736
-#: ../libpurple/protocols/oscar/oscar.c:5752
-#: ../libpurple/protocols/oscar/oscar.c:5759
-#: ../libpurple/protocols/oscar/oscar.c:5766
+#: ../libpurple/protocols/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/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1797,81 +1656,100 @@
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3725
-#: ../libpurple/protocols/yahoo/yahoo.c:3731
+#: ../libpurple/protocols/yahoo/yahoo.c:3751
+#: ../libpurple/protocols/yahoo/yahoo.c:3757
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:525
-#: ../pidgin/gtksavedstatuses.c:1009
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
 msgstr ""
 
 #. Use
-#: ../finch/gntstatus.c:193
-#: ../finch/gntstatus.c:592
+#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
 msgid "Use"
 msgstr ""
 
-#: ../finch/gntstatus.c:300
-msgid "Invalid title"
-msgstr ""
-
 #: ../finch/gntstatus.c:301
+msgid "Invalid title"
+msgstr ""
+
+#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr ""
 
-#: ../finch/gntstatus.c:309
-msgid "Duplicate title"
-msgstr ""
-
 #: ../finch/gntstatus.c:310
+msgid "Duplicate title"
+msgstr ""
+
+#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr ""
 
-#: ../finch/gntstatus.c:451
+#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr ""
 
-#: ../finch/gntstatus.c:463
-#: ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr ""
 
-#: ../finch/gntstatus.c:478
+#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr ""
 
-#: ../finch/gntstatus.c:527
+#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr ""
 
-#: ../finch/gntstatus.c:569
+#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr ""
 
 #. Save & Use
-#: ../finch/gntstatus.c:603
+#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr ""
 
-#: ../finch/gntui.c:87
-#: ../pidgin/gtkprefs.c:2030
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr ""
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
 msgid "Sounds"
 msgstr ""
 
-#: ../finch/gntui.c:89
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr ""
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr ""
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr ""
 
-#: ../finch/plugins/gntclipboard.c:152
-msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
+#: ../finch/plugins/gntclipboard.c:161
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
 msgstr ""
 
 #: ../finch/plugins/gntgf.c:231
@@ -1931,155 +1809,143 @@
 msgid "GntGf"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:379
-#: ../finch/plugins/gntgf.c:380
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:116
-#: ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:138
-#: ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 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:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
 msgstr ""
 
 #: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:181
-#: ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:182
-#: ../pidgin/plugins/history.c:191
-msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
 msgstr ""
 
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr ""
 
-#: ../finch/plugins/lastlog.c:99
+#. Translator Note: The "backlog" is the conversation buffer/history.
+#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr ""
 
-#: ../finch/plugins/lastlog.c:121
+#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr ""
 
-#: ../finch/plugins/lastlog.c:123
-#: ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:790
+#: ../libpurple/account.c:791
 msgid "accounts"
 msgstr ""
 
-#: ../libpurple/account.c:937
-#: ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
 msgid "Password is required to sign on."
 msgstr ""
 
-#: ../libpurple/account.c:963
+#: ../libpurple/account.c:992
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr ""
 
-#: ../libpurple/account.c:970
+#: ../libpurple/account.c:999
 msgid "Enter Password"
 msgstr ""
 
-#: ../libpurple/account.c:975
+#: ../libpurple/account.c:1004
 msgid "Save password"
 msgstr ""
 
-#: ../libpurple/account.c:1010
-#: ../libpurple/connection.c:104
+#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+#: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr ""
 
-#: ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4021
+#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
+#: ../pidgin/gtkblist.c:4036
 msgid "Connection Error"
 msgstr ""
 
-#: ../libpurple/account.c:1170
-#: ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "New passwords do not match."
 msgstr ""
 
-#: ../libpurple/account.c:1179
+#: ../libpurple/account.c:1208
 msgid "Fill out all fields completely."
 msgstr ""
 
-#: ../libpurple/account.c:1202
+#: ../libpurple/account.c:1231
 msgid "Original password"
 msgstr ""
 
-#: ../libpurple/account.c:1209
+#: ../libpurple/account.c:1238
 msgid "New password"
 msgstr ""
 
-#: ../libpurple/account.c:1216
+#: ../libpurple/account.c:1245
 msgid "New password (again)"
 msgstr ""
 
-#: ../libpurple/account.c:1222
+#: ../libpurple/account.c:1251
 #, c-format
 msgid "Change password for %s"
 msgstr ""
 
-#: ../libpurple/account.c:1230
+#: ../libpurple/account.c:1259
 msgid "Please enter your current password and your new password."
 msgstr ""
 
-#: ../libpurple/account.c:1261
+#: ../libpurple/account.c:1290
 #, c-format
 msgid "Change user information for %s"
 msgstr ""
 
-#: ../libpurple/account.c:1264
-#: ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr ""
 
-#: ../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/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/qq/qq.c:232
-#: ../pidgin/gtkft.c:159
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr ""
 
-#: ../libpurple/blist.c:521
-#: ../libpurple/blist.c:1301
-#: ../libpurple/blist.c:1530
-#: ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5323
+#: ../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
-#: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr ""
 
@@ -2087,24 +1953,169 @@
 msgid "buddy list"
 msgstr ""
 
-#: ../libpurple/connection.c:106
+#: ../libpurple/certificate.c:545
+msgid "(DOES NOT MATCH)"
+msgstr ""
+
+#. Make messages
+#: ../libpurple/certificate.c:549
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr ""
+
+#: ../libpurple/certificate.c:550
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:555
+msgid "Single-use Certificate Verification"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:872
+msgid "Certificate Authorities"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1040
+msgid "SSL Peers Cache"
+msgstr ""
+
+#. Make messages
+#: ../libpurple/certificate.c:1171
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1177
+msgid "SSL Certificate Verification"
+msgstr ""
+
+#. Number of actions
+#: ../libpurple/certificate.c:1186
+msgid "Accept"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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
+msgid "SSL Certificate Error"
+msgstr ""
+
+#: ../libpurple/certificate.c:1340
+msgid "Invalid certificate chain"
+msgstr ""
+
+#. 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
+msgid "Certificate Information"
+msgstr ""
+
+#: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr ""
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:180
+msgid "Unregistration Error"
+msgstr ""
+
+#: ../libpurple/connection.c:350
 #, c-format
 msgid "+++ %s signed on"
 msgstr ""
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:380
 #, c-format
 msgid "+++ %s signed off"
 msgstr ""
 
-#: ../libpurple/connection.c:440
-#: ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1750
-#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/protocols/msn/servconn.c:141
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr ""
@@ -2113,8 +2124,7 @@
 msgid "Unable to send message: The message is too large."
 msgstr ""
 
-#: ../libpurple/conversation.c:173
-#: ../libpurple/conversation.c:186
+#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr ""
@@ -2123,46 +2133,45 @@
 msgid "The message is too large."
 msgstr ""
 
-#: ../libpurple/conversation.c:183
-#: ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
 #: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr ""
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr ""
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr ""
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr ""
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr ""
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr ""
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr ""
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr ""
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr ""
@@ -2182,112 +2191,110 @@
 msgid "Failed to get serv name: %s"
 msgstr ""
 
-#: ../libpurple/dbus-server.h:84
+#: ../libpurple/dbus-server.h:85
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
 
-#: ../libpurple/desktopitem.c:286
-#: ../libpurple/desktopitem.c:877
+#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:510
+#: ../libpurple/dnsquery.c:511
 msgid "Unable to create new resolver process\n"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:515
+#: ../libpurple/dnsquery.c:516
 msgid "Unable to send request to resolver process\n"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:548
-#: ../libpurple/dnsquery.c:696
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:551
-#: ../libpurple/dnsquery.c:710
-#: ../libpurple/dnsquery.c:830
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
+#: ../libpurple/dnsquery.c:831
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:573
+#: ../libpurple/dnsquery.c:574
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:577
+#: ../libpurple/dnsquery.c:578
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:760
-#, c-format
-msgid "Thread creation failure: %s"
-msgstr ""
-
 #: ../libpurple/dnsquery.c:761
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr ""
+
+#: ../libpurple/dnsquery.c:762
 msgid "Unknown reason"
 msgstr ""
 
-#: ../libpurple/ft.c:207
+#: ../libpurple/ft.c:209
 #, c-format
 msgid ""
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:211
+#: ../libpurple/ft.c:213
 #, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:215
+#: ../libpurple/ft.c:217
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:251
+#: ../libpurple/ft.c:253
 msgid "Directory is not writable."
 msgstr ""
 
-#: ../libpurple/ft.c:266
+#: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
 msgstr ""
 
-#: ../libpurple/ft.c:276
+#: ../libpurple/ft.c:278
 msgid "Cannot send a directory."
 msgstr ""
 
-#: ../libpurple/ft.c:285
+#: ../libpurple/ft.c:287
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:345
+#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
 
-#: ../libpurple/ft.c:352
+#: ../libpurple/ft.c:354
 #, c-format
 msgid "%s wants to send you a file"
 msgstr ""
 
-#: ../libpurple/ft.c:395
+#: ../libpurple/ft.c:397
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr ""
 
-#: ../libpurple/ft.c:399
+#: ../libpurple/ft.c:401
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2295,61 +2302,63 @@
 "Remote port: %d"
 msgstr ""
 
-#: ../libpurple/ft.c:434
+#: ../libpurple/ft.c:436
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr ""
 
-#: ../libpurple/ft.c:486
+#: ../libpurple/ft.c:488
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:507
+#: ../libpurple/ft.c:509
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr ""
 
-#: ../libpurple/ft.c:519
+#: ../libpurple/ft.c:521
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr ""
 
-#: ../libpurple/ft.c:680
+#: ../libpurple/ft.c:682
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#: ../libpurple/ft.c:683
+#: ../libpurple/ft.c:685
+#, c-format
 msgid "File transfer complete"
 msgstr ""
 
-#: ../libpurple/ft.c:1101
+#: ../libpurple/ft.c:1103
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr ""
 
-#: ../libpurple/ft.c:1106
+#: ../libpurple/ft.c:1108
+#, c-format
 msgid "File transfer cancelled"
 msgstr ""
 
-#: ../libpurple/ft.c:1164
+#: ../libpurple/ft.c:1166
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr ""
 
-#: ../libpurple/ft.c:1169
+#: ../libpurple/ft.c:1171
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr ""
 
-#: ../libpurple/ft.c:1226
-#, c-format
-msgid "File transfer to %s failed."
-msgstr ""
-
 #: ../libpurple/ft.c:1228
 #, c-format
+msgid "File transfer to %s failed."
+msgstr ""
+
+#: ../libpurple/ft.c:1230
+#, c-format
 msgid "File transfer from %s failed."
 msgstr ""
 
@@ -2422,39 +2431,57 @@
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
-msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
-msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
-msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
-msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
-msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
-msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
-msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
-msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
-msgid "True if the command used to handle this type of URL should be run in a terminal."
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
 msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
@@ -2489,52 +2516,54 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr ""
 
-#: ../libpurple/log.c:182
+#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 
-#: ../libpurple/log.c:597
+#: ../libpurple/log.c:598
 msgid "HTML"
 msgstr ""
 
-#: ../libpurple/log.c:611
+#: ../libpurple/log.c:612
 msgid "Plain text"
 msgstr ""
 
-#: ../libpurple/log.c:625
+#: ../libpurple/log.c:626
 msgid "Old flat format"
 msgstr ""
 
-#: ../libpurple/log.c:838
+#: ../libpurple/log.c:839
 msgid "Logging of this conversation failed."
 msgstr ""
 
-#: ../libpurple/log.c:1281
+#: ../libpurple/log.c:1282
 msgid "XML"
 msgstr ""
 
-#: ../libpurple/log.c:1365
-#, c-format
-msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-
-#: ../libpurple/log.c:1367
-#, c-format
-msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-
-#: ../libpurple/log.c:1425
-#: ../libpurple/log.c:1558
+#: ../libpurple/log.c:1366
+#, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#: ../libpurple/log.c:1368
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 
-#: ../libpurple/log.c:1437
-#: ../libpurple/log.c:1567
+#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr ""
 
-#: ../libpurple/log.c:1499
+#: ../libpurple/log.c:1500
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
@@ -2545,6 +2574,7 @@
 msgstr ""
 
 #: ../libpurple/plugin.c:380
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2564,7 +2594,9 @@
 
 #: ../libpurple/plugin.c:547
 #, c-format
-msgid "The required plugin %s was not found. Please install this plugin and try again."
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
 msgstr ""
 
 #: ../libpurple/plugin.c:552
@@ -2593,8 +2625,7 @@
 msgid "Autoaccept"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:25
-#: ../libpurple/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr ""
 
@@ -2620,19 +2651,16 @@
 msgid "_Save"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:165
-#: ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204
-#: ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1451
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5836
-#: ../libpurple/protocols/oscar/oscar.c:5891
-#: ../libpurple/protocols/oscar/oscar.c:6117
-#: ../libpurple/protocols/oscar/oscar.c:6187
-#: ../libpurple/request.h:1387
-#: ../libpurple/request.h:1397
+#: ../libpurple/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
 msgid "_Cancel"
 msgstr ""
 
@@ -2669,9 +2697,8 @@
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#: ../libpurple/plugins/buddynote.c:46
-#: ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
+#: ../libpurple/protocols/msn/msn.c:1690
 msgid "Notes"
 msgstr ""
 
@@ -2691,21 +2718,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90
-#: ../pidgin/plugins/gtkbuddynote.c:71
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr ""
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92
-#: ../pidgin/plugins/gtkbuddynote.c:73
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr ""
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93
-#: ../pidgin/plugins/gtkbuddynote.c:74
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 
@@ -2723,8 +2747,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267
-#: ../libpurple/plugins/ciphertest.c:269
+#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr ""
 
@@ -2761,32 +2784,26 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251
-#: ../libpurple/plugins/filectl.c:253
+#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:158
-#: ../libpurple/plugins/idle.c:218
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr ""
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165
-#: ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225
-#: ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:166
-#: ../libpurple/plugins/idle.c:258
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:169
-#: ../libpurple/plugins/idle.c:229
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr ""
 
@@ -2794,8 +2811,7 @@
 msgid "None of your accounts are idle."
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:200
-#: ../libpurple/plugins/idle.c:262
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr ""
 
@@ -2803,8 +2819,7 @@
 msgid "_Unset"
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:226
-#: ../libpurple/plugins/idle.c:266
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr ""
 
@@ -2812,8 +2827,7 @@
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:320
-#: ../libpurple/plugins/idle.c:321
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr ""
 
@@ -2836,7 +2850,9 @@
 
 #. *  description
 #: ../libpurple/plugins/ipc-test-client.c:92
-msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
 msgstr ""
 
 #. *< type
@@ -2892,7 +2908,9 @@
 
 #. *  description
 #: ../libpurple/plugins/joinpart.c:275
-msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
 msgstr ""
 
 #. This is used in the place of a timezone abbreviation if the
@@ -2927,7 +2945,9 @@
 msgstr ""
 
 #: ../libpurple/plugins/log_reader.c:1628
-msgid "You are currently disconnected. Messages will not be received unless you are logged in."
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
 msgstr ""
 
 #: ../libpurple/plugins/log_reader.c:1643
@@ -3024,9 +3044,11 @@
 #. * description
 #: ../libpurple/plugins/log_reader.c:2531
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
 msgstr ""
 
 #: ../libpurple/plugins/mono/loader/mono.c:217
@@ -3059,70 +3081,69 @@
 
 #. *< summary
 #: ../libpurple/plugins/newline.c:71
-msgid "Prepends a newline to messages so that the rest of the message appears below the screen name in the conversation window."
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the screen name in the conversation window."
 msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:25
-#: ../libpurple/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:95
-msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
-msgstr ""
-
-#: ../libpurple/plugins/offlinemsg.c:152
-#, c-format
-msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
+msgid ""
+"The rest of the messages will be saved as pounce. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:156
+#, c-format
+msgid ""
+"\"%s\" is currently offline. Do you want to save the rest of the messages in "
+"a pounce and automatically send them when \"%s\" logs back in?"
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:157
-msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr ""
-
 #: ../libpurple/plugins/offlinemsg.c:161
+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:522
-#: ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../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/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
 msgid "Yes"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522
-#: ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../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/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
 msgid "No"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:189
-msgid "Save offline messages in pounce"
-msgstr ""
-
 #: ../libpurple/plugins/offlinemsg.c:193
+msgid "Save offline messages in pounce"
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
@@ -3139,8 +3160,7 @@
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603
-#: ../libpurple/plugins/perl/perl.c:604
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr ""
 
@@ -3153,7 +3173,9 @@
 msgstr ""
 
 #: ../libpurple/plugins/psychic.c:22
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libpurple/plugins/psychic.c:72
@@ -3209,11 +3231,54 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40
-#: ../libpurple/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 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
+msgid "X.509 Certificates"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+msgid "GNUTLS"
+msgstr ""
+
+#. *< 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 ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-nss.c:810
+msgid "NSS"
+msgstr ""
+
+#. *< 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 ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3228,49 +3293,10 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97
-#: ../libpurple/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
-msgid "GNUTLS"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
-msgid "Provides SSL support through GNUTLS."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
-msgid "NSS"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
-msgid "Provides SSL support through Mozilla NSS."
-msgstr ""
-
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
@@ -3328,20 +3354,23 @@
 #. *  description
 #: ../libpurple/plugins/statenotify.c:151
 #: ../libpurple/plugins/statenotify.c:154
-msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
 msgstr ""
 
 #: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr ""
 
-#: ../libpurple/plugins/tcl/tcl.c:423
-#: ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr ""
 
 #: ../libpurple/plugins/tcl/tcl.c:507
-msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
 
 #. Send a message about the connection error
@@ -3350,29 +3379,30 @@
 msgstr ""
 
 #: ../libpurple/protocols/bonjour/bonjour.c:137
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/bonjour/bonjour.c:614
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:942
 msgid "First name"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/bonjour/bonjour.c:617
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:947
 msgid "Last name"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:350
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:295
+#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:1335
+#: ../libpurple/protocols/jabber/buddy.c:2216
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3381,13 +3411,13 @@
 msgid "E-Mail"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:623
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
 msgid "AIM Account"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:356
-#: ../libpurple/protocols/bonjour/bonjour.c:626
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "XMPP Account"
 msgstr ""
 
@@ -3401,27 +3431,18 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:460
-#: ../libpurple/protocols/bonjour/bonjour.c:462
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:505
-#: ../libpurple/protocols/bonjour/bonjour.c:512
-#: ../libpurple/protocols/bonjour/bonjour.c:561
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr ""
 
-#. 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 ""
-
-#: ../libpurple/protocols/bonjour/bonjour.c:620
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/jabber/jabber.c:932
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3433,57 +3454,54 @@
 msgid "Bonjour"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:383
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:435
-#: ../libpurple/protocols/bonjour/jabber.c:658
-#: ../libpurple/protocols/bonjour/jabber.c:676
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:581
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:589
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:613
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:621
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:76
-#: ../libpurple/proxy.c:1812
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
 msgid "Invalid proxy settings"
 msgstr ""
 
-#: ../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."
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:115
-#: ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:116
-#: ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
 #: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:269
-#: ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr ""
 
@@ -3491,8 +3509,7 @@
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:276
-#: ../libpurple/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr ""
 
@@ -3500,8 +3517,7 @@
 msgid "Buddylist saved successfully!"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:307
-#: ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr ""
 
@@ -3537,322 +3553,293 @@
 msgid "Registration completed successfully!"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/jabber/jabber.c:913
+#: ../libpurple/protocols/jabber/jabber.c:916
+#: ../libpurple/protocols/jabber/jabber.c:1722
 msgid "Password"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:482
-#: ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:487
-#: ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:493
-#: ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:497
-#: ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3759
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/gg/gg.c: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/qq/buddy_info.c:49
 msgid "City"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:642
-msgid "Year of birth"
-msgstr ""
-
-#: ../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
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
-msgid "Gender"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:646
-msgid "Male or female"
-msgstr ""
-
 #: ../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 ""
-
-#: ../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"
+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/qq/buddy_info.c:46
+#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
+msgid "Gender"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:651
+msgid "Male or female"
 msgstr ""
 
 #: ../libpurple/protocols/gg/gg.c:652
-msgid "Only online"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:656
+#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../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/qq/buddy_info.c:84
+#: ../libpurple/protocols/qq/qq.c:229
+msgid "Female"
+msgstr ""
+
 #: ../libpurple/protocols/gg/gg.c:657
+msgid "Only online"
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:722
+#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:731
+#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:732
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:765
+#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:794
-#: ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:874
-#: ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1466
+#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:2031
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/qq/qq.c:170
-#: ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3073
-#: ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3084
-#: ../pidgin/gtkblist.c:3421
-#: ../pidgin/gtkdocklet.c:450
-#: ../pidgin/gtkstatusbox.c:1060
+#: ../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
 msgid "Offline"
 msgstr ""
 
-#: ../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/gg/gg.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../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:3075
-#: ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438
-#: ../pidgin/gtkstatusbox.c:1056
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr ""
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1009
-#: ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
+#: ../libpurple/protocols/jabber/buddy.c:2037
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4506
-#: ../libpurple/protocols/oscar/oscar.c:5582
-#: ../libpurple/protocols/qq/qq.c:180
-#: ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:4547
+#: ../libpurple/protocols/oscar/oscar.c:5632
+#: ../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:3627
-#: ../libpurple/protocols/yahoo/yahoo.c:3701
-#: ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442
-#: ../pidgin/gtkprefs.c:1934
-#: ../pidgin/gtkstatusbox.c:1057
+#: ../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
 msgid "Away"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1038
-#: ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2669
-#: ../libpurple/protocols/oscar/oscar.c:3669
+#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2699
+#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "UIN"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1041
-#: ../libpurple/protocols/gg/gg.c:1115
-#: ../libpurple/protocols/jabber/buddy.c:1623
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3680
+#: ../libpurple/protocols/gg/gg.c: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/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1124
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1106
-#: ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3881
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3911
 msgid "Unable to display the search results."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1166
+#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1210
+#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1211
+#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1305
-#: ../libpurple/protocols/gg/gg.c:1458
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1398
+#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1399
+#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1504
-#: ../libpurple/protocols/gg/gg.c:1710
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1616
-#: ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
 msgid "Blocked"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1639
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1648
+#: ../libpurple/protocols/gg/gg.c:1653
 msgid "Unblock"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1652
+#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Block"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1909
+#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1910
+#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1993
+#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2016
+#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2022
+#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2040
+#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2044
+#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr ""
 
@@ -3867,16 +3854,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2148
+#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr ""
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2149
+#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2203
+#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr ""
 
@@ -3906,7 +3893,7 @@
 #: ../libpurple/protocols/irc/dcc_send.c:337
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
 msgid "File Transfer Failed"
 msgstr ""
 
@@ -3932,11 +3919,9 @@
 msgid "MOTD for %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:127
-#: ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614
-#: ../libpurple/protocols/irc/irc.c:639
-#: ../libpurple/protocols/myspace/myspace.c:3490
+#: ../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
 msgid "Server has disconnected"
 msgstr ""
 
@@ -3944,15 +3929,13 @@
 msgid "View MOTD"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:261
-#: ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr ""
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
-#: ../pidgin/gtkaccount.c:527
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr ""
 
@@ -3963,71 +3946,59 @@
 #. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:1280
 #: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:637
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1285
+#: ../libpurple/protocols/oscar/oscar.c:1287
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1676
-#: ../libpurple/protocols/yahoo/yahoo.c:2918
-#: ../libpurple/protocols/zephyr/zephyr.c:1621
-#: ../pidgin/gtkstatusbox.c:661
+#: ../libpurple/protocols/simple/simple.c:1716
+#: ../libpurple/protocols/yahoo/yahoo.c:2939
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr ""
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:610
+#: ../libpurple/protocols/jabber/jabber.c:1095
 msgid "SSL support unavailable"
 msgstr ""
 
 #. TODO: try other ports if in auto mode, then save
 #. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:653
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1591
+#: ../libpurple/protocols/simple/simple.c:1631
 msgid "Couldn't create socket"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/myspace/myspace.c:3603
-#: ../libpurple/protocols/oscar/oscar.c:1281
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2469
+#: ../libpurple/protocols/oscar/oscar.c:1283
 msgid "Couldn't connect to host"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr ""
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr ""
-
-#: ../libpurple/protocols/irc/irc.c:611
-#: ../libpurple/protocols/irc/irc.c:636
-#: ../libpurple/protocols/myspace/myspace.c:3486
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2352
 msgid "Read error"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1402
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/irc/irc.c:776
 #: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1411
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr ""
 
@@ -4039,35 +4010,33 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr ""
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr ""
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942
-#: ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6621
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2185
+#: ../libpurple/protocols/oscar/oscar.c:6671
 #: ../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:1855
+#: ../libpurple/protocols/simple/simple.c:1896
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr ""
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945
-#: ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6624
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
+#: ../libpurple/protocols/oscar/oscar.c:6674
 #: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
@@ -4076,13 +4045,13 @@
 msgid "Port"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:951
-#: ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:904
+#: ../libpurple/protocols/jabber/jabber.c:907
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -4098,8 +4067,7 @@
 msgid "Username"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:954
-#: ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -4109,7 +4077,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr ""
 
@@ -4140,7 +4108,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3670
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4245,8 +4213,7 @@
 msgstr ""
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800
-#: ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
@@ -4257,17 +4224,20 @@
 msgid "mode (%s %s) by %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:908
-#: ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr ""
 
 #: ../libpurple/protocols/irc/msgs.c:910
-msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
 msgstr ""
 
 #: ../libpurple/protocols/irc/msgs.c:915
-msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
 msgstr ""
 
 #: ../libpurple/protocols/irc/msgs.c:954
@@ -4317,7 +4287,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:123
-msgid "away [message]:  Set an away message, or use no message to return from being away."
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:124
@@ -4325,31 +4297,46 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:125
-msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:126
-msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:127
-msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:128
-msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:129
-msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:130
-msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:131
-msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:132
@@ -4361,11 +4348,15 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:134
-msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:135
-msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:136
@@ -4373,7 +4364,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1830
+#: ../libpurple/protocols/jabber/jabber.c:2261
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 
@@ -4382,11 +4373,15 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:139
-msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:140
-msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:141
@@ -4394,15 +4389,21 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:142
-msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:143
-msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:144
-msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:145
@@ -4414,7 +4415,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:147
-msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:148
@@ -4434,11 +4437,15 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:152
-msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:153
-msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:154
@@ -4463,315 +4470,607 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581
-#: ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694
-#: ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:52
+#: ../libpurple/protocols/jabber/adhoccommands.c:137
+#: ../libpurple/protocols/jabber/jabber.c:671
+#: ../libpurple/protocols/jabber/jabber.c:701
+#: ../libpurple/protocols/jabber/jabber.c:1887
+msgid "Unknown Error"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:139
+#: ../libpurple/protocols/jabber/adhoccommands.c:140
+msgid "Ad-Hoc Command Failed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:173
+msgid "execute"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:115
+#: ../libpurple/protocols/jabber/auth.c:116
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-#: ../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 ""
-
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:508
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth.c:321
+#: ../libpurple/protocols/jabber/auth.c:322
+#: ../libpurple/protocols/jabber/auth.c:510
+#: ../libpurple/protocols/jabber/auth.c:511
+#: ../libpurple/protocols/jabber/auth.c:598
+#: ../libpurple/protocols/jabber/auth.c:599
 msgid "Plaintext Authentication"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:334
+#: ../libpurple/protocols/jabber/auth.c:523
+#: ../libpurple/protocols/jabber/auth.c:610
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
-#: ../libpurple/protocols/jabber/jabber.c:115
+#: ../libpurple/protocols/jabber/auth.c:462
+#: ../libpurple/protocols/jabber/auth.c:561
+#: ../libpurple/protocols/jabber/auth.c:776
+#: ../libpurple/protocols/jabber/auth.c:917
+#: ../libpurple/protocols/jabber/auth.c:942
+#: ../libpurple/protocols/jabber/auth.c:961
+#: ../libpurple/protocols/jabber/jabber.c:123
 msgid "Invalid response from server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:572
-msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/auth.c:769
-#: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:600
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth.c:797
+#: ../libpurple/protocols/jabber/auth.c:820
 msgid "Invalid challenge from server"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:892
 msgid "SASL error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:1219
 #: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:1231
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:842
-msgid "Given Name"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
-msgid "URL"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:894
-msgid "Street Address"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:890
-msgid "Extended Address"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:898
-msgid "Locality"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:902
-msgid "Region"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:906
-msgid "Postal Code"
-msgstr ""
-
-#: ../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 ""
-
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:929
-msgid "Telephone"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:963
-msgid "Organization Name"
-msgstr ""
-
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:967
-msgid "Organization Unit"
+#: ../libpurple/protocols/jabber/buddy.c:1234
+msgid "Given Name"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:976
-msgid "Role"
+#: ../libpurple/protocols/jabber/jabber.c:977
+msgid "URL"
 msgstr ""
 
 #: ../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"
+#: ../libpurple/protocols/jabber/buddy.c:1282
+msgid "Street Address"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:979
+#: ../libpurple/protocols/jabber/buddy.c:1279
+msgid "Extended Address"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
+msgid "Locality"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
+msgid "Region"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
+msgid "Postal Code"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:293
+#: ../libpurple/protocols/jabber/buddy.c:1295
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
+msgid "Country"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
+msgid "Telephone"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
+msgid "Organization Name"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
+msgid "Organization Unit"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
+msgid "Role"
+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
+msgid "Birthday"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../pidgin/gtkblist.c:3095
-#: ../pidgin/gtkprefs.c:738
+#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:584
-msgid "All items below are optional. Enter only the information with which you feel comfortable."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:724
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:659
-#: ../libpurple/protocols/jabber/buddy.c:700
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:669
-#: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../libpurple/protocols/jabber/si.c:853
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+msgid "Service Discovery Info"
+msgstr ""
+
+#: ../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
+msgid "Extended Stanza Addressing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+msgid "Multi-User Chat"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
+msgid "Multi-User Chat Extended Presence Information"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
+msgid "In-Band Bytestreams"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
+msgid "Ad-Hoc Commands"
+msgstr ""
+
+#: ../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
+msgid "XHTML-IM"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+msgid "In-Band Registration"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+msgid "User Location"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
+msgid "User Avatar"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
+msgid "Chat State Notifications"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+msgid "Software Version"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+msgid "Stream Initiation"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+msgid "User Mood"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
+msgid "User Activity"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
+msgid "Entity Capabilities"
+msgstr ""
+
+#: ../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
+msgid "User Tune"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
+msgid "Roster Item Exchange"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
+msgid "Reachability Address"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+msgid "User Profile"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+msgid "Jingle"
+msgstr ""
+
+#: ../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
+msgid "User Nickname"
+msgstr ""
+
+#: ../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
+msgid "Jingle Video"
+msgstr ""
+
+#: ../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
+msgid "Message Receipts"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+msgid "Public Key Publishing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+msgid "User Chatting"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+msgid "User Browsing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+msgid "User Gaming"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+msgid "User Viewing"
+msgstr ""
+
+#: ../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 ""
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+msgid "Stanza Encryption"
+msgstr ""
+
+#: ../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 ""
+
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Priority"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/jabber/buddy.c:1237
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3758
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:952
+#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/oscar/oscar.c:3801
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:886
+#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/jabber/buddy.c:1942
 msgid "Un-hide From"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/buddy.c:1946
 msgid "Temporarily Hide From"
 msgstr ""
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/jabber/buddy.c:1954
 msgid "Cancel Presence Notification"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "(Re-)Request authorization"
 msgstr ""
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1437
+#: ../libpurple/protocols/jabber/buddy.c:1970
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/buddy.c:1985
+msgid "Log In"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1989
+msgid "Log Out"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1474
+#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Extended Away"
 msgstr ""
 
-#: ../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/jabber/buddy.c:2041
+#: ../libpurple/protocols/jabber/jabber.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:727
+#: ../libpurple/protocols/oscar/oscar.c:5808
 #: ../libpurple/protocols/sametime/sametime.c:3297
+#, c-format
 msgid "Do Not Disturb"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1621
+#: ../libpurple/protocols/jabber/buddy.c:2208
 msgid "JID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1625
-#: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3681
+#: ../libpurple/protocols/jabber/buddy.c:2212
+#: ../libpurple/protocols/jabber/buddy.c:2391
+#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "Last Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1657
+#: ../libpurple/protocols/jabber/buddy.c:2244
 msgid "The following are the results of your search"
 msgstr ""
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../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 (%)"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:1752
+#: ../libpurple/protocols/jabber/buddy.c:2319
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:2339
 msgid "Directory Query Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1753
+#: ../libpurple/protocols/jabber/buddy.c:2340
 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:1787
+#: ../libpurple/protocols/jabber/buddy.c:2374
 #, c-format
 msgid "Server Instructions: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:2381
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1814
+#: ../libpurple/protocols/jabber/buddy.c:2401
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3684
-#: ../libpurple/protocols/oscar/oscar.c:3693
+#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/oscar/oscar.c:3723
 msgid "E-Mail Address"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:2410
+#: ../libpurple/protocols/jabber/buddy.c:2411
 msgid "Search for XMPP users"
 msgstr ""
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1825
+#: ../libpurple/protocols/jabber/buddy.c:2412
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
@@ -4783,25 +5082,25 @@
 msgid "Search"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1840
+#: ../libpurple/protocols/jabber/buddy.c:2427
 msgid "Invalid Directory"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1857
+#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Enter a User Directory"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1858
+#: ../libpurple/protocols/jabber/buddy.c:2445
 msgid "Select a user directory to search"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1861
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Search Directory"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5244
-#: ../libpurple/protocols/yahoo/yahoochat.c:963
+#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr ""
 
@@ -4891,80 +5190,99 @@
 msgid "Find Rooms"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:84
+#: ../libpurple/protocols/jabber/jabber.c:92
 msgid "Error initializing session"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:145
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:259
+#: ../libpurple/protocols/jabber/jabber.c:312
+#: ../libpurple/protocols/jabber/jabber.c:340
 msgid "Write error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:408
+#: ../libpurple/protocols/jabber/jabber.c:445
 msgid "Read Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/jabber/jabber.c:482
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2537
-#: ../libpurple/protocols/yahoo/yahoo.c:2569
+#: ../libpurple/protocols/yahoo/yahoo.c:2558
+#: ../libpurple/protocols/yahoo/yahoo.c:2590
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:529
 msgid "Unable to create socket"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:575
+#: ../libpurple/protocols/jabber/jabber.c:1063
 msgid "Invalid XMPP ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:580
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:656
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:662
+#, c-format
+msgid "Registration to %s successful"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:664
+#: ../libpurple/protocols/jabber/jabber.c:665
 msgid "Registration Successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Unknown Error"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:673
+#: ../libpurple/protocols/jabber/jabber.c:674
 msgid "Registration Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:692
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:694
+#: ../libpurple/protocols/jabber/jabber.c:695
+msgid "Unregistration Successful"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:703
+#: ../libpurple/protocols/jabber/jabber.c:704
+msgid "Unregistration Failed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:865
 msgid "Already Registered"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3760
-#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/jabber/jabber.c:962
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "State"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:967
 msgid "Postal code"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:972
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4974,396 +5292,572 @@
 msgid "Phone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:982
 msgid "Date"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:987
+msgid "Unregister"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:994
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:997
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:1005
+#: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "Register New XMPP Account"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:881
+#: ../libpurple/protocols/jabber/jabber.c:1007
+#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Register"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
-msgid "Initializing Stream"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1055
-#: ../libpurple/protocols/msn/session.c:351
-msgid "Authenticating"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1064
-msgid "Re-initializing Stream"
+#: ../libpurple/protocols/jabber/jabber.c:1012
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1013
+#, c-format
+msgid "Register New Account at %s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1016
+msgid "Change Registration"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1120
+#: ../libpurple/protocols/jabber/jabber.c:1121
+msgid "Error unregistering account"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/jabber/jabber.c:1127
+msgid "Account successfully unregistered"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1284
+msgid "Initializing Stream"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1289
+msgid "Initializing SSL/TLS"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1293
+#: ../libpurple/protocols/msn/session.c:351
+msgid "Authenticating"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1302
+msgid "Re-initializing Stream"
+msgstr ""
+
+#: ../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
 msgid "Not Authorized"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "Both"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1444
 msgid "From (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1446
 msgid "From"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1449
 msgid "To"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1451
 msgid "None (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1453
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1456
 msgid "Subscription"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1466
+#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1625
+#: ../libpurple/protocols/jabber/usermood.c:166
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr ""
+
+#: ../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
+msgid "Mood Text"
+msgstr ""
+
+#: ../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
+msgid "Tune Artist"
+msgstr ""
+
+#: ../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
+msgid "Tune Title"
+msgstr ""
+
+#: ../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
+msgid "Tune Comment"
+msgstr ""
+
+#: ../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
+msgid "Allow Buzz"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Password Changed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Your password has been changed."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Error changing password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1728
 msgid "Password (again)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1734
+#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Change XMPP Password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Please enter your new password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6338
+#: ../libpurple/protocols/jabber/jabber.c:1749
+#: ../libpurple/protocols/oscar/oscar.c:6388
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr ""
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6349
+#: ../libpurple/protocols/jabber/jabber.c:1754
+#: ../libpurple/protocols/oscar/oscar.c:6399
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr ""
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1759
 msgid "Search for Users..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Bad Request"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Conflict"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Feature Not Implemented"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1851
 msgid "Forbidden"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Item Not Found"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Malformed XMPP ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Not Acceptable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Not Allowed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Payment Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Recipient Unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Registration Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Remote Server Not Found"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Remote Server Timeout"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Server Overloaded"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Service Unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Subscription Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1885
 msgid "Unexpected Request"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Authorization Aborted"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Incorrect encoding in authorization"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Invalid authzid"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Invalid Authorization Mechanism"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1903
 msgid "Authorization mechanism too weak"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Temporary Authentication Failure"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Authentication Failure"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Bad Format"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Bad Namespace Prefix"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1925
 msgid "Resource Conflict"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1927
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1929
 msgid "Host Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1931
 msgid "Host Unknown"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Improper Addressing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Invalid ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Invalid Namespace"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1941
 msgid "Invalid XML"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1943
 msgid "Non-matching Hosts"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Policy Violation"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Remote Connection Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Resource Constraint"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1953
 msgid "Restricted XML"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "See Other Host"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "System Shutdown"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1959
 msgid "Undefined Condition"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1961
 msgid "Unsupported Encoding"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1963
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Unsupported Version"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1967
 msgid "XML Not Well Formed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1969
 msgid "Stream Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:2052
 #, c-format
 msgid "Unable to ban user %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:2072
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:2077
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:2096
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:2101
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unable to kick user %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:2185
+#, c-format
+msgid "Unable to ping user %s"
+msgstr ""
+
+#: ../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
+#, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2253
 msgid "config:  Configure a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:2257
 msgid "configure:  Configure a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:2266
 msgid "part [room]:  Leave the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:2271
 msgid "register:  Register with a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:2277
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:2283
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 
-#: ../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."
-msgstr ""
-
-#: ../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."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:2289
+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
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2301
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:2307
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1882
+#: ../libpurple/protocols/jabber/jabber.c:2313
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+#: ../libpurple/protocols/jabber/jabber.c:2318
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+
+#: ../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 ""
 
 #. *< type
@@ -5376,146 +5870,200 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:169
-#: ../libpurple/protocols/jabber/libxmpp.c:171
+#: ../libpurple/protocols/jabber/libxmpp.c:170
+#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
 msgstr ""
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198
-#: ../pidgin/gtkaccount.c:509
+#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:210
+msgid "Require SSL/TLS"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Force old (port 5223) SSL"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:219
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/myspace/myspace.c:4420
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/jabber/libxmpp.c:224
+#: ../libpurple/protocols/myspace/myspace.c:3277
+#: ../libpurple/protocols/simple/simple.c:1902
 msgid "Connect port"
 msgstr ""
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:220
-#: ../libpurple/protocols/myspace/myspace.c:4417
+#: ../libpurple/protocols/jabber/libxmpp.c:228
+#: ../libpurple/protocols/myspace/myspace.c:3274
 #: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857
-#: ../pidgin/gtkaccount.c:838
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:102
+#: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:153
+#: ../libpurple/protocols/jabber/message.c:161
 #, c-format
 msgid "Message from %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:217
+#: ../libpurple/protocols/jabber/message.c:225
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:227
 #, c-format
 msgid "The topic is: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:267
+#: ../libpurple/protocols/jabber/message.c:275
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:270
+#: ../libpurple/protocols/jabber/message.c:278
 msgid "XMPP Message Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:359
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4120
+#, c-format
+msgid "%s has buzzed you!"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:292
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:366
-#: ../libpurple/protocols/jabber/presence.c:367
+#: ../libpurple/protocols/jabber/presence.c:508
+#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:368
-msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/presence.c:374
+#: ../libpurple/protocols/jabber/presence.c:510
+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
 msgid "_Configure Room"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:375
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:417
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:421
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:836
+#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:851
+#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr ""
 
+#: ../libpurple/protocols/jabber/usermood.c:179
+#: ../libpurple/protocols/jabber/usermood.c:180
+msgid "Edit User Mood"
+msgstr ""
+
+#: ../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
+msgid "Set"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:191
+msgid "Set Mood..."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usernick.c:76
+msgid "Set User Nickname"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usernick.c:76
+msgid "Please specify a new nickname for you."
+msgstr ""
+
+#: ../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
+msgid "Set Nickname..."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+msgid "Actions"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/xdata.c:380
+msgid "Select an action"
+msgstr ""
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5523,232 +6071,288 @@
 
 #: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
-msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
 msgstr ""
 
 #: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
-msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
 msgstr ""
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:119
+#: ../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 ""
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../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:1378
+#: ../libpurple/protocols/oscar/oscar.c:1380
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1363
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
+#, c-format
 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 ""
 
 #: ../libpurple/protocols/msn/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr ""
 
@@ -5762,172 +6366,180 @@
 msgid "MSN Error: %s\n"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:121
-msgid "You have just sent a Nudge!"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:130
+msgid "Nudge"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:131
+#, c-format
+msgid "%s has nudged you!"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:132
+#, c-format
+msgid "Nudging %s..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../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?"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:351
+msgid ""
+"Do you want to allow or disallow people on your buddy list to send you MSN "
+"Mobile pages to your cell phone or other mobile device?"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:346
-msgid "This Hotmail account may not be active."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:372
-msgid "Send a mobile message."
-msgstr ""
-
 #: ../libpurple/protocols/msn/msn.c:374
+msgid "This Hotmail account may not be active."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:400
+msgid "Send a mobile message."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:549
 msgid "Has you"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:551
-#: ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3051
-#: ../libpurple/protocols/yahoo/yahoo.c:3735
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3077
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Be Right Back"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:555
-#: ../libpurple/protocols/msn/state.c:31
+#: ../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/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:3053
-#: ../libpurple/protocols/yahoo/yahoo.c:3738
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Busy"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:3061
-#: ../libpurple/protocols/yahoo/yahoo.c:3750
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On the Phone"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:3065
-#: ../libpurple/protocols/yahoo/yahoo.c:3756
-msgid "Out to Lunch"
-msgstr ""
-
 #: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
+msgid "Out to Lunch"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:688
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:754
 msgid "Failed to connect to server."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1479
-#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1550
-#: ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/myspace/myspace.c:1948
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/oscar/oscar.c:3755
 #: ../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:1559
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1560
-#: ../libpurple/protocols/myspace/myspace.c:1957
+#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/myspace/user.c:119
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5935,204 +6547,201 @@
 msgid "Location"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1565
-#: ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763
-#: ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
 msgid "Hobbies and Interests"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1571
-#: ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697
-#: ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712
-#: ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c: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
 msgid "A Little About Me"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1588
-msgid "Social"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
-msgid "Marital Status"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1591
-msgid "Interests"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1592
-msgid "Pets"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1593
-msgid "Hometown"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1594
-msgid "Places Lived"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1595
-msgid "Fashion"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1596
-msgid "Humor"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1597
-msgid "Music"
-msgstr ""
-
-#: ../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 ""
-
-#: ../libpurple/protocols/msn/msn.c:1615
-msgid "Contact Info"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1616
-msgid "Personal"
-msgstr ""
-
 #: ../libpurple/protocols/msn/msn.c:1619
-msgid "Significant Other"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1620
-msgid "Home Phone"
+msgid "Social"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1621
-msgid "Home Phone 2"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
+msgid "Marital Status"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3763
-msgid "Home Address"
+msgid "Interests"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1623
-msgid "Personal Mobile"
+msgid "Pets"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1624
-msgid "Home Fax"
+msgid "Hometown"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1625
-msgid "Personal E-Mail"
+msgid "Places Lived"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1626
-msgid "Personal IM"
+msgid "Fashion"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1627
+msgid "Humor"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1628
+msgid "Music"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
+msgid "Favorite Quote"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1646
+msgid "Contact Info"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1647
+msgid "Personal"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1650
+msgid "Significant Other"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1651
+msgid "Home Phone"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1652
+msgid "Home Phone 2"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/oscar/oscar.c:3793
+msgid "Home Address"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1654
+msgid "Personal Mobile"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1655
+msgid "Home Fax"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1656
+msgid "Personal E-Mail"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1657
+msgid "Personal IM"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Anniversary"
 msgstr ""
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1675
 msgid "Work"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1677
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/msn/msn.c:1678
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Company"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1679
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1680
 msgid "Profession"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Phone"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Phone 2"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Work Address"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work Pager"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Work Fax"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work E-Mail"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1689
 msgid "Start Date"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1728
-#: ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741
-#: ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
 msgid "Favorite Things"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1824
 msgid "Last Updated"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1835
 #: ../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:1828
+#: ../libpurple/protocols/msn/msn.c:1859
 msgid "The user has not created a public profile."
 msgstr ""
 
-#: ../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 public profile."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1833
-msgid "Could not find any information in the user's profile. The user most likely does not exist."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:1860
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1864
+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/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr ""
@@ -6147,25 +6756,28 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127
-#: ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
 msgid "MSN Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2194
 msgid "Use HTTP Method"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2199
+msgid "HTTP Method Server"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "Show custom smileys"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2212
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
 #: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:133
+#: ../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
@@ -6179,8 +6791,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1321
-#: ../libpurple/protocols/yahoo/yahoochat.c:1347
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr ""
 
@@ -6240,25 +6852,31 @@
 #: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr ""
 
-#: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msn/servconn.c:139
 msgid "Reading error"
 msgstr ""
 
-#: ../libpurple/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/msn/servconn.c:146
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -6293,7 +6911,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/msn/session.c:325
-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
 #: ../libpurple/protocols/msn/session.c:346
@@ -6350,22 +6969,20 @@
 msgstr ""
 
 #: ../libpurple/protocols/msn/switchboard.c:424
-msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
+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 ""
 
 #: ../libpurple/protocols/msn/switchboard.c:431
-msgid "Message could not be sent because an error with the switchboard occurred:"
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 
 #: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/switchboard.c:963
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr ""
-
 #: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
@@ -6385,369 +7002,390 @@
 msgid "The screen name specified is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:232
+#: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:233
+#: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:234
-msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
-msgstr ""
-
-#. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/myspace.c:303
-msgid "zap"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:303
-#: ../libpurple/protocols/myspace/myspace.c:1696
-msgid "zapped"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:303
-msgid "Zapping"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:304
-msgid "whack"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:304
-#: ../libpurple/protocols/myspace/myspace.c:1697
-msgid "whacked"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:304
-msgid "Whacking"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:305
-msgid "torch"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:305
-#: ../libpurple/protocols/myspace/myspace.c:1698
-msgid "torched"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:305
-msgid "Torching"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:306
-msgid "smooch"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:306
-#: ../libpurple/protocols/myspace/myspace.c:1699
-msgid "smooched"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:306
-msgid "Smooching"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:307
-msgid "hug"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:307
-#: ../libpurple/protocols/myspace/myspace.c:1700
-msgid "hugged"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:307
-msgid "Hugging"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:308
-msgid "bslap"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:308
-#: ../libpurple/protocols/myspace/myspace.c:1701
-msgid "bslapped"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:308
-msgid "Bslapping"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:309
-msgid "goose"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:309
-#: ../libpurple/protocols/myspace/myspace.c:1702
-msgid "goosed"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:309
-msgid "Goosing"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:310
-msgid "hi-five"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:310
-#: ../libpurple/protocols/myspace/myspace.c:1703
-msgid "hi-fived"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:310
-msgid "Hi-fiving"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:311
-msgid "punk"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:311
-#: ../libpurple/protocols/myspace/myspace.c:1704
-msgid "punk'd"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:311
-msgid "Punking"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:312
-msgid "raspberry"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:312
-#: ../libpurple/protocols/myspace/myspace.c:1705
-msgid "raspberried"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:312
-msgid "Raspberry'ing"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:469
-msgid "Zap"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:622
-#, c-format
-msgid "Sorry, passwords over %d characters in length (yours is %d) are not supported by MySpace."
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
 msgstr ""
 
 #. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:628
-#: ../libpurple/protocols/myspace/myspace.c:2953
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1801
 msgid "MySpaceIM Error"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:684
+#: ../libpurple/protocols/myspace/myspace.c:349
 msgid "Reading challenge"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:690
+#: ../libpurple/protocols/myspace/myspace.c:355
 msgid "Unexpected challenge length from server"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:694
+#: ../libpurple/protocols/myspace/myspace.c:359
 msgid "Logging in"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1725
-#, c-format
-msgid "*** You have been %s! ***"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1933
+#: ../libpurple/protocols/myspace/myspace.c:1286
+#, 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
+msgid "New mail messages"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1329
+msgid "New blog comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1330
+msgid "New profile comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1331
+msgid "New friend requests!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1332
+msgid "New picture comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1360
+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/sametime/sametime.c:1544
+msgid "Connected"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/myspace/myspace.c:1556
+msgid "No username set"
+msgstr ""
+
+#: ../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:1782
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:2006
+msgid "Failed to add buddy"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1972
+msgid "'addbuddy' command failed."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:2247
+msgid "persist command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2115
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2116
+msgid "User lookup"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2269
+msgid "Failed to remove buddy"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2228
+msgid "'delbuddy' command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2269
+msgid "blocklist command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2315
+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
+msgid "Read buffer full"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2402
+msgid "Unparseable message"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2471
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2642
+msgid "IM Friends"
+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)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2742
+msgid "Add contacts from server"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2794
+#: ../libpurple/protocols/myspace/myspace.c:2859
+msgid "Add friends from MySpace.com"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2795
+msgid "Importing friends failed"
+msgstr ""
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2851
+msgid "Find people..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2854
+msgid "Change IM name..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3156
+msgid "myim URL handler"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3157
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3158
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3281
+msgid "Show display name in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3284
+msgid "Show headline in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3289
+msgid "Send emoticons"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3294
+msgid "Screen resolution (dots per inch)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3297
+msgid "Base font size (points)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:95
 #: ../libpurple/protocols/zephyr/zephyr.c:786
 #: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr ""
 
 #. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/myspace.c:1940
-#: ../libpurple/protocols/oscar/oscar.c:2934
+#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/oscar/oscar.c:2964
 msgid "Profile"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1962
+#: ../libpurple/protocols/myspace/user.c:124
 msgid "Headline"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1967
+#: ../libpurple/protocols/myspace/user.c:129
 msgid "Song"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/user.c:134
 msgid "Total Friends"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1983
-#: ../libpurple/protocols/myspace/myspace.c:1986
-#: ../libpurple/protocols/myspace/myspace.c:1989
+#: ../libpurple/protocols/myspace/user.c:145
+#: ../libpurple/protocols/myspace/user.c:148
+#: ../libpurple/protocols/myspace/user.c:151
 msgid "Client Version"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2353
-#, 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:2411
-msgid "New mail messages"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2412
-msgid "New blog comments"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2413
-msgid "New profile comments"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2414
-msgid "New friend requests!"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2415
-msgid "New picture comments"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2445
-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:2537
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2945
-#, c-format
-msgid "Protocol error, code %d: %s"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3105
-#: ../libpurple/protocols/myspace/myspace.c:3139
-msgid "Failed to add buddy"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3105
-msgid "'addbuddy' command failed."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3139
-#: ../libpurple/protocols/myspace/myspace.c:3381
-msgid "persist command failed"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3249
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3250
-msgid "User lookup"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3362
-#: ../libpurple/protocols/myspace/myspace.c:3381
-#: ../libpurple/protocols/myspace/myspace.c:3403
-msgid "Failed to remove buddy"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3362
-msgid "'delbuddy' command failed"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3403
-msgid "blocklist command failed"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3449
-msgid "Invalid input condition"
-msgstr ""
-
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:3467
-#: ../libpurple/protocols/myspace/myspace.c:3498
-msgid "Read buffer full"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3536
-msgid "Unparseable message"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3605
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3948
-msgid "IM Friends"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:4045
-#, c-format
-msgid "%d buddies were added or updated"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:4047
-msgid "Add contacts from server"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:4072
-#: ../libpurple/protocols/myspace/myspace.c:4147
-msgid "Add friends from MySpace.com"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:4073
-msgid "Importing friends failed"
-msgstr ""
-
-#. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:4139
-msgid "Find people..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:4142
-msgid "Change IM name..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:4424
-msgid "Show display name in status text"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:4427
-msgid "Show headline in status text"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:4432
-msgid "Send emoticons"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:4437
-msgid "Screen resolution (dots per inch)"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:4440
-msgid "Base font size (points)"
-msgstr ""
-
-#. cmd
-#. args - accept a single word
-#. priority
-#. flags
-#. prpl_id
-#. func
-#: ../libpurple/protocols/myspace/myspace.c:4456
-msgid "zap: zap a user to get their attention"
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:177
+msgid "Zap"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "%s has zapped you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "Zapping %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:45
+msgid "Whack"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "%s has whacked you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "Whacking %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:46
+msgid "Torch"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "%s has torched you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "Torching %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:47
+msgid "Smooch"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "%s has smooched you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "Smooching %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:48
+msgid "Hug"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "%s has hugged you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "Hugging %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:49
+msgid "Slap"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "%s has slapped you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Slapping %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:50
+msgid "Goose"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "%s has goosed you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "Goosing %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:51
+msgid "High-five"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "%s has high-fived you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "High-fiving %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:52
+msgid "Punk"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "%s has punk'd you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "Punking %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+msgid "Raspberry"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "%s has raspberried you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Raspberrying %s..."
 msgstr ""
 
 #: ../libpurple/protocols/novell/nmuser.c:1864
@@ -6831,7 +7469,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/novell/nmuser.c:1928
-msgid "Your account has been disabled because too many incorrect passwords were entered"
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
 msgstr ""
 
 #: ../libpurple/protocols/novell/nmuser.c:1931
@@ -6859,7 +7499,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/novell/nmuser.c:1950
-msgid "This evaluation version does not allow more than ten users to log in at one time"
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
 msgstr ""
 
 #: ../libpurple/protocols/novell/nmuser.c:1953
@@ -6910,12 +7552,16 @@
 
 #: ../libpurple/protocols/novell/novell.c:584
 #, c-format
-msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
 msgstr ""
 
 #: ../libpurple/protocols/novell/novell.c:632
 #, c-format
-msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
 msgstr ""
 
 #: ../libpurple/protocols/novell/novell.c:705
@@ -7036,7 +7682,8 @@
 
 #: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 #. TODO: Would be nice to prompt if not set!
@@ -7044,7 +7691,9 @@
 #.
 #. ...but for now just error out with a nice message.
 #: ../libpurple/protocols/novell/novell.c:2167
-msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
+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
@@ -7052,6 +7701,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/novell/novell.c:2504
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -7079,25 +7729,19 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2448
-#: ../libpurple/protocols/yahoo/yahoo.c:2615
-#: ../libpurple/protocols/yahoo/ycht.c:481
-#: ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1099
-#: ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308
-#: ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/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
 msgid "Server closed the connection."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2442
-#: ../libpurple/protocols/yahoo/yahoo.c:2609
-#: ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1111
-#: ../libpurple/proxy.c:1220
-#: ../libpurple/proxy.c:1320
-#: ../libpurple/proxy.c:1448
+#: ../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
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -7105,11 +7749,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1128
-#: ../libpurple/proxy.c:1233
-#: ../libpurple/proxy.c:1332
-#: ../libpurple/proxy.c:1404
-#: ../libpurple/proxy.c:1461
+#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
+#: ../libpurple/proxy.c:1478
 msgid "Received invalid data on connection with server."
 msgstr ""
 
@@ -7144,7 +7786,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4353
+#: ../libpurple/protocols/yahoo/yahoo.c:4410
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr ""
@@ -7174,133 +7816,138 @@
 msgid "Direct IM established"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:115
-msgid "Invalid error"
-msgstr ""
-
 #: ../libpurple/protocols/oscar/oscar.c:116
-msgid "Invalid SNAC"
+msgid "Invalid error"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:117
-msgid "Rate to host"
+msgid "Invalid SNAC"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:118
+msgid "Rate to host"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to client"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:120
-msgid "Service unavailable"
-msgstr ""
-
 #: ../libpurple/protocols/oscar/oscar.c:121
-msgid "Service not defined"
+msgid "Service unavailable"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:122
-msgid "Obsolete SNAC"
+msgid "Service not defined"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:123
-msgid "Not supported by host"
+msgid "Obsolete SNAC"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:124
-msgid "Not supported by client"
+msgid "Not supported by host"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:125
-msgid "Refused by client"
+msgid "Not supported by client"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:126
-msgid "Reply too big"
+msgid "Refused by client"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:127
-msgid "Responses lost"
+msgid "Reply too big"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:128
-msgid "Request denied"
+msgid "Responses lost"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:129
-msgid "Busted SNAC payload"
+msgid "Request denied"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:130
-msgid "Insufficient rights"
+msgid "Busted SNAC payload"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:131
-msgid "In local permit/deny"
+msgid "Insufficient rights"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:132
-msgid "Too evil (sender)"
+msgid "In local permit/deny"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:133
-msgid "Too evil (receiver)"
+msgid "Too evil (sender)"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:134
-msgid "User temporarily unavailable"
+msgid "Too evil (receiver)"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:135
-msgid "No match"
+msgid "User temporarily unavailable"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:136
-msgid "List overflow"
+msgid "No match"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:137
-msgid "Request ambiguous"
+msgid "List overflow"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:138
-msgid "Queue full"
+msgid "Request ambiguous"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:139
+msgid "Queue full"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Not while on AOL"
 msgstr ""
 
-#: ../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 encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:456
-#, c-format
-msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
+#: ../libpurple/protocols/oscar/oscar.c:348
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:457
+#, c-format
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638
-#: ../pidgin/gtkutils.c:2386
-#: ../pidgin/gtkutils.c:2416
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
+#: ../pidgin/gtkutils.c:2417
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:641
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:644
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:647
+#: ../libpurple/protocols/oscar/oscar.c:648
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -7308,293 +7955,302 @@
 msgid "Chat"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:5960
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:6010
 msgid "Get File"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:681
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:684
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:687
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:690
+#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:693
+#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:696
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:700
+#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:703
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:706
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5730
+#: ../libpurple/protocols/oscar/oscar.c:725
+#: ../libpurple/protocols/oscar/oscar.c:5780
+#, c-format
 msgid "Free For Chat"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5765
+#: ../libpurple/protocols/oscar/oscar.c:729
+#: ../libpurple/protocols/oscar/oscar.c:5815
+#, c-format
 msgid "Not Available"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5751
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5801
+#, c-format
 msgid "Occupied"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:734
+#: ../libpurple/protocols/oscar/oscar.c:735
+#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:736
-#: ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3069
-#: ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446
-#: ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
+#, c-format
 msgid "Invisible"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:738
+#: ../libpurple/protocols/oscar/oscar.c:739
+#, c-format
 msgid "Online"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3677
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721
-#: ../pidgin/gtkprefs.c:1123
+#: ../libpurple/protocols/oscar/oscar.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
 msgid "IP Address"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:845
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Warning Level"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:854
+#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:994
+#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1002
+#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1042
+#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1047
+#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr ""
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1076
+#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr ""
 
-#: ../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 ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1343
-#: ../libpurple/protocols/yahoo/yahoo.c:2084
+#: ../libpurple/protocols/oscar/oscar.c:1260
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the screen name is "
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1345
+#: ../libpurple/protocols/yahoo/yahoo.c:2105
 msgid "Invalid screen name."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1350
+#: ../libpurple/protocols/oscar/oscar.c:1352
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/simple/simple.c:1045
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Incorrect password."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1355
+#: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1359
+#: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#: ../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."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1369
+#: ../libpurple/protocols/oscar/oscar.c:1366
+#: ../libpurple/protocols/oscar/oscar.c:1377
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1371
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1408
+#: ../libpurple/protocols/oscar/oscar.c:1410
 msgid "Could Not Connect"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1412
+#: ../libpurple/protocols/oscar/oscar.c:1414
 msgid "Received authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1434
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1447
+#: ../libpurple/protocols/oscar/oscar.c:1449
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1448
+#: ../libpurple/protocols/oscar/oscar.c:1450
 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:1450
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5835
-#: ../libpurple/protocols/oscar/oscar.c:6116
-#: ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c: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
 msgid "_OK"
 msgstr ""
 
-#: ../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 fixed.  Check %s for updates."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1492
-#: ../libpurple/protocols/oscar/oscar.c:1535
+#: ../libpurple/protocols/oscar/oscar.c:1491
+#: ../libpurple/protocols/oscar/oscar.c:1534
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1494
+#: ../libpurple/protocols/oscar/oscar.c:1537
 msgid "Unable to get a valid AIM login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1620
+#: ../libpurple/protocols/oscar/oscar.c:1622
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1623
+#: ../libpurple/protocols/oscar/oscar.c:1625
 msgid "Unable to get a valid login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:1655
 msgid "Password sent"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1708
+#: ../libpurple/protocols/oscar/oscar.c:1711
 msgid "Unable to initialize connection"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2202
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Authorization Request Message:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2231
 msgid "Please authorize me!"
 msgstr ""
 
-#: ../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:1026
+#: ../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
 msgid "No reason given."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2279
 msgid "Authorization Denied Message:"
 msgstr ""
 
-#: ../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 following reason:\n"
+#: ../libpurple/protocols/oscar/oscar.c:2407
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2418
+#: ../libpurple/protocols/oscar/oscar.c:2408
 msgid "ICQ authorization denied."
 msgstr ""
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2425
+#: ../libpurple/protocols/oscar/oscar.c:2415
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2433
+#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7603,7 +8259,7 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2441
+#: ../libpurple/protocols/oscar/oscar.c:2431
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7612,7 +8268,7 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2449
+#: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7621,60 +8277,61 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:2460
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2466
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2481
-#: ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2472
 msgid "_Decline"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2566
+#: ../libpurple/protocols/oscar/oscar.c:2596
 #, 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] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2575
+#: ../libpurple/protocols/oscar/oscar.c:2605
 #, 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] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2584
-#, c-format
-msgid "You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
+#: ../libpurple/protocols/oscar/oscar.c:2614
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2593
+#: ../libpurple/protocols/oscar/oscar.c:2623
 #, 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] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2602
+#: ../libpurple/protocols/oscar/oscar.c:2632
 #, 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] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2611
+#: ../libpurple/protocols/oscar/oscar.c:2641
 #, 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."
@@ -7682,482 +8339,523 @@
 msgstr[1] ""
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2796
 #, c-format
 msgid "Unable to send message: %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2766
-#: ../libpurple/protocols/oscar/oscar.c:2771
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2801
+#: ../libpurple/protocols/oscar/oscar.c:2865
 msgid "Unknown reason."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2769
+#: ../libpurple/protocols/oscar/oscar.c:2799
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2865
 #, c-format
 msgid "User information not available: %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2896
 msgid "Online Since"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2901
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
-msgid "Capabilities"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2936
 msgid "Available Message"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3014
+#: ../libpurple/protocols/oscar/oscar.c:3044
 msgid "Your AIM connection may be lost."
 msgstr ""
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3202
-msgid "[Unable to display a message from this user because it contained invalid characters.]"
-msgstr ""
-
-#: ../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."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3449
+#: ../libpurple/protocols/oscar/oscar.c:3232
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3396
+msgid ""
+"The last action you attempted could not be performed because you are over "
+"the rate limit. Please wait 10 seconds and try again."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3479
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3699
-#: ../libpurple/protocols/silc/util.c:585
-#: ../libpurple/protocols/silc10/util.c:581
-msgid "Mobile Phone"
-msgstr ""
-
 #: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
+msgid "Mobile Phone"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Personal Web Page"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3753
+#: ../libpurple/protocols/oscar/oscar.c:3783
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3761
-#: ../libpurple/protocols/oscar/oscar.c:3774
-msgid "Zip Code"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3785
-msgid "Division"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3786
-msgid "Position"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3788
-msgid "Web Page"
-msgstr ""
-
 #: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3804
+msgid "Zip Code"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3815
+msgid "Division"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3816
+msgid "Position"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3818
+msgid "Web Page"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Information"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3847
+#: ../libpurple/protocols/oscar/oscar.c:3877
 msgid "Pop-Up Message"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3887
+#: ../libpurple/protocols/oscar/oscar.c:3917
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3922
 msgid "Screen name"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3918
+#: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3939
+#: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3941
+#: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3972
+#: ../libpurple/protocols/oscar/oscar.c:4002
+#, c-format
 msgid "Error Changing Account Info"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3975
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3978
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3981
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3984
-#, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3987
-#, 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 ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3990
-#, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3993
-#, c-format
-msgid "Error 0x%04x: Unknown error."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4003
-#, c-format
-msgid "The e-mail address for %s is %s"
-msgstr ""
-
 #: ../libpurple/protocols/oscar/oscar.c:4005
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4008
+#, c-format
+msgid "Error 0x%04x: Unable to format screen name because it is invalid."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4011
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4014
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because there is already a "
+"request pending for this screen name."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4017
+#, 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 ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4020
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because the given address is "
+"invalid."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4023
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4033
+#, c-format
+msgid "The e-mail address for %s is %s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4177
-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4448
+#: ../libpurple/protocols/oscar/oscar.c:4218
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4489
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: ../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 fully connected."
-msgstr ""
-
-#: ../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."
-msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4468
-msgid "Profile too long."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4513
-#, c-format
-msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
-msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
+#: ../libpurple/protocols/oscar/oscar.c:4490
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4504
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4518
+#: ../libpurple/protocols/oscar/oscar.c:4509
+msgid "Profile too long."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4554
+#, c-format
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4559
 msgid "Away message too long."
 msgstr ""
 
-#: ../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 ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4589
-#: ../libpurple/protocols/oscar/oscar.c:5022
-#: ../libpurple/protocols/oscar/oscar.c:5037
+#: ../libpurple/protocols/oscar/oscar.c:4628
+#, 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 ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4630
+#: ../libpurple/protocols/oscar/oscar.c:5060
+#: ../libpurple/protocols/oscar/oscar.c:5075
 msgid "Unable To Add"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4698
+#: ../libpurple/protocols/oscar/oscar.c:4739
 msgid "Unable To Retrieve Buddy List"
 msgstr ""
 
-#: ../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."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4881
-#: ../libpurple/protocols/oscar/oscar.c:4883
-#: ../libpurple/protocols/oscar/oscar.c:5091
-#: ../libpurple/protocols/oscar/oscar.c:5092
-#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:4740
+msgid ""
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few hours."
+msgstr ""
+
+#: ../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
 msgid "Orphans"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5020
-#, c-format
-msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5020
-#: ../libpurple/protocols/oscar/oscar.c:5035
+#: ../libpurple/protocols/oscar/oscar.c:5058
+#, c-format
+msgid ""
+"Could not add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5073
 msgid "(no name)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5034
+#: ../libpurple/protocols/oscar/oscar.c:5072
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr ""
 
-#: ../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 want to add them?"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5136
+#: ../libpurple/protocols/oscar/oscar.c:5178
+#, c-format
+msgid ""
+"The user %s has given you permission to add you to their buddy list.  Do you "
+"want to add them?"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5186
 msgid "Authorization Given"
 msgstr ""
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5209
+#: ../libpurple/protocols/oscar/oscar.c:5259
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5210
+#: ../libpurple/protocols/oscar/oscar.c:5260
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: ../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 following reason:\n"
+#: ../libpurple/protocols/oscar/oscar.c:5263
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5214
+#: ../libpurple/protocols/oscar/oscar.c:5264
 msgid "Authorization Denied"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5250
+#: ../libpurple/protocols/oscar/oscar.c:5300
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5290
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Invalid chat name specified."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5359
+#: ../libpurple/protocols/oscar/oscar.c:5409
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5519
-#: ../libpurple/protocols/oscar/oscar.c:5524
+#: ../libpurple/protocols/oscar/oscar.c:5569
+#: ../libpurple/protocols/oscar/oscar.c:5574
 msgid "Away Message"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5524
+#: ../libpurple/protocols/oscar/oscar.c:5574
 msgid "<i>(retrieving)</i>"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:5774
 msgid "iTunes Music Store Link"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5832
+#: ../libpurple/protocols/oscar/oscar.c:5882
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5833
+#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Buddy Comment:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5880
+#: ../libpurple/protocols/oscar/oscar.c:5930
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: ../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 ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5890
-#: ../libpurple/protocols/oscar/peer.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:5934
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5940
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:5975
 msgid "Get AIM Info"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5931
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Edit Buddy Comment"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5939
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get Status Msg"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5952
+#: ../libpurple/protocols/oscar/oscar.c:6002
 msgid "Direct IM"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5974
+#: ../libpurple/protocols/oscar/oscar.c:6024
 msgid "Re-request Authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6033
+#: ../libpurple/protocols/oscar/oscar.c:6083
 msgid "Require authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6036
+#: ../libpurple/protocols/oscar/oscar.c:6086
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6041
+#: ../libpurple/protocols/oscar/oscar.c:6091
 msgid "ICQ Privacy Options"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6060
+#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "The new formatting is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6061
+#: ../libpurple/protocols/oscar/oscar.c:6111
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6114
-msgid "Change Address To:"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6160
-msgid "<i>you are not waiting for authorization</i>"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6163
-msgid "You are awaiting authorization from the following buddies"
-msgstr ""
-
 #: ../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.\""
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6181
+msgid "Change Address To:"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:6210
+msgid "<i>you are not waiting for authorization</i>"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:6213
+msgid "You are awaiting authorization from the following buddies"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:6214
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Find Buddy by E-Mail"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6182
+#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Search for a buddy by e-mail address"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6183
+#: ../libpurple/protocols/oscar/oscar.c:6233
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6186
+#: ../libpurple/protocols/oscar/oscar.c:6236
 msgid "_Search"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6344
+#: ../libpurple/protocols/oscar/oscar.c:6394
 msgid "Set User Info (URL)..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6355
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Change Password (URL)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6359
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Configure IM Forwarding (URL)"
 msgstr ""
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6369
+#: ../libpurple/protocols/oscar/oscar.c:6419
 msgid "Set Privacy Options..."
 msgstr ""
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6376
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Confirm Account"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6380
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Display Currently Registered E-Mail Address"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6384
+#: ../libpurple/protocols/oscar/oscar.c:6434
 msgid "Change Currently Registered E-Mail Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6391
+#: ../libpurple/protocols/oscar/oscar.c:6441
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6397
+#: ../libpurple/protocols/oscar/oscar.c:6447
 msgid "Search for Buddy by E-Mail Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6402
+#: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6470
+#: ../libpurple/protocols/oscar/oscar.c:6520
 msgid "Use recent buddies group"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6473
+#: ../libpurple/protocols/oscar/oscar.c:6523
 msgid "Show how long you have been idle"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6628
+#: ../libpurple/protocols/oscar/oscar.c:6678
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: ../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 considered a privacy risk."
+#: ../libpurple/protocols/oscar/peer.c:1037
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
 msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
@@ -8327,7 +9025,9 @@
 
 #: ../libpurple/protocols/qq/buddy_info.c:560
 #, c-format
-msgid "Setting custom faces is not currently supported. Please choose an image from %s."
+msgid ""
+"Setting custom faces is not currently supported. Please choose an image from "
+"%s."
 msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:577
@@ -8355,14 +9055,6 @@
 msgid "Sorry, you are not my type..."
 msgstr ""
 
-#: ../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 ""
-
 #: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr ""
@@ -8613,8 +9305,7 @@
 msgstr ""
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139
-#: ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8690,8 +9381,7 @@
 msgid "Set My Information"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:536
-#: ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr ""
 
@@ -8717,8 +9407,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725
-#: ../libpurple/protocols/qq/qq.c:727
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr ""
 
@@ -8869,7 +9558,8 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
-msgid "A Sametime administrator has issued the following announcement on server %s"
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:1650
@@ -8920,10 +9610,6 @@
 msgid "Video Camera"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3235
-msgid "File Transfer"
-msgstr ""
-
 #: ../libpurple/protocols/sametime/sametime.c:3269
 #: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
@@ -8940,7 +9626,9 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
-msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:3385
@@ -8965,7 +9653,10 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
-msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:3471
@@ -8980,8 +9671,7 @@
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3586
-#: ../pidgin/gtkconv.c:4299
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
 msgid "Topic:"
 msgstr ""
 
@@ -8991,7 +9681,9 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
-msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:3641
@@ -9002,8 +9694,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:4026
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
 msgid "Connect"
 msgstr ""
 
@@ -9032,7 +9723,9 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
-msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:4334
@@ -9045,7 +9738,9 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
-msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:4425
@@ -9117,7 +9812,10 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
-msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5394
@@ -9130,7 +9828,9 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
-msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5480
@@ -9138,7 +9838,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5481
-msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5530
@@ -9148,11 +9850,13 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
-msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5538
-#: ../pidgin/gtknotify.c:724
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
 msgid "Search Results"
 msgstr ""
 
@@ -9174,7 +9878,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5606
-msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5609
@@ -9287,7 +9993,9 @@
 #: ../libpurple/protocols/silc/buddy.c:298
 #: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
-msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:302
@@ -9392,7 +10100,9 @@
 
 #: ../libpurple/protocols/silc/buddy.c:726
 #: ../libpurple/protocols/silc10/buddy.c:738
-msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
 msgstr ""
 
 #. Open file selector to select the public key.
@@ -9409,7 +10119,9 @@
 
 #: ../libpurple/protocols/silc/buddy.c:1073
 #: ../libpurple/protocols/silc10/buddy.c:1081
-msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:1077
@@ -9424,12 +10136,16 @@
 
 #: ../libpurple/protocols/silc/buddy.c:1185
 #: ../libpurple/protocols/silc10/buddy.c:1183
-msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:1187
 #: ../libpurple/protocols/silc10/buddy.c:1185
-msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:1474
@@ -9567,13 +10283,6 @@
 msgid "User Modes"
 msgstr ""
 
-#: ../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 ""
-
 #: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1224
 #: ../libpurple/protocols/silc10/buddy.c:1562
@@ -9707,6 +10416,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr ""
 
@@ -9745,7 +10455,13 @@
 
 #: ../libpurple/protocols/silc/chat.c:435
 #: ../libpurple/protocols/silc10/chat.c:413
-msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
+#, c-format
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:444
@@ -9866,7 +10582,8 @@
 #: ../libpurple/protocols/silc/chat.c:1045
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
-msgid "You have to join the %s channel before you are able to join the private group"
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:1047
@@ -9900,20 +10617,13 @@
 msgid "Unknown command"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:85
-#: ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104
-#: ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112
-#: ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120
-#: ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277
-#: ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288
-#: ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89
-#: ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
 #: ../libpurple/protocols/silc10/ft.c:96
 #: ../libpurple/protocols/silc10/ft.c:100
 #: ../libpurple/protocols/silc10/ft.c:104
@@ -9925,16 +10635,11 @@
 msgid "Secure File Transfer"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:86
-#: ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105
-#: ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113
-#: ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121
-#: ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93
-#: ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
 #: ../libpurple/protocols/silc10/ft.c:101
 #: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
@@ -9944,13 +10649,11 @@
 msgid "Remote disconnected"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:106
-#: ../libpurple/protocols/silc10/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:110
-#: ../libpurple/protocols/silc10/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr ""
 
@@ -9962,33 +10665,27 @@
 msgid "Creating connection failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:122
-#: ../libpurple/protocols/silc10/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:273
-#: ../libpurple/protocols/silc10/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:278
-#: ../libpurple/protocols/silc10/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:283
-#: ../libpurple/protocols/silc10/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:289
-#: ../libpurple/protocols/silc10/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:426
-#: ../libpurple/protocols/silc10/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr ""
 
@@ -9996,8 +10693,7 @@
 msgid "Error occurred"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:533
-#: ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
 #: ../libpurple/protocols/silc/ops.c:551
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
@@ -10036,8 +10732,7 @@
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:718
-#: ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
 #: ../libpurple/protocols/silc/ops.c:728
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
@@ -10046,8 +10741,7 @@
 msgid "You have been killed by %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:749
-#: ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
 #: ../libpurple/protocols/silc/ops.c:759
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
@@ -10233,13 +10927,6 @@
 msgstr ""
 
 #: ../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 ""
-
-#: ../libpurple/protocols/silc/ops.c:1596
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr ""
@@ -10286,20 +10973,19 @@
 msgid "Passphrase required"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:98
-#: ../libpurple/protocols/silc10/pk.c:104
-#, c-format
-msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
-msgstr ""
-
-#: ../libpurple/protocols/silc/pk.c:103
-#: ../libpurple/protocols/silc10/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:107
-#: ../libpurple/protocols/silc10/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -10308,20 +10994,17 @@
 "%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:110
-#: ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
 #: ../libpurple/protocols/silc10/pk.c:116
 #: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:115
-#: ../libpurple/protocols/silc10/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:140
-#: ../libpurple/protocols/silc10/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr ""
 
@@ -10342,7 +11025,8 @@
 
 #: ../libpurple/protocols/silc/silc.c:238
 #: ../libpurple/protocols/silc10/ops.c:1714
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:265
@@ -10363,6 +11047,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:352
+#, c-format
 msgid "Could not load SILC key pair"
 msgstr ""
 
@@ -10391,8 +11076,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652
-#: ../pidgin/gtkprefs.c:1638
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
+#, c-format
 msgid "Normal"
 msgstr ""
 
@@ -10465,7 +11150,10 @@
 
 #: ../libpurple/protocols/silc/silc.c:818
 #: ../libpurple/protocols/silc10/silc.c:731
-msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
+msgid ""
+"You can let other users see your online status information and your personal "
+"information. Please fill the information you would like other users to see "
+"about yourself."
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:859
@@ -10674,12 +11362,16 @@
 
 #: ../libpurple/protocols/silc/silc.c:1716
 #: ../libpurple/protocols/silc10/silc.c:1645
-msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1720
 #: ../libpurple/protocols/silc10/silc.c:1649
-msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1724
@@ -10694,7 +11386,9 @@
 
 #: ../libpurple/protocols/silc/silc.c:1732
 #: ../libpurple/protocols/silc10/silc.c:1661
-msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1736
@@ -10734,7 +11428,9 @@
 
 #: ../libpurple/protocols/silc/silc.c:1765
 #: ../libpurple/protocols/silc10/silc.c:1694
-msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
 msgstr ""
 
 #. *< type
@@ -10758,8 +11454,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853
-#: ../pidgin/gtkprefs.c:2031
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
 msgid "Network"
 msgstr ""
 
@@ -10929,20 +11624,19 @@
 msgid "Terminal"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:284
-#: ../libpurple/protocols/silc10/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:288
-#: ../libpurple/protocols/silc10/wb.c:288
-#, c-format
-msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
-msgstr ""
-
-#: ../libpurple/protocols/silc/wb.c:302
-#: ../libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr ""
 
@@ -10951,42 +11645,52 @@
 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 ""
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../libpurple/protocols/silc10/ops.c:1964
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr ""
 
@@ -11013,26 +11717,30 @@
 msgstr ""
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1489
+#: ../libpurple/protocols/simple/simple.c:1529
 msgid "Could not connect"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1523
-#: ../libpurple/protocols/simple/simple.c:1565
-#: ../libpurple/protocols/simple/simple.c:1578
-#: ../libpurple/protocols/simple/simple.c:1629
+#: ../libpurple/protocols/simple/simple.c:1059
+msgid "Unknown server response."
+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
 msgid "Could not create listen socket"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1546
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't resolve host"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1637
+#: ../libpurple/protocols/simple/simple.c:1677
 msgid "Could not resolve hostname"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1654
+#: ../libpurple/protocols/simple/simple.c:1694
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr ""
 
@@ -11044,36 +11752,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1829
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr ""
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1830
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/simple/simple.c:1899
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1864
+#: ../libpurple/protocols/simple/simple.c:1905
 msgid "Use UDP"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1866
+#: ../libpurple/protocols/simple/simple.c:1907
 msgid "Use proxy"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1868
+#: ../libpurple/protocols/simple/simple.c:1909
 msgid "Proxy"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1911
 msgid "Auth User"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1913
 msgid "Auth Domain"
 msgstr ""
 
@@ -11118,6 +11826,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 
@@ -11142,38 +11851,47 @@
 msgstr ""
 
 #: ../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 ""
 
@@ -11183,19 +11901,25 @@
 msgstr ""
 
 #: ../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
-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."
+#, 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."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:560
@@ -11228,9 +11952,8 @@
 msgid "Password Change Successful"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:1366
-#: ../pidgin/gtkblist.c:5532
-#: ../pidgin/gtkblist.c:5885
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
+#: ../pidgin/gtkblist.c:5932
 msgid "_Group:"
 msgstr ""
 
@@ -11251,10 +11974,8 @@
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:1878
-#: ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042
-#: ../libpurple/protocols/toc/toc.c:2130
+#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr ""
 
@@ -11288,222 +12009,224 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306
-#: ../libpurple/protocols/toc/toc.c:2308
+#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:778
+#: ../libpurple/protocols/yahoo/yahoo.c:782
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:834
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:906
-#, c-format
-msgid "%s just sent you a Buzz!"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:953
+#: ../libpurple/protocols/yahoo/yahoo.c:960
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1025
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
 msgid "Authorization denied message:"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1043
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1046
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#, c-format
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1050
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1048
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 msgid "Add buddy rejected"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1973
-#, c-format
-msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1976
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 msgid "Failed Yahoo! Authentication"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2042
-#, c-format
-msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2045
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#, c-format
+msgid ""
+"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
+"\"Yes\" will remove and ignore the buddy."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2066
 msgid "Ignore buddy?"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2108
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2111
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2165
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2168
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2287
+#: ../libpurple/protocols/yahoo/yahoo.c:2308
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2630
+#: ../libpurple/protocols/yahoo/yahoo.c:2651
 msgid "Received unexpected HTTP response from server."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2654
-#: ../libpurple/protocols/yahoo/yahoo.c:2840
-#: ../libpurple/protocols/yahoo/yahoo.c:2943
-#: ../libpurple/protocols/yahoo/yahoo.c:2953
-#: ../libpurple/protocols/yahoo/yahoochat.c:1419
-#: ../libpurple/protocols/yahoo/yahoochat.c:1489
+#: ../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/ycht.c:585
 msgid "Connection problem"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2680
+#: ../libpurple/protocols/yahoo/yahoo.c:2701
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2705
+#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
-#: ../libpurple/protocols/yahoo/yahoo.c:3741
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Home"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3057
-#: ../libpurple/protocols/yahoo/yahoo.c:3744
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not at Desk"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3059
-#: ../libpurple/protocols/yahoo/yahoo.c:3747
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "Not in Office"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3063
-#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "On Vacation"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3067
-#: ../libpurple/protocols/yahoo/yahoo.c:3759
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3785
 msgid "Stepped Out"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3160
-#: ../libpurple/protocols/yahoo/yahoo.c:3190
+#: ../libpurple/protocols/yahoo/yahoo.c:3186
+#: ../libpurple/protocols/yahoo/yahoo.c:3216
 msgid "Not on server list"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3207
-#: ../libpurple/protocols/yahoo/yahoo.c:3265
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Appear Online"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3210
-#: ../libpurple/protocols/yahoo/yahoo.c:3286
+#: ../libpurple/protocols/yahoo/yahoo.c:3236
+#: ../libpurple/protocols/yahoo/yahoo.c:3312
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3254
 msgid "Presence"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3271
+#: ../libpurple/protocols/yahoo/yahoo.c:3297
 msgid "Appear Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3280
+#: ../libpurple/protocols/yahoo/yahoo.c:3306
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3328
+#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Join in Chat"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3334
+#: ../libpurple/protocols/yahoo/yahoo.c:3360
 msgid "Initiate Conference"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3362
+#: ../libpurple/protocols/yahoo/yahoo.c:3388
 msgid "Presence Settings"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3368
+#: ../libpurple/protocols/yahoo/yahoo.c:3394
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3469
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
 msgid "Activate which ID?"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3480
-msgid "Join who in chat?"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
+msgid "Join whom in chat?"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3518
 msgid "Activate ID..."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3496
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "Join User in Chat..."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/yahoo/yahoo.c:3527
 msgid "Open Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4021
-msgid "You have just sent a Buzz!"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
+msgid "Buzz"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4136
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4085
+#: ../libpurple/protocols/yahoo/yahoo.c:4141
 msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4089
-msgid "buzz: Buzz a user to get their attention"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4093
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -11517,126 +12240,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4301
-#: ../libpurple/protocols/yahoo/yahoo.c:4303
+#: ../libpurple/protocols/yahoo/yahoo.c:4358
+#: ../libpurple/protocols/yahoo/yahoo.c:4360
 msgid "Yahoo Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4326
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Yahoo Japan"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4329
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Pager server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4332
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Japan Pager server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4335
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "Pager port"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4338
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "File transfer server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4341
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "Japan file transfer server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4344
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "File transfer port"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4347
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Chat room locale"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4350
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room list URL"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4361
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4364
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 msgid "Yahoo Chat port"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:205
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:207
-msgid "Invitation Rejected"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:363
-msgid "Failed to join chat"
-msgstr ""
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:366
-msgid "Unknown room"
-msgstr ""
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:369
-msgid "Maybe the room is full"
-msgstr ""
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:372
-msgid "Not available"
-msgstr ""
-
-#: ../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 ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:454
-#, c-format
-msgid "You are now chatting in %s."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
-msgid "Failed to join buddy in chat"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:630
-msgid "Maybe they're not in a chat?"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1321
-#: ../libpurple/protocols/yahoo/yahoochat.c:1347
-msgid "Fetching the room list failed."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1405
-msgid "Voices"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1408
-msgid "Webcams"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1419
-#: ../libpurple/protocols/yahoo/yahoochat.c:1489
-msgid "Unable to fetch room list."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1482
-msgid "User Rooms"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -11646,7 +12302,7 @@
 
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -11664,11 +12320,15 @@
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:838
-msgid "Sorry, profiles marked as containing adult content are not supported at this time."
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:840
-msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
@@ -11712,21 +12372,97 @@
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
-msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
-msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
-msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr ""
 
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
+msgid "Invitation Rejected"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr ""
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr ""
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr ""
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr ""
+
+#: ../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 ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#, c-format
+msgid "You are now chatting in %s."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Fetching the room list failed."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+msgid "Voices"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr ""
+
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr ""
@@ -11739,7 +12475,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:354
-msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
 msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
@@ -11805,19 +12543,26 @@
 msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2727
-msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
 msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2733
-msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2739
-msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2744
@@ -11879,237 +12624,261 @@
 msgid "Exposure"
 msgstr ""
 
-#: ../libpurple/proxy.c:458
-#: ../libpurple/proxy.c:877
-#: ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1600
+#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
+#: ../libpurple/proxy.c:1617
 #, c-format
 msgid ""
 "Unable to create socket:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/proxy.c:658
+#: ../libpurple/proxy.c:659
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr ""
 
-#: ../libpurple/proxy.c:686
-#: ../libpurple/proxy.c:732
-#: ../libpurple/proxy.c:770
-#: ../libpurple/proxy.c:782
+#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
+#: ../libpurple/proxy.c:792
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr ""
 
-#: ../libpurple/proxy.c:778
+#: ../libpurple/proxy.c:788
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 
-#: ../libpurple/proxy.c:995
+#: ../libpurple/proxy.c:1012
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-#: ../libpurple/proxy.c:1697
+#: ../libpurple/proxy.c:1714
 msgid "Could not resolve host name"
 msgstr ""
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1377
+#: ../libpurple/request.h:1378
 msgid "_Yes"
 msgstr ""
 
-#: ../libpurple/request.h:1377
+#: ../libpurple/request.h:1378
 msgid "_No"
 msgstr ""
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1397
+#: ../libpurple/request.h:1398
 msgid "_Accept"
 msgstr ""
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:47
+#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr ""
 
-#: ../libpurple/savedstatuses.c:534
+#: ../libpurple/savedstatuses.c:535
 msgid "saved statuses"
 msgstr ""
 
-#: ../libpurple/server.c:233
+#: ../libpurple/server.c:234
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr ""
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:302
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr ""
+
+#: ../libpurple/server.c:347
+#, c-format
+msgid "%s has requested your attention!"
+msgstr ""
+
+#: ../libpurple/server.c:796
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:801
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr ""
 
-#: ../libpurple/server.c:689
+#: ../libpurple/server.c:805
 msgid "Accept chat invitation?"
 msgstr ""
 
-#: ../libpurple/status.c:152
+#: ../libpurple/sslconn.c:164
+msgid "SSL Connection Failed"
+msgstr ""
+
+#: ../libpurple/sslconn.c:166
+msgid "SSL Handshake Failed"
+msgstr ""
+
+#: ../libpurple/sslconn.c:168
+msgid "SSL peer presented an invalid certificate"
+msgstr ""
+
+#: ../libpurple/sslconn.c:171
+msgid "Unknown SSL error"
+msgstr ""
+
+#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr ""
 
-#: ../libpurple/status.c:155
-#: ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr ""
 
-#: ../libpurple/status.c:158
-msgid "Extended away"
-msgstr ""
-
 #: ../libpurple/status.c:159
+msgid "Extended away"
+msgstr ""
+
+#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr ""
 
-#: ../libpurple/status.c:608
+#: ../libpurple/status.c:609
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr ""
 
-#: ../libpurple/status.c:618
+#: ../libpurple/status.c:619
 #, c-format
 msgid "%s is now %s"
 msgstr ""
 
-#: ../libpurple/status.c:623
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is no longer %s"
 msgstr ""
 
-#: ../libpurple/status.c:1233
+#: ../libpurple/status.c:1234
 #, c-format
 msgid "%s became idle"
 msgstr ""
 
-#: ../libpurple/status.c:1250
+#: ../libpurple/status.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr ""
 
-#: ../libpurple/status.c:1313
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became idle"
 msgstr ""
 
-#: ../libpurple/status.c:1315
+#: ../libpurple/status.c:1316
 #, c-format
 msgid "+++ %s became unidle"
 msgstr ""
 
-#: ../libpurple/util.c:717
+#: ../libpurple/util.c:718
 #, c-format
 msgid "%x %X"
 msgstr ""
 
-#: ../libpurple/util.c:2702
+#: ../libpurple/util.c:2722
 #, c-format
 msgid "Error Reading %s"
 msgstr ""
 
-#: ../libpurple/util.c:2703
-#, 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 ""
-
-#: ../libpurple/util.c:3203
+#: ../libpurple/util.c:2723
+#, 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 ""
+
+#: ../libpurple/util.c:3223
 msgid "Calculating..."
 msgstr ""
 
-#: ../libpurple/util.c:3206
+#: ../libpurple/util.c:3226
 msgid "Unknown."
 msgstr ""
 
-#: ../libpurple/util.c:3232
+#: ../libpurple/util.c:3252
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3244
+#: ../libpurple/util.c:3264
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3272
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3258
+#: ../libpurple/util.c:3278
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3266
+#: ../libpurple/util.c:3286
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3292
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3532
+#: ../libpurple/util.c:3552
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3569
-#: ../libpurple/util.c:3864
+#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
 #, c-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: ../libpurple/util.c:3692
-#, c-format
-msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
-msgstr ""
-
-#: ../libpurple/util.c:3727
+#: ../libpurple/util.c:3712
+#, 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
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:3758
+#: ../libpurple/util.c:3778
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:3783
+#: ../libpurple/util.c:3803
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
@@ -12135,72 +12904,71 @@
 msgstr ""
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:410
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:431
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:442
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:532
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:536
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr ""
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:594
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:607
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr ""
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:612
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:732
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr ""
 
+#: ../pidgin/gtkaccount.c:936
+msgid "Use GNOME Proxy Settings"
+msgstr ""
+
 #: ../pidgin/gtkaccount.c:937
-msgid "Use GNOME Proxy Settings"
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:938
 msgid "Use Global Proxy Settings"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:944
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:950
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:956
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:962
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:968
-#: ../pidgin/gtkprefs.c:1208
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
 msgid "Use Environmental Settings"
 msgstr ""
 
@@ -12209,767 +12977,768 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1007
+#: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
 msgstr ""
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1010
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1031
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1045
-#: ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
 msgid "Proxy _type:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1054
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
 msgid "_Host:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1058
-#: ../pidgin/gtkprefs.c:1241
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
 msgid "_Port:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1066
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1073
-#: ../pidgin/gtkprefs.c:1278
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
 msgid "Pa_ssword:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1468
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1487
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1494
+#: ../pidgin/gtkaccount.c:1499
 msgid "Create this new account on the server"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1510
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1968
-#: ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1996
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2196
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with %s press the <b>Add</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add</b> again to configure them all.\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add</b> button below and configure your first account. If you want %s to "
+"connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
 "\n"
-"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Add/Edit</b> in the Buddy List window"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:760
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:767
 msgid "Join a Chat"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:781
-msgid "Please enter the appropriate information about the chat you would like to join.\n"
+#: ../pidgin/gtkblist.c:788
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
 msgstr ""
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:792
-#: ../pidgin/gtkblist.c:5480
-#: ../pidgin/gtkblist.c:5846
-#: ../pidgin/gtkpounce.c:538
-#: ../pidgin/gtkroomlist.c:395
+#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
+#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
+#: ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1081
-#: ../pidgin/gtkprivacy.c:602
-#: ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1088
 msgid "Un_block"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1132
+#: ../pidgin/gtkblist.c:1139
 msgid "Get _Info"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1135
-#: ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1141
-msgid "_Send File"
-msgstr ""
-
 #: ../pidgin/gtkblist.c:1148
+msgid "_Send File"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1155
 msgid "Add Buddy _Pounce"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1153
-#: ../pidgin/gtkblist.c:1157
-#: ../pidgin/gtkblist.c:1262
-#: ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
+#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
 msgid "View _Log"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1170
-#: ../pidgin/gtkblist.c:1179
-#: ../pidgin/gtkblist.c:1270
-#: ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Alias..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1173
-#: ../pidgin/gtkblist.c:1181
-#: ../pidgin/gtkblist.c:1272
-#: ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
+#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
 msgid "_Remove"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1231
+#: ../pidgin/gtkblist.c:1238
 msgid "Add a _Buddy"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1241
 msgid "Add a C_hat"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1237
+#: ../pidgin/gtkblist.c:1244
 msgid "_Delete Group"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1246
 msgid "_Rename"
 msgstr ""
 
 #. join button
-#: ../pidgin/gtkblist.c:1258
-#: ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459
-#: ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1267
 msgid "Auto-Join"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1298
-#: ../pidgin/gtkblist.c:1322
+#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
 msgid "_Collapse"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1334
 msgid "_Expand"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1572
-#: ../pidgin/gtkblist.c:1584
-#: ../pidgin/gtkblist.c:4574
-#: ../pidgin/gtkblist.c:4584
+#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
+#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
 msgid "/Tools/Mute Sounds"
 msgstr ""
 
-#: ../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."
+#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
+#: ../pidgin/gtkpounce.c:430
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
 msgstr ""
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2869
 msgid "/_Buddies"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/New Instant _Message..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2871
 msgid "/Buddies/Join a _Chat..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:2872
 msgid "/Buddies/Get User _Info..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2873
 msgid "/Buddies/View User _Log..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/Show _Offline Buddies"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Show _Empty Groups"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:2860
-msgid "/Buddies/Show Buddy _Details"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:2861
-msgid "/Buddies/Show Idle _Times"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Empty Groups"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2878
+msgid "/Buddies/Show/Buddy _Details"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2879
+msgid "/Buddies/Show/Idle _Times"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2880
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/_Sort Buddies"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2883
 msgid "/Buddies/_Add Buddy..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/Add C_hat..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2885
 msgid "/Buddies/Add _Group..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2868
+#: ../pidgin/gtkblist.c:2887
 msgid "/Buddies/_Quit"
 msgstr ""
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2890
 msgid "/_Accounts"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2872
-#: ../pidgin/gtkblist.c:6544
+#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr ""
 
 #. Tools
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2894
 msgid "/_Tools"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Buddy _Pounces"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2896
+msgid "/Tools/_Certificates"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2897
 msgid "/Tools/Plu_gins"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/Pr_eferences"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2901
 msgid "/Tools/_File Transfers"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2882
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/R_oom List"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2903
 msgid "/Tools/System _Log"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:2905
 msgid "/Tools/Mute _Sounds"
 msgstr ""
 
 #. Help
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2907
 msgid "/_Help"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2888
+#: ../pidgin/gtkblist.c:2908
 msgid "/Help/Online _Help"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2889
+#: ../pidgin/gtkblist.c:2909
 msgid "/Help/_Debug Window"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2891
-#: ../pidgin/gtkblist.c:2893
+#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
 msgid "/Help/_About"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2922
+#: ../pidgin/gtkblist.c:2942
 #, c-format
 msgid ""
 "\n"
 "<b>Account:</b> %s"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3000
+#: ../pidgin/gtkblist.c:3020
 msgid "Buddy Alias"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3029
+#: ../pidgin/gtkblist.c:3049
 msgid "Logged In"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3075
-msgid "Last Seen"
-msgstr ""
-
 #: ../pidgin/gtkblist.c:3095
+msgid "Last Seen"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3116
 msgid "Spooky"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3118
 msgid "Awesome"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3099
+#: ../pidgin/gtkblist.c:3120
 msgid "Rockin'"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3438
+#: ../pidgin/gtkblist.c:3453
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3440
+#: ../pidgin/gtkblist.c:3455
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3442
+#: ../pidgin/gtkblist.c:3457
 #, c-format
 msgid "Idle %dm"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3587
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/New Instant Message..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3588
-#: ../pidgin/gtkblist.c:3621
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Join a Chat..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3589
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Get User Info..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3590
+#: ../pidgin/gtkblist.c:3605
 msgid "/Buddies/Add Buddy..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3591
-#: ../pidgin/gtkblist.c:3624
+#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
 msgid "/Buddies/Add Chat..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3592
+#: ../pidgin/gtkblist.c:3607
 msgid "/Buddies/Add Group..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3627
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Privacy"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3630
+#: ../pidgin/gtkblist.c:3645
 msgid "/Tools/Room List"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3727
-#: ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkblist.c:3807
+#: ../pidgin/gtkblist.c:3822
 msgid "Manually"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3824
 msgid "Alphabetically"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3810
+#: ../pidgin/gtkblist.c:3825
 msgid "By status"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3811
+#: ../pidgin/gtkblist.c:3826
 msgid "By log size"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4016
-#: ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
 #, c-format
 msgid "%s disconnected"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4026
-msgid "Re-enable Account"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:4052
+#: ../pidgin/gtkblist.c:4067
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4204
+#: ../pidgin/gtkblist.c:4219
 msgid "<b>Username:</b>"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4211
+#: ../pidgin/gtkblist.c:4226
 msgid "<b>Password:</b>"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4222
+#: ../pidgin/gtkblist.c:4237
 msgid "_Login"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4305
+#: ../pidgin/gtkblist.c:4320
 msgid "/Accounts"
 msgstr ""
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4319
+#: ../pidgin/gtkblist.c:4334
 #, 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 able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
 msgstr ""
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4568
-msgid "/Buddies/Show Offline Buddies"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:4571
-msgid "/Buddies/Show Empty Groups"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:4577
-msgid "/Buddies/Show Buddy Details"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:4580
-msgid "/Buddies/Show Idle Times"
-msgstr ""
-
-#: ../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. The alias will be displayed in place of the screen name whenever possible.\n"
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Offline Buddies"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4600
+msgid "/Buddies/Show/Empty Groups"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Buddy Details"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Idle Times"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4612
+msgid "/Buddies/Show/Protocol Icons"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5507
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5492
+#: ../pidgin/gtkblist.c:5542
 msgid "_Screen name:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:5514
-#: ../pidgin/gtkblist.c:5867
+#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
 msgid "A_lias:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:5779
+#: ../pidgin/gtkblist.c:5826
 msgid "This protocol does not support chat rooms."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:5795
-msgid "You are not currently signed on with any protocols that have the ability to chat."
-msgstr ""
-
-#: ../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"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:5924
+#: ../pidgin/gtkblist.c:5842
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5883
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5964
 msgid "Please enter the name of the group to be added."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6564
-msgid "<PurpleMain>/Accounts/"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6588
-msgid "_Edit Account"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6601
-#: ../pidgin/gtkconv.c:3007
-msgid "No actions available"
-msgstr ""
-
 #: ../pidgin/gtkblist.c:6609
+msgid "<PurpleMain>/Accounts/"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6633
+msgid "_Edit Account"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+msgid "No actions available"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6621
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6627
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6676
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6746
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
-#: ../pidgin/gtkconn.c:179
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:530
+msgid "SSL Servers"
+msgstr ""
+
+#: ../pidgin/gtkconn.c:180
 #, c-format
 msgid ""
 "%s\n"
 "\n"
-"%s will not attempt to reconnect the account until you correct the error and re-enable the account."
-msgstr ""
-
-#: ../pidgin/gtkconv.c:458
+"%s will not attempt to reconnect the account until you correct the error and "
+"re-enable the account."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:482
 msgid "Unknown command."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:730
-#: ../pidgin/gtkconv.c:756
+#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:750
-msgid "You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-
-#: ../pidgin/gtkconv.c:803
+#: ../pidgin/gtkconv.c:774
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:827
 msgid "Invite Buddy Into Chat Room"
 msgstr ""
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:833
-msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
-msgstr ""
-
-#: ../pidgin/gtkconv.c:854
+#: ../pidgin/gtkconv.c:857
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:878
 msgid "_Buddy:"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:874
-#: ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1527
+#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:931
-#: ../pidgin/gtkconv.c:2514
-#: ../pidgin/gtkdebug.c:218
-#: ../pidgin/gtkft.c:542
+#: ../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:937
+#: ../pidgin/gtkconv.c:953
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:973
+#: ../pidgin/gtkconv.c:991
 msgid "Save Conversation"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1122
-#: ../pidgin/gtkdebug.c:166
-#: ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1148
-#: ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1331
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-
-#: ../pidgin/gtkconv.c:1339
-msgid "Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-
-#: ../pidgin/gtkconv.c:1587
+#: ../pidgin/gtkconv.c:1622
 msgid "Un-Ignore"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1590
+#: ../pidgin/gtkconv.c:1625
 msgid "Ignore"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1610
+#: ../pidgin/gtkconv.c:1645
 msgid "Get Away Message"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1633
+#: ../pidgin/gtkconv.c:1668
 msgid "Last said"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2522
+#: ../pidgin/gtkconv.c:2606
 msgid "Unable to save icon file to disk."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2573
+#: ../pidgin/gtkconv.c:2657
 msgid "Save Icon"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2625
+#: ../pidgin/gtkconv.c:2709
 msgid "Animate"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2630
+#: ../pidgin/gtkconv.c:2714
 msgid "Hide Icon"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2717
 msgid "Save Icon As..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2637
+#: ../pidgin/gtkconv.c:2721
 msgid "Set Custom Icon..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2650
+#: ../pidgin/gtkconv.c:2734
 msgid "Remove Custom Icon"
 msgstr ""
 
+#: ../pidgin/gtkconv.c:2861
+msgid "Show All"
+msgstr ""
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2792
+#: ../pidgin/gtkconv.c:2880
 msgid "/_Conversation"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/New Instant _Message..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2887
 msgid "/Conversation/_Find..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2889
 msgid "/Conversation/View _Log"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2802
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/_Save As..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/Clea_r Scrollback"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2897
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2811
+#: ../pidgin/gtkconv.c:2899
 msgid "/Conversation/_Get Info"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2813
+#: ../pidgin/gtkconv.c:2901
 msgid "/Conversation/In_vite..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/M_ore"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2907
 msgid "/Conversation/Al_ias..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2909
 msgid "/Conversation/_Block..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Unblock..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2825
+#: ../pidgin/gtkconv.c:2913
 msgid "/Conversation/_Add..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2915
 msgid "/Conversation/_Remove..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2920
 msgid "/Conversation/Insert Lin_k..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2834
+#: ../pidgin/gtkconv.c:2922
 msgid "/Conversation/Insert Imag_e..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2840
+#: ../pidgin/gtkconv.c:2928
 msgid "/Conversation/_Close"
 msgstr ""
 
 #. Options
-#: ../pidgin/gtkconv.c:2844
+#: ../pidgin/gtkconv.c:2932
 msgid "/_Options"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2845
+#: ../pidgin/gtkconv.c:2933
 msgid "/Options/Enable _Logging"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2846
+#: ../pidgin/gtkconv.c:2934
 msgid "/Options/Enable _Sounds"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2847
-msgid "/Options/Show Buddy _Icon"
-msgstr ""
-
-#: ../pidgin/gtkconv.c:2849
+#: ../pidgin/gtkconv.c:2936
 msgid "/Options/Show Formatting _Toolbars"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2850
+#: ../pidgin/gtkconv.c:2937
 msgid "/Options/Show Ti_mestamps"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2995
+#: ../pidgin/gtkconv.c:3061
 msgid "/Conversation/More"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3051
+#: ../pidgin/gtkconv.c:3117
 msgid "/Options"
 msgstr ""
 
@@ -12978,783 +13747,758 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3086
-#: ../pidgin/gtkconv.c:3118
+#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
 msgid "/Conversation"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3126
+#: ../pidgin/gtkconv.c:3192
 msgid "/Conversation/View Log"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3132
+#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Send File..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3136
+#: ../pidgin/gtkconv.c:3202
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3142
+#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/Get Info"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3146
+#: ../pidgin/gtkconv.c:3212
 msgid "/Conversation/Invite..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3152
+#: ../pidgin/gtkconv.c:3218
 msgid "/Conversation/Alias..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3156
+#: ../pidgin/gtkconv.c:3222
 msgid "/Conversation/Block..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3160
+#: ../pidgin/gtkconv.c:3226
 msgid "/Conversation/Unblock..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3164
+#: ../pidgin/gtkconv.c:3230
 msgid "/Conversation/Add..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3168
+#: ../pidgin/gtkconv.c:3234
 msgid "/Conversation/Remove..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3174
+#: ../pidgin/gtkconv.c:3240
 msgid "/Conversation/Insert Link..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3178
+#: ../pidgin/gtkconv.c:3244
 msgid "/Conversation/Insert Image..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3250
 msgid "/Options/Enable Logging"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3187
+#: ../pidgin/gtkconv.c:3253
 msgid "/Options/Enable Sounds"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3200
+#: ../pidgin/gtkconv.c:3266
 msgid "/Options/Show Formatting Toolbars"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3203
+#: ../pidgin/gtkconv.c:3269
 msgid "/Options/Show Timestamps"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3206
-msgid "/Options/Show Buddy Icon"
-msgstr ""
-
-#: ../pidgin/gtkconv.c:3290
-#: ../pidgin/gtkconv.c:3332
+#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
 msgid "User is typing..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3335
+#: ../pidgin/gtkconv.c:3391
 msgid "User has typed something and stopped"
 msgstr ""
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3518
-#: ../pidgin/gtkconv.c:7782
+#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
 msgid "_Send To"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:4231
+#: ../pidgin/gtkconv.c:4286
 msgid "_Send"
 msgstr ""
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4335
+#: ../pidgin/gtkconv.c:4390
 msgid "0 people in room"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:5603
-#: ../pidgin/gtkconv.c:5724
+#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkconv.c:6327
-#: ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6331
+#: ../pidgin/gtkconv.c:6490
 msgid "Stopped Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6334
+#: ../pidgin/gtkconv.c:6493
 msgid "Nick Said"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6337
-#: ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6340
+#: ../pidgin/gtkconv.c:6499
 msgid "New Event"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:7332
+#: ../pidgin/gtkconv.c:7572
 msgid "clear: Clears all conversation scrollbacks."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:7496
+#: ../pidgin/gtkconv.c:7736
 msgid "Confirm close"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:7528
+#: ../pidgin/gtkconv.c:7768
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8114
+#: ../pidgin/gtkconv.c:8355
 msgid "Close other tabs"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8120
+#: ../pidgin/gtkconv.c:8361
 msgid "Close all tabs"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8128
+#: ../pidgin/gtkconv.c:8369
 msgid "Detach this tab"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8134
+#: ../pidgin/gtkconv.c:8375
 msgid "Close this tab"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8632
+#: ../pidgin/gtkconv.c:8875
 msgid "Close conversation"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9232
+#: ../pidgin/gtkconv.c:9477
 msgid "Last created window"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9234
+#: ../pidgin/gtkconv.c:9479
 msgid "Separate IM and Chat windows"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9236
-#: ../pidgin/gtkprefs.c:1412
+#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
 msgid "New window"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9238
+#: ../pidgin/gtkconv.c:9483
 msgid "By group"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9240
+#: ../pidgin/gtkconv.c:9485
 msgid "By account"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:581
+#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:584
+#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:651
-msgid "_Icon Only"
-msgstr ""
-
 #: ../pidgin/gtkdebug.c:652
-msgid "_Text Only"
+msgid "_Icon Only"
 msgstr ""
 
 #: ../pidgin/gtkdebug.c:653
+msgid "_Text Only"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:774
+#: ../pidgin/gtkdebug.c:775
 msgid "Filter"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:793
+#: ../pidgin/gtkdebug.c:794
 msgid "Right click for more options."
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:823
-msgid "Level "
-msgstr ""
-
 #: ../pidgin/gtkdebug.c:824
-#: ../pidgin/gtkdebug.c:830
+msgid "Level "
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
 msgid "Select the debug filter level."
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:832
-msgid "All"
-msgstr ""
-
 #: ../pidgin/gtkdebug.c:833
+msgid "All"
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:834
 msgid "Misc"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:835
-msgid "Warning"
-msgstr ""
-
 #: ../pidgin/gtkdebug.c:836
-msgid "Error "
+msgid "Warning"
 msgstr ""
 
 #: ../pidgin/gtkdebug.c:837
+msgid "Error "
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:838
 msgid "Fatal Error"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:71
-#: ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:72
-#: ../pidgin/gtkdialogs.c:73
-#: ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77
-#: ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79
-#: ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81
-#: ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83
-#: ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85
-#: ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:92
 msgid "developer"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:86
-msgid "support"
-msgstr ""
-
 #: ../pidgin/gtkdialogs.c:87
+msgid "support"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:88
 msgid "support/QA"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:89
-#: ../pidgin/gtkdialogs.c:108
+#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:104
+#: ../pidgin/gtkdialogs.c:99
+msgid "Senior Contributor/QA"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:105
-#: ../pidgin/gtkdialogs.c:106
+#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:111
 msgid "libfaim maintainer"
 msgstr ""
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:115
 msgid "XMPP developer"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:133
 msgid "Afrikaans"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
 msgid "Arabic"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:130
-#: ../pidgin/gtkdialogs.c:131
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:135
+msgid "Belarusian Latin"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:227
 msgid "Bulgarian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:132
-#: ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134
-#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:142
 msgid "Bosnian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229
 msgid "Catalan"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
 msgid "Czech"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:143
-#: ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:231
 msgid "German"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:145
-#: ../pidgin/gtkdialogs.c:146
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:148
-#: ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
 msgid "Greek"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:150
-msgid "Australian English"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:151
-msgid "Canadian English"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:152
-msgid "British English"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:153
-msgid "Esperanto"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:154
-#: ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:226
-msgid "Spanish"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:155
-msgid "Estonian"
-msgstr ""
-
 #: ../pidgin/gtkdialogs.c:156
+msgid "Australian English"
+msgstr ""
+
 #: ../pidgin/gtkdialogs.c:157
-msgid "Euskera(Basque)"
+msgid "Canadian English"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:158
+msgid "British English"
+msgstr ""
+
 #: ../pidgin/gtkdialogs.c:159
-#: ../pidgin/gtkdialogs.c:160
-msgid "Persian"
+msgid "Esperanto"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
+msgid "Spanish"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:161
-#: ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+msgid "Estonian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+msgid "Euskera(Basque)"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:166
+msgid "Persian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Finnish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:162
-#: ../pidgin/gtkdialogs.c:229
-#: ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "French"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:163
-#: ../pidgin/gtkdialogs.c:164
-#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:242
 msgid "Galician"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:166
-msgid "Gujarati Language Team"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:167
-#: ../pidgin/gtkdialogs.c:234
-msgid "Hebrew"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:168
-msgid "Hindi"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:169
-msgid "Hungarian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:170
-msgid "Indonesian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:235
-msgid "Italian"
-msgstr ""
-
 #: ../pidgin/gtkdialogs.c:172
-#: ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
-msgid "Japanese"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:173
-#: ../pidgin/gtkdialogs.c:239
-msgid "Georgian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:173
-msgid "Ubuntu Georgian Translators"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:174
-msgid "Kannada"
+msgid "Gujarati Language Team"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
+msgid "Hebrew"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:174
-msgid "Kannada Translation team"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
-msgid "Korean"
+msgid "Hindi"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
+msgid "Hungarian"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:176
-#: ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:178
-msgid "Kurdish"
+msgid "Indonesian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
+msgid "Italian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+msgid "Japanese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+msgid "Georgian"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243
-msgid "Lithuanian"
+msgid "Ubuntu Georgian Translators"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:180
+msgid "Kannada"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:181
-#: ../pidgin/gtkdialogs.c:244
-msgid "Macedonian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:182
-#: ../pidgin/gtkdialogs.c:245
-msgid "Bokmål Norwegian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:183
-msgid "Nepali"
-msgstr ""
-
+msgid "Kannada Translation team"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:251
+msgid "Korean"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
 #: ../pidgin/gtkdialogs.c:184
-msgid "Dutch, Flemish"
+msgid "Kurdish"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:185
-msgid "Norwegian Nynorsk"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:186
-#: ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:246
-msgid "Polish"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:189
-msgid "Portuguese"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:190
-msgid "Portuguese-Brazil"
+msgid "Lao"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:253
+msgid "Lithuanian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
+msgid "Macedonian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:256
+msgid "Bokmål Norwegian"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:191
-msgid "Pashto"
+msgid "Nepali"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:192
-msgid "Romanian"
+msgid "Dutch, Flemish"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:193
-#: ../pidgin/gtkdialogs.c:247
-#: ../pidgin/gtkdialogs.c:248
-msgid "Russian"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:194
-#: ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:249
-#: ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
-msgid "Slovak"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:196
-#: ../pidgin/gtkdialogs.c:252
-msgid "Slovenian"
+msgid "Norwegian Nynorsk"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
+msgid "Polish"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:197
-msgid "Albanian"
+msgid "Portuguese"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:198
+msgid "Portuguese-Brazil"
+msgstr ""
+
 #: ../pidgin/gtkdialogs.c:199
-msgid "Serbian"
+msgid "Pashto"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:200
-#: ../pidgin/gtkdialogs.c:253
-#: ../pidgin/gtkdialogs.c:254
-msgid "Swedish"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:201
-msgid "Tamil"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:202
-msgid "Telugu"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:203
-msgid "Thai"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:255
-msgid "Turkish"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:205
-msgid "Vietnamese"
+msgid "Romanian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:259
+msgid "Russian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:262
+msgid "Slovak"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
+msgid "Slovenian"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:205
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:256
-msgid "Simplified Chinese"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:208
+msgid "Albanian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+msgid "Serbian"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:267
+msgid "Swedish"
+msgstr ""
+
 #: ../pidgin/gtkdialogs.c:209
-msgid "Hong Kong Chinese"
+msgid "Tamil"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:210
+msgid "Telugu"
+msgstr ""
+
 #: ../pidgin/gtkdialogs.c:211
-#: ../pidgin/gtkdialogs.c:257
+msgid "Thai"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
+msgid "Turkish"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:213
+msgid "Vietnamese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:213
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
+msgid "Simplified Chinese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
+msgid "Hong Kong Chinese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:270
 msgid "Traditional Chinese"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:225
 msgid "Amharic"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:342
+#: ../pidgin/gtkdialogs.c:357
 #, c-format
 msgid "About %s"
 msgstr ""
 
-#: ../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, 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 ""
-
-#: ../pidgin/gtkdialogs.c:395
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
-
 #: ../pidgin/gtkdialogs.c:400
+#, 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."
+"<BR><BR>"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:418
+#, c-format
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:423
 msgid "Current Developers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:415
+#: ../pidgin/gtkdialogs.c:438
 msgid "Crazy Patch Writers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:430
+#: ../pidgin/gtkdialogs.c:453
 msgid "Retired Developers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:445
+#: ../pidgin/gtkdialogs.c:468
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:460
+#: ../pidgin/gtkdialogs.c:483
 msgid "Artists"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:475
+#: ../pidgin/gtkdialogs.c:498
 msgid "Current Translators"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:495
+#: ../pidgin/gtkdialogs.c:518
 msgid "Past Translators"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:513
+#: ../pidgin/gtkdialogs.c:536
 msgid "Debugging Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:882
+#: ../pidgin/gtkdialogs.c:906
 msgid "Get User Info"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:884
-msgid "Please enter the screen name or alias of the person whose info you would like to view."
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:908
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:998
 msgid "View User Log"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:976
-msgid "Please enter the screen name or alias of the person whose log you would like to view."
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1000
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Alias Contact"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:997
-msgid "Enter an alias for this contact."
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1019
-#, c-format
-msgid "Enter an alias for %s."
-msgstr ""
-
 #: ../pidgin/gtkdialogs.c:1021
-msgid "Alias Buddy"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1042
-msgid "Alias Chat"
+msgid "Enter an alias for this contact."
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:1043
+#, c-format
+msgid "Enter an alias for %s."
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1045
+msgid "Alias Buddy"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1066
+msgid "Alias Chat"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1067
 msgid "Enter an alias for this chat."
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1082
-#, c-format
-msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
-msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
+#: ../pidgin/gtkdialogs.c:1106
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkdialogs.c:1090
+#: ../pidgin/gtkdialogs.c:1114
 msgid "Remove Contact"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1093
+#: ../pidgin/gtkdialogs.c:1117
 msgid "_Remove Contact"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1124
-#, c-format
-msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1148
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1155
 msgid "Merge Groups"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1134
+#: ../pidgin/gtkdialogs.c:1158
 msgid "_Merge Groups"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1184
-#, c-format
-msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1187
+#: ../pidgin/gtkdialogs.c:1208
+#, c-format
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1211
 msgid "Remove Group"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1190
+#: ../pidgin/gtkdialogs.c:1214
 msgid "_Remove Group"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1223
-#, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1226
-msgid "Remove Buddy"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1229
-msgid "_Remove Buddy"
+#: ../pidgin/gtkdialogs.c:1247
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:1250
-#, c-format
-msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
+msgid "Remove Buddy"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:1253
+msgid "_Remove Buddy"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1274
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:1277
 msgid "Remove Chat"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1256
+#: ../pidgin/gtkdialogs.c:1280
 msgid "_Remove Chat"
 msgstr ""
 
@@ -13786,145 +14530,143 @@
 msgid "Quit"
 msgstr ""
 
-#: ../pidgin/gtkft.c:153
+#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr ""
 
-#: ../pidgin/gtkft.c:273
+#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr ""
 
-#: ../pidgin/gtkft.c:275
+#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr ""
 
-#: ../pidgin/gtkft.c:279
+#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr ""
 
-#: ../pidgin/gtkft.c:281
+#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr ""
 
-#: ../pidgin/gtkft.c:497
+#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
 msgstr ""
 
-#: ../pidgin/gtkft.c:502
+#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr ""
 
-#: ../pidgin/gtkft.c:539
+#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr ""
 
-#: ../pidgin/gtkft.c:548
-#, c-format
-msgid "Error running %s"
-msgstr ""
-
 #: ../pidgin/gtkft.c:549
 #, c-format
+msgid "Error running %s"
+msgstr ""
+
+#: ../pidgin/gtkft.c:550
+#, c-format
 msgid "Process returned error code %d"
 msgstr ""
 
-#: ../pidgin/gtkft.c:696
-msgid "Filename:"
-msgstr ""
-
 #: ../pidgin/gtkft.c:697
+msgid "Filename:"
+msgstr ""
+
+#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr ""
 
-#: ../pidgin/gtkft.c:699
-msgid "Speed:"
-msgstr ""
-
 #: ../pidgin/gtkft.c:700
-msgid "Time Elapsed:"
+msgid "Speed:"
 msgstr ""
 
 #: ../pidgin/gtkft.c:701
+msgid "Time Elapsed:"
+msgstr ""
+
+#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr ""
 
-#: ../pidgin/gtkft.c:783
+#: ../pidgin/gtkft.c:784
 msgid "Close this window when all transfers _finish"
 msgstr ""
 
-#: ../pidgin/gtkft.c:793
+#: ../pidgin/gtkft.c:794
 msgid "C_lear finished transfers"
 msgstr ""
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:802
+#: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
 msgstr ""
 
 #. Pause button
-#: ../pidgin/gtkft.c:832
-#: ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr ""
 
 #. Resume button
-#: ../pidgin/gtkft.c:842
+#: ../pidgin/gtkft.c:843
 msgid "_Resume"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:815
+#: ../pidgin/gtkimhtml.c:816
 msgid "Paste as Plain _Text"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:832
-#: ../pidgin/gtkimhtmltoolbar.c:1138
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Reset formatting"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1372
-msgid "Hyperlink color"
-msgstr ""
-
 #: ../pidgin/gtkimhtml.c:1373
+msgid "Hyperlink color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1374
 msgid "Color to draw hyperlinks."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1376
-msgid "Hyperlink prelight color"
-msgstr ""
-
 #: ../pidgin/gtkimhtml.c:1377
+msgid "Hyperlink prelight color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1378
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1597
+#: ../pidgin/gtkimhtml.c:1598
 msgid "_Copy E-Mail Address"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1609
+#: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1619
+#: ../pidgin/gtkimhtml.c:1620
 msgid "_Copy Link Location"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3365
+#: ../pidgin/gtkimhtml.c:3369
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3368
+#: ../pidgin/gtkimhtml.c:3372
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3397
+#: ../pidgin/gtkimhtml.c:3401
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13932,7 +14674,7 @@
 "%s"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3400
+#: ../pidgin/gtkimhtml.c:3404
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13940,193 +14682,266 @@
 "%s"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3478
-#: ../pidgin/gtkimhtml.c:3490
+#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
 msgid "Save Image"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3518
+#: ../pidgin/gtkimhtml.c:3522
+#, c-format
 msgid "_Save Image..."
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:163
 msgid "Select Font"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:242
 msgid "Select Text Color"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:321
 msgid "Select Background Color"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:410
 msgid "_URL"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "_Description"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
-msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:421
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:425
 msgid "Please enter the URL of the link that you want to insert."
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Insert Link"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:424
-#: ../pidgin/gtkimhtmltoolbar.c:1207
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
 msgid "_Insert"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:514
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:519
-#: ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
 msgid "Insert Image"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:761
 msgid "This theme has no available smileys."
 msgstr ""
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:778
 msgid "Smile!"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:820
-#: ../pidgin/gtkimhtmltoolbar.c:1164
+#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
 msgid "_Font"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1124
+#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgid "Group Items"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgid "Ungroup Items"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1091
+msgid "Strikethrough"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Increase Font Size"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Decrease Font Size"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Font Face"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1097
+msgid "Background Color"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1098
+msgid "Foreground Color"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Reset Formatting"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1103
+msgid "Insert IM Image"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1104
+msgid "Insert Smiley"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<b>_Bold</b>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1125
+#: ../pidgin/gtkimhtmltoolbar.c:1180
 msgid "<i>_Italic</i>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1126
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<u>_Underline</u>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1127
+#: ../pidgin/gtkimhtmltoolbar.c:1182
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span size='larger'>_Larger</span>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1129
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "_Normal"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1131
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr ""
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1135
+#: ../pidgin/gtkimhtmltoolbar.c:1191
 msgid "_Font face"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1136
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "Foreground _color"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1137
+#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "Bac_kground color"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1215
+#: ../pidgin/gtkimhtmltoolbar.c:1270
 msgid "_Smiley"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1221
+#: ../pidgin/gtkimhtmltoolbar.c:1276
 msgid "_Image"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1227
+#: ../pidgin/gtkimhtmltoolbar.c:1282
 msgid "_Link"
 msgstr ""
 
-#: ../pidgin/gtklog.c:292
-#, c-format
-msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
-msgstr ""
-
-#: ../pidgin/gtklog.c:303
-#, c-format
-msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
-msgstr ""
-
-#: ../pidgin/gtklog.c:308
-#, c-format
-msgid "Are you sure you want to permanently delete the system log which started at %s?"
-msgstr ""
-
-#: ../pidgin/gtklog.c:452
+#: ../pidgin/gtkimhtmltoolbar.c:1288
+msgid "_Horizontal rule"
+msgstr ""
+
+#: ../pidgin/gtklog.c:293
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+
+#: ../pidgin/gtklog.c:304
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr ""
+
+#: ../pidgin/gtklog.c:309
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr ""
+
+#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr ""
 
-#: ../pidgin/gtklog.c:455
+#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr ""
 
-#: ../pidgin/gtklog.c:502
+#: ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr ""
 
-#: ../pidgin/gtklog.c:549
-msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
-msgstr ""
-
-#: ../pidgin/gtklog.c:553
-msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
-msgstr ""
-
-#: ../pidgin/gtklog.c:556
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-
-#: ../pidgin/gtklog.c:560
+#: ../pidgin/gtklog.c:550
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:554
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:557
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:561
 msgid "No logs were found"
 msgstr ""
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:575
+#: ../pidgin/gtklog.c:576
 msgid "_Browse logs folder"
 msgstr ""
 
-#: ../pidgin/gtklog.c:639
+#: ../pidgin/gtklog.c:640
 msgid "Total log size:"
 msgstr ""
 
-#: ../pidgin/gtklog.c:708
+#: ../pidgin/gtklog.c:709
 #, c-format
 msgid "Conversations in %s"
 msgstr ""
 
-#: ../pidgin/gtklog.c:716
-#: ../pidgin/gtklog.c:778
+#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
 #, c-format
 msgid "Conversations with %s"
 msgstr ""
 
-#: ../pidgin/gtklog.c:803
+#: ../pidgin/gtklog.c:804
 msgid "System Log"
 msgstr ""
 
@@ -14175,68 +14990,65 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699
-#: ../pidgin/pidgin.h:50
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:348
+#: ../pidgin/gtknotify.c:349
 msgid "Open All Messages"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:401
+#: ../pidgin/gtknotify.c:402
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:521
+#: ../pidgin/gtknotify.c:540
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtknotify.c:532
+#: ../pidgin/gtknotify.c:564
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtknotify.c:957
+#: ../pidgin/gtknotify.c:989
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr ""
 
-#: ../pidgin/gtknotify.c:959
-#: ../pidgin/gtknotify.c:971
-#: ../pidgin/gtknotify.c:984
-#: ../pidgin/gtknotify.c:1112
+#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
+#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
 msgid "Unable to open URL"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:969
-#: ../pidgin/gtknotify.c:982
+#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:1113
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr ""
-
-#: ../pidgin/gtkplugin.c:264
+#: ../pidgin/gtknotify.c:1145
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:283
+#: ../pidgin/gtkplugin.c:284
 msgid "Multiple plugins will be unloaded."
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:287
+#: ../pidgin/gtkplugin.c:288
 msgid "Unload Plugins"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:399
+#: ../pidgin/gtkplugin.c:400
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -14244,7 +15056,7 @@
 "<span weight=\"bold\">Filename:</span>\t\t%s"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:409
+#: ../pidgin/gtkplugin.c:410
 #, c-format
 msgid ""
 "%s\n"
@@ -14252,748 +15064,753 @@
 "Check the plugin website for an update.</span>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:535
+#: ../pidgin/gtkplugin.c:536
 msgid "Configure Pl_ugin"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:598
+#: ../pidgin/gtkplugin.c:599
 msgid "<b>Plugin Details</b>"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:156
+#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr ""
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:531
+#: ../pidgin/gtkpounce.c:532
 msgid "Pounce on Whom"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:558
+#: ../pidgin/gtkpounce.c:559
 msgid "_Buddy name:"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:592
+#: ../pidgin/gtkpounce.c:593
 msgid "Si_gns on"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:595
 msgid "Signs o_ff"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:597
 msgid "Goes a_way"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:599
 msgid "Ret_urns from away"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:601
 msgid "Becomes _idle"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:603
 msgid "Is no longer i_dle"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:605
 msgid "Starts _typing"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:607
 msgid "P_auses while typing"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:609
 msgid "Stops t_yping"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:611
 msgid "Sends a _message"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:653
+#: ../pidgin/gtkpounce.c:654
 msgid "Ope_n an IM window"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:656
 msgid "_Pop up a notification"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:658
 msgid "Send a _message"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:660
 msgid "E_xecute a command"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:662
 msgid "P_lay a sound"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:667
+#: ../pidgin/gtkpounce.c:668
 msgid "Brows_e..."
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:669
-msgid "Br_owse..."
-msgstr ""
-
 #: ../pidgin/gtkpounce.c:670
+msgid "Br_owse..."
+msgstr ""
+
+#: ../pidgin/gtkpounce.c:671
 msgid "Pre_view"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:797
+#: ../pidgin/gtkpounce.c:798
 msgid "P_ounce only when my status is not Available"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:802
+#: ../pidgin/gtkpounce.c:803
 msgid "_Recurring"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:1245
+#: ../pidgin/gtkpounce.c:1246
 msgid "Pounce Target"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/gtkprefs.c:386
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:516
+#: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:643
+#: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
 msgstr ""
 
-#: ../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."
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:731
+#: ../pidgin/gtkprefs.c:697
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:732
 msgid "Icon"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:893
-msgid "System Tray Icon"
-msgstr ""
-
 #: ../pidgin/gtkprefs.c:894
+msgid "System Tray Icon"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:895
 msgid "_Show system tray icon:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:898
+#: ../pidgin/gtkprefs.c:899
 msgid "On unread messages"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:903
-msgid "Conversation Window Hiding"
-msgstr ""
-
 #: ../pidgin/gtkprefs.c:904
+msgid "Conversation Window Hiding"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:905
 msgid "_Hide new IM conversations:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1939
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
 msgid "When away"
 msgstr ""
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:916
 msgid "Tabs"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:918
 msgid "Show IMs and chats in _tabbed windows"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:931
+#: ../pidgin/gtkprefs.c:932
 msgid "Show close b_utton on tabs"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:934
+#: ../pidgin/gtkprefs.c:935
 msgid "_Placement:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:936
-msgid "Top"
-msgstr ""
-
 #: ../pidgin/gtkprefs.c:937
-msgid "Bottom"
+msgid "Top"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:938
-msgid "Left"
+msgid "Bottom"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:939
+msgid "Left"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:940
 msgid "Right"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:941
-msgid "Left Vertical"
-msgstr ""
-
 #: ../pidgin/gtkprefs.c:942
+msgid "Left Vertical"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:943
 msgid "Right Vertical"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:949
+#: ../pidgin/gtkprefs.c:950
 msgid "N_ew conversations:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:994
+#: ../pidgin/gtkprefs.c:995
 msgid "Show _formatting on incoming messages"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:997
+#: ../pidgin/gtkprefs.c:998
 msgid "Show _detailed information"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:999
+#: ../pidgin/gtkprefs.c:1000
 msgid "Enable buddy ic_on animation"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1006
+#: ../pidgin/gtkprefs.c:1007
 msgid "_Notify buddies that you are typing to them"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1009
+#: ../pidgin/gtkprefs.c:1010
 msgid "Highlight _misspelled words"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1013
+#: ../pidgin/gtkprefs.c:1014
 msgid "Use smooth-scrolling"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1016
+#: ../pidgin/gtkprefs.c:1017
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1018
+#: ../pidgin/gtkprefs.c:1019
 msgid "Minimi_ze new conversation windows"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1022
+#: ../pidgin/gtkprefs.c:1023
 msgid "Font"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1024
+#: ../pidgin/gtkprefs.c:1025
 msgid "Use document font from _theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1026
+#: ../pidgin/gtkprefs.c:1027
 msgid "Use font from _theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1028
+#: ../pidgin/gtkprefs.c:1029
 msgid "Conversation _font:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1043
 msgid "Default Formatting"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1059
-msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1125
+#: ../pidgin/gtkprefs.c:1062
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting."
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1128
 msgid "ST_UN server:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkprefs.c:1140
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1141
+#: ../pidgin/gtkprefs.c:1144
 msgid "_Autodetect IP address"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1150
+#: ../pidgin/gtkprefs.c:1153
 msgid "Public _IP:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1179
-msgid "Ports"
-msgstr ""
-
 #: ../pidgin/gtkprefs.c:1182
-msgid "_Manually specify range of ports to listen on"
+msgid "Ports"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1185
+msgid "_Manually specify range of ports to listen on"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1188
 msgid "_Start port:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1192
+#: ../pidgin/gtkprefs.c:1195
 msgid "_End port:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkprefs.c:1203
 msgid "Proxy Server"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1204
+#: ../pidgin/gtkprefs.c:1207
 msgid "No proxy"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1263
 msgid "_User:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1325
-msgid "Seamonkey"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1326
-msgid "Opera"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1327
-msgid "Netscape"
-msgstr ""
-
 #: ../pidgin/gtkprefs.c:1328
-msgid "Mozilla"
+msgid "Seamonkey"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1329
-msgid "Konqueror"
+msgid "Opera"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1330
-msgid "GNOME Default"
+msgid "Netscape"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1331
-msgid "Galeon"
+msgid "Mozilla"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1332
-msgid "Firefox"
+msgid "Konqueror"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1333
-msgid "Firebird"
+msgid "GNOME Default"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1334
+msgid "Galeon"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1335
+msgid "Firefox"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1336
+msgid "Firebird"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1337
 msgid "Epiphany"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1343
+#: ../pidgin/gtkprefs.c:1346
 msgid "Manual"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1396
+#: ../pidgin/gtkprefs.c:1399
 msgid "Browser Selection"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1403
 msgid "_Browser:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1408
-msgid "_Open link in:"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1410
-msgid "Browser default"
-msgstr ""
-
 #: ../pidgin/gtkprefs.c:1411
-msgid "Existing window"
+msgid "_Open link in:"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1413
+msgid "Browser default"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1414
+msgid "Existing window"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1416
 msgid "New tab"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1430
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1467
+#: ../pidgin/gtkprefs.c:1470
 msgid "Log _format:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1475
 msgid "Log all _instant messages"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1477
 msgid "Log all c_hats"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1476
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all _status changes to system log"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1622
+#: ../pidgin/gtkprefs.c:1625
 msgid "Sound Selection"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1635
+#, c-format
 msgid "Quietest"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1637
+#, c-format
 msgid "Quieter"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1639
+#, c-format
 msgid "Quiet"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1643
+#, c-format
 msgid "Loud"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1645
+#, c-format
 msgid "Louder"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1647
+#, c-format
 msgid "Loudest"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1713
 msgid "_Method:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1710
+#: ../pidgin/gtkprefs.c:1715
 msgid "Console beep"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1722
 msgid "No sounds"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1730
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1757
 msgid "Sounds when conversation has _focus"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1754
+#: ../pidgin/gtkprefs.c:1759
 msgid "Enable sounds:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/gtkprefs.c:1770
 msgid "Volume:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1845
+#: ../pidgin/gtkprefs.c:1850
 msgid "Play"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1922
-msgid "_Report idle time:"
-msgstr ""
-
 #: ../pidgin/gtkprefs.c:1927
+msgid "_Report idle time:"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1932
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkprefs.c:1941
 msgid "_Auto-reply:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/gtkprefs.c:1945
 msgid "When both away and idle"
 msgstr ""
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1951
 msgid "Auto-away"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:1953
 msgid "Change status when _idle"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1952
+#: ../pidgin/gtkprefs.c:1957
 msgid "_Minutes before becoming idle:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkprefs.c:1965
 msgid "Change _status to:"
 msgstr ""
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1986
 msgid "Status at Startup"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1983
+#: ../pidgin/gtkprefs.c:1988
 msgid "Use status from last _exit at startup"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1989
+#: ../pidgin/gtkprefs.c:1994
 msgid "Status to a_pply at startup:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2032
 msgid "Interface"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2029
+#: ../pidgin/gtkprefs.c:2034
 msgid "Smiley Themes"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2041
 msgid "Browser"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2040
+#: ../pidgin/gtkprefs.c:2045
 msgid "Status / Idle"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:79
-msgid "Allow all users to contact me"
-msgstr ""
-
 #: ../pidgin/gtkprivacy.c:80
-msgid "Allow only the users on my buddy list"
+msgid "Allow all users to contact me"
 msgstr ""
 
 #: ../pidgin/gtkprivacy.c:81
-msgid "Allow only the users below"
+msgid "Allow only the users on my buddy list"
 msgstr ""
 
 #: ../pidgin/gtkprivacy.c:82
-msgid "Block all users"
+msgid "Allow only the users below"
 msgstr ""
 
 #: ../pidgin/gtkprivacy.c:83
+msgid "Block all users"
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:84
 msgid "Block only the users below"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:369
+#: ../pidgin/gtkprivacy.c:370
 msgid "Privacy"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:381
+#: ../pidgin/gtkprivacy.c:382
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:393
+#: ../pidgin/gtkprivacy.c:394
 msgid "Set privacy for:"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:556
-#: ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
 msgid "Permit User"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:557
-msgid "Type a user you permit to contact you."
-msgstr ""
-
 #: ../pidgin/gtkprivacy.c:558
+msgid "Type a user you permit to contact you."
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:559
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:561
-#: ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 msgid "_Permit"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:567
+#: ../pidgin/gtkprivacy.c:568
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:569
+#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:598
-#: ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
 msgid "Block User"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:599
-msgid "Type a user to block."
-msgstr ""
-
 #: ../pidgin/gtkprivacy.c:600
+msgid "Type a user to block."
+msgstr ""
+
+#: ../pidgin/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:608
+#: ../pidgin/gtkprivacy.c:609
 #, c-format
 msgid "Block %s?"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:271
+#: ../pidgin/gtkrequest.c:272
 msgid "Apply"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1504
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1505
-msgid "Would you like to overwrite it?"
-msgstr ""
-
 #: ../pidgin/gtkrequest.c:1508
+msgid "Would you like to overwrite it?"
+msgstr ""
+
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1509
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1647
-#: ../pidgin/gtkrequest.c:1661
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr ""
 
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:374
+#: ../pidgin/gtkroomlist.c:375
 msgid "Room List"
 msgstr ""
 
 #. list button
-#: ../pidgin/gtkroomlist.c:442
+#: ../pidgin/gtkroomlist.c:443
 msgid "_Get List"
 msgstr ""
 
 #. add button
-#: ../pidgin/gtkroomlist.c:450
+#: ../pidgin/gtkroomlist.c:451
 msgid "_Add Chat"
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:336
+#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr ""
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:619
-#: ../pidgin/gtksavedstatuses.c:1265
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
 msgid "_Use"
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:779
+#: ../pidgin/gtksavedstatuses.c:780
 msgid "Title already in use.  You must choose a unique title."
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:969
+#: ../pidgin/gtksavedstatuses.c:970
 msgid "Different"
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1159
 msgid "_Title:"
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:1177
-#: ../pidgin/gtksavedstatuses.c:1496
+#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
 msgid "_Status:"
 msgstr ""
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1209
+#: ../pidgin/gtksavedstatuses.c:1210
 msgid "Use a _different status for some accounts"
 msgstr ""
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1273
+#: ../pidgin/gtksavedstatuses.c:1274
 msgid "Sa_ve & Use"
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:1479
+#: ../pidgin/gtksavedstatuses.c:1480
 #, c-format
 msgid "Status for %s"
 msgstr ""
 
-#: ../pidgin/gtkstatusbox.c:663
+#: ../pidgin/gtkstatusbox.c:664
 msgid "Waiting for network connection"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:631
+#: ../pidgin/gtkutils.c:632
 msgid "Google Talk"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1398
-#: ../pidgin/gtkutils.c:1421
+#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1401
-#: ../pidgin/gtkutils.c:1423
+#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
 msgid "Failed to load image"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1497
-#, c-format
-msgid "Cannot send folder %s."
-msgstr ""
-
 #: ../pidgin/gtkutils.c:1498
 #, c-format
-msgid "%s cannot transfer a folder. You will need to send the files within individually."
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1530
-#: ../pidgin/gtkutils.c:1542
-#: ../pidgin/gtkutils.c:1549
+msgid "Cannot send folder %s."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1499
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1550
 msgid "You have dragged an image"
 msgstr ""
 
-#: ../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."
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1537
-#: ../pidgin/gtkutils.c:1557
+#: ../pidgin/gtkutils.c:1532
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Set as buddy icon"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1538
-#: ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
 msgid "Send image file"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1539
-#: ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
 msgid "Insert in message"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1544
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr ""
 
-#: ../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 ""
-
 #: ../pidgin/gtkutils.c:1551
-msgid "You can insert this image into this message, or use it as the buddy icon for this user"
+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
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
 msgstr ""
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
@@ -15001,15 +15818,17 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1609
+#: ../pidgin/gtkutils.c:1610
 msgid "Cannot send launcher"
 msgstr ""
 
-#: ../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."
-msgstr ""
-
-#: ../pidgin/gtkutils.c:2344
+#: ../pidgin/gtkutils.c:1610
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:2345
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -15017,31 +15836,31 @@
 "<b>Image size:</b> %dx%d"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2640
+#: ../pidgin/gtkutils.c:2641
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2642
-msgid "Icon Error"
-msgstr ""
-
 #: ../pidgin/gtkutils.c:2643
+msgid "Icon Error"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:2644
 msgid "Could not set icon"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2743
+#: ../pidgin/gtkutils.c:2744
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2792
-#, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
-#: ../pidgin/gtkwhiteboard.c:754
-#: ../pidgin/gtkwhiteboard.c:773
+#: ../pidgin/gtkutils.c:2793
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr ""
 
@@ -15049,27 +15868,27 @@
 msgid "Select color"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr ""
 
@@ -15093,8 +15912,7 @@
 msgid "Display Statistics"
 msgstr ""
 
-#: ../pidgin/plugins/cap/cap.c:462
-#: ../pidgin/plugins/cap/cap.c:465
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr ""
 
@@ -15107,10 +15925,8 @@
 msgid "Maximum response timeout:"
 msgstr ""
 
-#: ../pidgin/plugins/cap/cap.c:817
-#: ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831
-#: ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr ""
 
@@ -15142,7 +15958,9 @@
 
 #. *  summary
 #: ../pidgin/plugins/cap/cap.c:939
-msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
 msgstr ""
 
 #: ../pidgin/plugins/contact_priority.c:61
@@ -15171,7 +15989,9 @@
 msgstr ""
 
 #: ../pidgin/plugins/contact_priority.c:118
-msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
 msgstr ""
 
 #: ../pidgin/plugins/contact_priority.c:125
@@ -15196,20 +16016,22 @@
 #. *< version
 #. *< summary
 #: ../pidgin/plugins/contact_priority.c:190
-msgid "Allows for controlling the values associated with different buddy states."
+msgid ""
+"Allows for controlling the values associated with different buddy states."
 msgstr ""
 
 #. *< description
 #: ../pidgin/plugins/contact_priority.c:192
-msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
 msgstr ""
 
 #: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:25
-#: ../pidgin/plugins/convcolors.c:26
+#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr ""
 
@@ -15233,24 +16055,11 @@
 msgid "Received Messages"
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:210
-#: ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr ""
-
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr ""
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr ""
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr ""
@@ -15273,7 +16082,9 @@
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
 #: ../pidgin/plugins/extplacement.c:105
-msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
 msgstr ""
 
 #: ../pidgin/plugins/extplacement.c:111
@@ -15303,7 +16114,9 @@
 #. *< summary
 #. *  description
 #: ../pidgin/plugins/extplacement.c:150
-msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
 msgstr ""
 
 #. Configuration frame
@@ -15362,25 +16175,27 @@
 msgstr ""
 
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
 msgid "Group:"
 msgstr ""
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
 msgid "New Person"
 msgstr ""
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 msgid "Select Buddy"
 msgstr ""
 
 #. Add the label.
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:343
-msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
 msgstr ""
 
 #. Add the expander
@@ -15443,42 +16258,35 @@
 msgid "Provides integration with Evolution."
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the buddy's screen name and account type below."
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
 msgstr ""
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 msgid "E-mail:"
 msgstr ""
 
-#: ../pidgin/plugins/gtkbuddynote.c:34
-#, c-format
-msgid ""
-"\n"
-"<b>Buddy Note</b>: %s"
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15498,6 +16306,13 @@
 msgid "Test to see that all ui signals are working properly."
 msgstr ""
 
+#: ../pidgin/plugins/gtkbuddynote.c:36
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+
 #: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr ""
@@ -15516,8 +16331,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85
-#: ../pidgin/plugins/iconaway.c:87
+#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr ""
 
@@ -15537,8 +16351,7 @@
 msgid "Markerline"
 msgstr ""
 
-#: ../pidgin/plugins/markerline.c:25
-#: ../pidgin/plugins/markerline.c:26
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr ""
 
@@ -15546,50 +16359,50 @@
 msgid "Draw Markerline in "
 msgstr ""
 
-#: ../pidgin/plugins/markerline.c:250
-#: ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr ""
 
-#: ../pidgin/plugins/markerline.c:254
-#: ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr ""
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid "A music messaging session has been requested. Please click the MM icon to accept."
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
 msgstr ""
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr ""
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr ""
 
@@ -15601,84 +16414,86 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr ""
 
 #. *  summary
-#: ../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."
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr ""
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr ""
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr ""
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr ""
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr ""
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr ""
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr ""
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr ""
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr ""
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr ""
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr ""
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr ""
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr ""
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr ""
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr ""
 
@@ -15688,7 +16503,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr ""
 
@@ -15696,8 +16511,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904
-#: ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 
@@ -15768,6 +16582,7 @@
 msgstr ""
 
 #: ../pidgin/plugins/pidginrc.c:300
+#, c-format
 msgid "Select Interface Font"
 msgstr ""
 
@@ -15833,8 +16648,7 @@
 msgid "Pidgin GTK+ Theme Control"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:546
-#: ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr ""
 
@@ -15847,12 +16661,16 @@
 msgstr ""
 
 #: ../pidgin/plugins/raw.c:178
-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."
+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 ""
 
 #: ../pidgin/plugins/relnot.c:71
 #, 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>"
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\"%s\">%s</a><hr>"
 msgstr ""
 
 #: ../pidgin/plugins/relnot.c:79
@@ -15860,8 +16678,7 @@
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr ""
 
-#: ../pidgin/plugins/relnot.c:84
-#: ../pidgin/plugins/relnot.c:85
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr ""
 
@@ -15884,7 +16701,9 @@
 
 #. *  description
 #: ../pidgin/plugins/relnot.c:148
-msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
 msgstr ""
 
 #: ../pidgin/plugins/spellchk.c:1962
@@ -15948,8 +16767,7 @@
 msgid "Text replacement"
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:2372
-#: ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
@@ -15959,8 +16777,7 @@
 #. *< 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:354
 msgid "Buddy Ticker"
 msgstr ""
 
@@ -15968,8 +16785,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357
-#: ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr ""
 
@@ -16004,6 +16820,7 @@
 msgstr ""
 
 #: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr ""
 
@@ -16048,47 +16865,49 @@
 
 #. *  description
 #: ../pidgin/plugins/timestamp_format.c:156
-msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
-msgstr ""
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:597
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:644
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr ""
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:561
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:576
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:583
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:586
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:634
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "ຢູ່ຂ້າງເທີງ ເລຶ້ອຍ ຯ "
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:618
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:632
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr ""
 
@@ -16098,21 +16917,22 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:692
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:695
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr ""
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:697
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
@@ -16158,7 +16978,8 @@
 msgstr ""
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
 
 #: ../pidgin/plugins/xmppconsole.c:667
@@ -16171,8 +16992,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746
-#: ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
 #: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "ຈໍ XMPP "
@@ -16208,4 +17028,3 @@
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
-