diff po/eo.po @ 20236:60485bc8ff7f

applied changes from 98c6a98c20211da70f7a11c8b1e6aeb73621fbce through 71a27720e49364f4f24fc09309442fc3a2c17bc9
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 15:54:45 +0000
parents e5b23336e52f
children 15ad77c653ad
line wrap: on
line diff
--- a/po/eo.po	Fri Sep 28 15:53:46 2007 +0000
+++ b/po/eo.po	Fri Sep 28 15:54:45 2007 +0000
@@ -4,10 +4,12 @@
 #
 # Stéphane Fillod <f8cfe@free.fr>, 2006, 2007.
 # This file is distributed under the same license as the Pidgin package.
+#: ../libpurple/certificate.c:543
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
-"POT-Creation-Date: 2007-04-09 08:32-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-25 01:15-0700\n"
 "PO-Revision-Date: 2007-04-13 13:01+0200\n"
 "Last-Translator: Stéphane Fillod <f8cfe@free.fr>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
@@ -17,12 +19,18 @@
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../finch/finch.c:229
+#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
+#: ../finch/finch.c:418
+#, fuzzy
+msgid "Finch"
+msgstr "Franca"
+
+#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Provu `%s -h' por plia informo.\n"
 
-#: ../finch/finch.c:231
+#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -43,441 +51,523 @@
 "  -n, --nologin       ne aŭtomate ensalutu\n"
 "  -v, --version       vidigu la aktualan version kaj finu\n"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
-#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
-#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1406
-#: ../libpurple/protocols/jabber/chat.c:679
-#: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1216
-#: ../libpurple/protocols/qq/group_join.c:324
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+
+#: ../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:2032
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../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/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Eraro"
 
-#: ../finch/gntaccount.c:119
+#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "Konto ne estis aldonita"
 
-#: ../finch/gntaccount.c:120
+#: ../finch/gntaccount.c:125
 msgid "Screenname of an account must be non-empty."
 msgstr "Ekrannomo de konto ne devas esti malplena."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "Nova retpoŝto avizoj"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Memoru pasvorton"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
-#: ../pidgin/gtkblist.c:3891
+#: ../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:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4322
 msgid "Modify Account"
 msgstr "Ŝanĝu Konton"
 
-#: ../finch/gntaccount.c:474
+#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "Nova Konto"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protokolo:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
-#: ../pidgin/gtkblist.c:5293
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:529
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Screen name:"
 msgstr "Ekrannomo:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "Pasvorton:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5314
-#: ../pidgin/gtkblist.c:5677
+#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Alinomo:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:615
-#: ../finch/gntaccount.c:834 ../finch/gntblist.c:316 ../finch/gntblist.c:383
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:740 ../finch/gntblist.c:926
-#: ../finch/gntblist.c:1017 ../finch/gntblist.c:2049 ../finch/gntpounce.c:456
-#: ../finch/gntpounce.c:652 ../finch/gntprefs.c:284 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:472 ../finch/gntstatus.c:597
-#: ../libpurple/account.c:969 ../libpurple/account.c:1218
-#: ../libpurple/account.c:1252 ../libpurple/conversation.c:1164
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:498
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:792
-#: ../libpurple/protocols/gg/gg.c:871
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1768
-#: ../libpurple/protocols/jabber/buddy.c:1802
-#: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:876
-#: ../libpurple/protocols/jabber/jabber.c:1371
-#: ../libpurple/protocols/jabber/xdata.c:338
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:265
-#: ../libpurple/protocols/msn/msn.c:280 ../libpurple/protocols/msn/msn.c:295
-#: ../libpurple/protocols/msn/msn.c:312
-#: ../libpurple/protocols/oscar/oscar.c:6039
-#: ../libpurple/protocols/oscar/peer.c:1021
+#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
+#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
+#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntcertmgr.c:91
+#: ../finch/gntplugin.c: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:2416
+#: ../libpurple/protocols/jabber/buddy.c:2452
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/jabber/jabber.c:1017
+#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usernick.c:78
+#: ../libpurple/protocols/jabber/xdata.c:400
+#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/msn/msn.c:362
+#: ../libpurple/protocols/oscar/oscar.c:6092
+#: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:142
-#: ../libpurple/protocols/qq/group_opt.c:392
-#: ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/qq/group_join.c:140
+#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_opt.c:144
+#: ../libpurple/protocols/qq/group_opt.c:399
+#: ../libpurple/protocols/qq/sys_msg.c:113
+#: ../libpurple/protocols/qq/sys_msg.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:266
+#: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../libpurple/protocols/sametime/sametime.c:5388
-#: ../libpurple/protocols/sametime/sametime.c:5477
-#: ../libpurple/protocols/sametime/sametime.c:5601
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc/chat.c:726
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
-#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
-#: ../pidgin/gtkaccount.c:2446 ../pidgin/gtkblist.c:5733
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:861
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:993 ../pidgin/gtkdialogs.c:1013
-#: ../pidgin/gtkdialogs.c:1057 ../pidgin/gtkdialogs.c:1095
-#: ../pidgin/gtkdialogs.c:1149 ../pidgin/gtkdialogs.c:1186
-#: ../pidgin/gtkdialogs.c:1211 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:6267
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:767
+#: ../pidgin/gtkdialogs.c:906 ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1018 ../pidgin/gtkdialogs.c:1042
+#: ../pidgin/gtkdialogs.c:1064 ../pidgin/gtkdialogs.c:1112
+#: ../pidgin/gtkdialogs.c:1153 ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1248 ../pidgin/gtkdialogs.c:1275
+#: ../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 "Rezignu"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
-#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
-#: ../libpurple/account.c:1251 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
-#: ../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 "Konservu"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
-#: ../pidgin/gtksavedstatuses.c:328
+#: ../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 "Ĉu vi certas vi volas forigi %s-n?"
 
-#: ../finch/gntaccount.c:614
+#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "Forigu Konton"
 
 #. Delete button
-#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
-#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
-#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:335
+#: ../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 "Forigu"
 
-#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1955 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Kontoj"
 
-#: ../finch/gntaccount.c:650
+#: ../finch/gntaccount.c:675
 msgid "You can enable/disable accounts from the following list."
 msgstr "Vi povas ŝalti/malŝalti kontojn de la jena listo."
 
 #. Add button
-#: ../finch/gntaccount.c:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
-#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
-#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
-#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:5476
-#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2445
-#: ../pidgin/gtkblist.c:5732 ../pidgin/gtkconv.c:1651
-#: ../pidgin/gtkrequest.c:274
+#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2305
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:383 ../finch/gntpounce.c:713
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883
+#: ../libpurple/protocols/qq/sys_msg.c:114
+#: ../libpurple/protocols/qq/sys_msg.c:173
+#: ../libpurple/protocols/qq/sys_msg.c:267
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:6266 ../pidgin/gtkconv.c:1712
+#: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Aldonu"
 
 #. Modify button
-#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
 msgid "Modify"
 msgstr "Ŝanĝu"
 
-#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2392
+#: ../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 "%s%s%s%s faris %s-n sia kunul%s%s"
 
-#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2444
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Aldonu kunulon al via listo?"
 
-#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2496
+#: ../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 "%s%s%s%s volas aldoni %s-n al sia kunullisto%s%s"
 
-#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
-#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Permesi kunulon?"
 
-#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
-#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Permesi"
 
-#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
-#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Rifuzi"
 
-#: ../finch/gntblist.c:266
+#: ../finch/gntblist.c:289
 msgid "You must provide a screename for the buddy."
 msgstr "Vi devas enigi ekrannomon por la kunul."
 
-#: ../finch/gntblist.c:268
+#: ../finch/gntblist.c:291
 msgid "You must provide a group."
 msgstr "Vi devas enigi grupon."
 
-#: ../finch/gntblist.c:270
+#: ../finch/gntblist.c:293
 msgid "You must select an account."
 msgstr "Vi devas elekti konton."
 
-#: ../finch/gntblist.c:274
+#: ../finch/gntblist.c:295
+msgid "The selected account is not online."
+msgstr ""
+
+#: ../finch/gntblist.c:300
 msgid "Error adding buddy"
 msgstr "Eraro aldonante kunul"
 
-#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2851
-#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2884
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "Ekranonomo"
 
-#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
-#: ../libpurple/protocols/msn/msn.c:1340
-#: ../libpurple/protocols/silc/chat.c:587
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
+#: ../libpurple/protocols/msn/msn.c:1507
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:970
-#: ../pidgin/gtkdialogs.c:992 ../pidgin/gtkdialogs.c:1012
-#: ../pidgin/gtkrequest.c:277
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1041 ../pidgin/gtkdialogs.c:1063
+#: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "Alinomo"
 
-#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
 msgid "Group"
 msgstr "Grupo"
 
-#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1186
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
-#: ../pidgin/gtkblist.c:2890 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
+#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:3206 ../pidgin/gtknotify.c:503
+#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
 
-#: ../finch/gntblist.c:315 ../finch/gntblist.c:787
-#: ../libpurple/protocols/silc/buddy.c:736
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1174
-#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5247
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3342 ../pidgin/gtkblist.c:5772
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Aldonu Kunulon"
 
-#: ../finch/gntblist.c:315
+#: ../finch/gntblist.c:341
 msgid "Please enter buddy information."
 msgstr "B.v. enigi kunul informon."
 
-#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "Babilejoj"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:372 ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/msn/msn.c:1513 ../libpurple/protocols/msn/msn.c:1578
-#: ../libpurple/protocols/msn/msn.c:1605
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:579
-#: ../pidgin/gtkroomlist.c:621
+#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
+#: ../libpurple/protocols/jabber/jabber.c:927
+#: ../libpurple/protocols/msn/msn.c:1694 ../libpurple/protocols/msn/msn.c:1759
+#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/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 "Nomo"
 
-#: ../finch/gntblist.c:381 ../finch/gntblist.c:789 ../pidgin/gtkblist.c:5623
+#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
+msgid "Auto-join"
+msgstr "Aŭtomate-aliĝu"
+
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6154
 msgid "Add Chat"
 msgstr "Aldonu Babilejon"
 
-#: ../finch/gntblist.c:382
+#: ../finch/gntblist.c:420
 msgid "You can edit more information from the context menu later."
 msgstr "Vi povas redakti plian informon per la ĉirkaŭteksto menuo poste."
 
-#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
 msgid "Error adding group"
 msgstr "Eraro aldonante grupo"
 
-#: ../finch/gntblist.c:394
+#: ../finch/gntblist.c:434
 msgid "You must give a name for the group to add."
 msgstr "Vi devas enigi nomon de la grupo aldonenda."
 
-#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:447
 msgid "A group with the name already exists."
 msgstr "Grupo samnomita jam ekzistas."
 
-#: ../finch/gntblist.c:414 ../finch/gntblist.c:791
-#: ../libpurple/protocols/sametime/sametime.c:5387
-#: ../libpurple/protocols/sametime/sametime.c:5474 ../pidgin/gtkblist.c:5729
+#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6263
 msgid "Add Group"
 msgstr "Aldonu Grupon"
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:454
 msgid "Enter the name of the group"
 msgstr "B.v. enigi la nomon de la grupo"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:802
 msgid "Edit Chat"
 msgstr "Redaktu Babilejon"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:802
 msgid "Please Update the necessary fields."
 msgstr "B.v. Aktualigi la necesajn kampojn."
 
-#: ../finch/gntblist.c:740 ../finch/gntstatus.c:196
+#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Redaktu"
 
-#: ../finch/gntblist.c:754
-msgid "Auto-join"
-msgstr "Aŭtomate-aliĝu"
-
-#: ../finch/gntblist.c:763
+#: ../finch/gntblist.c:828
 msgid "Edit Settings"
 msgstr "Agordu"
 
-#: ../finch/gntblist.c:827 ../libpurple/protocols/silc/chat.c:878
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#, fuzzy
+msgid "Information"
+msgstr "Laborinformo"
+
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#, fuzzy
+msgid "Retrieving..."
+msgstr "Aŭtentokontrolas..."
+
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:534
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Ricevu Informon"
 
-#: ../finch/gntblist.c:831
+#: ../finch/gntblist.c:908
 msgid "Add Buddy Pounce"
 msgstr "Aldonu Kunul Atentigon"
 
-#: ../finch/gntblist.c:838 ../libpurple/protocols/oscar/oscar.c:635
-#: ../pidgin/gtkconv.c:1599
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1660
 msgid "Send File"
 msgstr "Sendu Dosieron"
 
-#: ../finch/gntblist.c:842
+#: ../finch/gntblist.c:919
 msgid "View Log"
 msgstr "Montru Protokolon"
 
-#: ../finch/gntblist.c:922
+#: ../finch/gntblist.c:1000
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "B.v. enigi la novan nomon por %s"
 
-#: ../finch/gntblist.c:924 ../finch/gntblist.c:925 ../finch/gntblist.c:1136
+#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
 msgid "Rename"
 msgstr "Alinomu"
 
-#: ../finch/gntblist.c:924
+#: ../finch/gntblist.c:1002
+#, fuzzy
+msgid "Set Alias"
+msgstr "Alinomo"
+
+#: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
 msgstr "Enigu malplenan ĉenon por forviŝi la nomon."
 
-#: ../finch/gntblist.c:997
+#: ../finch/gntblist.c:1079
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Forigi tiun kontakton ankaŭ forigos ĉiujn kunulojn en la kontakto"
 
-#: ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1087
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Forigi tiun grupon ankaŭ forigos ĉiujn kunulojn en la grupo"
 
-#: ../finch/gntblist.c:1010
+#: ../finch/gntblist.c:1092
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Ĉu vi certas vi volas forigi %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1013
+#: ../finch/gntblist.c:1095
 msgid "Confirm Remove"
 msgstr "Konfirmu Forigon"
 
-#: ../finch/gntblist.c:1016 ../finch/gntblist.c:1138 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
+#: ../pidgin/gtkconv.c:1709 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Forigu"
 
 #. Buddy List
-#: ../finch/gntblist.c:1113 ../finch/gntblist.c:2118 ../finch/gntprefs.c:278
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4133
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2355 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4566
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Kunul Listo"
 
-#: ../finch/gntblist.c:1143
+#: ../finch/gntblist.c:1257
 msgid "Place tagged"
 msgstr "Loko etikedita"
 
-#: ../finch/gntblist.c:1148
+#: ../finch/gntblist.c:1262
 msgid "Toggle Tag"
 msgstr "Inversiga Etikedo"
 
 #. General
-#: ../finch/gntblist.c:1181 ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
-#: ../libpurple/protocols/gg/gg.c:2182
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:1569
-#: ../libpurple/protocols/jabber/buddy.c:1751
-#: ../libpurple/protocols/jabber/jabber.c:817
-#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../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:2217
+#: ../libpurple/protocols/jabber/buddy.c:2399
+#: ../libpurple/protocols/jabber/jabber.c:937
+#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1590
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1636
+#: ../libpurple/protocols/msn/msn.c:1515 ../libpurple/protocols/msn/msn.c:1697
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1528
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2914
+#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/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:3230
 msgid "Nickname"
 msgstr "Karesnomo"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1201 ../finch/gntprefs.c:281
-#: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:646
-#: ../libpurple/protocols/jabber/buddy.c:686
-#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2826
-#: ../libpurple/protocols/oscar/oscar.c:2875
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2934
-#: ../pidgin/gtkblist.c:3323 ../pidgin/gtkprefs.c:1807
+#: ../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/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2908
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258
+#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927
 msgid "Idle"
 msgstr "Senfara"
 
-#: ../finch/gntblist.c:1290
+#: ../finch/gntblist.c:1334
+#, fuzzy
+msgid "On Mobile"
+msgstr "Movante"
+
+#: ../finch/gntblist.c:1415
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -486,12 +576,12 @@
 "Konektita: %d\n"
 "Entute: %d"
 
-#: ../finch/gntblist.c:1299
+#: ../finch/gntblist.c:1424
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Konto: %s (%s)"
 
-#: ../finch/gntblist.c:1311
+#: ../finch/gntblist.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -500,158 +590,286 @@
 "\n"
 "Laste vidita: antaŭ %s"
 
-#: ../finch/gntblist.c:1560 ../pidgin/gtkdocklet.c:478
-#: ../pidgin/gtkstatusbox.c:1102
+#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "Nova..."
 
-#: ../finch/gntblist.c:1567 ../pidgin/gtkdocklet.c:479
-#: ../pidgin/gtkstatusbox.c:1103
+#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "Konservita..."
 
-#: ../finch/gntblist.c:1923 ../finch/gntplugin.c:216 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
+#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:255 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Kromaĵoj"
 
-#: ../finch/gntblist.c:2030 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:748
+#: ../pidgin/gtkdialogs.c:887 ../pidgin/gtkdialogs.c:968
 msgid "_Name"
 msgstr "_Nomo"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:847 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2210 ../pidgin/gtkdialogs.c:753
+#: ../pidgin/gtkdialogs.c:892 ../pidgin/gtkdialogs.c:973
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../finch/gntblist.c:2043 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:761
 msgid "New Instant Message"
 msgstr "Nova Tuj Mesaĝo"
 
-#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:763
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "B.v. enigi la ekrannomon aŭ alinomon de persono kiun vi dezrias TM-i."
 
-#: ../finch/gntblist.c:2048 ../finch/gntconn.c:47 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:968 ../libpurple/account.c:1217
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:655
-#: ../libpurple/protocols/gg/gg.c:791
-#: ../libpurple/protocols/jabber/jabber.c:1370
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:264
-#: ../libpurple/protocols/msn/msn.c:279 ../libpurple/protocols/msn/msn.c:294
-#: ../libpurple/protocols/oscar/oscar.c:6038
-#: ../libpurple/protocols/silc/buddy.c:466
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:725
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1911
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
-#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3890
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
+#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
+#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
+#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
+#: ../libpurple/protocols/jabber/jabber.c:1736
+#: ../libpurple/protocols/jabber/xdata.c:399
+#: ../libpurple/protocols/msn/msn.c:289 ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:323 ../libpurple/protocols/msn/msn.c:340
+#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
+#: ../libpurple/protocols/yahoo/yahoo.c:3507 ../pidgin/gtkblist.c:4321
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:766
+#: ../pidgin/gtkdialogs.c:905 ../pidgin/gtkdialogs.c:997
+#: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "Daŭrigu"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2067 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+#: ../finch/gntblist.c:2261 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
 msgid "Options"
 msgstr "Opcioj"
 
-#: ../finch/gntblist.c:2073
+#: ../finch/gntblist.c:2267
 msgid "Send IM..."
 msgstr "Sendu TM-n..."
 
-#: ../finch/gntblist.c:2077
-msgid "Toggle offline buddies"
-msgstr "Inversigi senkonektajn kunulojn"
-
-#: ../finch/gntblist.c:2083
-msgid "Sort by status"
-msgstr "Ordigi laŭ stato"
-
-#: ../finch/gntblist.c:2087
-msgid "Sort alphabetically"
-msgstr "Ordigi alfabete"
-
-#: ../finch/gntblist.c:2091
-msgid "Sort by log size"
-msgstr "Oridgi laŭ protokolo grandeco"
-
-#: ../finch/gntconn.c:38
+#: ../finch/gntblist.c:2271
+msgid "Show"
+msgstr ""
+
+#: ../finch/gntblist.c:2276
+#, fuzzy
+msgid "Empty groups"
+msgstr "Laŭ grupo"
+
+#: ../finch/gntblist.c:2282
+#, fuzzy
+msgid "Offline buddies"
+msgstr "Montru Senkonektajn Kunulojn"
+
+#: ../finch/gntblist.c:2288
+#, fuzzy
+msgid "Sort"
+msgstr "Pordo"
+
+#: ../finch/gntblist.c:2293
+#, fuzzy
+msgid "By Status"
+msgstr "Laŭ stato"
+
+#: ../finch/gntblist.c:2297 ../pidgin/gtkblist.c:4106
+msgid "Alphabetically"
+msgstr "Alfabete"
+
+#: ../finch/gntblist.c:2301
+#, fuzzy
+msgid "By Log Size"
+msgstr "Laŭ protokolo grandeco"
+
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+#, fuzzy
+msgid "Certificate Import"
+msgstr "Konekto pordo"
+
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgid "Specify a hostname"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+msgid "Type the host name this certificate is for."
+msgstr ""
+
+#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+msgid "Certificate Import Error"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
+msgid "X.509 certificate import failed"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
+#, fuzzy
+msgid "Select a PEM certificate"
+msgstr "Elektu dosieron"
+
+#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+msgid "Certificate Export Error"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
+msgid "X.509 certificate export failed"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
+msgid "PEM X.509 Certificate Export"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:188
+#, fuzzy, c-format
+msgid "Certificate for %s"
+msgstr "Stato por %s"
+
+#: ../finch/gntcertmgr.c:195
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:198
+msgid "SSL Host Certificate"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+msgid "Confirm certificate delete"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+msgid "Certificate Manager"
+msgstr ""
+
+#. Creating the user splits
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr "Komputilnomo"
+
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1688
+#: ../pidgin/gtkdebug.c:835
+msgid "Info"
+msgstr "Informo"
+
+#. 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:406
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../pidgin/gtkrequest.c:273
+msgid "Close"
+msgstr "Fermu"
+
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:41
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s malkontaktita."
 
-#: ../finch/gntconn.c:42
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"%s estis diskonektigita pro la jena eraro:\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:996
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3888
-msgid "Connection Error"
-msgstr "Konekteraro"
-
-#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
-#: ../pidgin/gtkblist.c:3892
-msgid "Connect"
-msgstr "Kontaktu"
-
-#: ../finch/gntconv.c:103
+#: ../finch/gntconn.c:129
+#, 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/gntconn.c:138 ../pidgin/gtkblist.c:4323
+msgid "Re-enable Account"
+msgstr "Reŝaltu Konton"
+
+#: ../finch/gntconv.c:139
 msgid "No such command."
 msgstr "Nenia komando."
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:530
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:536
 msgid "Your command failed for an unknown reason."
 msgstr "Via komanda malsukcesis pro nekonata kialo."
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:543
 msgid "That command only works in chats, not IMs."
 msgstr "Tiu komando nur funkcias en babilejoj, ne TM-oj."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:546
 msgid "That command only works in IMs, not chats."
 msgstr "Tiu komando nur funkcias en TM-oj, ne babilejoj."
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:551
 msgid "That command doesn't work on this protocol."
 msgstr "Tiu komando ne funkcias je tiu protokolo."
 
-#: ../finch/gntconv.c:131
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "Komandoj estas ne akceptitaj nune. Mesaĝo NE estis sendita."
-
-#: ../finch/gntconv.c:234
+#: ../finch/gntconv.c:168
+msgid "Message was not sent, because you are not signed on."
+msgstr ""
+
+#: ../finch/gntconv.c:251
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:257
+#: ../finch/gntconv.c:274
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
 #, c-format
 msgid ""
 "\n"
@@ -660,24 +878,72 @@
 "\n"
 "%s tajpas..."
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:298
+#, fuzzy
+msgid "You have left this chat."
+msgstr "Vi parolas en babilejo"
+
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1415
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+
+#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1423
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+
+#: ../finch/gntconv.c:469
+#, fuzzy
+msgid "Send To"
+msgstr "_Sendu Al"
+
+#: ../finch/gntconv.c:513
+#, fuzzy
+msgid "Conversation"
+msgstr "Konversacioj"
+
+#: ../finch/gntconv.c:519
+#, fuzzy
+msgid "Clear Scrollback"
+msgstr "/Konversacio/Fo_rviŝu Dialogon"
+
+#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
+msgid "Show Timestamps"
+msgstr "Montru Tempomarkojn"
+
+#: ../finch/gntconv.c:539
+#, fuzzy
+msgid "Add Buddy Pounce..."
+msgstr "Aldonu Kunul Atentigon"
+
+#: ../finch/gntconv.c:554
+#, fuzzy
+msgid "Enable Logging"
+msgstr "/Opcioj/Ŝaltu Protokoladon"
+
+#: ../finch/gntconv.c:560
+#, fuzzy
+msgid "Enable Sounds"
+msgstr "Ŝaltu Sonojn:"
+
+#: ../finch/gntconv.c:766
 msgid "<AUTO-REPLY> "
 msgstr "<AŬTO-RESPONDO> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:505
+#: ../finch/gntconv.c:889
 msgid "List of users:\n"
 msgstr "Uzantoj Listo:\n"
 
-#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:370
 msgid "Supported debug options are:  version"
 msgstr "Subtenitaj sencimigopcioj estas:  versio"
 
-#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:422
 msgid "No such command (in this context)."
 msgstr "Nenia komando (en tiu kunteksto)."
 
-#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:425
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -685,55 +951,59 @@
 "Uzu \"/help &lt;komandon&gt;\" por helpo pri speciala komando.\n"
 "La komandoj aktuale disponeblaj estas:\n"
 
-#: ../finch/gntconv.c:706 ../pidgin/gtkconv.c:6949
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7642
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 
-#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:6952
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7645
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 
-#: ../finch/gntconv.c:712 ../pidgin/gtkconv.c:6955
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7648
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 
-#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:6958
+#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7651
 msgid "clear: Clears the conversation scrollback."
 msgstr ""
 
-#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:6961
+#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7657
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 
-#: ../finch/gntconv.c:723
+#: ../finch/gntconv.c:1163
+msgid "users:  Show the list of users in the chat."
+msgstr ""
+
+#: ../finch/gntconv.c:1168
 msgid "plugins: Show the plugins window."
 msgstr ""
 
-#: ../finch/gntconv.c:726
+#: ../finch/gntconv.c:1171
 msgid "buddylist: Show the buddylist."
 msgstr ""
 
-#: ../finch/gntconv.c:729
+#: ../finch/gntconv.c:1174
 msgid "accounts: Show the accounts window."
 msgstr ""
 
-#: ../finch/gntconv.c:732
+#: ../finch/gntconv.c:1177
 msgid "debugwin: Show the debug window."
 msgstr ""
 
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:1180
 msgid "prefs: Show the preference window."
 msgstr ""
 
-#: ../finch/gntconv.c:738
+#: ../finch/gntconv.c:1183
 msgid "statuses: Show the savedstatuses window."
 msgstr ""
 
-#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "Sencimigo Fenestro"
 
@@ -741,180 +1011,187 @@
 #. * 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:246 ../pidgin/gtkdebug.c:767
+#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "Forviŝu"
 
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+#: ../finch/gntdebug.c:262
+#, fuzzy
+msgid "Filter: "
+msgstr "Filtrilo"
+
+#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "Paŭzu"
 
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:783 ../pidgin/gtkdebug.c:784
-msgid "Timestamps"
-msgstr "Tempomarkojn"
-
-#: ../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 "Dosiero alŝuto - %d%% je %d dosieroj"
 
-#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+#. Create the window.
+#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
+#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
 msgid "File Transfers"
 msgstr "Dosiero Alŝutoj"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Dosiernomo"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Grandeco"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:201
 msgid "Speed"
 msgstr "Rapideco"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Restanta"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
-#: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
-#: ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/jabber/buddy.c:637
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:676
-#: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:512
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:802
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2664
-#: ../libpurple/protocols/oscar/oscar.c:3782
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4149
-#: ../libpurple/protocols/yahoo/yahoo.c:3047 ../pidgin/gtkblist.c:2978
-#: ../pidgin/gtkblist.c:2991 ../pidgin/gtkblist.c:2993
-#: ../pidgin/gtksavedstatuses.c:942 ../pidgin/gtksavedstatuses.c:1089
+#: ../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:596 ../libpurple/protocols/msn/msn.c:603
+#: ../libpurple/protocols/novell/novell.c:2840
+#: ../libpurple/protocols/oscar/oscar.c:821
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:2696
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3247 ../pidgin/gtkblist.c:3302
+#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "Stato"
 
-#: ../finch/gntft.c:207
+#: ../finch/gntft.c:211
 msgid "Close this window when all transfers finish"
 msgstr "Fermu tiun fenestron kiam ĉiuj transmetoj finas"
 
-#: ../finch/gntft.c:214
+#: ../finch/gntft.c:218
 msgid "Clear finished transfers"
 msgstr "Forviŝu finitajn transmetojn"
 
-#: ../finch/gntft.c:228
+#: ../finch/gntft.c:232
 msgid "Stop"
 msgstr "Haltu"
 
-#. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
-#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
-#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2419 ../pidgin/gtkrequest.c:272
-msgid "Close"
-msgstr "Fermu"
-
-#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr "Atendante la alŝutoeko"
 
-#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr "Rezignita"
 
-#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr "Malsukcesita"
 
-#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
+#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
+#, fuzzy, c-format
+msgid "%.2f KiB/s"
 msgstr "%.2f KB/s"
 
-#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1118
+#: ../finch/gntft.c:431
+#, 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 "Finita"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:386
 msgid "Transferring"
 msgstr ""
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "Retadresoj"
 
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
 msgid "You have mail!"
 msgstr "Vi ricevis retmesaĝon!"
 
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
-msgid "From"
-msgstr "De"
-
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:510
+msgid "Sender"
+msgstr "Sendanto"
+
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:517
 msgid "Subject"
 msgstr "Subjekto"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:201
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) havas %d novan mesaĝon."
 msgstr[1] "%s (%s) havas %d novajn mesaĝojn."
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr "Nova Retmesaĝo"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
 msgid "Info for %s"
 msgstr "Informo pri %s"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:941
 msgid "Buddy Information"
 msgstr "Kunul Informo"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:380 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Daŭrigu"
 
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
-msgid "Info"
-msgstr "Informo"
-
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:389 ../pidgin/gtkconv.c:1649
 msgid "IM"
 msgstr "TM"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:392
 msgid "Join"
 msgstr "Aliĝu"
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:395 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Invitu"
 
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:398
 msgid "(none)"
 msgstr "(neniu)"
 
-#: ../finch/gntplugin.c:102
+#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+msgid "ERROR"
+msgstr ""
+
+#: ../finch/gntplugin.c:75
+msgid "loading plugin failed"
+msgstr ""
+
+#: ../finch/gntplugin.c:84
+msgid "unloading plugin failed"
+msgstr ""
+
+#: ../finch/gntplugin.c:129
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -931,466 +1208,695 @@
 "Retejo: %s\n"
 "Dosiernomo: %s\n"
 
-#: ../finch/gntplugin.c:155
+#: ../finch/gntplugin.c:187
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Necesas ŝarĝi kromaĵon por agordi ĝin."
 
-#: ../finch/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#: ../finch/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr ""
-
-#: ../finch/gntplugin.c:200
+#: ../finch/gntplugin.c:235
 msgid "No configuration options for this plugin."
 msgstr "Neniuj agordaj opcioj por tiu kromaĵo."
 
-#: ../finch/gntplugin.c:221
+#: ../finch/gntplugin.c:260
 msgid "You can (un)load plugins from the following list."
 msgstr "Vi povas (mal)ŝarĝi kromaĵojn de la jena listo."
 
-#: ../finch/gntplugin.c:264
+#: ../finch/gntplugin.c:315
 msgid "Configure Plugin"
 msgstr "Agordu Kromaĵon"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2069
+msgid "Preferences"
+msgstr "Agordo"
+
+#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "B.v. enigi kunulon atentigendan."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "New Buddy Pounce"
 msgstr "Nova Kunul Atentigo"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "Edit Buddy Pounce"
 msgstr "Redaktu Kunul Atentigo"
 
-#: ../finch/gntpounce.c:330
+#: ../finch/gntpounce.c:333
 msgid "Pounce Who"
 msgstr "Atentigi Kiun"
 
 #. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5341
-#: ../pidgin/gtkblist.c:5657
+#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../finch/gntpounce.c:355
+#: ../finch/gntpounce.c:358
 msgid "Buddy name:"
 msgstr "Kunul nomo:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
 msgid "Pounce When Buddy..."
 msgstr "Atentigu kiam Kunul..."
 
-#: ../finch/gntpounce.c:372
-msgid "Signs on"
-msgstr "Ensalutas"
-
-#: ../finch/gntpounce.c:373
-msgid "Signs off"
-msgstr "Audiaŭas"
-
-#: ../finch/gntpounce.c:374
-msgid "Goes away"
-msgstr "Foriĝas"
-
-#: ../finch/gntpounce.c:375
-msgid "Returns from away"
-msgstr "Ekmalforiĝas"
-
 #: ../finch/gntpounce.c:376
-msgid "Becomes idle"
-msgstr "Eksenfaras"
+msgid "Signs on"
+msgstr "Ensalutas"
 
 #: ../finch/gntpounce.c:377
+msgid "Signs off"
+msgstr "Audiaŭas"
+
+#: ../finch/gntpounce.c:378
+msgid "Goes away"
+msgstr "Foriĝas"
+
+#: ../finch/gntpounce.c:379
+msgid "Returns from away"
+msgstr "Ekmalforiĝas"
+
+#: ../finch/gntpounce.c:380
+msgid "Becomes idle"
+msgstr "Eksenfaras"
+
+#: ../finch/gntpounce.c:381
 msgid "Is no longer idle"
 msgstr "Ekfaras"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:382
 msgid "Starts typing"
 msgstr "Ektajpas"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:383
 msgid "Pauses while typing"
 msgstr "Paŭzas tajpante"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:384
 msgid "Stops typing"
 msgstr "Maltajpas"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:385
 msgid "Sends a message"
 msgstr "Sendas mesagôn"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
 msgid "Action"
 msgstr "Ago"
 
-#: ../finch/gntpounce.c:413
+#: ../finch/gntpounce.c:416
 msgid "Open an IM window"
 msgstr "Malfermu TM-n fenestron"
 
-#: ../finch/gntpounce.c:414
-msgid "Pop up a notification"
-msgstr "Ŝprucigu avizon"
-
-#: ../finch/gntpounce.c:415
-msgid "Send a message"
-msgstr "Sendu mesaĝon"
-
-#: ../finch/gntpounce.c:416
-msgid "Execute a command"
-msgstr "Lanĉu komandon"
-
 #: ../finch/gntpounce.c:417
+msgid "Pop up a notification"
+msgstr "Ŝprucigu avizon"
+
+#: ../finch/gntpounce.c:418
+msgid "Send a message"
+msgstr "Sendu mesaĝon"
+
+#: ../finch/gntpounce.c:419
+msgid "Execute a command"
+msgstr "Lanĉu komandon"
+
+#: ../finch/gntpounce.c:420
 msgid "Play a sound"
 msgstr "Ludu sonon"
 
-#: ../finch/gntpounce.c:445
+#: ../finch/gntpounce.c:448
 msgid "Pounce only when my status is not available"
 msgstr "Atentigi nur kiam mia stato ne disponeblas"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
 msgid "Recurring"
 msgstr "Rikuranta"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:618
+#, fuzzy
+msgid "Cannot create pounce"
+msgstr "Ne povas ŝanĝi karesnomon"
+
+#: ../finch/gntpounce.c:619
+#, fuzzy
+msgid "You do not have any accounts."
+msgstr "Vi devas elekti konton."
+
+#: ../finch/gntpounce.c:620
+msgid "You must create an account first before you can create a pounce."
+msgstr ""
+
+#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr ""
 
-#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
 msgid "Buddy Pounces"
 msgstr "Kunul Atentigoj"
 
-#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ektajpis al vi (%s)"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s paŭzis tajpante al vi (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s ensalutis (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s revenis el senfarado (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s revenis el forado (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ekmaltajpis vin (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s malsalutis (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s senfariĝis (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s foriĝis. (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s sendis mesaĝon al vi. (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
-#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntprefs.c:92
+#, fuzzy
+msgid "Based on keyboard use"
+msgstr "Laŭ klavaro aŭ muso uzo"
+
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
 msgid "From last sent message"
 msgstr "Ekde lasta sendita mesaĝo"
 
-#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
-#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
-#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
+#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Neniam"
 
-#: ../finch/gntprefs.c:159
+#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "Montru Senfaran Tempon"
 
-#: ../finch/gntprefs.c:160
+#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "Montru Senkonektajn Kunulojn"
 
-#: ../finch/gntprefs.c:166
-msgid "Show Timestamps"
-msgstr "Montru Tempomarkojn"
-
-#: ../finch/gntprefs.c:167
+#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "Avizu kunulojn kiam vi estas tajpante"
 
-#: ../finch/gntprefs.c:173
+#: ../finch/gntprefs.c:198
 msgid "Log format"
 msgstr "Protokolo formato"
 
-#: ../finch/gntprefs.c:174
+#: ../finch/gntprefs.c:199
 msgid "Log IMs"
 msgstr "Protokolu TM-ojn"
 
-#: ../finch/gntprefs.c:175
+#: ../finch/gntprefs.c:200
 msgid "Log chats"
 msgstr "Protokolu babilojn"
 
-#: ../finch/gntprefs.c:176
+#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Protokolu stato ŝanĝeventojn"
 
+#: ../finch/gntprefs.c:207
+#, fuzzy
+msgid "Report Idle time"
+msgstr "_Raportu senfaran tempon:"
+
+#: ../finch/gntprefs.c:208
+#, fuzzy
+msgid "Change status when idle"
+msgstr "Ŝanĝu staton kiam _senfara"
+
+#: ../finch/gntprefs.c:209
+#, fuzzy
+msgid "Minutes before changing status"
+msgstr "_Minutoj antaŭe ŝanĝenda staton:"
+
+#: ../finch/gntprefs.c:210
+#, fuzzy
+msgid "Change status to"
+msgstr "Ŝangû _staton al:"
+
 #. Conversations
-#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Konversacioj"
 
-#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046
 msgid "Logging"
 msgstr "Protokolado"
 
-#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
-#: ../pidgin/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "Agordo"
-
-#: ../finch/gntrequest.c:521
+#: ../finch/gntrequest.c:583
 msgid "Not implemented yet."
 msgstr "Ne jam programita."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
-#: ../pidgin/gtkrequest.c:1559
+#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Konservu Dosieron..."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
-#: ../pidgin/gtkrequest.c:1560
+#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Malfermu Dosieron..."
 
-#: ../finch/gntstatus.c:135
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+msgid "Buddy logs in"
+msgstr "Kunul ensalutas"
+
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+msgid "Buddy logs out"
+msgstr "Kunul elsalutas"
+
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+msgid "Message received"
+msgstr "Mesaĝo ricevita"
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+msgid "Message received begins conversation"
+msgstr "Ricevita mesaĝo komencas konversacio"
+
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+msgid "Message sent"
+msgstr "Mesaĝo sendita"
+
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+msgid "Person enters chat"
+msgstr "Persono eniras babilejon"
+
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+msgid "Person leaves chat"
+msgstr "Persono eliras babilejon"
+
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+msgid "You talk in chat"
+msgstr "Vi parolas en babilejo"
+
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+msgid "Others talk in chat"
+msgstr "Aliaj parolas en babilejo"
+
+#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+msgid "Someone says your screen name in chat"
+msgstr "Iun diras vian ekrannomon en babilejo"
+
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+msgid "GStreamer Failure"
+msgstr "GStreamer Malsukceso"
+
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer malsukcesis ekon."
+
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589
+#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874
+msgid "(default)"
+msgstr ""
+
+#: ../finch/gntsound.c:729
+#, fuzzy
+msgid "Select Sound File ..."
+msgstr "Elektu Dosierujon..."
+
+#: ../finch/gntsound.c:904
+#, fuzzy
+msgid "Sound Preferences"
+msgstr "Agordo"
+
+#: ../finch/gntsound.c:915
+#, fuzzy
+msgid "Profiles"
+msgstr "Profilo"
+
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
+msgid "Automatic"
+msgstr "Aŭtomate"
+
+#: ../finch/gntsound.c:957
+#, fuzzy
+msgid "Console Beep"
+msgstr "Konzolo pepo"
+
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
+msgid "Command"
+msgstr "Komando"
+
+#: ../finch/gntsound.c:959
+#, fuzzy
+msgid "No Sound"
+msgstr "Sen Sono"
+
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
+msgid "Sound Method"
+msgstr "Sono Metodo"
+
+#: ../finch/gntsound.c:966
+#, fuzzy
+msgid "Method: "
+msgstr "_Metodo:"
+
+#: ../finch/gntsound.c:973
+#, fuzzy, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"Sono k_omando:\n"
+"(%s por dosiernomo)"
+
+#. Sound options
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
+msgid "Sound Options"
+msgstr "Son-opcioj"
+
+#: ../finch/gntsound.c:982
+#, fuzzy
+msgid "Sounds when conversation has focus"
+msgstr "Sonu kiam konversacio _fokusas"
+
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
+#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
+msgid "Always"
+msgstr "Ĉiam"
+
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763
+msgid "Only when available"
+msgstr "Nur kiam disponebla"
+
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
+msgid "Only when not available"
+msgstr "Nur kiam nedisponebla"
+
+#: ../finch/gntsound.c:999
+#, fuzzy
+msgid "Volume(0-100):"
+msgstr "Laŭteco:"
+
+#. Sound events
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
+msgid "Sound Events"
+msgstr "Soneventoj"
+
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
+msgid "Event"
+msgstr "Evento"
+
+#: ../finch/gntsound.c:1020
+#, fuzzy
+msgid "File"
+msgstr "Malsukcesita"
+
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
+msgid "Test"
+msgstr "Provo"
+
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
+msgid "Reset"
+msgstr "Restarigu"
+
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
+msgid "Choose..."
+msgstr "Elektu..."
+
+#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Ĉu vi certas vi volas forigi \"%s\""
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Forigu Staton"
 
-#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Konservitaj Statoj"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:938
-#: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:463
+#: ../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:1486
+#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Titolon"
 
-#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Tipo"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
-#: ../libpurple/protocols/bonjour/bonjour.c:258
-#: ../libpurple/protocols/bonjour/bonjour.c:265
-#: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
-#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
-#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
-#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1233
-#: ../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:1285
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2942
-#: ../libpurple/protocols/novell/novell.c:2948
-#: ../libpurple/protocols/novell/novell.c:2954
-#: ../libpurple/protocols/oscar/oscar.c:5492
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
-#: ../libpurple/protocols/silc/buddy.c:1544
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:256
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/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/msn/msn.c:634 ../libpurple/protocols/msn/msn.c:641
+#: ../libpurple/protocols/msn/msn.c:648 ../libpurple/protocols/msn/msn.c:655
+#: ../libpurple/protocols/msn/msn.c:661 ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/myspace/myspace.c:148
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/novell/novell.c:2946
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/novell/novell.c:2958
+#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5784
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/oscar/oscar.c:5807
+#: ../libpurple/protocols/oscar/oscar.c:5814
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3470
-#: ../libpurple/protocols/yahoo/yahoo.c:3476
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
-#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
+#: ../libpurple/protocols/yahoo/yahoo.c:3750
+#: ../libpurple/protocols/yahoo/yahoo.c:3756
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
 msgstr "Mesaĝo"
 
 #. Use
-#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
+#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Uzu"
 
-#: ../finch/gntstatus.c:291
+#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "Malvalida titolo"
 
-#: ../finch/gntstatus.c:292
+#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "B.v. enigi malmalplenan titolon por la stato."
 
-#: ../finch/gntstatus.c:299
+#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "Duplikata titolo"
 
-#: ../finch/gntstatus.c:300
+#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "B.v. enigi malsimilan titolon por la stato."
 
-#: ../finch/gntstatus.c:440
+#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Substato"
 
-#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Stato"
 
-#: ../finch/gntstatus.c:466
+#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Mesaĝo:"
 
-#: ../finch/gntstatus.c:515
+#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Redaktu Staton"
 
-#: ../finch/gntstatus.c:557
+#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Uzu malsimilan staton por jenaj kontoj"
 
 #. Save & Use
-#: ../finch/gntstatus.c:591
+#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "Konservu & Uzu"
 
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr ""
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
+msgid "Sounds"
+msgstr "Sonoj"
+
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Statoj"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#, fuzzy
+msgid "Error loading the plugin."
+msgstr "Ne eblas ŝargi kromaĵon"
+
+#: ../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
+#: ../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:209
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s ekensalutis"
 
-#: ../finch/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s ekmalsalutis"
 
-#: ../finch/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s sendis mesaĝon al vi"
 
-#: ../finch/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s diris vian karesnomon en %s"
 
-#: ../finch/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s sendis mesaĝon en %s"
 
-#: ../finch/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Kunul en/el-salutas"
 
-#: ../finch/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Vi ricevas TM-on"
 
-#: ../finch/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Iun babilas en babilejo"
 
-#: ../finch/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Iun diras vian nomon en babilejo"
 
-#: ../finch/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Avizu per panrostilo kiam"
 
-#: ../finch/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Pep ankaŭ!"
 
-#: ../finch/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Difini URĜAN por la terminalfenestro."
 
-#: ../finch/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Panrostilo kromaĵo"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:123
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Konversacion kun %s ĉe %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:150
 msgid "History Plugin Requires Logging"
 msgstr "Historio Kormaĵo postulas Protokoladon"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:151
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1402,11 +1908,11 @@
 msgid "GntHistory"
 msgstr "GntHistorio"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:194
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Montru lastatempe protokolatajn konversaciojn en novajn konversaciojn."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:195
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1430,281 +1936,444 @@
 msgid "Lastlog plugin."
 msgstr "Lastaprotokolo kromaĵo."
 
-#: ../libpurple/account.c:777
+#: ../libpurple/account.c:791
 msgid "accounts"
 msgstr "kontoj"
 
-#: ../libpurple/account.c:923
+#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
 msgid "Password is required to sign on."
 msgstr "Pasvorto estas postulata por en saulti."
 
-#: ../libpurple/account.c:948
+#: ../libpurple/account.c:992
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Enigu pasvorton por %s (%s)"
 
-#: ../libpurple/account.c:955
+#: ../libpurple/account.c:999
 msgid "Enter Password"
 msgstr "Enigu Pasvorton"
 
-#: ../libpurple/account.c:960
+#: ../libpurple/account.c:1004
 msgid "Save password"
 msgstr "Konservu pasvorton"
 
-#: ../libpurple/account.c:994 ../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 "Mankanta protokolo-kromaĵo por %s"
 
-#: ../libpurple/account.c:1154 ../libpurple/protocols/gg/gg.c:696
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
+#: ../pidgin/gtkblist.c:4318
+msgid "Connection Error"
+msgstr "Konekteraro"
+
+#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "New passwords do not match."
 msgstr "Novaj pasvortoj malsamas."
 
-#: ../libpurple/account.c:1163
+#: ../libpurple/account.c:1208
 msgid "Fill out all fields completely."
 msgstr "Enigu ĉiujn kampojn komplete"
 
-#: ../libpurple/account.c:1186
+#: ../libpurple/account.c:1231
 msgid "Original password"
 msgstr "Originala pasvorto"
 
-#: ../libpurple/account.c:1193
+#: ../libpurple/account.c:1238
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: ../libpurple/account.c:1200
+#: ../libpurple/account.c:1245
 msgid "New password (again)"
 msgstr "Nova pasvorto (denove)"
 
-#: ../libpurple/account.c:1206
+#: ../libpurple/account.c:1251
 #, c-format
 msgid "Change password for %s"
 msgstr "Ŝanĝu pasvorton de %s"
 
-#: ../libpurple/account.c:1214
+#: ../libpurple/account.c:1259
 msgid "Please enter your current password and your new password."
 msgstr "B.v. enigi vian aktualan pasvorton kaj vian novan pasvorton."
 
-#: ../libpurple/account.c:1244
+#: ../libpurple/account.c:1290
 #, c-format
 msgid "Change user information for %s"
 msgstr "Ŝanĝu uzanto-informon de %s"
 
-#: ../libpurple/account.c:1247 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Difini Uzanto Informon"
 
-#: ../libpurple/account.c:1783 ../libpurple/protocols/gg/gg.c:1002
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:1404
-#: ../libpurple/protocols/jabber/buddy.c:1421
-#: ../libpurple/protocols/novell/novell.c:2832
-#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2836
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Nekonata"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
-#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5137 ../pidgin/plugins/gevolution/gevolution.c:97
-#: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3242 ../pidgin/gtkblist.c:5662
+#: ../pidgin/plugins/gevolution/gevo-util.c:67
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Kunuloj"
 
-#: ../libpurple/blist.c:550
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "kunullisto"
 
-#: ../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
+#, fuzzy, c-format
+msgid "Accept certificate for %s?"
+msgstr "Ĉu akceptu babilinviton ?"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1177
+msgid "SSL Certificate Verification"
+msgstr ""
+
+#. Number of actions
+#: ../libpurple/certificate.c:1186
+#, fuzzy
+msgid "Accept"
+msgstr "_Akceptu"
+
+#: ../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 "Malakceptu"
+
+#: ../libpurple/certificate.c:1188
+msgid "_View Certificate..."
+msgstr ""
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1288
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1313
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+
+#: ../libpurple/certificate.c:1331
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr ""
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+#, fuzzy
+msgid "SSL Certificate Error"
+msgstr "Skriberaro"
+
+#: ../libpurple/certificate.c:1340
+#, fuzzy
+msgid "Invalid certificate chain"
+msgstr "Malvalida titolo"
+
+#. 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:1882
+#, 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:1891
+#, fuzzy
+msgid "Certificate Information"
+msgstr "Uzanto Informo"
+
+#: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "Registra Eraro"
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:180
+#, fuzzy
+msgid "Unregistration Error"
+msgstr "Registra Eraro"
+
+#: ../libpurple/connection.c:350
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s ensalutis"
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:380
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s malsalutis"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1692
-#: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:321
+#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/msn/servconn.c:141
+#: ../libpurple/protocols/msn/session.c:361
 msgid "Unknown error"
 msgstr "Nekonata eraro"
 
-#: ../libpurple/conversation.c:165
+#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr ""
 
-#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr ""
 
-#: ../libpurple/conversation.c:169
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr ""
 
-#: ../libpurple/conversation.c:178
+#: ../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:1162
+#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "Sendu Mesaĝon"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "_Sendu Mesaĝon"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s eniris la ĉambron."
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] eniris la ĉambron."
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vi nun estas konata kiel %s"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s nun estas konata kiel %s"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s forlasis la ĉambron."
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s forlasis la ĉambron (%s)."
 
-#: ../libpurple/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Malsukcesis konekti: %s"
 
-#: ../libpurple/dbus-server.c:590
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Malsukcesis ricevi nomon: %s"
 
-#: ../libpurple/dbus-server.c:603
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Malsukcesis ricevi servilnomon: %s"
 
-#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+#: ../libpurple/dbus-server.h:85
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr ""
+
+#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Neniu nomo"
 
-#: ../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
 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 "Nekonata kialo"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
+#: ../libpurple/ft.c:209
 #, c-format
 msgid ""
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:208
+#: ../libpurple/ft.c:213
 #, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:212
+#: ../libpurple/ft.c:217
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:248
+#: ../libpurple/ft.c:253
 msgid "Directory is not writable."
 msgstr ""
 
-#: ../libpurple/ft.c:263
+#: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
 msgstr ""
 
-#: ../libpurple/ft.c:273
+#: ../libpurple/ft.c:278
 msgid "Cannot send a directory."
 msgstr ""
 
-#: ../libpurple/ft.c:282
+#: ../libpurple/ft.c:287
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:340
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr ""
-
 #: ../libpurple/ft.c:347
 #, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr ""
+
+#: ../libpurple/ft.c:354
+#, c-format
 msgid "%s wants to send you a file"
 msgstr ""
 
-#: ../libpurple/ft.c:388
+#: ../libpurple/ft.c:397
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Akcepti dosier-alŝuton demandon de %s?"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:401
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1712,60 +2381,60 @@
 "Remote port: %d"
 msgstr ""
 
-#: ../libpurple/ft.c:425
+#: ../libpurple/ft.c:436
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr ""
 
-#: ../libpurple/ft.c:477
+#: ../libpurple/ft.c:488
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:498
+#: ../libpurple/ft.c:509
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr ""
 
-#: ../libpurple/ft.c:510
+#: ../libpurple/ft.c:521
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr ""
 
-#: ../libpurple/ft.c:664
+#: ../libpurple/ft.c:682
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#: ../libpurple/ft.c:667
+#: ../libpurple/ft.c:685
 msgid "File transfer complete"
 msgstr "Dosiero alŝuto kompleta"
 
-#: ../libpurple/ft.c:1084
+#: ../libpurple/ft.c:1103
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Vi rezignis la alŝuton de %s"
 
-#: ../libpurple/ft.c:1089
+#: ../libpurple/ft.c:1108
 msgid "File transfer cancelled"
 msgstr "Dosiero alŝuto rezignita"
 
-#: ../libpurple/ft.c:1147
+#: ../libpurple/ft.c:1166
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s rezignis la alŝuton de %s"
 
-#: ../libpurple/ft.c:1152
+#: ../libpurple/ft.c:1171
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s rezignis la dosiero-alŝuton"
 
-#: ../libpurple/ft.c:1209
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Dosiero alŝuto al %s malsukcesis."
 
-#: ../libpurple/ft.c:1211
+#: ../libpurple/ft.c:1230
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Dosiero elŝuto de %s malsukcesis."
@@ -1942,31 +2611,31 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Ĉu la donita komando devu trakti \"ymsgr\" URL-ojn"
 
-#: ../libpurple/log.c:181
+#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">La protokolilo ne havas legkapablon</font></b>"
 
-#: ../libpurple/log.c:593
+#: ../libpurple/log.c:598
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:607
+#: ../libpurple/log.c:612
 msgid "Plain text"
 msgstr "Plata teksto"
 
-#: ../libpurple/log.c:621
+#: ../libpurple/log.c:626
 msgid "Old flat format"
 msgstr ""
 
-#: ../libpurple/log.c:732
+#: ../libpurple/log.c:839
 msgid "Logging of this conversation failed."
 msgstr "Protokolado de tiu konversacio malsukcesis."
 
-#: ../libpurple/log.c:1175
+#: ../libpurple/log.c:1282
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1251
+#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -1975,7 +2644,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AŬTO-"
 "RESPONDO&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1253
+#: ../libpurple/log.c:1368
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -1984,16 +2653,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AŬTO-"
 "RESPONDO&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
+#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 
-#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
+#: ../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:1385
+#: ../libpurple/log.c:1500
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AŬTO-RESPONDO>: %s\n"
@@ -2076,153 +2745,58 @@
 msgid "Set Autoaccept Setting"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "_Konservu"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
-#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
-#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:6110
-#: ../libpurple/protocols/oscar/oscar.c:6179 ../libpurple/request.h:1350
-#: ../libpurple/request.h:1360
+#: ../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:2229
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5884
+#: ../libpurple/protocols/oscar/oscar.c:5939
+#: ../libpurple/protocols/oscar/oscar.c:6165
+#: ../libpurple/protocols/oscar/oscar.c:6235 ../libpurple/request.h:1388
+#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
 msgid "_Cancel"
 msgstr "_Rezignu"
 
-#: ../libpurple/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "Aŭtomate Akcepti"
 
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "Aŭtomate Malakcepti"
 
-#: ../libpurple/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "Aŭtomate Akcepti Dosiero-Alŝutojn..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
 msgstr "Aŭtomate malakcepti uzantojn ekster la kunullisto"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#: ../libpurple/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "Aŭtomate-respondo"
-
-#: ../libpurple/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-msgstr ""
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libpurple/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "Difini aŭtomatan mesaĝon por %s"
-
-#: ../libpurple/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "Difini Aŭtomatan Mesaĝon"
-
-#: ../libpurple/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "Difinu _Aŭtomatan Mesaĝon"
-
-#: ../libpurple/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "Aŭtomata respondo mesaĝo"
-
-#: ../libpurple/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "Sendu aŭtomatorespondajn mesaĝojn kiam"
-
-#: ../libpurple/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "Kiam mia konto _senfaras"
-
-#: ../libpurple/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "Apriora respon_do"
-
-#: ../libpurple/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "Stato mesaĝo"
-
-#: ../libpurple/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr ""
-
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1800
 msgid "Notes"
 msgstr "Notoj"
 
@@ -2230,28 +2804,30 @@
 msgid "Enter your notes below..."
 msgstr ""
 
-#: ../libpurple/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr ""
 
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Kunul Notoj"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr ""
 
-#. *  summary
-#: ../libpurple/plugins/buddynote.c:90
+#. *< summary
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 
@@ -2310,46 +2886,46 @@
 msgid "Allows control by entering commands in a file."
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minutoj"
 
 #. 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:198
-#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
+#: ../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 "S'enfarigilo"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Difinu Konton Senfaran Tempon"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Difinu"
 
-#: ../libpurple/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Neniu el viaj kontoj senfaras."
 
-#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Maldifinu Konton Senfaran Tempon"
 
-#: ../libpurple/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Malfaru"
 
-#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Difinu Senfaran Tempon por Ĉiuj Kontoj"
 
-#: ../libpurple/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Malfaru Senfaran Tempon por Ĉiuj Senfarantaj Kontoj"
 
-#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr ""
 
@@ -2417,19 +2993,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:264
+#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:267
+#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr ""
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:269
+#: ../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."
@@ -2439,102 +3015,110 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "Uzanto senkonektas."
 
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
 msgstr "Aŭto-respondo sendita:"
 
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s malsalutis."
 
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "Vi estis diskonektita de la servilo."
 
-#: ../libpurple/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1628
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "Mesaĝo malsendiĝeblas."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1976
-#: ../libpurple/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:2349
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:2362
+#: ../libpurple/plugins/log_reader.c:2477
 msgid "Fire"
 msgstr "Fajro"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2001
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2374
+#: ../libpurple/plugins/log_reader.c:2481
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2388
+#: ../libpurple/plugins/log_reader.c:2486
+msgid "QIP"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2400
+#: ../libpurple/plugins/log_reader.c:2490
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2026
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2412
+#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
 msgstr "Ĝenerala Protokolo Legado Agordo"
 
-#: ../libpurple/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
 msgstr "Rapidaj grandeco kalkuloj"
 
-#: ../libpurple/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
 msgstr "Protokolo Dosierujo"
 
@@ -2544,19 +3128,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "Protokolo Legilo"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2134
+#: ../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"
@@ -2565,12 +3149,12 @@
 "at your own risk!"
 msgstr ""
 
-#: ../libpurple/plugins/mono/loader/mono.c:211
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Mono Kromaĵo Ŝaĝilo"
 
-#: ../libpurple/plugins/mono/loader/mono.c:213
-#: ../libpurple/plugins/mono/loader/mono.c:214
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "Ŝarĝas .NET-ajn kromaĵojn pere de Mono."
 
@@ -2593,7 +3177,7 @@
 msgid "Prepends a newline to displayed message."
 msgstr ""
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
@@ -2614,46 +3198,50 @@
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Senkonekta Mesaĝo"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:159
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:313
-#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/plugins/offlinemsg.c:165
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/novell/novell.c:1919
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
 msgid "Yes"
 msgstr "Jes"
 
-#: ../libpurple/plugins/offlinemsg.c:160
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1919
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/plugins/offlinemsg.c:166
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/novell/novell.c:1920
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
 msgid "No"
 msgstr "Ne"
 
-#: ../libpurple/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
@@ -2663,50 +3251,51 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl Kromaĵo Ŝaĝilo"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Provizas subteno por ŝarĝi perl-ajn kormaĵojn."
 
-#: ../libpurple/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Psiŝika Moduso"
 
-#: ../libpurple/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Psiŝika modo je enen konversacion"
 
-#: ../libpurple/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
+#, fuzzy
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Igas aperon de konversacia fenestro kiam alia uzanto komencas mesaĝi vin.  "
 "Tio funkcias por AIM, ICQ, Jabber, Sametime, kaj Yahoo!"
 
-#: ../libpurple/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Nur ŝaltu por uzantoj en la kunullisto"
 
-#: ../libpurple/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Malŝaltu kiam fora"
 
-#: ../libpurple/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Montru avizmesaĝon en konversacioj"
 
-#: ../libpurple/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Startigu psiŝikajn konversaciojn"
 
@@ -2716,7 +3305,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "Signaloj Provo"
 
@@ -2724,8 +3313,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:687
-#: ../libpurple/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:714
+#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "Provu por vidi ke ĉiuj signaloj bonfunkcias."
 
@@ -2747,6 +3336,50 @@
 msgid "Tests to see that most things are working."
 msgstr "Provu por vidi ke plej parto de aĵoj bonfunkcias."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../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:987
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+msgid "Provides SSL support through GNUTLS."
+msgstr "Provizas SSL-an subtenon per GNUTLS."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-nss.c:810
+msgid "NSS"
+msgstr "NSS"
+
+#. *< 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 "Provizas SSL-an subtenon per Mozilla NSS."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2765,44 +3398,6 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Provizas ŝelon ĉirkaŭ SSL subtenantaj bibliotekoj."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
-msgid "Provides SSL support through GNUTLS."
-msgstr "Provizas SSL-an subtenon per GNUTLS."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:409
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:412
-#: ../libpurple/plugins/ssl/ssl-nss.c:414
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Provizas SSL-an subtenon per Mozilla NSS."
-
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
@@ -2850,7 +3445,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Kunul Stato Avizo"
 
@@ -2858,8 +3453,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:145
-#: ../libpurple/plugins/statenotify.c:148
+#: ../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."
@@ -2867,48 +3462,68 @@
 "Avizu en konversacio fenestro kiam kunul foriras aŭ revenas de fora aŭ "
 "senfara."
 
-#: ../libpurple/plugins/tcl/tcl.c:415
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Tcl Kromaĵo Ŝarĝilo"
 
-#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Provizas subteno por ŝarĝi Tcl-an kromaĵojn"
 
-#: ../libpurple/plugins/tcl/tcl.c:483
+#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 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/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:999 ../libpurple/protocols/irc/irc.c:514
-#: ../libpurple/protocols/irc/msgs.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1414
-#: ../libpurple/protocols/novell/novell.c:2820
-#: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4520
-#: ../libpurple/protocols/oscar/oscar.c:5570
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1469
-#: ../libpurple/protocols/yahoo/yahoo.c:3373
-#: ../libpurple/protocols/yahoo/yahoo.c:3446 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkprefs.c:1821
-#: ../pidgin/gtkstatusbox.c:1090
-msgid "Away"
-msgstr "Fora"
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:942
+msgid "First name"
+msgstr "Antaŭ nomo"
+
+#: ../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 "Familia nomo"
+
+#: ../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:2219
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+msgid "E-Mail"
+msgstr "Retadreso"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
+msgid "AIM Account"
+msgstr "AIM Konto"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
+#, fuzzy
+msgid "XMPP Account"
+msgstr "AIM Konto"
 
 #. *< type
 #. *< ui_requirement
@@ -2920,86 +3535,61 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour Protokol-Kromaĵo"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:463
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Purpura Persono"
 
-#. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
-#: ../libpurple/protocols/silc/silc.c:925
-msgid "Hostname"
-msgstr "Komputilnomo"
-
-#. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:822
-msgid "First name"
-msgstr "Antaŭ nomo"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:574
-#: ../libpurple/protocols/gg/gg.c:617
-#: ../libpurple/protocols/jabber/jabber.c:827
-msgid "Last name"
-msgstr "Familia nomo"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:577
-#: ../libpurple/protocols/gg/gg.c:468
-#: ../libpurple/protocols/jabber/jabber.c:812
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:929
+#: ../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
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
 msgstr "Retadreso"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
-msgid "AIM Account"
-msgstr "AIM Konto"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber Konto"
-
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s fermis la konversacion."
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../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:583
 msgid "Cannot open socket"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
 msgid "Invalid proxy settings"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
+#: ../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."
@@ -3047,287 +3637,312 @@
 msgid "Save buddylist..."
 msgstr "Konservu kunulliston..."
 
-#: ../libpurple/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Pasvortoj ne kongruas."
 
-#: ../libpurple/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nova Gadu-Gadu-a Konto Registrita"
 
-#: ../libpurple/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "Registro pleniĝis sukcese!"
 
-#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
-#: ../libpurple/protocols/jabber/jabber.c:801
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../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 "Pasvorto"
 
-#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "Pasvorto (retajpu)"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registru Novan Gadu-Gadu-an Konton"
 
-#: ../libpurple/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/jabber/jabber.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../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:3785
+#: ../libpurple/protocols/oscar/oscar.c:3798
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Urbo"
 
-#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "Naskiĝjaro"
 
-#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1699
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3728
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
+#: ../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 "Sekso"
 
-#: ../libpurple/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "Malina aŭ ina"
 
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/oscar/oscar.c:3728
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Malina"
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3728
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Ina"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "Nur konektita"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "Trovu kunulojn"
 
-#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "Aktuala pasvorto"
 
-#: ../libpurple/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Ŝanĝu Gadu-Gadu Pasvorton"
 
-#: ../libpurple/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Elektu babilejon por kunul: %s"
 
-#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "Aldonu al babilejo..."
 
-#: ../libpurple/protocols/gg/gg.c:993
-#: ../libpurple/protocols/jabber/buddy.c:1408
-#: ../libpurple/protocols/novell/novell.c:2829
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:5602
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:2978 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1092
+#: ../libpurple/protocols/qq/qq.c:292
+#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Senkonekta"
 
-#: ../libpurple/protocols/gg/gg.c:996
-#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/gg/gg.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2817
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1089
+#: ../libpurple/protocols/novell/novell.c:2821
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:3100 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Disponebla"
 
-#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
-#: ../libpurple/protocols/oscar/oscar.c:2663
-#: ../libpurple/protocols/oscar/oscar.c:3701
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2824
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:4543
+#: ../libpurple/protocols/oscar/oscar.c:5630
+#: ../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:3652
+#: ../libpurple/protocols/yahoo/yahoo.c:3726 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkstatusbox.c:1058
+msgid "Away"
+msgstr "Fora"
+
+#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2695
+#: ../libpurple/protocols/oscar/oscar.c:3695
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
-#: ../libpurple/protocols/jabber/buddy.c:1565
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3712
-#: ../libpurple/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:3706
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Persona Nomo"
 
-#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "Naskiĝjaro"
 
-#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
-#: ../libpurple/protocols/oscar/oscar.c:3913
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3907
 msgid "Unable to display the search results."
 msgstr "Ne eblas vidigi la serĉo-rezultojn."
 
-#: ../libpurple/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu Publika Katalogo"
 
-#: ../libpurple/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "Serĉo rezultoj"
 
-#: ../libpurple/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "Konekto malsukcesis."
 
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:621
 msgid "Blocked"
 msgstr "Blokita"
 
-#: ../libpurple/protocols/gg/gg.c:1631
-msgid "Add to chat"
-msgstr "Aldonu al babilejo"
-
-#: ../libpurple/protocols/gg/gg.c:1640
-msgid "Unblock"
-msgstr "Malbloku"
-
 #: ../libpurple/protocols/gg/gg.c:1644
+msgid "Add to chat"
+msgstr "Aldonu al babilejo"
+
+#: ../libpurple/protocols/gg/gg.c:1653
+msgid "Unblock"
+msgstr "Malbloku"
+
+#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Block"
 msgstr "Bloku"
 
-#: ../libpurple/protocols/gg/gg.c:1661
+#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "Babilejo _nomo:"
 
-#: ../libpurple/protocols/gg/gg.c:1901
+#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "Babileraro"
 
-#: ../libpurple/protocols/gg/gg.c:1902
+#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "Tiu babil nomo jam estas uzata"
 
-#: ../libpurple/protocols/gg/gg.c:1985
+#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "Ne konektita al servilo."
 
-#: ../libpurple/protocols/gg/gg.c:2008
+#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "Trovu kunulojn..."
 
-#: ../libpurple/protocols/gg/gg.c:2014
+#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "Ŝanĝu pasvorton..."
 
-#: ../libpurple/protocols/gg/gg.c:2020
+#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "Alŝutu kunulliston al Servilo"
 
-#: ../libpurple/protocols/gg/gg.c:2024
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "Elŝutu kunulliston el Servilo"
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "Forigu kunulliston de Servilo"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr "Konservu kunulliston en dosiero..."
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr "Ŝarĝu kunulliston el dosiero..."
 
@@ -3342,43 +3957,46 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2134
+#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protokol-Kromaĵo"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2135
+#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr "Pola fama TM"
 
-#: ../libpurple/protocols/gg/gg.c:2183
+#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Uzanto"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1575
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nekonata komando: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1283
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "aktuala temo estas: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1287
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Neniu temo estas"
 
 #: ../libpurple/protocols/irc/dcc_send.c:296
 #: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
 msgid "File Transfer Failed"
 msgstr "Dosiero Transmeto Malsukcesis"
 
@@ -3405,7 +4023,8 @@
 msgstr "MOTD por %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:598 ../libpurple/protocols/irc/irc.c:623
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2354
 msgid "Server has disconnected"
 msgstr "Servilo diskonektis"
 
@@ -3414,11 +4033,12 @@
 msgstr "Rigardu MOTD-n"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanalo:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
@@ -3426,63 +4046,62 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC karesnomoj ne enhaveblas blankan spacon"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
-#: ../libpurple/protocols/msn/session.c:344
-#: ../libpurple/protocols/novell/novell.c:2183
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/jabber/jabber.c:1280
+#: ../libpurple/protocols/msn/session.c:384
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:1287
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3721
-#: ../libpurple/protocols/simple/simple.c:1669
-#: ../libpurple/protocols/yahoo/yahoo.c:2743
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1718
+#: ../libpurple/protocols/yahoo/yahoo.c:2938
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Konektante"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:597
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:610
+#: ../libpurple/protocols/jabber/jabber.c:1095
 msgid "SSL support unavailable"
 msgstr "SSL subteno ne disponeblas"
 
+#. 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:318
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/simple/simple.c:1633
 msgid "Couldn't create socket"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:402
-#: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2467
+#: ../libpurple/protocols/oscar/oscar.c:1283
 msgid "Couldn't connect to host"
 msgstr "Ne povis konekti al servilo"
 
-#: ../libpurple/protocols/irc/irc.c:424
-#: ../libpurple/protocols/jabber/jabber.c:495
-msgid "Connection Failed"
-msgstr "Konekto Malsukcesis"
-
-#: ../libpurple/protocols/irc/irc.c:427
-#: ../libpurple/protocols/jabber/jabber.c:498
-msgid "SSL Handshake Failed"
-msgstr "SSL kvitanca reĝimo malsukcesis"
-
-#: ../libpurple/protocols/irc/irc.c:595 ../libpurple/protocols/irc/irc.c:620
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Read error"
 msgstr "Legeraro"
 
-#: ../libpurple/protocols/irc/irc.c:759
-#: ../libpurple/protocols/silc/chat.c:1421
-#: ../libpurple/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/irc/irc.c:773
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Uzantoj"
 
-#: ../libpurple/protocols/irc/irc.c:762
-#: ../libpurple/protocols/sametime/sametime.c:3375
-#: ../libpurple/protocols/silc/chat.c:1424
-#: ../libpurple/protocols/silc/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1447
+#: ../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:1506
 msgid "Topic"
 msgstr "Temo"
 
@@ -3494,56 +4113,66 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:893
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protokol-Kromaĵo"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:894
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "La IRC Protokolo Kromaĵo kiu Malpli Fekas"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:913 ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/jabber.c:1994
-#: ../libpurple/protocols/msn/msn.c:2099
-#: ../libpurple/protocols/oscar/oscar.c:6621
-#: ../libpurple/protocols/qq/qq.c:746
-#: ../libpurple/protocols/sametime/sametime.c:5706
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2297
+#: ../libpurple/protocols/oscar/oscar.c:6669
+#: ../libpurple/protocols/qq/qq.c:755
+#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1898
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servilo"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:916 ../libpurple/protocols/msn/msn.c:2104
-#: ../libpurple/protocols/oscar/oscar.c:6624
-#: ../libpurple/protocols/qq/qq.c:749
-#: ../libpurple/protocols/sametime/sametime.c:5711
-#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2302
+#: ../libpurple/protocols/oscar/oscar.c:6672
+#: ../libpurple/protocols/qq/qq.c:758
+#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Pordo"
 
-#: ../libpurple/protocols/irc/irc.c:919
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Kodoprezentoj"
 
-#: ../libpurple/protocols/irc/irc.c:922 ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/jabber/jabber.c:797
-#: ../libpurple/protocols/silc/buddy.c:1532
-#: ../libpurple/protocols/silc/ops.c:1191
-#: ../libpurple/protocols/silc/ops.c:1194
-#: ../libpurple/protocols/silc/ops.c:1340
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:923
+#: ../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
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "Uzantonomo"
 
-#: ../libpurple/protocols/irc/irc.c:925 ../libpurple/protocols/irc/msgs.c:306
-#: ../libpurple/protocols/silc/silc.c:927
+#: ../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"
 msgstr "Vera nomo"
 
@@ -3551,155 +4180,158 @@
 #. 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:933
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Uzu SSL-n"
 
-#: ../libpurple/protocols/irc/msgs.c:180
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "Malbona moduso"
 
-#: ../libpurple/protocols/irc/msgs.c:191
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "Vi estas malpermesita de %s."
 
-#: ../libpurple/protocols/irc/msgs.c:192
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "Malpermesita"
 
-#: ../libpurple/protocols/irc/msgs.c:209
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Ne povas malpermesi %s: malpermesolisto estas plena"
 
-#: ../libpurple/protocols/irc/msgs.c:290
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:291
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(identiĝita)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:292
-#: ../libpurple/protocols/oscar/oscar.c:3702
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3696
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Karesnomo"
 
-#: ../libpurple/protocols/irc/msgs.c:318
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Aktuale ĉe"
 
-#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "Senfara dum"
 
-#: ../libpurple/protocols/irc/msgs.c:326
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "Enrete ek de"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Difinante adjektivon:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "Glora"
 
-#: ../libpurple/protocols/irc/msgs.c:406
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ŝanĝis la temon al: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s forviŝis la temon."
 
-#: ../libpurple/protocols/irc/msgs.c:416
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "La temo por %s estas: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:434
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Nekonata mesaĝo '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Nekonata mesaĝo"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "La IRC servilo ricevis mesaĝon li ne komprenis."
 
-#: ../libpurple/protocols/irc/msgs.c:456
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Uzantoj ĉe %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:553
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Tempo Respondo"
 
-#: ../libpurple/protocols/irc/msgs.c:554
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "La IRC servilo loka tempo estas:"
 
-#: ../libpurple/protocols/irc/msgs.c:565
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "Neniu tia kanalo"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "neniu tia kanalo"
 
-#: ../libpurple/protocols/irc/msgs.c:579
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "Uzanto ne estas ensalutita"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "Neniu tia karesnomo aŭ kanalo"
 
-#: ../libpurple/protocols/irc/msgs.c:604
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Ne sendeblis"
 
-#: ../libpurple/protocols/irc/msgs.c:660
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Aliĝi %s postulas inviton."
 
-#: ../libpurple/protocols/irc/msgs.c:661
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Nur per invito"
 
-#: ../libpurple/protocols/irc/msgs.c:773
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Vi estas forigita de %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:778 ../libpurple/protocols/silc/ops.c:720
+#: ../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)"
 msgstr "Forigita de %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:801
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moduso (%s %s) de %s"
 
-#: ../libpurple/protocols/irc/msgs.c:886 ../libpurple/protocols/irc/msgs.c:887
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Malvalida karesnomo"
 
-#: ../libpurple/protocols/irc/msgs.c:888
+#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3707,7 +4339,7 @@
 "Via elektita karesnomo estas refuzita de la servilo.  Ĝi verŝajne enhavas "
 "malvalidajn signojn."
 
-#: ../libpurple/protocols/irc/msgs.c:893
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3715,52 +4347,53 @@
 "Via elektita kontonomo estas refuzita de la servilo.  Ĝi verŝajne enhavas "
 "malvalidajn signojn."
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "Ne povas ŝanĝi karesnomon"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "Ne povas ŝanĝi karesnomon"
 
-#: ../libpurple/protocols/irc/msgs.c:953
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:995
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "Eraro: malvalida PONG el servilo"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING respondo -- [Lag]: %lu sekundoj"
 
-#: ../libpurple/protocols/irc/msgs.c:1078
-#, c-format
-msgid "Cannot join %s:"
-msgstr "Ne povas aliĝi %s:"
-
-#: ../libpurple/protocols/irc/msgs.c:1079
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1110
+#, fuzzy, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "Registrado Postulita"
+
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ne povas aliĝi kanalon"
 
-#: ../libpurple/protocols/irc/msgs.c:1113
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Karesnomo aŭ kanalo estas provizore ne disponebla."
 
-#: ../libpurple/protocols/irc/msgs.c:1125
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops el %s"
 
-#: ../libpurple/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "ago &lt;ago farenda&gt;:  Faru agon."
 
-#: ../libpurple/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -3768,525 +4401,843 @@
 "fora [mesaĝo]:  Difinu foran mesaĝon, aŭ uzu neniun mesaĝon por reveni el "
 "forado."
 
-#: ../libpurple/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Sendu komandon al chanserv"
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:124
-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:125
-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:126
-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:127
-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:128
-msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "me &lt;ago farenda&gt;:  Faru agon."
+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 "memoserv: Send a command to memoserv"
+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 ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
+"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 ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
+"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
-msgid "names [channel]:  List the users currently in a channel."
-msgstr ""
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr "me &lt;ago farenda&gt;:  Faru agon."
 
 #: ../libpurple/protocols/irc/parse.c:133
-#: ../libpurple/protocols/jabber/jabber.c:1798
-msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgid "memoserv: Send a command to memoserv"
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:134
-msgid "nickserv: Send a command to nickserv"
+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 ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
+"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
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
+msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:137
-msgid "operserv: Send a command to operserv"
+#: ../libpurple/protocols/jabber/jabber.c:2299
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:138
+msgid "nickserv: Send a command to nickserv"
+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."
+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."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:141
+msgid "operserv: Send a command to operserv"
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../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)."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:141
-msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:142
-msgid "quote [...]:  Send a raw command to the server."
-msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:143
-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:144
-msgid "time: Displays the current local time at the IRC server."
-msgstr ""
-
 #: ../libpurple/protocols/irc/parse.c:145
-msgid "topic [new topic]:  View or change the channel topic."
+msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:146
-msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgid "quote [...]:  Send a raw command to the server."
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:147
-msgid "version [nick]: send CTCP VERSION request to a user"
+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
+msgid "time: Displays the current local time at the IRC server."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:149
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:150
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:151
+msgid "version [nick]: send CTCP VERSION request to a user"
+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."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:444
+#: ../libpurple/protocols/irc/parse.c:155
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Responda tempo el %s: %lu sekundoj"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "CTCP PING respondo"
 
-#: ../libpurple/protocols/irc/parse.c:556
-#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+#: ../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/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Malkonektita."
 
-#: ../libpurple/protocols/jabber/auth.c:51
+#: ../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 "Nekonata Eraro"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:139
+#: ../libpurple/protocols/jabber/adhoccommands.c:140
+msgid "Ad-Hoc Command Failed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:176
+#, fuzzy
+msgid "execute"
+msgstr "Ne atendita"
+
+#: ../libpurple/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:114
+#: ../libpurple/protocols/jabber/auth.c:116
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:229
-msgid "Server couldn't authenticate you without a password"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/auth.c:232
-#: ../libpurple/protocols/jabber/auth.c:233
-#: ../libpurple/protocols/jabber/auth.c:407
-#: ../libpurple/protocols/jabber/auth.c:408
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:490
+#: ../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 "Platteksta Aŭtentokontrolo"
 
-#: ../libpurple/protocols/jabber/auth.c:234
-#: ../libpurple/protocols/jabber/auth.c:409
-#: ../libpurple/protocols/jabber/auth.c:491
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/auth.c:240
-#: ../libpurple/protocols/jabber/auth.c:417
-#: ../libpurple/protocols/jabber/auth.c:499
+#: ../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:330
-#: ../libpurple/protocols/jabber/auth.c:452
-#: ../libpurple/protocols/jabber/auth.c:620
-#: ../libpurple/protocols/jabber/auth.c:754
-#: ../libpurple/protocols/jabber/auth.c:779
-#: ../libpurple/protocols/jabber/auth.c:798
-#: ../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 "Malvalida respondo el servilo."
 
-#: ../libpurple/protocols/jabber/auth.c:641
+#: ../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:729
+#: ../libpurple/protocols/jabber/auth.c:892
 msgid "SASL error"
 msgstr "SASL eraro"
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:790
-#: ../libpurple/protocols/sametime/sametime.c:4127
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../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 "Plena Nomo"
 
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:803
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../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 "Familia Nomo"
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:807
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "Donita Nomo"
 
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:857
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/jabber.c:977
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "Strato Adreso"
 
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "Plia Adreso"
 
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "Loko"
 
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "Regiono"
 
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "Poŝto Kodo"
 
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/silc/silc.c:933
+#: ../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 "Lando"
 
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "Telfono"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1571
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
-msgid "E-Mail"
-msgstr "Retadreso"
-
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:928
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "Organizacio nomo"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:932
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "Organizacio Unito"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "Rolo"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:824
-#: ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/jabber/buddy.c:300
+#: ../libpurple/protocols/jabber/buddy.c:1250
+#: ../libpurple/protocols/msn/msn.c:1768
+#: ../libpurple/protocols/oscar/oscar.c:3745
 msgid "Birthday"
 msgstr "Naskiĝdato"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:2989
-#: ../pidgin/gtkprefs.c:680
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3314
+#: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Priskibo"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
+#, fuzzy
+msgid "Edit XMPP vCard"
 msgstr "Redaktu Jabber-n vCard-n"
 
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "Ĉiuj eroj sube opcias. Enskribi nur informon kiu konfortigas vin."
 
-#: ../libpurple/protocols/jabber/buddy.c:654
-#: ../libpurple/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "Kliento"
 
-#: ../libpurple/protocols/jabber/buddy.c:658
-#: ../libpurple/protocols/jabber/buddy.c:699
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:668
-#: ../libpurple/protocols/jabber/jabber.c:1997
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+#, fuzzy
+msgid "Service Discovery Info"
+msgstr "Difini Ujan Informon"
+
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
+msgid "Service Discovery Items"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
+#, fuzzy
+msgid "Extended Stanza Addressing"
+msgstr "Plia Adreso"
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+#, fuzzy
+msgid "Multi-User Chat"
+msgstr "Alinomu Babilejon"
+
+#: ../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
+#, fuzzy
+msgid "Ad-Hoc Commands"
+msgstr "Komando"
+
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
+msgid "PubSub Service"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
+msgid "SOCKS5 Bytestreams"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
+msgid "Out of Band Data"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
+#, fuzzy
+msgid "XHTML-IM"
+msgstr "HTML"
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+#, fuzzy
+msgid "In-Band Registration"
+msgstr "Registra Eraro"
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+#, fuzzy
+msgid "User Location"
+msgstr "Loko"
+
+#: ../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
+#, fuzzy
+msgid "Chat State Notifications"
+msgstr "Kunul Stato Avizo"
+
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+#, fuzzy
+msgid "Software Version"
+msgstr "Konservu Konversacion"
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+#, fuzzy
+msgid "Stream Initiation"
+msgstr "Orientiĝo"
+
+#: ../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
+#, fuzzy
+msgid "User Mood"
+msgstr "Uzanto Modusoj"
+
+#: ../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
+#, fuzzy
+msgid "Entity Capabilities"
+msgstr "Kapablecoj"
+
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
+msgid "Encrypted Session Negotiations"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
+#, fuzzy
+msgid "User Tune"
+msgstr "Uzantonomo"
+
+#: ../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
+#, fuzzy
+msgid "Reachability Address"
+msgstr "Retadreso"
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+#, fuzzy
+msgid "User Profile"
+msgstr "Profilo"
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+#, fuzzy
+msgid "Jingle"
+msgstr "Aliĝu"
+
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "Jingle Audio"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+#, fuzzy
+msgid "User Nickname"
+msgstr "Karesnomo"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Jingle ICE UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Jingle ICE TCP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+msgid "Jingle Raw UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
+#, fuzzy
+msgid "Jingle Video"
+msgstr "Viva Video"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "Jingle DTMF"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+#, fuzzy
+msgid "Message Receipts"
+msgstr "Mesaĝo ricevita"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+#, fuzzy
+msgid "Public Key Publishing"
+msgstr "Publika Ŝloŝilo Informo"
+
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+#, fuzzy
+msgid "User Chatting"
+msgstr "Uzantoopcioj"
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+#, fuzzy
+msgid "User Browsing"
+msgstr "Uzanto Modusoj"
+
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+#, fuzzy
+msgid "User Gaming"
+msgstr "Uzantonomo"
+
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+#, fuzzy
+msgid "User Viewing"
+msgstr "Uzanto tajpas..."
+
+#: ../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:2902
+msgid "Capabilities"
+msgstr "Kapablecoj"
+
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Rimedo"
 
-#: ../libpurple/protocols/jabber/buddy.c:670
-#: ../libpurple/protocols/jabber/jabber.c:1232
-#: ../libpurple/protocols/jabber/jabber.c:1242
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../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 "Prioriteco"
 
-#: ../libpurple/protocols/jabber/buddy.c:811
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:1237
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Meza Nomo"
 
-#: ../libpurple/protocols/jabber/buddy.c:844
-#: ../libpurple/protocols/jabber/jabber.c:832
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:952
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adreso"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "P.O. Kesto"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "Malkaŝu De"
 
-#: ../libpurple/protocols/jabber/buddy.c:1355
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "Provizore Kaŝu De"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "Ĉesigu Prezentavizon"
 
-#: ../libpurple/protocols/jabber/buddy.c:1370
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "(Re-)demandu permeson"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1379
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "Eliĝu"
 
-#: ../libpurple/protocols/jabber/buddy.c:1412
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1988
+#, fuzzy
+msgid "Log In"
+msgstr "Ensalutita"
+
+#: ../libpurple/protocols/jabber/buddy.c:1992
+#, fuzzy
+msgid "Log Out"
+msgstr "Protokolu babilojn"
+
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Babilema"
 
-#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "Longfora"
 
-#: ../libpurple/protocols/jabber/buddy.c:1418
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/jabber/jabber.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:727
+#: ../libpurple/protocols/oscar/oscar.c:5806
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Ne Ĝenu"
 
-#: ../libpurple/protocols/jabber/buddy.c:1563
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1567
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/oscar/oscar.c:3707
 msgid "Last Name"
 msgstr "Familia Nomo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1599
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "La jenaj estas la rezultoj de via serĉo"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1674
+#: ../libpurple/protocols/jabber/buddy.c:2322
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:2342
 msgid "Directory Query Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1695
+#: ../libpurple/protocols/jabber/buddy.c:2343
 msgid "Could not query the directory server."
 msgstr ""
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Servilo instrukcioj: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:1756
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/jabber/buddy.c:2384
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/novell/novell.c:1490
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3719
 msgid "E-Mail Address"
 msgstr "Retadreso"
 
-#: ../libpurple/protocols/jabber/buddy.c:1765
-#: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2414
+#, fuzzy
+msgid "Search for XMPP users"
 msgstr "Serĉu Jabber-ajn uzantojn"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/jabber/buddy.c:2415
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/sys_msg.c:162
-#: ../libpurple/protocols/qq/sys_msg.c:232
+#: ../libpurple/protocols/qq/group_im.c:147
+#: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/sametime/sametime.c:5600
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#: ../libpurple/protocols/qq/sys_msg.c:268
+#: ../libpurple/protocols/sametime/sametime.c:5611
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Serĉu"
 
-#: ../libpurple/protocols/jabber/buddy.c:1780
+#: ../libpurple/protocols/jabber/buddy.c:2430
 msgid "Invalid Directory"
 msgstr "Malvalida Adreslibro"
 
-#: ../libpurple/protocols/jabber/buddy.c:1797
+#: ../libpurple/protocols/jabber/buddy.c:2447
 msgid "Enter a User Directory"
 msgstr "Enigu Uzanto Adreslibro"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Select a user directory to search"
 msgstr "Elektu uzantan adreslibron serĉendan"
 
-#: ../libpurple/protocols/jabber/buddy.c:1801
+#: ../libpurple/protocols/jabber/buddy.c:2451
 msgid "Search Directory"
 msgstr "Serŝu Adreslibron"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5252
-#: ../libpurple/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/oscar/oscar.c:5290
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Ĉambro:"
 
@@ -4298,540 +5249,788 @@
 msgid "_Handle:"
 msgstr "_Tenilo:"
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ne estas valida ĉambro nomo"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Malvalida Ĉambro Nomo"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ne estas valida servilo nomo"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Malvalida Servilo Nomo"
 
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ne estas valida ĉambro tenilo"
 
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Malvalida Ĉambro Tenilo"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Agorderaro"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Ne eblas agordi"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Eraro ricevante babilejliston"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Malvalida Servilo"
 
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Enigu Konferencan Servilon"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Elektu konferencan servilon petendan"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Trovu Babilejojn"
 
-#: ../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 "Skriberaro"
 
-#: ../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 "Legeraro"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:482
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/protocols/yahoo/yahoo.c:2557
+#: ../libpurple/protocols/yahoo/yahoo.c:2589
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:529
 msgid "Unable to create socket"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:567
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
+#: ../libpurple/protocols/jabber/jabber.c:575
+#: ../libpurple/protocols/jabber/jabber.c:1063
+#, fuzzy
+msgid "Invalid XMPP ID"
 msgstr "Malvalida Jabber ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:580
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:656
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrado de %s@%s sukcesa"
 
-#: ../libpurple/protocols/jabber/jabber.c:640
-#: ../libpurple/protocols/jabber/jabber.c:641
+#: ../libpurple/protocols/jabber/jabber.c:662
+#, fuzzy, c-format
+msgid "Registration to %s successful"
+msgstr "Registrado de %s@%s sukcesa"
+
+#: ../libpurple/protocols/jabber/jabber.c:664
+#: ../libpurple/protocols/jabber/jabber.c:665
 msgid "Registration Successful"
 msgstr "Registrado Sukcesa"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:1509
-msgid "Unknown Error"
-msgstr "Nekonata Eraro"
-
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:650
+#: ../libpurple/protocols/jabber/jabber.c:673
+#: ../libpurple/protocols/jabber/jabber.c:674
 msgid "Registration Failed"
 msgstr "Registrado Malsukcesis"
 
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:766
+#: ../libpurple/protocols/jabber/jabber.c:692
+#, fuzzy, c-format
+msgid "Registration from %s successfully removed"
+msgstr "Registrado de %s@%s sukcesa"
+
+#: ../libpurple/protocols/jabber/jabber.c:694
+#: ../libpurple/protocols/jabber/jabber.c:695
+#, fuzzy
+msgid "Unregistration Successful"
+msgstr "Registrado Sukcesa"
+
+#: ../libpurple/protocols/jabber/jabber.c:703
+#: ../libpurple/protocols/jabber/jabber.c:704
+#, fuzzy
+msgid "Unregistration Failed"
+msgstr "Registrado Malsukcesis"
+
+#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:865
 msgid "Already Registered"
 msgstr "Jam Registrita"
 
-#: ../libpurple/protocols/jabber/jabber.c:842
-#: ../libpurple/protocols/oscar/oscar.c:3792
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/jabber/jabber.c:962
+#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "State"
 msgstr "Ŝato"
 
-#: ../libpurple/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:967
 msgid "Postal code"
 msgstr "Poŝtkodo"
 
-#: ../libpurple/protocols/jabber/jabber.c:852
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:972
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../libpurple/protocols/jabber/jabber.c:862
+#: ../libpurple/protocols/jabber/jabber.c:982
 msgid "Date"
 msgstr "Dato"
 
-#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:987
+#, fuzzy
+msgid "Unregister"
+msgstr "Registru"
+
+#: ../libpurple/protocols/jabber/jabber.c:994
+#, fuzzy
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr "B.v. plenigi la informon sube por registradi vian novan konton."
+
+#: ../libpurple/protocols/jabber/jabber.c:997
 msgid "Please fill out the information below to register your new account."
 msgstr "B.v. plenigi la informon sube por registradi vian novan konton."
 
-#: ../libpurple/protocols/jabber/jabber.c:873
-#: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
+#: ../libpurple/protocols/jabber/jabber.c:1005
+#: ../libpurple/protocols/jabber/jabber.c:1006
+#, fuzzy
+msgid "Register New XMPP Account"
 msgstr "Registradu Novan Jabber-n Konton"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:1007
+#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Register"
 msgstr "Registru"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1012
+#, fuzzy, c-format
+msgid "Change Account Registration at %s"
+msgstr "Ŝanĝu uzanto-informon de %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1013
+#, fuzzy, c-format
+msgid "Register New Account at %s"
+msgstr "Registradu Novan Jabber-n Konton"
+
+#: ../libpurple/protocols/jabber/jabber.c:1016
+#, fuzzy
+msgid "Change Registration"
+msgstr "Registra Eraro"
+
+#: ../libpurple/protocols/jabber/jabber.c:1120
+#: ../libpurple/protocols/jabber/jabber.c:1121
+#, fuzzy
+msgid "Error unregistering account"
+msgstr "Eraro ŝanĝante kontoinformon"
+
+#: ../libpurple/protocols/jabber/jabber.c:1126
+#: ../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:1047
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1289
+msgid "Initializing SSL/TLS"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1293
+#: ../libpurple/protocols/msn/session.c:390
 msgid "Authenticating"
 msgstr "Aŭtentokontrolante"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1302
 msgid "Re-initializing Stream"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1487
-#: ../libpurple/protocols/jabber/jabber.c:1528
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5540
+#: ../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:5600
 msgid "Not Authorized"
 msgstr "Malpermesita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "Both"
 msgstr "Ambaŭ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#: ../libpurple/protocols/jabber/jabber.c:1444
 msgid "From (To pending)"
 msgstr "De (Al atendante)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#: ../libpurple/protocols/jabber/jabber.c:1446
+msgid "From"
+msgstr "De"
+
+#: ../libpurple/protocols/jabber/jabber.c:1449
 msgid "To"
 msgstr "Al"
 
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#: ../libpurple/protocols/jabber/jabber.c:1451
 msgid "None (To pending)"
 msgstr "Nenio (Al atendante)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1453
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Nenio"
 
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#: ../libpurple/protocols/jabber/jabber.c:1456
 msgid "Subscription"
 msgstr "Abono"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../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 "Etoso"
+
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#, fuzzy
+msgid "Mood Text"
+msgstr "Sanga Tipo"
+
+#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#, fuzzy
+msgid "Tune Artist"
+msgstr "Artistoj"
+
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1628
+#, fuzzy
+msgid "Tune Title"
+msgstr "Titolon"
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1606
+#: ../libpurple/protocols/jabber/jabber.c:1629
+msgid "Tune Album"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Tune Genre"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1608
+#: ../libpurple/protocols/jabber/jabber.c:1631
+#, fuzzy
+msgid "Tune Comment"
+msgstr "Kunul Komento"
+
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1632
+msgid "Tune Track"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1633
+msgid "Tune Time"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1542
+#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1634
+msgid "Tune Year"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1635
+msgid "Tune URL"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1637
+#, fuzzy
+msgid "Allow Buzz"
+msgstr "Permesu"
+
+#: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Password Changed"
 msgstr "Pasvorto Ŝanĝita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Your password has been changed."
 msgstr "Via pasvorto estas ŝanĝita."
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Error changing password"
 msgstr "Erara ŝanĝante pasvorton"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1728
 msgid "Password (again)"
 msgstr "Pasvorton (denove)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Ŝanĝu Jabber-n Pasvorton"
-
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1734
+#: ../libpurple/protocols/jabber/jabber.c:1735
+#, fuzzy
+msgid "Change XMPP Password"
+msgstr "Ŝanĝu Pasvorton..."
+
+#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Please enter your new password"
 msgstr "B.v. tajpi vian novan pasvorton"
 
-#: ../libpurple/protocols/jabber/jabber.c:1379
-#: ../libpurple/protocols/oscar/oscar.c:6341
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1749
+#: ../libpurple/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Difinu Uzanto-Informon..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/oscar/oscar.c:6352
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1754
+#: ../libpurple/protocols/oscar/oscar.c:6397
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Ŝanĝu Pasvorton..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1389
+#: ../libpurple/protocols/jabber/jabber.c:1759
 msgid "Search for Users..."
 msgstr "Serĉu Uzantojn..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Bad Request"
 msgstr "Malbona Demando"
 
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Conflict"
 msgstr "Konflikto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Feature Not Implemented"
 msgstr "Eblo Malrealigita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1851
 msgid "Forbidden"
 msgstr "Malpermesita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Gone"
 msgstr "Foririnta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Internal Server Error"
 msgstr "Interna Servilo Eraro"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Item Not Found"
 msgstr "Ero Ne Trovita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
+#: ../libpurple/protocols/jabber/jabber.c:1859
+#, fuzzy
+msgid "Malformed XMPP ID"
 msgstr "Misformita Jabber ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Not Acceptable"
 msgstr "Ne Aceptinda"
 
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Not Allowed"
 msgstr "Ne Permesita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Payment Required"
 msgstr "Pago Postulita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Recipient Unavailable"
 msgstr "Ricevanto maldisponebla"
 
-#: ../libpurple/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Registration Required"
 msgstr "Registrado Postulita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Remote Server Not Found"
 msgstr "Dista Servia Ne Trovita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Remote Server Timeout"
 msgstr "Dista Servilo Ne Respondis"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Server Overloaded"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Service Unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Subscription Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1885
 msgid "Unexpected Request"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Authorization Aborted"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Incorrect encoding in authorization"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
+#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Invalid authzid"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Invalid Authorization Mechanism"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1903
 msgid "Authorization mechanism too weak"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Temporary Authentication Failure"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Authentication Failure"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Bad Format"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Bad Namespace Prefix"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1925
 msgid "Resource Conflict"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
-#: ../libpurple/protocols/silc/ops.c:1729
+#: ../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:1548
+#: ../libpurple/protocols/jabber/jabber.c:1929
 msgid "Host Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1931
 msgid "Host Unknown"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Improper Addressing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Invalid ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Invalid Namespace"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1941
 msgid "Invalid XML"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1943
 msgid "Non-matching Hosts"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Policy Violation"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Remote Connection Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Resource Constraint"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1953
 msgid "Restricted XML"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "See Other Host"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "System Shutdown"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1959
 msgid "Undefined Condition"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1961
 msgid "Unsupported Encoding"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1963
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Unsupported Version"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1967
 msgid "XML Not Well Formed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1969
 msgid "Stream Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:2052
 #, c-format
 msgid "Unable to ban user %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:2072
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:2077
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1699
+#: ../libpurple/protocols/jabber/jabber.c:2096
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:2101
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unable to kick user %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1790
+#: ../libpurple/protocols/jabber/jabber.c:2185
+#, fuzzy, c-format
+msgid "Unable to ping user %s"
+msgstr "Ne eblas permezi uzanton ĉe %s (%s)"
+
+#: ../libpurple/protocols/jabber/jabber.c:2207
+#: ../libpurple/protocols/jabber/jabber.c:2217
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2213
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2239
+#, fuzzy, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr "Ne eblis sendu dosieron al %s, uzanto ne subtenas dosiero-transmeton"
+
+#: ../libpurple/protocols/jabber/jabber.c:2250
+#: ../libpurple/protocols/yahoo/yahoo.c:4118
+#, fuzzy
+msgid "Buzz"
+msgstr "Zum!!"
+
+#: ../libpurple/protocols/jabber/jabber.c:2251
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "%s ensalutis."
+
+#: ../libpurple/protocols/jabber/jabber.c:2252
+#: ../libpurple/protocols/yahoo/yahoo.c:4120
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2291
 msgid "config:  Configure a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/jabber/jabber.c:2295
 msgid "configure:  Configure a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1803
+#: ../libpurple/protocols/jabber/jabber.c:2304
 msgid "part [room]:  Leave the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1808
+#: ../libpurple/protocols/jabber/jabber.c:2309
 msgid "register:  Register with a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1814
+#: ../libpurple/protocols/jabber/jabber.c:2315
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1820
+#: ../libpurple/protocols/jabber/jabber.c:2321
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:2327
 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:1832
+#: ../libpurple/protocols/jabber/jabber.c:2333
 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:1838
+#: ../libpurple/protocols/jabber/jabber.c:2339
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1844
+#: ../libpurple/protocols/jabber/jabber.c:2345
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1850
+#: ../libpurple/protocols/jabber/jabber.c:2351
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:2356
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 
+#: ../libpurple/protocols/jabber/jabber.c:2362
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2367
+#: ../libpurple/protocols/yahoo/yahoo.c:4144
+msgid "buzz: Buzz a user to get their attention"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4842,73 +6041,95 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/jabber.c:1972
-#: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber Protokol-Kromaĵo"
-
-#: ../libpurple/protocols/jabber/jabber.c:2000
+#: ../libpurple/protocols/jabber/libxmpp.c:170
+#: ../libpurple/protocols/jabber/libxmpp.c:172
+#, fuzzy
+msgid "XMPP Protocol Plugin"
+msgstr "MSN Protokol-Kromaĵo"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
+#, fuzzy
+msgid "Domain"
+msgstr "Rumana"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:210
+msgid "Require SSL/TLS"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Force old (port 5223) SSL"
 msgstr "Devigi malnovan (pordo 5223) SSL-n"
 
-#: ../libpurple/protocols/jabber/jabber.c:2005
+#: ../libpurple/protocols/jabber/libxmpp.c:219
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permesi plattekstan permeson tra malĉifritaj datumstrioj"
 
-#: ../libpurple/protocols/jabber/jabber.c:2010
-#: ../libpurple/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:224
+#: ../libpurple/protocols/myspace/myspace.c:3275
+#: ../libpurple/protocols/simple/simple.c:1904
 msgid "Connect port"
 msgstr "Konekto pordo"
 
+#. 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/jabber.c:2014
-#: ../libpurple/protocols/silc/silc.c:1846
+#: ../libpurple/protocols/jabber/libxmpp.c:228
+#: ../libpurple/protocols/myspace/myspace.c:3272
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Konekto servilo"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:106
+#, fuzzy, c-format
+msgid "%s has left the conversation."
+msgstr "%s fermis la konversacion."
+
+#: ../libpurple/protocols/jabber/message.c:161
 #, c-format
 msgid "Message from %s"
 msgstr "Mesaĝo de %s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:225
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ŝanĝis la temon al: %s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:227
 #, c-format
 msgid "The topic is: %s"
 msgstr "La temo estas: %s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:275
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Mesaĝo transdono al %s malsukcesis: %s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
+#: ../libpurple/protocols/jabber/message.c:278
+#, fuzzy
+msgid "XMPP Message Error"
 msgstr "Jabber mesaĝo eraro"
 
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
 msgstr " (Kodo %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:282
+#: ../libpurple/protocols/jabber/presence.c:422
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:356
-#: ../libpurple/protocols/jabber/presence.c:357
+#: ../libpurple/protocols/jabber/presence.c:503
+#: ../libpurple/protocols/jabber/presence.c:504
 msgid "Create New Room"
 msgstr "Kreu Novan Ĉambron"
 
-#: ../libpurple/protocols/jabber/presence.c:358
+#: ../libpurple/protocols/jabber/presence.c:505
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -4916,47 +6137,135 @@
 "Vi estas kreante nova ĉambro. Ĉu vi deziras agordi ĝin, aŭ akcepti apriorajn "
 "agordojn?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:511
 msgid "_Configure Room"
 msgstr "_Agordu Ĉambron"
 
-#: ../libpurple/protocols/jabber/presence.c:363
+#: ../libpurple/protocols/jabber/presence.c:512
 msgid "_Accept Defaults"
 msgstr "_Akceptu Apriorajn"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:554
 #, c-format
 msgid "Error in chat %s"
 msgstr "Eraro en babilejo %s"
 
-#: ../libpurple/protocols/jabber/presence.c:404
+#: ../libpurple/protocols/jabber/presence.c:558
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Eraro aliĝante babilejon %s"
 
-#: ../libpurple/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Ne eblis sendu dosieron al %s, uzanto ne subtenas dosiero-transmeton"
 
-#: ../libpurple/protocols/jabber/si.c:766
-#: ../libpurple/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Dosiersendo malsukcesis"
 
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/jabber/si.c:838
+#, fuzzy, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "Ne eblas sendi mesaĝon al %s:"
+
+#: ../libpurple/protocols/jabber/si.c:840
+#, fuzzy, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "Ne eblis sendu dosieron al %s, uzanto ne subtenas dosiero-transmeton"
+
+#: ../libpurple/protocols/jabber/si.c:842
+#, fuzzy, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr "Ne eblis sendu dosieron al %s, uzanto ne subtenas dosiero-transmeton"
+
+#: ../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:873
+#, fuzzy
+msgid "Select a Resource"
+msgstr "Elektu dosieron"
+
+#: ../libpurple/protocols/jabber/usermood.c:179
+#: ../libpurple/protocols/jabber/usermood.c:180
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "Uzanto Modusoj"
+
+#: ../libpurple/protocols/jabber/usermood.c:181
+msgid "Please select your mood from the list."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usernick.c:78
+#, fuzzy
+msgid "Set"
+msgstr "_Difinu"
+
+#: ../libpurple/protocols/jabber/usermood.c:191
+#, fuzzy
+msgid "Set Mood..."
+msgstr "Sendu TM-n..."
+
+#: ../libpurple/protocols/jabber/usernick.c:76
+#, fuzzy
+msgid "Set User Nickname"
+msgstr "Difini Uzanto Informon"
+
+#: ../libpurple/protocols/jabber/usernick.c:76
+#, fuzzy
+msgid "Please specify a new nickname for you."
+msgstr "B.v. enigi la novan nomon por %s"
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usernick.c:100
+#, fuzzy
+msgid "Set Nickname..."
+msgstr "Karesnomo"
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+#, fuzzy
+msgid "Actions"
+msgstr "Ago"
+
+#: ../libpurple/protocols/jabber/xdata.c:380
+#, fuzzy
+msgid "Select an action"
+msgstr "Elektu dosieron"
+
+#: ../libpurple/protocols/msn/contact.c:207
+#, fuzzy
+msgid "Unable to connect to contact server"
+msgstr "Malsukcesis konekti servilon."
+
+#: ../libpurple/protocols/msn/contact.c:954
+#, fuzzy
+msgid "Unable to retrieve MSN Address Book"
+msgstr "Ne eblas Ricevi Kunulliston"
+
+#: ../libpurple/protocols/msn/dialog.c:118
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -5061,7 +6370,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Not logged in"
 msgstr "Ne ensalutita"
 
@@ -5156,9 +6465,10 @@
 msgstr "Servilo tro okupita"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../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:1380
 msgid "Authentication failed"
 msgstr "Aŭtentokontrolo malsukcesis"
 
@@ -5192,367 +6502,387 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN Eraro: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
-msgid "You have just sent a Nudge!"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:130
+msgid "Nudge"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:131
+#, fuzzy, c-format
+msgid "%s has nudged you!"
+msgstr "%s ensalutis."
+
+#: ../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 "Via nova MSN amika nomo estas tro longa."
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:285
 msgid "Set your friendly name."
 msgstr "Difinu vian amikan nomon."
 
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:286
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Tio estas la nomo kiu aliaj MSN kunuloj vidos vin kiel."
 
-#: ../libpurple/protocols/msn/msn.c:262
+#: ../libpurple/protocols/msn/msn.c:304
 msgid "Set your home phone number."
 msgstr "Difinu vian hejm telefononombron."
 
-#: ../libpurple/protocols/msn/msn.c:277
+#: ../libpurple/protocols/msn/msn.c:321
 msgid "Set your work phone number."
 msgstr "Difinu vian labor telefononombron."
 
-#: ../libpurple/protocols/msn/msn.c:292
+#: ../libpurple/protocols/msn/msn.c:338
 msgid "Set your mobile phone number."
 msgstr "Difiniu vian poŝtelefona nombron."
 
-#: ../libpurple/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:353
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:354
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:360
 msgid "Allow"
 msgstr "Permesu"
 
-#: ../libpurple/protocols/msn/msn.c:311
+#: ../libpurple/protocols/msn/msn.c:361
 msgid "Disallow"
 msgstr "Malpermesu"
 
-#: ../libpurple/protocols/msn/msn.c:327
+#: ../libpurple/protocols/msn/msn.c:377
 msgid "This Hotmail account may not be active."
 msgstr "Tiu Hotmail konto eble ne estas aktiva."
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:403
 msgid "Send a mobile message."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:405
 msgid "Page"
 msgstr "Paĝo"
 
-#: ../libpurple/protocols/msn/msn.c:518
-msgid "Has you"
-msgstr "Havas vin"
-
-#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2876
-#: ../libpurple/protocols/yahoo/yahoo.c:3480
+#: ../libpurple/protocols/msn/msn.c:610 ../libpurple/protocols/msn/msn.c:635
+#: ../libpurple/protocols/msn/msn.c:642 ../libpurple/protocols/msn/msn.c:649
+#: ../libpurple/protocols/msn/msn.c:656 ../libpurple/protocols/msn/msn.c:662
+#: ../libpurple/protocols/msn/msn.c:668
+#, fuzzy
+msgid "Current media"
+msgstr "Aktuale ĉe"
+
+#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3760
 msgid "Be Right Back"
 msgstr "Tuj Revenas"
 
-#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2823
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/silc/buddy.c:1473
-#: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/msn/msn.c:654 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2827
+#: ../libpurple/protocols/novell/novell.c:2957
+#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:3078
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Busy"
 msgstr "Okupata"
 
-#: ../libpurple/protocols/msn/msn.c:556
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/yahoo/yahoo.c:3086
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "On the Phone"
 msgstr "Telefonante"
 
-#: ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/msn/msn.c:666
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "Out to Lunch"
 msgstr "Ekstere Tagmanĝanten"
 
-#: ../libpurple/protocols/msn/msn.c:588
+#: ../libpurple/protocols/msn/msn.c:697
 msgid "Set Friendly Name..."
 msgstr "Difinu Amika Nomo..."
 
-#: ../libpurple/protocols/msn/msn.c:593
+#: ../libpurple/protocols/msn/msn.c:702
 msgid "Set Home Phone Number..."
 msgstr "Difinu Hejm-Telefonnumeron..."
 
-#: ../libpurple/protocols/msn/msn.c:597
+#: ../libpurple/protocols/msn/msn.c:706
 msgid "Set Work Phone Number..."
 msgstr "Difinu Labor-Telefonnumeron..."
 
-#: ../libpurple/protocols/msn/msn.c:601
+#: ../libpurple/protocols/msn/msn.c:710
 msgid "Set Mobile Phone Number..."
 msgstr "Difiniu Poŝtelefonan Numeron..."
 
-#: ../libpurple/protocols/msn/msn.c:607
+#: ../libpurple/protocols/msn/msn.c:716
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Ebligu/Malebligu Poŝtelefonajn Ekipaĵojn..."
 
-#: ../libpurple/protocols/msn/msn.c:612
+#: ../libpurple/protocols/msn/msn.c:721
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Ebligu/Malebligu Poŝtelefonajn Paĝojn..."
 
-#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/msn/msn.c:732
 msgid "Open Hotmail Inbox"
 msgstr "Malfermu Hotmail-an Alkeston"
 
-#: ../libpurple/protocols/msn/msn.c:646
+#: ../libpurple/protocols/msn/msn.c:756
 msgid "Send to Mobile"
 msgstr "Sendu al Poŝtelefono"
 
-#: ../libpurple/protocols/msn/msn.c:656
-#: ../libpurple/protocols/novell/novell.c:3409
+#: ../libpurple/protocols/msn/msn.c:766
+#: ../libpurple/protocols/novell/novell.c:3413
 msgid "Initiate _Chat"
 msgstr "Iniciatu _Babilon"
 
-#: ../libpurple/protocols/msn/msn.c:694
+#: ../libpurple/protocols/msn/msn.c:804
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:719
+#: ../libpurple/protocols/msn/msn.c:832
 msgid "Failed to connect to server."
 msgstr "Malsukcesis konekti servilon."
 
-#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1620 ../libpurple/protocols/msn/msn.c:1968
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Eraro ricevante profilon"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:448
+#: ../libpurple/protocols/msn/msn.c:1691 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "Ĝenerala"
 
-#: ../libpurple/protocols/msn/msn.c:1517
-#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/msn/msn.c:1698
+#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/oscar/oscar.c:3751
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:219
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Aĝo"
 
-#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/msn/msn.c:1700
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Okupiĝo"
 
-#: ../libpurple/protocols/msn/msn.c:1520
-#: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/msn/msn.c:1701
+#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1214
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Loko"
 
-#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
-#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1706 ../libpurple/protocols/msn/msn.c:1898
+#: ../libpurple/protocols/msn/msn.c:1904 ../libpurple/protocols/msn/msn.c:1911
 msgid "Hobbies and Interests"
 msgstr "Hobioj kaj Interesiĝoj"
 
-#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
-#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
-#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msn/msn.c:1838 ../libpurple/protocols/msn/msn.c:1845
+#: ../libpurple/protocols/msn/msn.c:1853 ../libpurple/protocols/msn/msn.c:1860
 msgid "A Little About Me"
 msgstr "Iomete Pri Mi"
 
-#: ../libpurple/protocols/msn/msn.c:1548
+#: ../libpurple/protocols/msn/msn.c:1729
 msgid "Social"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1550
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1731
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Edzstato"
 
-#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msn/msn.c:1732
 msgid "Interests"
 msgstr "Interesiĝoj"
 
-#: ../libpurple/protocols/msn/msn.c:1552
+#: ../libpurple/protocols/msn/msn.c:1733
 msgid "Pets"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1553
+#: ../libpurple/protocols/msn/msn.c:1734
 msgid "Hometown"
 msgstr "Hejmurbo"
 
-#: ../libpurple/protocols/msn/msn.c:1554
+#: ../libpurple/protocols/msn/msn.c:1735
 msgid "Places Lived"
 msgstr "Vivintejoj"
 
-#: ../libpurple/protocols/msn/msn.c:1555
+#: ../libpurple/protocols/msn/msn.c:1736
 msgid "Fashion"
 msgstr "Fasono"
 
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/msn/msn.c:1737
 msgid "Humor"
 msgstr "Humuro"
 
-#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/msn/msn.c:1738
 msgid "Music"
 msgstr "Muziko"
 
-#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msn/msn.c:1745
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1739 ../libpurple/protocols/msn/msn.c:1920
+#: ../libpurple/protocols/msn/msn.c:1926
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Favorita Citaĵo"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1756
 msgid "Contact Info"
 msgstr "Kontakto Informo"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1757
 msgid "Personal"
 msgstr "Persona"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1760
 msgid "Significant Other"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1580
+#: ../libpurple/protocols/msn/msn.c:1761
 msgid "Home Phone"
 msgstr "Hejmo Telfono"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1762
 msgid "Home Phone 2"
 msgstr "Hejmo Telfono 2"
 
-#: ../libpurple/protocols/msn/msn.c:1582
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1763
+#: ../libpurple/protocols/oscar/oscar.c:3789
 msgid "Home Address"
 msgstr "Hejmo Adreso"
 
-#: ../libpurple/protocols/msn/msn.c:1583
+#: ../libpurple/protocols/msn/msn.c:1764
 msgid "Personal Mobile"
 msgstr "Persona Poŝtelefono"
 
-#: ../libpurple/protocols/msn/msn.c:1584
+#: ../libpurple/protocols/msn/msn.c:1765
 msgid "Home Fax"
 msgstr "Hejmfakso"
 
-#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/msn/msn.c:1766
 msgid "Personal E-Mail"
 msgstr "Persona Retadreso"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1767
 msgid "Personal IM"
 msgstr "Persona TM"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1769
 msgid "Anniversary"
 msgstr "Naskiĝdato"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1785
 msgid "Work"
 msgstr "Laboro"
 
-#: ../libpurple/protocols/msn/msn.c:1606
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1787
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Laboro Titolo"
 
-#: ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/oscar/oscar.c:3810
 msgid "Company"
 msgstr "Kompanio"
 
-#: ../libpurple/protocols/msn/msn.c:1608
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Departemento"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1790
 msgid "Profession"
 msgstr "Prefesio"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1791
 msgid "Work Phone"
 msgstr "Labor Telefono"
 
-#: ../libpurple/protocols/msn/msn.c:1611
+#: ../libpurple/protocols/msn/msn.c:1792
 msgid "Work Phone 2"
 msgstr "Labor Telefono 2"
 
-#: ../libpurple/protocols/msn/msn.c:1612
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Work Address"
 msgstr "Laboro Adreso"
 
-#: ../libpurple/protocols/msn/msn.c:1613
+#: ../libpurple/protocols/msn/msn.c:1794
 msgid "Work Mobile"
 msgstr "Laborpoŝtelefono"
 
-#: ../libpurple/protocols/msn/msn.c:1614
+#: ../libpurple/protocols/msn/msn.c:1795
 msgid "Work Pager"
 msgstr "Laborpaĝilo"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1796
 msgid "Work Fax"
 msgstr "Laborfakso"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1797
 msgid "Work E-Mail"
 msgstr "Laboro Retadreso"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1798
 msgid "Work IM"
 msgstr "Laboro TM"
 
-#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1799
 msgid "Start Date"
 msgstr "Komenca Dato"
 
-#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
-#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
+#: ../libpurple/protocols/msn/msn.c:1869 ../libpurple/protocols/msn/msn.c:1875
+#: ../libpurple/protocols/msn/msn.c:1882 ../libpurple/protocols/msn/msn.c:1889
 msgid "Favorite Things"
 msgstr "Favorataj Aĵoj"
 
-#: ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1934
 msgid "Last Updated"
 msgstr "Laste Aktualigita"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1945
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Hejmpaĝo"
 
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1969
 msgid "The user has not created a public profile."
 msgstr "La uzanto ne kreis publikan profilon."
 
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1970
 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:1790
+#: ../libpurple/protocols/msn/msn.c:1974
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1982
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profilo URL"
 
@@ -5566,96 +6896,106 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
-msgid "MSN Protocol Plugin"
-msgstr "MSN Protokol-Kromaĵo"
-
-#: ../libpurple/protocols/msn/msn.c:2108
+#: ../libpurple/protocols/msn/msn.c:2269 ../libpurple/protocols/msn/msn.c:2271
+#, fuzzy
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Novell GroupWise Messenger Protokol-Kromaĵo"
+
+#: ../libpurple/protocols/msn/msn.c:2306
 msgid "Use HTTP Method"
 msgstr "Uzu HTTP-an metodon"
 
-#: ../libpurple/protocols/msn/msn.c:2113
+#: ../libpurple/protocols/msn/msn.c:2311
+#, fuzzy
+msgid "HTTP Method Server"
+msgstr "IPC Provoservilo"
+
+#: ../libpurple/protocols/msn/msn.c:2316
 msgid "Show custom smileys"
 msgstr "Montru personajn ridmienojn"
 
-#: ../libpurple/protocols/msn/msn.c:2121
+#: ../libpurple/protocols/msn/msn.c:2324
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:133
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
-msgid "Unable to connect"
-msgstr "Malkonekteblas"
-
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/nexus.c:137
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr ""
+
+#: ../libpurple/protocols/msn/nexus.c:275
+#, fuzzy
+msgid "Windows Live ID authentication Failed"
+msgstr "Normala aŭtentokontrolo malsukcesis!"
+
+#: ../libpurple/protocols/msn/notification.c:191
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s ne estas valida grupo."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/notification.c:197
+#: ../libpurple/protocols/msn/notification.c:938
+#: ../libpurple/protocols/msn/session.c:369
 msgid "Unknown error."
 msgstr "Nekonata eraro."
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:200
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s en %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:518
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr ""
+
+#: ../libpurple/protocols/msn/notification.c:843
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Nekonata eraro"
+
+#: ../libpurple/protocols/msn/notification.c:844
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr ""
+
+#: ../libpurple/protocols/msn/notification.c:904
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Ne eblas aldoni uzanto en %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:908
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Ne eblas bloki uzanton ĉe %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:912
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Ne eblas permezi uzanton ĉe %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:920
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s ne aldoneblas ĉar via kunullisto plenumas."
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:929
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ne etas valida pasporto konto."
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:934
 msgid "Service Temporarily Unavailable."
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:1272
 msgid "Unable to rename group"
 msgstr "Ne eblas alinomigi grupon"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:1327
 msgid "Unable to delete group"
 msgstr "Ne eblas forigi grupo"
 
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1943
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5674,71 +7014,95 @@
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../libpurple/protocols/msn/oim.c:141
+#, fuzzy
+msgid "Unable to connect to OIM server"
+msgstr "Ne konekteblas al %s"
+
 #: ../libpurple/protocols/msn/servconn.c:135
-msgid "Writing error"
-msgstr "Skriberaro"
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "Malkonekteblas"
 
 #: ../libpurple/protocols/msn/servconn.c:137
+msgid "Writing error"
+msgstr "Skriberaro"
+
+#: ../libpurple/protocols/msn/servconn.c:139
 msgid "Reading error"
 msgstr "Legeraro"
 
-#: ../libpurple/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/msn/servconn.c:146
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:336
 msgid "Our protocol is not supported by the server."
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:340
 msgid "Error parsing HTTP."
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3469
-#: ../libpurple/protocols/yahoo/yahoo.c:201
+#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "Vi ensalutis el alia loko."
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:349
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:354
 msgid "The MSN servers are going down temporarily."
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:359
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:364
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:385
+#: ../libpurple/protocols/msn/session.c:387
 msgid "Handshaking"
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:388
 msgid "Starting authentication"
 msgstr "Komencas aŭtentokontrolon"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:389
 msgid "Getting cookie"
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:391
 msgid "Sending cookie"
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:392
 msgid "Retrieving buddy list"
 msgstr ""
 
@@ -5776,158 +7140,571 @@
 
 #: ../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:"
+msgstr ""
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/switchboard.c:956
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr ""
-
-#: ../libpurple/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:243
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s aldonis vin en sia kunul listo."
 
-#: ../libpurple/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:312
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s forigis vin el sia kunul listo."
 
-#: ../libpurple/protocols/msn/userlist.c:641
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Malsukcesis aldoni \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:696
 msgid "The screen name specified is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr ""
+
+#: ../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:292
+#: ../libpurple/protocols/myspace/myspace.c:1798
+msgid "MySpaceIM Error"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:349
+#, fuzzy
+msgid "Reading challenge"
+msgstr "Legeraro"
+
+#: ../libpurple/protocols/myspace/myspace.c:355
+msgid "Unexpected challenge length from server"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:359
+#, fuzzy
+msgid "Logging in"
+msgstr "Protokolado"
+
+#: ../libpurple/protocols/myspace/myspace.c:1278
+#, 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:1321
+#, fuzzy
+msgid "New mail messages"
+msgstr "Sendu mesaĝon"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New blog comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New profile comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1324
+msgid "New friend requests!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1325
+msgid "New picture comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1355
+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:1538
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+#: ../libpurple/protocols/myspace/myspace.c:1551
+#, fuzzy
+msgid "No username set"
+msgstr "Neniu nomo"
+
+#: ../libpurple/protocols/myspace/myspace.c:1550
+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:1777
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1970
+#: ../libpurple/protocols/myspace/myspace.c:2004
+#, fuzzy
+msgid "Failed to add buddy"
+msgstr "Malsukcesis kuniĝi kunulon en babilejo"
+
+#: ../libpurple/protocols/myspace/myspace.c:1970
+#, fuzzy
+msgid "'addbuddy' command failed."
+msgstr "Ŝarĝu kunulliston el dosiero..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2004
+#: ../libpurple/protocols/myspace/myspace.c:2245
+msgid "persist command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2113
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2114
+#, fuzzy
+msgid "User lookup"
+msgstr "Uzanto Babilejoj"
+
+#: ../libpurple/protocols/myspace/myspace.c:2226
+#: ../libpurple/protocols/myspace/myspace.c:2245
+#: ../libpurple/protocols/myspace/myspace.c:2267
+#, fuzzy
+msgid "Failed to remove buddy"
+msgstr "Malsukcesis kuniĝi kunulon en babilejo"
+
+#: ../libpurple/protocols/myspace/myspace.c:2226
+msgid "'delbuddy' command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2267
+msgid "blocklist command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2313
+#, fuzzy
+msgid "Invalid input condition"
+msgstr "Malvalida titolo"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2331
+#: ../libpurple/protocols/myspace/myspace.c:2362
+msgid "Read buffer full"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2400
+#, fuzzy
+msgid "Unparseable message"
+msgstr "Nelegitaj mesaĝoj"
+
+#: ../libpurple/protocols/myspace/myspace.c:2469
+#, fuzzy, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Ne povis konekti al servilo"
+
+#: ../libpurple/protocols/myspace/myspace.c:2640
+#, fuzzy
+msgid "IM Friends"
+msgstr "_TM fenestroj"
+
+#: ../libpurple/protocols/myspace/myspace.c:2739
+#, 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:2740
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "Malvalida respondo el servilo."
+
+#: ../libpurple/protocols/myspace/myspace.c:2792
+#: ../libpurple/protocols/myspace/myspace.c:2857
+msgid "Add friends from MySpace.com"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2793
+#, fuzzy
+msgid "Importing friends failed"
+msgstr "Malbona amikodosiero"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2849
+#, fuzzy
+msgid "Find people..."
+msgstr "Trovu kunulojn..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2852
+#, fuzzy
+msgid "Change IM name..."
+msgstr "Ŝanĝu pasvorton..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3154
+msgid "myim URL handler"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3155
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3156
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3279
+msgid "Show display name in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3282
+msgid "Show headline in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3287
+#, fuzzy
+msgid "Send emoticons"
+msgstr "Son-opcioj"
+
+#: ../libpurple/protocols/myspace/myspace.c:3292
+msgid "Screen resolution (dots per inch)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3295
+#, fuzzy
+msgid "Base font size (points)"
+msgstr "Pligranda tiparo grandeco"
+
+#: ../libpurple/protocols/myspace/user.c:95
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "Uzanto"
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/oscar/oscar.c:2960
+msgid "Profile"
+msgstr "Profilo"
+
+#: ../libpurple/protocols/myspace/user.c:124
+#, fuzzy
+msgid "Headline"
+msgstr "_Tenilo:"
+
+#: ../libpurple/protocols/myspace/user.c:129
+#, fuzzy
+msgid "Song"
+msgstr "Sonoj"
+
+#: ../libpurple/protocols/myspace/user.c:134
+msgid "Total Friends"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:145
+#: ../libpurple/protocols/myspace/user.c:148
+#: ../libpurple/protocols/myspace/user.c:151
+#, fuzzy
+msgid "Client Version"
+msgstr "Fermu konversacion"
+
+#. 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
+#, fuzzy, c-format
+msgid "%s has zapped you!"
+msgstr "%s ensalutis."
+
+#: ../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
+#, fuzzy, c-format
+msgid "%s has whacked you!"
+msgstr "%s ensalutis."
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "Whacking %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy
+msgid "Torch"
+msgstr "Temo"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy, c-format
+msgid "%s has torched you!"
+msgstr "%s foriĝis."
+
+#: ../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
+#, fuzzy, c-format
+msgid "%s has smooched you!"
+msgstr "%s ensalutis."
+
+#: ../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
+#, fuzzy, c-format
+msgid "%s has hugged you!"
+msgstr "%s ensalutis."
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "Hugging %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy
+msgid "Slap"
+msgstr "Slovaka"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy, c-format
+msgid "%s has slapped you!"
+msgstr "%s ensalutis."
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Slapping %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, fuzzy
+msgid "Goose"
+msgstr "Foririnta"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, fuzzy, c-format
+msgid "%s has goosed you!"
+msgstr "%s foriĝis."
+
+#: ../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
+#, fuzzy, c-format
+msgid "%s has high-fived you!"
+msgstr "%s ensalutis."
+
+#: ../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
+#, fuzzy, c-format
+msgid "%s has punk'd you!"
+msgstr "%s ensalutis."
+
+#: ../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
+#, fuzzy, c-format
+msgid "%s has raspberried you!"
+msgstr "%s ensalutis."
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Raspberrying %s..."
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Malsukcesis skribi reten"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Malsukcesis ligi el reto"
 
+#: ../libpurple/protocols/novell/nmuser.c:1873
+msgid "Error communicating with server"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1877
+msgid "Conference not found"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1880
+msgid "Conference does not exist"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1884
+msgid "A folder with that name already exists"
+msgstr ""
+
 #: ../libpurple/protocols/novell/nmuser.c:1887
-msgid "Error communicating with server"
+msgid "Not supported"
 msgstr ""
 
 #: ../libpurple/protocols/novell/nmuser.c:1891
-msgid "Conference not found"
+msgid "Password has expired"
 msgstr ""
 
 #: ../libpurple/protocols/novell/nmuser.c:1894
-msgid "Conference does not exist"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1898
-msgid "A folder with that name already exists"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1901
-msgid "Not supported"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1905
-msgid "Password has expired"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1908
 msgid "Incorrect password"
 msgstr "Misa pasvorto"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "Misa ekrannomo aŭ pasvorto"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
+#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr ""
@@ -5937,108 +7714,108 @@
 msgid "Login failed (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:249
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:398
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr ""
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:424
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:495
+#: ../libpurple/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:534
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:539
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:586
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:634
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:707
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:753
+#: ../libpurple/protocols/novell/novell.c:899
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:800
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:853
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:921
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:944
+#: ../libpurple/protocols/novell/novell.c:1649
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1123
+#: ../libpurple/protocols/novell/novell.c:1694
 msgid "Error communicating with server. Closing connection."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1505
-#: ../libpurple/protocols/sametime/sametime.c:4121
+#: ../libpurple/protocols/novell/novell.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr ""
 
@@ -6048,41 +7825,41 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1517
 msgid "Full name"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1639
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1670
 msgid "Unable to make SSL connection to server."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1722
 msgid "Authenticating..."
 msgstr "Aŭtentokontrolas..."
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1734
 msgid "Unable to connect to server."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1738
+#: ../libpurple/protocols/novell/novell.c:1737
 msgid "Waiting for response..."
 msgstr "Atendante respondon..."
 
-#: ../libpurple/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1872
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s estas invitita al tiu konversacio."
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1900
 msgid "Invitation to Conversation"
 msgstr "Invito al Konversacio"
 
-#: ../libpurple/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1901
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6093,16 +7870,15 @@
 "\n"
 "Sendita: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1903
 msgid "Would you like to join the conversation?"
 msgstr "Ĉu vi deziras aliĝi al konversacio?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2017
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2074
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6112,17 +7888,17 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2172
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2200
 msgid "Error. SSL support is not installed."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2509
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tiu konferenco fermiĝis. Ne pliaj mesaĝoj sendiĝeblas."
 
@@ -6136,33 +7912,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3514
-#: ../libpurple/protocols/novell/novell.c:3516
+#: ../libpurple/protocols/novell/novell.c:3523
+#: ../libpurple/protocols/novell/novell.c:3525
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protokol-Kromaĵo"
 
-#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3550
 msgid "Server address"
 msgstr "Servilo adreso"
 
-#: ../libpurple/protocols/novell/novell.c:3539
+#: ../libpurple/protocols/novell/novell.c:3554
 msgid "Server port"
 msgstr "Servilo pordo"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2287
-#: ../libpurple/protocols/yahoo/yahoo.c:2446
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2468
+#: ../libpurple/protocols/yahoo/yahoo.c:2635
+#: ../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 "Servilo fermis la konekton."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2462
+#: ../libpurple/protocols/yahoo/yahoo.c:2629 ../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"
@@ -6171,20 +7947,13 @@
 "Perdis konekton kun servilo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
-#: ../libpurple/proxy.c:1449
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
+#: ../libpurple/proxy.c:1478
 msgid "Received invalid data on connection with server."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6195,8 +7964,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:112
-#: ../libpurple/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM Protokol-Kromaĵo"
 
@@ -6210,14 +7979,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:112
-#: ../libpurple/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ Protokol-Kromaĵo"
 
-#: ../libpurple/protocols/oscar/libicq.c:135
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kodoprezento"
 
@@ -6246,108 +8015,108 @@
 msgid "Direct IM established"
 msgstr "Rekta TM establiĝis"
 
-#: ../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
+#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid error"
 msgstr "Malvalida eraro"
 
-#: ../libpurple/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid SNAC"
 msgstr "Malvalida SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to host"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:118
+#: ../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"
-msgstr "En loka permeso/rifuzo"
+msgid "Insufficient rights"
+msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:132
-msgid "Too evil (sender)"
-msgstr ""
+msgid "In local permit/deny"
+msgstr "En loka permeso/rifuzo"
 
 #: ../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:329
+#: ../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 "
@@ -6355,7 +8124,7 @@
 "your AIM/ICQ account.)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:438
+#: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6363,144 +8132,147 @@
 msgstr ""
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
-#: ../pidgin/gtkutils.c:2357
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+#: ../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 "Kunul Piktogramo"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "Voĉo"
 
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "AIM Rekta TM"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
+#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Babilado"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5955
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:6008
 msgid "Get File"
 msgstr "Ricevu Dosieron"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Ludoj"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "Enaldonaĵoj"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Sendu Kunulliston"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "ICQ Rekta Konekto"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "AP Uzanto"
 
-#: ../libpurple/protocols/oscar/oscar.c:654
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nihilisto"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "ICQ Servilo Reludo"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "Malnova ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "Video Babilado"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "Viva Video"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "Kamerao"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:725
+#: ../libpurple/protocols/oscar/oscar.c:5778
 msgid "Free For Chat"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:729
+#: ../libpurple/protocols/oscar/oscar.c:5813
 msgid "Not Available"
 msgstr "Ne Disponebla"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "Occupied"
 msgstr "Okupata"
 
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:735
 msgid "Web Aware"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/qq/qq.c:288
+#: ../libpurple/protocols/yahoo/yahoo.c:3094 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
 msgid "Invisible"
 msgstr "Nevidebla"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:739
 msgid "Online"
 msgstr "Enrete"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3709
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3703
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128
 msgid "IP Address"
 msgstr "IP adreso"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2854
+#: ../libpurple/protocols/oscar/oscar.c:845
+#: ../libpurple/protocols/oscar/oscar.c:2887
 msgid "Warning Level"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Kunul Komento"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6509,7 +8281,7 @@
 "Ne povis konekti al aŭtentokontrolo servilo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6518,145 +8290,146 @@
 "Ne povis konekti al BOS servilo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "Ekrannomo sendita"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "Konekto estabilta, kuketo sendita"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
+#: ../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 either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1929
+"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:2104
 msgid "Invalid screen name."
 msgstr "Malvalida ekranonomo."
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1035
-#: ../libpurple/protocols/yahoo/yahoo.c:1947
+#: ../libpurple/protocols/oscar/oscar.c:1352
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:2125
 msgid "Incorrect password."
 msgstr "Misa pasvorto."
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "La AOL Tuj Mesaĝilo servo estas provizore nedisponebla."
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../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:1353
+#: ../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:1388
+#: ../libpurple/protocols/oscar/oscar.c:1410
 msgid "Could Not Connect"
 msgstr "Ne Povas Konekti"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1414
 msgid "Received authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1449
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../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:1433
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2288
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6109 ../libpurple/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1452
+#: ../libpurple/protocols/oscar/oscar.c:2228
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:6164 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "_Daŭrigu"
 
-#: ../libpurple/protocols/oscar/oscar.c:1471
-#: ../libpurple/protocols/oscar/oscar.c:1514
+#: ../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:1474
-#: ../libpurple/protocols/oscar/oscar.c:1517
+#: ../libpurple/protocols/oscar/oscar.c:1494
+#: ../libpurple/protocols/oscar/oscar.c:1537
 msgid "Unable to get a valid AIM login hash."
 msgstr "Ne eblas obteni validan AIM-an profilon."
 
-#: ../libpurple/protocols/oscar/oscar.c:1603
+#: ../libpurple/protocols/oscar/oscar.c:1622
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:1625
 msgid "Unable to get a valid login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1632
+#: ../libpurple/protocols/oscar/oscar.c:1655
 msgid "Password sent"
 msgstr "Pasvorto sendita"
 
-#: ../libpurple/protocols/oscar/oscar.c:1688
+#: ../libpurple/protocols/oscar/oscar.c:1711
 msgid "Unable to initialize connection"
 msgstr "Ne povas eki konekton"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2198
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "B.v. permesi min do mi povas aldoni vin al mia kunullisto."
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2226
 msgid "Authorization Request Message:"
 msgstr "Permeso Demando Mesaĝo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2227
 msgid "Please authorize me!"
 msgstr "B.v. permesu min!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2413
-#: ../libpurple/protocols/oscar/oscar.c:5221
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/oscar/oscar.c:2268
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
 msgid "No reason given."
 msgstr "Nenia kialo donita."
 
-#: ../libpurple/protocols/oscar/oscar.c:2286
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "Permeso Rifuzo Mesaĝo"
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6664,17 +8437,17 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2414
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "ICQ permeso rifuzita."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6683,7 +8456,7 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2437
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6692,7 +8465,7 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2445
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6701,38 +8474,38 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Ĉu vi volas aldoni tiun kunul en via kunullisto?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "_Aldonu"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "_Rifuzi"
 
-#: ../libpurple/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2592
 #, 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:2569
+#: ../libpurple/protocols/oscar/oscar.c:2601
 #, 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:2578
+#: ../libpurple/protocols/oscar/oscar.c:2610
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6741,21 +8514,21 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2619
 #, 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:2596
+#: ../libpurple/protocols/oscar/oscar.c:2628
 #, 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:2605
+#: ../libpurple/protocols/oscar/oscar.c:2637
 #, 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."
@@ -6763,240 +8536,219 @@
 msgstr[1] ""
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:2792
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ne eblas sendi mesaĝon: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:2765
-#: ../libpurple/protocols/oscar/oscar.c:2827
-#: ../libpurple/protocols/oscar/oscar.c:2831
+#: ../libpurple/protocols/oscar/oscar.c:2792
+#: ../libpurple/protocols/oscar/oscar.c:2797
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Unknown reason."
 msgstr "Nekonata kialo."
 
-#: ../libpurple/protocols/oscar/oscar.c:2763
+#: ../libpurple/protocols/oscar/oscar.c:2795
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Ne eblas sendi mesaĝon al %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2827
+#: ../libpurple/protocols/oscar/oscar.c:2861
 #, c-format
 msgid "User information not available: %s"
 msgstr "Uzantoinformo ne disponebla: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2830
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "Uzantoinformo des %s ne disponeblas:"
-
-#: ../libpurple/protocols/oscar/oscar.c:2859
+#: ../libpurple/protocols/oscar/oscar.c:2892
 msgid "Online Since"
 msgstr "Enrete Ek De"
 
-#: ../libpurple/protocols/oscar/oscar.c:2864
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2897
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Membro Ek De"
 
-#: ../libpurple/protocols/oscar/oscar.c:2869
-msgid "Capabilities"
-msgstr "Kapablecoj"
-
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2932
 msgid "Available Message"
 msgstr "Disponeblaj Mesaĝoj"
 
-#: ../libpurple/protocols/oscar/oscar.c:2913
-msgid "Profile"
-msgstr "Profilo"
-
-#: ../libpurple/protocols/oscar/oscar.c:2990
+#: ../libpurple/protocols/oscar/oscar.c:3040
 msgid "Your AIM connection may be lost."
 msgstr "Via AIM konekto perdeblas."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3177
+#: ../libpurple/protocols/oscar/oscar.c:3228
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3398
-msgid "Rate limiting error."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3399
+#: ../libpurple/protocols/oscar/oscar.c:3392
 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:3471
-msgid "You have been signed off for an unknown reason."
-msgstr "Vi estas malsalutigita pro nekonata kialo."
-
-#: ../libpurple/protocols/oscar/oscar.c:3484
+#: ../libpurple/protocols/oscar/oscar.c:3475
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vi estas diskonektita de babilejo %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3731
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Poŝtelefono"
 
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3755
 msgid "Personal Web Page"
 msgstr "Persona ttt-ejo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Kroma Informo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3787
+#: ../libpurple/protocols/oscar/oscar.c:3800
 msgid "Zip Code"
 msgstr "Poŝtkodo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Division"
 msgstr "Dividaĵo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3812
 msgid "Position"
 msgstr "Pozicio"
 
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Web Page"
 msgstr "TTT-ejo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "Work Information"
 msgstr "Laborinformo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3873
 msgid "Pop-Up Message"
 msgstr "Ŝpruca Mesaĝo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3919
+#: ../libpurple/protocols/oscar/oscar.c:3913
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "La jena ekrannomo estas kunligita kun %s"
 msgstr[1] "La jenaj ekrannomoj estas kunligitaj kun %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3924
+#: ../libpurple/protocols/oscar/oscar.c:3918
 msgid "Screen name"
 msgstr "Ekrannomo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3944
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3965
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3967
 msgid "Account Confirmation Requested"
 msgstr "Kontokonfirmo demandita"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:3998
 msgid "Error Changing Account Info"
 msgstr "Eraro ŝanĝante kontoinformon"
 
+#: ../libpurple/protocols/oscar/oscar.c:4001
+#, 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:4004
+#, c-format
+msgid "Error 0x%04x: Unable to format screen name because it is invalid."
+msgstr ""
+
 #: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
+"is too long."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4013
-#, 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:4016
-#, 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:4019
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, 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:4022
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4019
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Eraro 0x%04x: Nekonata eraro."
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4029
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "La retadreso de %s estas %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4031
 msgid "Account Info"
 msgstr "Konto Informo"
 
-#: ../libpurple/protocols/oscar/oscar.c:4210
+#: ../libpurple/protocols/oscar/oscar.c:4214
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4485
 msgid "Unable to set AIM profile."
 msgstr "Ne eblas difini AIM-an profilon."
 
-#: ../libpurple/protocols/oscar/oscar.c:4463
+#: ../libpurple/protocols/oscar/oscar.c:4486
 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:4477
+#: ../libpurple/protocols/oscar/oscar.c:4500
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4482
+#: ../libpurple/protocols/oscar/oscar.c:4505
 msgid "Profile too long."
 msgstr "Profilo tro longa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4527
+#: ../libpurple/protocols/oscar/oscar.c:4550
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7007,86 +8759,82 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4532
+#: ../libpurple/protocols/oscar/oscar.c:4555
 msgid "Away message too long."
 msgstr "Formesaĝo tro longa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4601
+#: ../libpurple/protocols/oscar/oscar.c:4624
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4603
-#: ../libpurple/protocols/oscar/oscar.c:5028
-#: ../libpurple/protocols/oscar/oscar.c:5042
+"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:4626
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "Ne eblas Aldoni"
 
-#: ../libpurple/protocols/oscar/oscar.c:4707
+#: ../libpurple/protocols/oscar/oscar.c:4735
 msgid "Unable To Retrieve Buddy List"
 msgstr "Ne eblas Ricevi Kunulliston"
 
-#: ../libpurple/protocols/oscar/oscar.c:4708
+#: ../libpurple/protocols/oscar/oscar.c:4736
 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:4913
-#: ../libpurple/protocols/oscar/oscar.c:4914
-#: ../libpurple/protocols/oscar/oscar.c:4919
-#: ../libpurple/protocols/oscar/oscar.c:5096
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5102
+#: ../libpurple/protocols/oscar/oscar.c:4918
+#: ../libpurple/protocols/oscar/oscar.c:4920
+#: ../libpurple/protocols/oscar/oscar.c:5136
+#: ../libpurple/protocols/oscar/oscar.c:5137
+#: ../libpurple/protocols/oscar/oscar.c:5142
 msgid "Orphans"
 msgstr "Senpatroj"
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5054
 #, 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:5026
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
 msgid "(no name)"
 msgstr "(sen nomo)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5040
-#, c-format
-msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5133
+#: ../libpurple/protocols/oscar/oscar.c:5068
+#, fuzzy, c-format
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "Via komanda malsukcesis pro nekonata kialo."
+
+#: ../libpurple/protocols/oscar/oscar.c:5174
 #, 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:5139
+#: ../libpurple/protocols/oscar/oscar.c:5182
 msgid "Authorization Given"
 msgstr "Permeso Donita"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5217
+#: ../libpurple/protocols/oscar/oscar.c:5255
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "La uzanto %s koncedis vian demandon aldoni sin al via kunullisto."
 
-#: ../libpurple/protocols/oscar/oscar.c:5218
+#: ../libpurple/protocols/oscar/oscar.c:5256
 msgid "Authorization Granted"
 msgstr "Aŭtentigo Koncedita"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5221
+#: ../libpurple/protocols/oscar/oscar.c:5259
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7097,115 +8845,116 @@
 "jena kialo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5222
+#: ../libpurple/protocols/oscar/oscar.c:5260
 msgid "Authorization Denied"
 msgstr "Permeso Rifuzita"
 
-#: ../libpurple/protocols/oscar/oscar.c:5258
+#: ../libpurple/protocols/oscar/oscar.c:5296
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Interŝanĝo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5298
+#: ../libpurple/protocols/oscar/oscar.c:5336
 msgid "Invalid chat name specified."
 msgstr "Malvalida babilejonomo enigita."
 
-#: ../libpurple/protocols/oscar/oscar.c:5368
+#: ../libpurple/protocols/oscar/oscar.c:5405
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Via TM-a Bildo ne estis sendita. Vi ne povas sendi TM-ajn Bildojn en AIM "
 "babilejoj."
 
-#: ../libpurple/protocols/oscar/oscar.c:5507
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5567
+#: ../libpurple/protocols/oscar/oscar.c:5572
 msgid "Away Message"
 msgstr "Formesaĝo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5572
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(ricevante)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5772
 msgid "iTunes Music Store Link"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5880
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Kunul Komento por %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5881
 msgid "Buddy Comment:"
 msgstr "Kunul Komento:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5877
+#: ../libpurple/protocols/oscar/oscar.c:5928
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Vi elektis malfermi Rektan TM konekton kun %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5932
 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:5885
+#: ../libpurple/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "K_onektu"
 
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:5973
 msgid "Get AIM Info"
 msgstr "Ricevu AIM Informon"
 
-#: ../libpurple/protocols/oscar/oscar.c:5926
+#: ../libpurple/protocols/oscar/oscar.c:5979
 msgid "Edit Buddy Comment"
 msgstr "Redaktu Kunul Komenton"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5987
 msgid "Get Status Msg"
 msgstr "Ricevi Statan Mesaĝon"
 
-#: ../libpurple/protocols/oscar/oscar.c:5947
+#: ../libpurple/protocols/oscar/oscar.c:6000
 msgid "Direct IM"
 msgstr "Rekta TM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5969
+#: ../libpurple/protocols/oscar/oscar.c:6022
 msgid "Re-request Authorization"
 msgstr "Re-petu aŭtentigon"
 
-#: ../libpurple/protocols/oscar/oscar.c:6028
+#: ../libpurple/protocols/oscar/oscar.c:6081
 msgid "Require authorization"
 msgstr "Petu aŭtentigon"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6084
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6036
+#: ../libpurple/protocols/oscar/oscar.c:6089
 msgid "ICQ Privacy Options"
 msgstr "ICQ Privatecaj Opcioj"
 
-#: ../libpurple/protocols/oscar/oscar.c:6053
+#: ../libpurple/protocols/oscar/oscar.c:6108
 msgid "The new formatting is invalid."
 msgstr "La nova formatumo malvalidas."
 
-#: ../libpurple/protocols/oscar/oscar.c:6054
+#: ../libpurple/protocols/oscar/oscar.c:6109
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6107
+#: ../libpurple/protocols/oscar/oscar.c:6162
 msgid "Change Address To:"
 msgstr "Ŝanĝu adreson al:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6152
+#: ../libpurple/protocols/oscar/oscar.c:6208
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>vi ne atendas aŭtentigon</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6155
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Vi atendas aŭtentigon de la jenaj kunuloj"
 
-#: ../libpurple/protocols/oscar/oscar.c:6156
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7213,73 +8962,73 @@
 "Vi povas re-peti aŭtentigon el tiuj kunuloj per dekstre-klaki ilin kaj "
 "elekti \"Re-petu aŭtentigon.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6173
+#: ../libpurple/protocols/oscar/oscar.c:6229
 msgid "Find Buddy by E-Mail"
 msgstr "Trovu kunulon laŭ Retadreso"
 
-#: ../libpurple/protocols/oscar/oscar.c:6174
+#: ../libpurple/protocols/oscar/oscar.c:6230
 msgid "Search for a buddy by e-mail address"
 msgstr "Serĉu kunulon laŭ retadreso"
 
-#: ../libpurple/protocols/oscar/oscar.c:6175
+#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Tajpu retadreson de la kunul kiun vi serĉas."
 
-#: ../libpurple/protocols/oscar/oscar.c:6178
+#: ../libpurple/protocols/oscar/oscar.c:6234
 msgid "_Search"
 msgstr "_Serĉu"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/oscar/oscar.c:6392
 msgid "Set User Info (URL)..."
 msgstr "Difinu Uzanto-Informon (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6358
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Change Password (URL)"
 msgstr "Ŝanĝu Pasvorton (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6407
 msgid "Configure IM Forwarding (URL)"
 msgstr "Agordu TM Plusendado (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6417
 msgid "Set Privacy Options..."
 msgstr "Difinu Privatecajn Opciojn..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6379
+#: ../libpurple/protocols/oscar/oscar.c:6424
 msgid "Confirm Account"
 msgstr "Konfirmu Konton"
 
-#: ../libpurple/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/oscar/oscar.c:6428
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Vidigu Aktualajn Aliĝintajn Retadresojn"
 
-#: ../libpurple/protocols/oscar/oscar.c:6387
+#: ../libpurple/protocols/oscar/oscar.c:6432
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Ŝanĝu Aktualajn Aliĝintajn Retadresojn.."
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6439
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Montru Kunulojn Atendante Permeso"
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6445
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Serĉu Kunulon laŭ Retadreso..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6450
 msgid "Search for Buddy by Information"
 msgstr "Serĉu Kunulon laŭ Informo..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6473
+#: ../libpurple/protocols/oscar/oscar.c:6518
 msgid "Use recent buddies group"
 msgstr "Uzu ĵusan kunulgrupon"
 
-#: ../libpurple/protocols/oscar/oscar.c:6476
+#: ../libpurple/protocols/oscar/oscar.c:6521
 msgid "Show how long you have been idle"
 msgstr "Montru kiom longa vi estis senfara"
 
-#: ../libpurple/protocols/oscar/oscar.c:6628
+#: ../libpurple/protocols/oscar/oscar.c:6676
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7287,36 +9036,32 @@
 "Ĉiam uzi ICQ-n prokurservilon por dosiero alŝutoj\n"
 "(pli malrapida, sed vualigas vian IP adreson)"
 
-#: ../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 "Demandas %s konekti nin al %s:%hu por Rekta TM."
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Provas konekti al %s:%hu"
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
 msgid "Attempting to connect via proxy server."
 msgstr "Provas konekti pere de prokurservilo."
 
-#: ../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 "%s ĵus petis rektan konekton al %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../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/oscar/peer.c:1020
-msgid "_Connect"
-msgstr "_Konektu"
-
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Ĉefa Informo"
@@ -7478,91 +9223,92 @@
 msgid "Update my information"
 msgstr "Aktualigi mian informon"
 
-#: ../libpurple/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "Via informo estas aktualigita."
 
-#: ../libpurple/protocols/qq/buddy_info.c:565
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_info.c:582
-#: ../libpurple/protocols/qq/buddy_info.c:595
+"%s."
+msgstr ""
+
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "Malvalida QQ Aspekto"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:207
-#: ../libpurple/protocols/qq/group_opt.c:135
-#, c-format
-msgid "You rejected %d's request"
-msgstr ""
-
 #: ../libpurple/protocols/qq/buddy_opt.c:208
 #: ../libpurple/protocols/qq/group_opt.c:136
+#, c-format
+msgid "You rejected %d's request"
+msgstr ""
+
+#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
 msgstr "Enigu vian kialon:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:210
-msgid "Reject request"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:139
-msgid "Sorry, you are not my type..."
-msgstr ""
-
 #: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_opt.c:125
-#: ../libpurple/protocols/qq/sys_msg.c:85
-#: ../libpurple/protocols/qq/sys_msg.c:228
-msgid "Reject"
-msgstr "Malakceptu"
-
-#: ../libpurple/protocols/qq/buddy_opt.c:272
-msgid "Add buddy with auth request fails"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_opt.c:303
+msgid "Reject request"
+msgstr ""
+
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:141
+msgid "Sorry, you are not my type..."
+msgstr ""
+
+#: ../libpurple/protocols/qq/buddy_opt.c:277
+msgid "Add buddy with auth request failed"
+msgstr ""
+
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "Vi sukcese forigis kunulon"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:331
-msgid "You have successfully removed yourself from a buddy"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_opt.c:395
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+#, fuzzy
+msgid "You have successfully removed yourself from your friend's buddy list"
+msgstr "Vi sukcese forigis kunulon"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Uzanto %d bezonas aŭtentokontrolon"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:397
-#: ../libpurple/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_opt.c:398
-#: ../libpurple/protocols/qq/group_join.c:135
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:407
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Ĉu vi estus mia amiko?"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:399
-#: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:140
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:408
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Sendu"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#, c-format
-msgid "You have added %d in buddy list"
+#: ../libpurple/protocols/qq/buddy_opt.c:418
+#, fuzzy, c-format
+msgid "You have added %d to buddy list"
 msgstr "Vi aldonis %d-n en kunullisto"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "QQid Eraro"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "Malvalida QQid"
 
@@ -7591,71 +9337,73 @@
 msgstr "QQ Qun"
 
 #: ../libpurple/protocols/qq/group.c:120
-msgid "Please input external group ID"
+#, fuzzy
+msgid "Please enter external group ID"
 msgstr "B.v. enigi eksteran groupon ID-n"
 
 #: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:122
-#, c-format
-msgid "User %d applied to join group %d"
+#: ../libpurple/protocols/qq/group_im.c:126
+#, fuzzy, c-format
+msgid "User %d requested to join group %d"
 msgstr "Uzanto %d aliĝpetis grupon %d"
 
-#: ../libpurple/protocols/qq/group_im.c:123
-#: ../libpurple/protocols/qq/group_im.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "Kialo: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:130
-#: ../libpurple/protocols/qq/group_im.c:174
-#: ../libpurple/protocols/qq/group_im.c:214
-#: ../libpurple/protocols/qq/group_im.c:249
-#: ../libpurple/protocols/qq/group_im.c:283
-#: ../libpurple/protocols/qq/group_join.c:229
-#: ../libpurple/protocols/qq/group_join.c:355
-#: ../libpurple/protocols/qq/group_opt.c:230
-#: ../libpurple/protocols/qq/group_opt.c:300
-#: ../libpurple/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_im.c:183
+#: ../libpurple/protocols/qq/group_im.c:223
+#: ../libpurple/protocols/qq/group_im.c:258
+#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "QQ Qun Operacio"
 
-#: ../libpurple/protocols/qq/group_im.c:133
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:87
-#: ../libpurple/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:128
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "Aprobi"
 
-#: ../libpurple/protocols/qq/group_im.c:171
-#, c-format
-msgid "You request to join group %d has been rejected by admin %d"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:212
-#, c-format
-msgid "You request to join group %d has been approved by admin %d"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:248
-#, c-format
-msgid "You [%d] has exit group \"%d\""
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:282
-#, c-format
-msgid "You [%d] has been added by group \"%d\""
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:180
+#, c-format
+msgid "Your request to join group %d has been rejected by admin %d"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_im.c:221
+#, c-format
+msgid "Your request to join group %d has been approved by admin %d"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_im.c:257
+#, c-format
+msgid "You [%d] have left group \"%d\""
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_im.c:291
+#, c-format
+msgid "You [%d] have been added to group \"%d\""
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr ""
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-msgid "I am not member"
+#, fuzzy
+msgid "I am not a member"
 msgstr "Mi ne estas membro"
 
 #: ../libpurple/protocols/qq/group_internal.c:44
@@ -7674,108 +9422,108 @@
 msgid "Unknown status"
 msgstr "Nekonata stato"
 
-#: ../libpurple/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:229
-msgid "You have successfully exited the group"
+#: ../libpurple/protocols/qq/group_join.c:233
+#, fuzzy
+msgid "You have successfully left the group"
 msgstr "Vi sukcese forlasis la grupon"
 
-#: ../libpurple/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:254
-msgid "Your authorization operation has been accepted by the QQ server"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_join.c:325
-msgid "You inputted a group id outside the acceptable range"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_join.c:356
-msgid "Are you sure to exit this Qun?"
-msgstr "Ĉu vi certas vi volas forigi tiun Qun-on?"
-
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:258
+msgid "Your authorization request has been accepted by the QQ server"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_join.c:329
+msgid "You entered a group ID outside the acceptable range"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_join.c:360
+#, fuzzy
+msgid "Are you sure you want to leave this Qun?"
+msgstr "Ĉu vi certas vi volas forigi %s-n?"
+
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:361
-msgid "Go ahead"
-msgstr "Daŭrigu"
-
-#: ../libpurple/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Kodo [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "Grupoperacio Eraro"
 
+#. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:84
-msgid "Do you wanna approve the request?"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_opt.c:230
-msgid "You have successfully modify Qun member"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_opt.c:300
-msgid "You have successfully modify Qun information"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/sys_msg.c:87
+#, fuzzy
+msgid "Do you want to approve the request?"
+msgstr "Ĉu vi certas vi volas forigi %s?"
+
+#: ../libpurple/protocols/qq/group_opt.c:137
+#, fuzzy
+msgid "Enter your reason:"
+msgstr "Enigu vian kialon:"
+
+#: ../libpurple/protocols/qq/group_opt.c:235
+#, fuzzy
+msgid "You have successfully modified Qun member"
+msgstr "Vi sukcese forigis kunulon"
+
+#: ../libpurple/protocols/qq/group_opt.c:305
+#, fuzzy
+msgid "You have successfully modified Qun information"
+msgstr "Vi sukcese forlasis la grupon"
+
+#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Agordo"
 
-#: ../libpurple/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Sistemo Mesaĝo"
 
-#: ../libpurple/protocols/qq/im.c:567
-msgid "Server ACK"
-msgstr "Servilo ACK"
-
-#: ../libpurple/protocols/qq/im.c:567
-msgid "Send IM fail\n"
-msgstr "TM Sendo malsukcesis\n"
-
-#: ../libpurple/protocols/qq/keep_alive.c:85
-msgid "Keep alive error, seems connection lost!"
-msgstr ""
+#: ../libpurple/protocols/qq/im.c:576
+#, fuzzy
+msgid "Failed to send IM."
+msgstr "Malsukcesis ricevi nomon: %s"
+
+#: ../libpurple/protocols/qq/keep_alive.c:87
+#, fuzzy
+msgid "Keep alive error"
+msgstr "Legeraro"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Request login token error!"
-msgstr ""
-
-#: ../libpurple/protocols/qq/login_logout.c:486
+#, fuzzy
+msgid "Error requesting login token"
+msgstr "Eraro kreante konekto"
+
+#: ../libpurple/protocols/qq/login_logout.c:488
 msgid "Unable to login, check debug log"
 msgstr ""
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2375
-#: ../libpurple/protocols/yahoo/yahoo.c:2403
-#: ../libpurple/protocols/yahoo/yahoo.c:2510
-#: ../libpurple/protocols/yahoo/yahoo.c:2531
-#: ../libpurple/protocols/yahoo/yahoo.c:2615
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Ne konekteblas."
@@ -7785,94 +9533,89 @@
 msgid "Unknown-%d"
 msgstr "Nekonata-%d"
 
-#: ../libpurple/protocols/qq/qq.c:209
-#, c-format
-msgid "%s Address"
-msgstr "%s Adreso"
-
-#: ../libpurple/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:211
+#, fuzzy
+msgid "TCP Address"
+msgstr "IP adreso"
+
+#: ../libpurple/protocols/qq/qq.c:213
+#, fuzzy
+msgid "UDP Address"
+msgstr "IP adreso"
+
+#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "Nivelo"
 
-#: ../libpurple/protocols/qq/qq.c:278
-msgid "QQ: Available"
-msgstr "QQ: Disponebla"
-
-#: ../libpurple/protocols/qq/qq.c:282
-msgid "QQ: Away"
-msgstr "QQ: Fora"
-
-#: ../libpurple/protocols/qq/qq.c:286
-msgid "QQ: Invisible"
-msgstr "QQ: Nevidebla"
-
-#: ../libpurple/protocols/qq/qq.c:290
-msgid "QQ: Offline"
-msgstr "QQ: Senkonekta"
-
-#: ../libpurple/protocols/qq/qq.c:371
+#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "Malvalida Uzantonomo"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:443
-#, c-format
-msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr ""
-
 #: ../libpurple/protocols/qq/qq.c:444
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr ""
 
 #: ../libpurple/protocols/qq/qq.c:445
 #, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr ""
+
+#: ../libpurple/protocols/qq/qq.c:446
+#, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:450
-#, c-format
-msgid "<b>Login Time</b>: %s<br>\n"
-msgstr ""
-
 #: ../libpurple/protocols/qq/qq.c:451
 #, c-format
-msgid "<b>Last Login IP</b>: %s<br>\n"
+msgid "<b>Login Time</b>: %s<br>\n"
 msgstr ""
 
 #: ../libpurple/protocols/qq/qq.c:452
 #, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr ""
+
+#: ../libpurple/protocols/qq/qq.c:453
+#, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "Ensaluta Informo"
 
-#: ../libpurple/protocols/qq/qq.c:531
-msgid "Modify My Information"
+#: ../libpurple/protocols/qq/qq.c:533
+#, fuzzy
+msgid "Set My Information"
 msgstr "Ŝanĝu Mian Informon"
 
-#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
 msgstr "Montru Ensalutan Informon"
 
-#: ../libpurple/protocols/qq/qq.c:558
-msgid "Exit this QQ Qun"
-msgstr ""
+#: ../libpurple/protocols/qq/qq.c:560
+msgid "Leave this QQ Qun"
+msgstr ""
+
+#: ../libpurple/protocols/qq/qq.c:584
+#, fuzzy
+msgid "Block this buddy"
+msgstr "Fermu tiun langeton"
 
 #. *< type
 #. *< ui_requirement
@@ -7884,25 +9627,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ Protokolo\tKromaĵo"
 
-#: ../libpurple/protocols/qq/qq.c:740
-msgid "Login in TCP"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq.c:743
-msgid "Login Hidden"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq_proxy.c:497
-msgid "Socket send error"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq_proxy.c:500
-msgid "Connection refused"
-msgstr "Konekto malakceptita"
+#: ../libpurple/protocols/qq/qq.c:752
+#, fuzzy
+msgid "Connect using TCP"
+msgstr "Konektante"
 
 #: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
@@ -7912,78 +9644,77 @@
 msgid "Unable to read from socket"
 msgstr ""
 
-#: ../libpurple/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr ""
 
-#: ../libpurple/protocols/qq/send_file.c:709
-#: ../libpurple/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr ""
 
-#: ../libpurple/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-#: ../libpurple/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "Konekto perdita"
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr ""
 
-#: ../libpurple/protocols/qq/sys_msg.c:103
-msgid "Do you wanna add this buddy?"
+#: ../libpurple/protocols/qq/sys_msg.c:110
+#, fuzzy
+msgid "Do you want to add this buddy?"
 msgstr "Ĉu vi volas aldoni tiun kunul?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr ""
 
-#: ../libpurple/protocols/qq/sys_msg.c:158
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:169
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "Ĉu vi deziras aldoni ŝlin?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:164
-#, c-format
-msgid "%s has added you [%s]"
-msgstr ""
-
-#: ../libpurple/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#, fuzzy, c-format
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "%s aldonis vin en sia kunul listo."
+
+#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr ""
 
-#: ../libpurple/protocols/qq/sys_msg.c:199
-#, c-format
-msgid "User %s has approved your request"
-msgstr ""
-
-#: ../libpurple/protocols/qq/sys_msg.c:222
-#, c-format
-msgid "%s wanna add you [%s] as friends"
-msgstr ""
-
-#: ../libpurple/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:212
+#, c-format
+msgid "User %s approved your request"
+msgstr ""
+
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:238
+#, c-format
+msgid "%s wants to add you [%s] as a friend"
+msgstr ""
+
+#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaĝo: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr ""
 
-#: ../libpurple/protocols/qq/sys_msg.c:246
-msgid "Would you like to add him?"
-msgstr "Ĉu vi deziras aldoni ŝlin?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Koneto fermita (skribante)"
@@ -8047,10 +9778,6 @@
 msgid "Starting Services"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr ""
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
@@ -8072,7 +9799,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr ""
 
@@ -8089,52 +9816,48 @@
 msgid "Unable to send message: "
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr ""
 
+#: ../libpurple/protocols/sametime/sametime.c:3229
+msgid "Microphone"
+msgstr ""
+
 #: ../libpurple/protocols/sametime/sametime.c:3230
-msgid "Microphone"
+msgid "Speakers"
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:3231
-msgid "Speakers"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3232
 msgid "Video Camera"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
-msgid "File Transfer"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4144
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Subtenas"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4118
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr ""
 
+#: ../libpurple/protocols/sametime/sametime.c:3380
+msgid "Create conference with user"
+msgstr ""
+
 #: ../libpurple/protocols/sametime/sametime.c:3381
-msgid "Create conference with user"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3382
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr ""
 
@@ -8162,150 +9885,150 @@
 msgid "Invite to Conference"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3561
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3566
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4417
 msgid "Topic:"
 msgstr "Temo:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3613
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3635
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3640
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4134
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4323
+msgid "Connect"
+msgstr "Kontaktu"
+
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4300
-#: ../libpurple/protocols/sametime/sametime.c:5495
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4303
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4327
-msgid "An ambiguous user ID was entered"
-msgstr ""
-
 #: ../libpurple/protocols/sametime/sametime.c:4328
+msgid "An ambiguous user ID was entered"
+msgstr ""
+
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4333
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4424
-msgid "Unable to add user"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5010
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5145
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5150
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5153
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5247
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5300
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5379
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5380
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8313,37 +10036,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5385
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5427
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5429
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5470
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5471
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5520
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8351,124 +10074,150 @@
 "buttons below."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:755
 msgid "Search Results"
 msgstr "Serĉ-Rezultojn"
 
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5553
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5594
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5595
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5598
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
-msgid "Import Sametime List..."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5614
-msgid "Export Sametime List..."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5618
-msgid "Add Notes Address Book Group..."
-msgstr ""
-
 #: ../libpurple/protocols/sametime/sametime.c:5622
+msgid "Import Sametime List..."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5626
+msgid "Export Sametime List..."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5630
+msgid "Add Notes Address Book Group..."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5719
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5729
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:420
-#: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/buddy.c:711
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
 #: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
 #: ../libpurple/protocols/silc/buddy.c:124
 #: ../libpurple/protocols/silc/buddy.c:129
 #: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:139
-#: ../libpurple/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr ""
 
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+msgid "Key Agreement failed"
+msgstr ""
+
 #: ../libpurple/protocols/silc/buddy.c:120
-msgid "Key Agreement failed"
+#: ../libpurple/protocols/silc10/buddy.c:125
+msgid "Timeout during key agreement"
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:125
-msgid "Timeout during key agreement"
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:130
-msgid "Key agreement was aborted"
+#: ../libpurple/protocols/silc10/buddy.c:135
+msgid "Key agreement is already started"
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:135
-msgid "Key agreement is already started"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:294
+#: ../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?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8476,342 +10225,453 @@
 "Remote port: %d"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:387
-#: ../libpurple/protocols/silc/buddy.c:422
-#: ../libpurple/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:512
-#: ../libpurple/protocols/silc/buddy.c:547
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:634
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ops.c:1087
-#: ../libpurple/protocols/silc/ops.c:1159
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Uzanto Informo"
 
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:737
+#: ../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."
 msgstr ""
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr ""
 
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr ""
+
 #: ../libpurple/protocols/silc/buddy.c:1073
-#, c-format
-msgid "The %s buddy is not present in the network"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1177
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1179
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1471
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1475
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1477
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1479
-msgid "Robot"
-msgstr ""
-
 #: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc10/buddy.c:1486
+msgid "Robot"
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1488
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/buddy.c:1495
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1490
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/buddy.c:1497
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1492
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/buddy.c:1499
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1494
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/buddy.c:1501
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/buddy.c:1503
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/buddy.c:1505
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/buddy.c:1507
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/buddy.c:1509
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/buddy.c:1511
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/buddy.c:1513
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Uzanto Modusoj"
 
-#: ../libpurple/protocols/silc/buddy.c:1550
-#: ../libpurple/protocols/silc/ops.c:1207
-msgid "Mood"
-msgstr "Etoso"
-
-#: ../libpurple/protocols/silc/buddy.c:1555
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Preferata Kontakto"
 
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Preferata Lingvo"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Temporegiono"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1660
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1670
-#: ../libpurple/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr ""
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:165
-#, c-format
-msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr ""
-
 #: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr ""
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:412
+#: ../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 "
@@ -8820,331 +10680,449 @@
 "able to join."
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:421
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:459
-#: ../libpurple/protocols/silc/chat.c:460
-#: ../libpurple/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Kanalo Aŭtentokontrola"
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:582
-#: ../libpurple/protocols/silc/ops.c:1909
-#: ../libpurple/protocols/silc/silc.c:938
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:891
-msgid "Ban List"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:899
-msgid "Add Private Group"
-msgstr ""
-
 #: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
+msgid "Ban List"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
+msgid "Add Private Group"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1034
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:1038
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:1097
+#: ../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"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1295
-#: ../libpurple/protocols/silc/silc.c:1147
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
+#: ../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
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Sekura Dosiero Transmeto"
 
-#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:105
+#: ../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"
 msgstr "Eraro dum dosiero transmeto"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+#, fuzzy
+msgid "Remote disconnected"
+msgstr "%s malkontaktita"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+#, fuzzy
+msgid "Connection timed out"
+msgstr "Konekto Malsukcesis"
+
+#: ../libpurple/protocols/silc/ft.c:118
+#, fuzzy
+msgid "Creating connection failed"
+msgstr "Konekto malsukcesis"
+
+#: ../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: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:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr ""
 
-#: ../libpurple/protocols/silc/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: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:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:57
+#, fuzzy
+msgid "Error occurred"
+msgstr "Eraro "
+
+#: ../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
+#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../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
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../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
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:931
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:997
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+#, fuzzy
+msgid "Network is empty"
+msgstr "Reto"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr ""
 
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
+msgid "Server Statistics"
+msgstr ""
+
 #: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
-msgid "Server Statistics"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9164,115 +11142,71 @@
 "Total router operators: %d\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
-msgid "Ping"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Aŭtentokontrolas konekton"
 
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1939
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1942
-msgid "Failure: Remote does not trust/support your public key"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1945
-msgid "Failure: Remote does not support proposed KE group"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1948
-msgid "Failure: Remote does not support proposed cipher"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1951
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1954
-msgid "Failure: Remote does not support proposed hash function"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1957
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1959
-msgid "Failure: Incorrect signature"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1961
-msgid "Failure: Invalid cookie"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1972
-msgid "Failure: Authentication failed"
-msgstr ""
-
-#: ../libpurple/protocols/silc/pk.c:103
+#: ../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:108
+#: ../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:112
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9281,340 +11215,439 @@
 "%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
+#: ../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 "Kontrolu Publikan Ŝlosilon..."
 
-#: ../libpurple/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Rigardu..."
 
-#: ../libpurple/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:153
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Konekto malsukcesis"
 
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:185
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:271
-msgid "Out of memory"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr "Sennomulo"
-
-#: ../libpurple/protocols/silc/silc.c:317
-msgid "Cannot initialize SILC protocol"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr ""
-
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:329
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:359
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:658
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
+msgid "Out of memory"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
+msgid "Cannot initialize SILC protocol"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643
 msgid "Normal"
 msgstr "Normala"
 
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:695
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:697
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:725
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:812
+#, fuzzy
+msgid "Timezone (UTC)"
+msgstr "Temporegiono"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:779
-#: ../libpurple/protocols/silc/silc.c:785
-#: ../libpurple/protocols/silc/silc.c:1424
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:779
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:1419
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:831
-#: ../libpurple/protocols/silc/silc.c:875
-#: ../libpurple/protocols/silc/silc.c:946
-#: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:831
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:875
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:914
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:916
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:918
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:941
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1001
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1104
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1295
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1376
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1478
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1483
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1498
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1528
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Nekonata komando: %s, (povas esti klienta cimo)"
 
-#: ../libpurple/protocols/silc/silc.c:1591
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1604
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1608
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1612
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1616
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1620
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1624
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1628
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1632
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1636
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1646
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1650
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1654
+#: ../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"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1658
+#: ../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"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1662
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1670
+#: ../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"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1699
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1703
+#: ../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)"
@@ -9629,116 +11662,141 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1814
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protokol-Kromaĵo"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038
 msgid "Network"
 msgstr "Reto"
 
-#: ../libpurple/protocols/silc/silc.c:1853
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1857
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1880
+#: ../libpurple/protocols/silc/silc.c:1948
+msgid "Use Perfect Forward Secrecy"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1883
-msgid "Reject watching by other users"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1886
-msgid "Block invites"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1892
-msgid "Reject online status attribute requests"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr ""
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr ""
 
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr ""
+
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:363
-#, c-format
-msgid "Organization: \t%s\n"
-msgstr ""
-
-#: ../libpurple/protocols/silc/util.c:365
-#, c-format
-msgid "Country: \t%s\n"
-msgstr ""
-
 #: ../libpurple/protocols/silc/util.c:366
-#, c-format
-msgid "Algorithm: \t%s\n"
-msgstr ""
-
-#: ../libpurple/protocols/silc/util.c:367
-#, c-format
-msgid "Key Length: \t%d bits\n"
+#: ../libpurple/protocols/silc10/util.c:363
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
+#, c-format
+msgid "Country: \t%s\n"
 msgstr ""
 
 #: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr ""
+
+#: ../libpurple/protocols/silc/util.c:372
+#, fuzzy, c-format
+msgid "Version: \t%s\n"
+msgstr "Kialo: %s"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -9746,80 +11804,154 @@
 "\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Publika Ŝloŝilo Informo"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Komputilo"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "Poŝkomputilo"
 
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminalo"
 
-#: ../libpurple/protocols/silc/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/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/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr ""
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "Sennomulo"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr ""
+
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr ""
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:1531
 msgid "Could not connect"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1516
-#: ../libpurple/protocols/simple/simple.c:1558
-#: ../libpurple/protocols/simple/simple.c:1571
-#: ../libpurple/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1061
+#, fuzzy
+msgid "Unknown server response."
+msgstr "Nekonata kialo."
+
+#: ../libpurple/protocols/simple/simple.c:1565
+#: ../libpurple/protocols/simple/simple.c:1607
+#: ../libpurple/protocols/simple/simple.c:1620
+#: ../libpurple/protocols/simple/simple.c:1671
 msgid "Could not create listen socket"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1588
 msgid "Couldn't resolve host"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1679
 msgid "Could not resolve hostname"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1696
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP ekrannomoj ne enhaveblas blankan spacon aŭ @ simbolon"
 
@@ -9831,36 +11963,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1872
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protokol-Kromaĵo"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1873
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "La SIP/SIMPLE Protokol-Kromaĵo"
 
-#: ../libpurple/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1901
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1907
 msgid "Use UDP"
 msgstr "Uzu UDP-n"
 
-#: ../libpurple/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1909
 msgid "Use proxy"
 msgstr "Uzu Prokurilon"
 
-#: ../libpurple/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1911
 msgid "Proxy"
 msgstr "Prokurilo"
 
-#: ../libpurple/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1913
 msgid "Auth User"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1915
 msgid "Auth Domain"
 msgstr ""
 
@@ -10017,7 +12149,8 @@
 msgid "Password Change Successful"
 msgstr "Pasvorto Ŝanĝita Sukcese"
 
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5871
+#: ../pidgin/gtkblist.c:6227
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -10077,40 +12210,41 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protokol-Kromaĵo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:805
+#: ../libpurple/protocols/yahoo/yahoo.c:784
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "Via Yahoo!-a mesaĝo malsendiĝas."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:875
-msgid "%s just sent you a Buzz!"
-msgstr "%s ĵus sendis al vi Zumon!!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:925
+#: ../libpurple/protocols/yahoo/yahoo.c:959
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! sistem-mesaĝo pro %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
 msgid "Authorization denied message:"
 msgstr "Rifuzita permeso mesaĝo:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1064
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
+#: ../libpurple/protocols/yahoo/yahoo.c:1046
 #, 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:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1051
 msgid "Add buddy rejected"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1821
+#: ../libpurple/protocols/yahoo/yahoo.c:1993
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10118,159 +12252,175 @@
 "Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 msgid "Failed Yahoo! Authentication"
 msgstr "Malsukcesis Yahoo! Aŭtentokontrolo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1890
+#: ../libpurple/protocols/yahoo/yahoo.c:2062
 #, 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:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 msgid "Ignore buddy?"
 msgstr "Ignoru Kunulon?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2007
+#: ../libpurple/protocols/yahoo/yahoo.c:2185
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2307
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Aŭdebla %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2461
+#: ../libpurple/protocols/yahoo/yahoo.c:2650
 msgid "Received unexpected HTTP response from server."
 msgstr "Ricevis neatendita HTTP respondo de servilo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2485
-#: ../libpurple/protocols/yahoo/yahoo.c:2664
-#: ../libpurple/protocols/yahoo/yahoo.c:2768
-#: ../libpurple/protocols/yahoo/yahoo.c:2778
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoo.c:2674
+#: ../libpurple/protocols/yahoo/yahoo.c:2860
+#: ../libpurple/protocols/yahoo/yahoo.c:2963
+#: ../libpurple/protocols/yahoo/yahoo.c:2973
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Konektado problemo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3486
+#: ../libpurple/protocols/yahoo/yahoo.c:2700
+#, fuzzy, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"Perdis konekton kun servilo:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2725
+#, fuzzy, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"Perdis konekton kun servilo:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3080
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Not at Home"
 msgstr "Malhejme"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
+#: ../libpurple/protocols/yahoo/yahoo.c:3082
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Desk"
 msgstr "Malpupitre"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:3084
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not in Office"
 msgstr "Malofice"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On Vacation"
 msgstr "Feriante"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Stepped Out"
 msgstr "Ekeliris"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoo.c:3015
+#: ../libpurple/protocols/yahoo/yahoo.c:3185
+#: ../libpurple/protocols/yahoo/yahoo.c:3215
 msgid "Not on server list"
 msgstr "Ne en servilo listo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3032
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3232
+#: ../libpurple/protocols/yahoo/yahoo.c:3290
 msgid "Appear Online"
 msgstr "Aperas Enreta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3035
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3311
 msgid "Appear Permanently Offline"
 msgstr "Aperas Ĉiama Senkonekta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3053
+#: ../libpurple/protocols/yahoo/yahoo.c:3253
 msgid "Presence"
 msgstr "Ĉeesto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3296
 msgid "Appear Offline"
 msgstr "Aperas Senkonekta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3105
+#: ../libpurple/protocols/yahoo/yahoo.c:3305
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne Aperas Ĉiama Senkonekta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3153
+#: ../libpurple/protocols/yahoo/yahoo.c:3353
 msgid "Join in Chat"
 msgstr "Aliĝu Babilejon"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3359
 msgid "Initiate Conference"
 msgstr "Iniciati Konferencon"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3187
+#: ../libpurple/protocols/yahoo/yahoo.c:3387
 msgid "Presence Settings"
 msgstr "Ĉeesto Agordoj"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3393
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3225
-msgid "Active which ID?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#, fuzzy
+msgid "Activate which ID?"
 msgstr "Ŝaltu kiun ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "Join whom in chat?"
 msgstr "Kiun kuniĝi en babilejo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3517
 msgid "Activate ID..."
 msgstr "Ŝaltu ID-on..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3521
 msgid "Join User in Chat..."
 msgstr "Kuniĝu Uzanto en Babilejo..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3755
-msgid "You have just sent a Buzz!"
-msgstr "Vi ĵus sendis Zumon!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3814
+#: ../libpurple/protocols/yahoo/yahoo.c:3526
+#, fuzzy
+msgid "Open Inbox"
+msgstr "Malfermu Hotmail-an Alkeston"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4135
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/yahoo/yahoo.c:4140
 msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
-msgid "buzz: Buzz a user to get their attention"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
+#: ../libpurple/protocols/yahoo/yahoo.c:4148
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -10284,128 +12434,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4023
-#: ../libpurple/protocols/yahoo/yahoo.c:4025
+#: ../libpurple/protocols/yahoo/yahoo.c:4357
+#: ../libpurple/protocols/yahoo/yahoo.c:4359
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protokol-Kromaĵo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4382
 msgid "Yahoo Japan"
 msgstr "Yahoo Japanio"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4045
+#: ../libpurple/protocols/yahoo/yahoo.c:4385
 msgid "Pager server"
 msgstr "Paĝila servilo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4388
 msgid "Japan Pager server"
 msgstr "Japana Paĝila servilo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4051
+#: ../libpurple/protocols/yahoo/yahoo.c:4391
 msgid "Pager port"
 msgstr "Paĝila pordo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4054
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "File transfer server"
 msgstr "Dosieralŝuto servilo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4057
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "Japan file transfer server"
 msgstr "Japana dosieralŝuto servilo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4060
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "File transfer port"
 msgstr "Dosieralŝuto pordo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4063
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Chat room locale"
 msgstr "Babilejo lokaĵaro"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4066
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoru konferencajn kaj babilejan invitojn"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4414
 msgid "Chat room list URL"
 msgstr "Babilejolisto URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "Yahoo Chat server"
 msgstr "Yahoo Babil servilo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Yahoo Chat port"
 msgstr "Yahoo Babilo pordo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "Invito malakceptita"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:361
-msgid "Failed to join chat"
-msgstr "Malsukcesis aliĝi babilejon"
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:364
-msgid "Unknown room"
-msgstr "Nekonata babilejo"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:367
-msgid "Maybe the room is full"
-msgstr "Eble la babilejo plenas"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:370
-msgid "Not available"
-msgstr "Ne disponebla"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:374
-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:452
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Vi nun estas babilanta en %s."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:627
-msgid "Failed to join buddy in chat"
-msgstr "Malsukcesis kuniĝi kunulon en babilejo"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
-msgid "Maybe they're not in a chat?"
-msgstr "Eble ili ne estas en babilejo?"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
-msgid "Fetching the room list failed."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1441
-msgid "Voices"
-msgstr "Voĉoj"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1444
-msgid "Webcams"
-msgstr "Retkameraoj"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-msgid "Unable to fetch room list."
-msgstr "Ne eblas ricevi babilejliston."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1518
-msgid "User Rooms"
-msgstr "Uzanto Babilejoj"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -10413,100 +12494,169 @@
 msgid "Sent Doodle request."
 msgstr ""
 
-#: ../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:270
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
 msgid "Unable to establish file descriptor."
 msgstr "Ne eblas estabi dosierotenilon."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Skriberaro"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japana profilo"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Yahoo! Profilo"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
+#: ../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:"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Hobioj"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Lastaj Novaĵoj"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Hejmpaĝo"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Mojosa Ligilo 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Mojosa Ligilo 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Mojosa Ligilo 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Lasta Aktualigo"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Uzanto informo pri %s nedisponebla"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "La uzanto profilo malplenas."
 
+#: ../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 "Invito malakceptita"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr "Malsukcesis aliĝi babilejon"
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr "Nekonata babilejo"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr "Eble la babilejo plenas"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr "Ne disponebla"
+
+#: ../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 "Vi nun estas babilanta en %s."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr "Malsukcesis kuniĝi kunulon en babilejo"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr "Eble ili ne estas en babilejo?"
+
+#: ../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 "Voĉoj"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr "Retkameraoj"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr "Ne eblas ricevi babilejliston."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr "Uzanto Babilejoj"
+
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Konektproblemo kun la YCHT servilo."
@@ -10531,100 +12681,95 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
-msgid "User"
-msgstr "Uzanto"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "Kaŝita aŭ ne ensalutita"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Ĉe %s ek de %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Iu ajn"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Klaso:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Apero:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Ricevanto:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+#: ../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;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+#: ../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;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+#: ../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;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "Realiĝu"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr ""
 
@@ -10638,112 +12783,122 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protokol-Kromaĵo"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2960
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "Uzu tzc-n"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2963
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "tzc komando"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2969
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "Sfero"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "Montreco"
 
-#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1588
+#: ../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 "HTTP prokura konekteraro %d"
 
-#: ../libpurple/proxy.c:778
+#: ../libpurple/proxy.c:788
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 "Aliro nepermesita: HTTP prokura servilo malpermesas pordon %d tunelumadon."
 
-#: ../libpurple/proxy.c:995
+#: ../libpurple/proxy.c:1012
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-#: ../libpurple/proxy.c:1685
+#: ../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:1341
+#: ../libpurple/request.h:1378
 msgid "_Yes"
 msgstr "_Jes"
 
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1378
 msgid "_No"
 msgstr "_Ne"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1360
+#: ../libpurple/request.h:1398
 msgid "_Accept"
 msgstr "_Akceptu"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "Mi ne estas tie nun"
 
-#: ../libpurple/savedstatuses.c:526
+#: ../libpurple/savedstatuses.c:535
 msgid "saved statuses"
 msgstr "konservitaj statoj"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:234
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s nun estas konata kiel %s.\n"
 
-#: ../libpurple/server.c:670
+#: ../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:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -10752,152 +12907,196 @@
 "%s invitis %s al babilejo %s:\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s invitis %s al babilejo %s\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "Ĉu akceptu babilinviton ?"
 
+#: ../libpurple/sslconn.c:164
+#, fuzzy
+msgid "SSL Connection Failed"
+msgstr "Konekto Malsukcesis"
+
+#: ../libpurple/sslconn.c:166
+msgid "SSL Handshake Failed"
+msgstr "SSL kvitanca reĝimo malsukcesis"
+
+#: ../libpurple/sslconn.c:168
+msgid "SSL peer presented an invalid certificate"
+msgstr ""
+
+#: ../libpurple/sslconn.c:171
+#, fuzzy
+msgid "Unknown SSL error"
+msgstr "Nekonata eraro"
+
 #: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Nedifinita"
 
-#: ../libpurple/status.c:156
-msgid "Unavailable"
-msgstr "Nedisponebla"
+#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#, fuzzy
+msgid "Do not disturb"
+msgstr "Ne Ĝenu"
+
+#: ../libpurple/status.c:159
+#, fuzzy
+msgid "Extended away"
+msgstr "Longfora"
 
 #: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "Movante"
 
-#: ../libpurple/status.c:611
+#: ../libpurple/status.c:609
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s ŝanĝis staton de %s al %s"
 
-#: ../libpurple/status.c:621
+#: ../libpurple/status.c:612
+#, fuzzy, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s ŝanĝis staton de %s al %s"
+
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is now %s"
 msgstr "%s nun estas %s"
 
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:625
+#, fuzzy, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s nun estas %s"
+
+#: ../libpurple/status.c:631
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s ne plu estas %s"
 
-#: ../libpurple/status.c:1293
+#: ../libpurple/status.c:633
+#, fuzzy, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s ne plu estas %s"
+
+#: ../libpurple/status.c:1244
 #, c-format
 msgid "%s became idle"
 msgstr "%s iĝis senfara"
 
-#: ../libpurple/status.c:1310
+#: ../libpurple/status.c:1261
 #, c-format
 msgid "%s became unidle"
 msgstr "%s iĝis fara"
 
-#: ../libpurple/status.c:1376
+#: ../libpurple/status.c:1324
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s iĝis senfara"
 
-#: ../libpurple/status.c:1378
+#: ../libpurple/status.c:1326
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s iĝis senfara"
 
-#: ../libpurple/util.c:681
+#: ../libpurple/util.c:701
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2442
+#: ../libpurple/util.c:2705
 #, c-format
 msgid "Error Reading %s"
 msgstr "Eraro dum legado %s"
 
-#: ../libpurple/util.c:2443
+#: ../libpurple/util.c:2706
 #, 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:2906
+#: ../libpurple/util.c:3206
 msgid "Calculating..."
 msgstr "Kalkulante..."
 
-#: ../libpurple/util.c:2909
+#: ../libpurple/util.c:3209
 msgid "Unknown."
 msgstr "Nekonata."
 
-#: ../libpurple/util.c:2935
+#: ../libpurple/util.c:3235
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekundo"
 msgstr[1] "%d sekundoj"
 
-#: ../libpurple/util.c:2947
+#: ../libpurple/util.c:3247
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d tago"
 msgstr[1] "%d tagoj"
 
-#: ../libpurple/util.c:2955
+#: ../libpurple/util.c:3255
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d horo"
 msgstr[1] "%s, %d horoj"
 
-#: ../libpurple/util.c:2961
+#: ../libpurple/util.c:3261
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d horo"
 msgstr[1] "%d horoj"
 
-#: ../libpurple/util.c:2969
+#: ../libpurple/util.c:3269
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutoj"
 
-#: ../libpurple/util.c:2975
+#: ../libpurple/util.c:3275
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutoj"
 
-#: ../libpurple/util.c:3242 ../libpurple/util.c:3540
+#: ../libpurple/util.c:3535
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr ""
+
+#: ../libpurple/util.c:3572 ../libpurple/util.c:3868
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Ne konekteblas al %s"
 
-#: ../libpurple/util.c:3368
+#: ../libpurple/util.c:3695
 #, 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:3403
+#: ../libpurple/util.c:3730
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Eraro legante de %s: %s"
 
-#: ../libpurple/util.c:3434
+#: ../libpurple/util.c:3761
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Eraro skribante al %s: %s"
 
-#: ../libpurple/util.c:3459
+#: ../libpurple/util.c:3786
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Ne konekteblas al %s: %s"
@@ -10923,55 +13122,77 @@
 msgstr "La oientiĝo de la pleto."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:390
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Salutaj Opcioj"
 
-#: ../pidgin/gtkaccount.c:492
-msgid "Local alias:"
+#: ../pidgin/gtkaccount.c:428
+#, fuzzy
+msgid "Pro_tocol:"
+msgstr "Protokolo:"
+
+#: ../pidgin/gtkaccount.c:439
+#, fuzzy
+msgid "Screen _name:"
+msgstr "Ekrannomo:"
+
+#: ../pidgin/gtkaccount.c:529
+#, fuzzy
+msgid "_Local alias:"
 msgstr "Loka Alinomo:"
 
+#: ../pidgin/gtkaccount.c:533
+#, fuzzy
+msgid "Remember pass_word"
+msgstr "Memoru pasvorton"
+
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:554
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Uzantoopcioj"
 
+#: ../pidgin/gtkaccount.c:604
+#, fuzzy
+msgid "New _mail notifications"
+msgstr "Nova retpoŝto avizoj"
+
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:572
-msgid "Use this buddy icon for this account:"
+#: ../pidgin/gtkaccount.c:609
+#, fuzzy
+msgid "Use this buddy _icon for this account:"
 msgstr "Uzu tiun kunul piktogramon por tiu konto:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:684
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "%s Opcioj"
 
-#: ../pidgin/gtkaccount.c:881
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "Uzu GNOME-ajn Prokurilo-Agordojn"
 
-#: ../pidgin/gtkaccount.c:882
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "Uzu Sistemajn Prokurilo-Agordojn"
 
-#: ../pidgin/gtkaccount.c:888
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "Sen Prokurilo"
 
-#: ../pidgin/gtkaccount.c:894
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:900
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:906
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213
 msgid "Use Environmental Settings"
 msgstr "Uzu Mediajn Agordojn"
 
@@ -10980,60 +13201,73 @@
 #. 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:951
+#: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
 msgstr "Se vi rigardas sufiĉe proksime"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "vi povas vidi la Zamenhofan barbon kreski"
 
-#: ../pidgin/gtkaccount.c:975
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "Prokurilo Opcioj"
 
-#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
 msgid "Proxy _type:"
 msgstr "Prokurilo _tipo:"
 
-#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
 msgid "_Host:"
 msgstr "_Retnodo:"
 
-#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
 msgid "_Port:"
 msgstr "_Pordo:"
 
-#: ../pidgin/gtkaccount.c:1010
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "_Salutnomo:"
 
-#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
 msgid "Pa_ssword:"
 msgstr "Pa_svorto:"
 
-#: ../pidgin/gtkaccount.c:1428
+#: ../pidgin/gtkaccount.c:1195
+#, fuzzy
+msgid "Unable to save new account"
+msgstr "Ne eblas alinomigi grupon"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Aldonu Konton"
 
-#: ../pidgin/gtkaccount.c:1452
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Baza"
 
-#: ../pidgin/gtkaccount.c:1463
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "_Kroma"
 
-#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "Enŝaltita"
 
-#: ../pidgin/gtkaccount.c:1961
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protokolo"
 
-#: ../pidgin/gtkaccount.c:2144
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11047,232 +13281,291 @@
 "<b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:704
+#: ../pidgin/gtkblist.c:524
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../pidgin/gtkblist.c:525
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:527
+#, fuzzy
+msgid "_Merge"
+msgstr "_Mesaĝo:"
+
+#: ../pidgin/gtkblist.c:924
 msgid "Join a Chat"
 msgstr "Aliĝu Babilejon"
 
-#: ../pidgin/gtkblist.c:725
+#: ../pidgin/gtkblist.c:945
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 "B.v enigi la konvenan informon pri la babilejo kiun vi deziras aliĝi.\n"
 
-#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
-#: ../pidgin/gtkroomlist.c:399
+#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6188
+#: ../pidgin/gtkpounce.c:539 ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "_Bloku"
 
-#: ../pidgin/gtkblist.c:1010
+#: ../pidgin/gtkblist.c:1245
 msgid "Un_block"
 msgstr "Mal_bloku"
 
-#: ../pidgin/gtkblist.c:1061
+#: ../pidgin/gtkblist.c:1288
+msgid "Move to"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1328
 msgid "Get _Info"
 msgstr "Ricevu _Informon"
 
-#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "T_M"
 
-#: ../pidgin/gtkblist.c:1070
-msgid "_Send File"
+#: ../pidgin/gtkblist.c:1337
+#, fuzzy
+msgid "_Send File..."
 msgstr "_Sendu Dosieron"
 
-#: ../pidgin/gtkblist.c:1077
-msgid "Add Buddy _Pounce"
+#: ../pidgin/gtkblist.c:1344
+#, fuzzy
+msgid "Add Buddy _Pounce..."
 msgstr "Aldonu Kunul _Atentigon"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
-#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353
+#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491
 msgid "View _Log"
 msgstr "Montru Protoko_lon"
 
-#: ../pidgin/gtkblist.c:1097
-msgid "Alias..."
-msgstr "Alinomo..."
-
-#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
-#: ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1359
+#, fuzzy
+msgid "Hide when offline"
+msgstr "Malpermesita kiam senkonekta"
+
+#: ../pidgin/gtkblist.c:1359
+#, fuzzy
+msgid "Show when offline"
+msgstr "Malpermesita kiam senkonekta"
+
+#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382
+#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497
 msgid "_Alias..."
 msgstr "_Alinomo..."
 
-#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
-#: ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499
 msgid "_Remove"
 msgstr "Fo_rigu"
 
-#: ../pidgin/gtkblist.c:1155
-msgid "Add a _Buddy"
-msgstr "Aldonu K_unulon"
-
-#: ../pidgin/gtkblist.c:1157
-msgid "Add a C_hat"
-msgstr "Aldonu Babile_jon"
-
-#: ../pidgin/gtkblist.c:1160
+#: ../pidgin/gtkblist.c:1434
+#, fuzzy
+msgid "Add _Buddy..."
+msgstr "Aldonu Kunulon"
+
+#: ../pidgin/gtkblist.c:1437
+#, fuzzy
+msgid "Add C_hat..."
+msgstr "Aldonu Babilejon"
+
+#: ../pidgin/gtkblist.c:1440
 msgid "_Delete Group"
 msgstr "_Forigu Grupon"
 
-#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1442
 msgid "_Rename"
 msgstr "_Alinomu"
 
 #. join button
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Aliĝu"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1464
 msgid "Auto-Join"
 msgstr "Aŭtomate-aliĝu"
 
-#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+#: ../pidgin/gtkblist.c:1466
+#, fuzzy
+msgid "Persistent"
+msgstr "Persa"
+
+#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
 msgid "_Collapse"
 msgstr "_Maletendu"
 
-#: ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1532
 msgid "_Expand"
 msgstr "_Etendu"
 
-#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
-#: ../pidgin/gtkblist.c:4431 ../pidgin/gtkblist.c:4441
+#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
+#: ../pidgin/gtkblist.c:4885 ../pidgin/gtkblist.c:4898
 msgid "/Tools/Mute Sounds"
 msgstr "/Iloj/Mutu Sonojn"
 
-#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
-#: ../pidgin/gtkpounce.c:421
+#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4903
+#: ../pidgin/gtkpounce.c:430
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "Vi ne ensalutis nun per konto kiu povas aldoni tiun kunul."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2757
+#: ../pidgin/gtkblist.c:3067
 msgid "/_Buddies"
 msgstr "/K_unuloj"
 
-#: ../pidgin/gtkblist.c:2758
+#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Kunuloj/Nova Tuj _Mesaĝo..."
 
-#: ../pidgin/gtkblist.c:2759
+#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Kunuloj/Aliĝu Babile_jon..."
 
-#: ../pidgin/gtkblist.c:2760
+#: ../pidgin/gtkblist.c:3070
 msgid "/Buddies/Get User _Info..."
 msgstr "/Kunuloj/Ricevu Uzanto-_Informon..."
 
-#: ../pidgin/gtkblist.c:2761
+#: ../pidgin/gtkblist.c:3071
 msgid "/Buddies/View User _Log..."
 msgstr "/Kunuloj/Montru Uzanto-_Protokolon..."
 
-#: ../pidgin/gtkblist.c:2763
-msgid "/Buddies/Show _Offline Buddies"
+#: ../pidgin/gtkblist.c:3073
+#, fuzzy
+msgid "/Buddies/Show"
+msgstr "/K_unuloj"
+
+#: ../pidgin/gtkblist.c:3074
+#, fuzzy
+msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Kunuloj/Montru Senk_onektajn Kunulojn"
 
-#: ../pidgin/gtkblist.c:2764
-msgid "/Buddies/Show _Empty Groups"
+#: ../pidgin/gtkblist.c:3075
+#, fuzzy
+msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Kunuloj/Montru Malpl_enajn Grupojn"
 
-#: ../pidgin/gtkblist.c:2765
-msgid "/Buddies/Show Buddy _Details"
+#: ../pidgin/gtkblist.c:3076
+#, fuzzy
+msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Kunuloj/Montru Kunul-_Detalojn"
 
-#: ../pidgin/gtkblist.c:2766
-msgid "/Buddies/Show Idle _Times"
+#: ../pidgin/gtkblist.c:3077
+#, fuzzy
+msgid "/Buddies/Show/Idle _Times"
 msgstr "/Kunuloj/Montru Senfarajn _Tempojn"
 
-#: ../pidgin/gtkblist.c:2767
+#: ../pidgin/gtkblist.c:3078
+#, fuzzy
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Kunuloj/Montru Malpl_enajn Grupojn"
+
+#: ../pidgin/gtkblist.c:3079
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Kunuloj/_Oridgu Kunulojn"
 
-#: ../pidgin/gtkblist.c:2769
+#: ../pidgin/gtkblist.c:3081
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Kunuloj/_Aldonu Kunulon..."
 
-#: ../pidgin/gtkblist.c:2770
+#: ../pidgin/gtkblist.c:3082
 msgid "/Buddies/Add C_hat..."
 msgstr "/Kunuloj/Aldonu Babile_jon..."
 
-#: ../pidgin/gtkblist.c:2771
+#: ../pidgin/gtkblist.c:3083
 msgid "/Buddies/Add _Group..."
 msgstr "/Kunuloj/Aldonu _Grupon..."
 
-#: ../pidgin/gtkblist.c:2773
+#: ../pidgin/gtkblist.c:3085
 msgid "/Buddies/_Quit"
 msgstr "/Kunuloj/_Finu"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2776
+#: ../pidgin/gtkblist.c:3088
 msgid "/_Accounts"
 msgstr "/_Kontoj"
 
-#: ../pidgin/gtkblist.c:2777 ../pidgin/gtkblist.c:6344
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Kontoj/Aldonu\\/Redaktu"
+#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6889
+#, fuzzy
+msgid "/Accounts/Manage"
+msgstr "/Kontoj"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2780
+#: ../pidgin/gtkblist.c:3092
 msgid "/_Tools"
 msgstr "/_Iloj"
 
-#: ../pidgin/gtkblist.c:2781
+#: ../pidgin/gtkblist.c:3093
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Iloj/Kunul _Atentigoj"
 
-#: ../pidgin/gtkblist.c:2782
+#: ../pidgin/gtkblist.c:3094
+#, fuzzy
+msgid "/Tools/_Certificates"
+msgstr "/Iloj/Agordoj"
+
+#: ../pidgin/gtkblist.c:3095
 msgid "/Tools/Plu_gins"
 msgstr "/Iloj/Kromaĵoj"
 
-#: ../pidgin/gtkblist.c:2783
+#: ../pidgin/gtkblist.c:3096
 msgid "/Tools/Pr_eferences"
 msgstr "/Iloj/Agordoj"
 
-#: ../pidgin/gtkblist.c:2784
+#: ../pidgin/gtkblist.c:3097
 msgid "/Tools/Pr_ivacy"
 msgstr "/Iloj/Pr_ivateco"
 
-#: ../pidgin/gtkblist.c:2786
+#: ../pidgin/gtkblist.c:3099
 msgid "/Tools/_File Transfers"
 msgstr "/Iloj/_Dosiero-alŝutoj"
 
-#: ../pidgin/gtkblist.c:2787
+#: ../pidgin/gtkblist.c:3100
 msgid "/Tools/R_oom List"
 msgstr "/Iloj/Ĉambro-Listo"
 
-#: ../pidgin/gtkblist.c:2788
+#: ../pidgin/gtkblist.c:3101
 msgid "/Tools/System _Log"
 msgstr "/Iloj/Sistemo-_Protokolo"
 
-#: ../pidgin/gtkblist.c:2790
+#: ../pidgin/gtkblist.c:3103
 msgid "/Tools/Mute _Sounds"
 msgstr "/Iloj/Mutu _Sonojn"
 
 #. Help
-#: ../pidgin/gtkblist.c:2793
+#: ../pidgin/gtkblist.c:3105
 msgid "/_Help"
 msgstr "/_Helpo"
 
-#: ../pidgin/gtkblist.c:2794
+#: ../pidgin/gtkblist.c:3106
 msgid "/Help/Online _Help"
 msgstr "/Helpo/Reta _Helpo"
 
-#: ../pidgin/gtkblist.c:2795
+#: ../pidgin/gtkblist.c:3107
 msgid "/Help/_Debug Window"
 msgstr "/Helpo/_Sencimig-fenestro"
 
-#: ../pidgin/gtkblist.c:2796
+#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
 msgid "/Help/_About"
 msgstr "/Helpo/_Pri"
 
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:3140
 #, c-format
 msgid ""
 "\n"
@@ -11281,160 +13574,162 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3218
 msgid "Buddy Alias"
 msgstr "Kunul Alinomo"
 
-#: ../pidgin/gtkblist.c:2923
+#: ../pidgin/gtkblist.c:3247
 msgid "Logged In"
 msgstr "Ensalutita"
 
-#: ../pidgin/gtkblist.c:2969
+#: ../pidgin/gtkblist.c:3293
 msgid "Last Seen"
 msgstr "Laste Vidita"
 
-#: ../pidgin/gtkblist.c:2989
+#: ../pidgin/gtkblist.c:3314
 msgid "Spooky"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2991
+#: ../pidgin/gtkblist.c:3316
 msgid "Awesome"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2993
-msgid "Rockin'"
-msgstr ""
-
 #: ../pidgin/gtkblist.c:3318
+msgid "Rockin'"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3657
+#, fuzzy, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "Senfara %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3659
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Senfara %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3320
+#: ../pidgin/gtkblist.c:3661
 #, c-format
 msgid "Idle %dm"
 msgstr "Senfara %dm"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3806
 msgid "/Buddies/New Instant Message..."
 msgstr "/Kunuloj/Nova Tuj Mesaĝo..."
 
-#: ../pidgin/gtkblist.c:3458 ../pidgin/gtkblist.c:3491
+#: ../pidgin/gtkblist.c:3807 ../pidgin/gtkblist.c:3840
 msgid "/Buddies/Join a Chat..."
 msgstr "/Kunuloj/Aliĝu Babilejon..."
 
-#: ../pidgin/gtkblist.c:3459
+#: ../pidgin/gtkblist.c:3808
 msgid "/Buddies/Get User Info..."
 msgstr "/Kunuloj/Ricevu Uzanto-Informon..."
 
-#: ../pidgin/gtkblist.c:3460
+#: ../pidgin/gtkblist.c:3809
 msgid "/Buddies/Add Buddy..."
 msgstr "/Kunuloj/Aldonu Kunulon..."
 
-#: ../pidgin/gtkblist.c:3461 ../pidgin/gtkblist.c:3494
+#: ../pidgin/gtkblist.c:3810 ../pidgin/gtkblist.c:3843
 msgid "/Buddies/Add Chat..."
 msgstr "/Kunuloj/Aldonu Babilejon..."
 
-#: ../pidgin/gtkblist.c:3462
+#: ../pidgin/gtkblist.c:3811
 msgid "/Buddies/Add Group..."
 msgstr "/Kunuloj/Aldonu Grupon..."
 
-#: ../pidgin/gtkblist.c:3497
-msgid "/Tools/Buddy Pounces"
-msgstr "/Iloj/Kunul Atentigoj"
-
-#: ../pidgin/gtkblist.c:3500
+#: ../pidgin/gtkblist.c:3846
 msgid "/Tools/Privacy"
 msgstr "/Iloj/Privateco"
 
-#: ../pidgin/gtkblist.c:3503
+#: ../pidgin/gtkblist.c:3849
 msgid "/Tools/Room List"
 msgstr "/Iloj/Ĉambro Listo"
 
-#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3944 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d nelegita mesaĝo el %s\n"
 msgstr[1] "%d nelegitaj mesaĝoj el %s\n"
 
-#: ../pidgin/gtkblist.c:3677
+#: ../pidgin/gtkblist.c:4104
 msgid "Manually"
 msgstr "Mane"
 
-#: ../pidgin/gtkblist.c:3679
-msgid "Alphabetically"
-msgstr "Alfabete"
-
-#: ../pidgin/gtkblist.c:3680
+#: ../pidgin/gtkblist.c:4107
 msgid "By status"
 msgstr "Laŭ stato"
 
-#: ../pidgin/gtkblist.c:3681
+#: ../pidgin/gtkblist.c:4108
 msgid "By log size"
 msgstr "Laŭ protokolo grandeco"
 
-#: ../pidgin/gtkblist.c:3883 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4313 ../pidgin/gtkconn.c:180
 #, c-format
 msgid "%s disconnected"
 msgstr "%s malkontaktita"
 
-#: ../pidgin/gtkblist.c:3892
-msgid "Re-enable Account"
-msgstr "Reŝaltu Konton"
-
-#: ../pidgin/gtkblist.c:3913
+#: ../pidgin/gtkblist.c:4349
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s malkontaktita: %s</span>"
 
-#: ../pidgin/gtkblist.c:4066
+#: ../pidgin/gtkblist.c:4501
 msgid "<b>Username:</b>"
 msgstr "<b>_Uzantonomo:</b>"
 
-#: ../pidgin/gtkblist.c:4073
+#: ../pidgin/gtkblist.c:4508
 msgid "<b>Password:</b>"
 msgstr "<b>Pasvorton:</b>"
 
-#: ../pidgin/gtkblist.c:4084
+#: ../pidgin/gtkblist.c:4519
 msgid "_Login"
 msgstr "Sa_lutnomo"
 
-#: ../pidgin/gtkblist.c:4169
+#: ../pidgin/gtkblist.c:4602
 msgid "/Accounts"
 msgstr "/Kontoj"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4183
+#: ../pidgin/gtkblist.c:4616
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4425
-msgid "/Buddies/Show Offline Buddies"
+#: ../pidgin/gtkblist.c:4879
+#, fuzzy
+msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Kunuloj/Montru Senkonektajn Kunulojn"
 
-#: ../pidgin/gtkblist.c:4428
-msgid "/Buddies/Show Empty Groups"
+#: ../pidgin/gtkblist.c:4882
+#, fuzzy
+msgid "/Buddies/Show/Empty Groups"
 msgstr "/Kunuloj/Montru Malplenajn Grupojn"
 
-#: ../pidgin/gtkblist.c:4434
-msgid "/Buddies/Show Buddy Details"
+#: ../pidgin/gtkblist.c:4888
+#, fuzzy
+msgid "/Buddies/Show/Buddy Details"
 msgstr "/Kunulojn/Montru Kunul-Detalojn"
 
-#: ../pidgin/gtkblist.c:4437
-msgid "/Buddies/Show Idle Times"
+#: ../pidgin/gtkblist.c:4891
+#, fuzzy
+msgid "/Buddies/Show/Idle Times"
 msgstr "/Kunuloj/Montru Senfarajn Tempojn"
 
-#: ../pidgin/gtkblist.c:5271
+#: ../pidgin/gtkblist.c:4894
+#, fuzzy
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Kunuloj/Montru Malplenajn Grupojn"
+
+#: ../pidgin/gtkblist.c:5796
 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. "
@@ -11444,23 +13739,34 @@
 "kunullisto. Vi povas laŭ deziro enigi alinomon, aŭ karesnomon, pri la kunul. "
 "La alinomo estos vidigita anstataŭ la erkrana nomo laŭ kaze.\n"
 
-#: ../pidgin/gtkblist.c:5331 ../pidgin/gtkblist.c:5692
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Grupo:"
-
-#: ../pidgin/gtkblist.c:5590
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:5819
+#, fuzzy
+msgid "A_ccount:"
+msgstr "Konto:"
+
+#. End of account box
+#: ../pidgin/gtkblist.c:5831
+#, fuzzy
+msgid "_Screen name:"
+msgstr "Ekrannomo:"
+
+#: ../pidgin/gtkblist.c:5853 ../pidgin/gtkblist.c:6209
+#, fuzzy
+msgid "A_lias:"
+msgstr "Alinomo:"
+
+#: ../pidgin/gtkblist.c:6121
 msgid "This protocol does not support chat rooms."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:5606
+#: ../pidgin/gtkblist.c:6137
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:5647
+#: ../pidgin/gtkblist.c:6178
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -11468,43 +13774,57 @@
 "B.v. enigi alinomon, kaj la konvenan informon pri la babilejo kiun vi volas "
 "aldoni en via kunullisto.\n"
 
-#: ../pidgin/gtkblist.c:5730
+#: ../pidgin/gtkblist.c:6237
+msgid "Autojoin when account becomes online."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6238
+msgid "Hide chat when the window is closed."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6264
 msgid "Please enter the name of the group to be added."
 msgstr "B.v. enigi la nomon de la grupo aldonenda."
 
-#: ../pidgin/gtkblist.c:6364
+#: ../pidgin/gtkblist.c:6909
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Kontoj/"
 
-#: ../pidgin/gtkblist.c:6388
+#: ../pidgin/gtkblist.c:6933
 msgid "_Edit Account"
 msgstr "_Redaktu Konton"
 
-#: ../pidgin/gtkblist.c:6401 ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkblist.c:6946 ../pidgin/gtkconv.c:3136
 msgid "No actions available"
 msgstr "Neniu ago disponebla"
 
-#: ../pidgin/gtkblist.c:6409
+#: ../pidgin/gtkblist.c:6954
 msgid "_Disable"
 msgstr "_Malŝaltu"
 
-#: ../pidgin/gtkblist.c:6421
+#: ../pidgin/gtkblist.c:6966
 msgid "Enable Account"
 msgstr "Ŝaltu Konton"
 
-#: ../pidgin/gtkblist.c:6427
+#: ../pidgin/gtkblist.c:6972
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6476
+#: ../pidgin/gtkblist.c:7021
 msgid "/Tools"
 msgstr "/Iloj"
 
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:7091
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kunuloj/Ordigu Kunulojn"
 
-#: ../pidgin/gtkconn.c:179
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:530
+#, fuzzy
+msgid "SSL Servers"
+msgstr "Servilo"
+
+#: ../pidgin/gtkconn.c:181
 #, c-format
 msgid ""
 "%s\n"
@@ -11513,21 +13833,26 @@
 "re-enable the account."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:523
+#, fuzzy
+msgid "Unknown command."
+msgstr "Nekonata komando: %s"
+
+#: ../pidgin/gtkconv.c:795 ../pidgin/gtkconv.c:821
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:815
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:855
+#: ../pidgin/gtkconv.c:868
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitu Kunul En Babilejo"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:898
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -11535,738 +13860,790 @@
 "B.v. enigi la nomon de uzanto kiun vi deziras inviti, kun fakultativan "
 "invitmesaĝon."
 
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:919
 msgid "_Buddy:"
 msgstr "K_unul:"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:930 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "_Mesaĝo:"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
-#: ../pidgin/gtkft.c:542
+#: ../pidgin/gtkconv.c:988 ../pidgin/gtkconv.c:2657 ../pidgin/gtkdebug.c:219
+#: ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "Dosiero malfermeblas."
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:994
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Konversacio kun %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1032
 msgid "Save Conversation"
 msgstr "Konservu Konversacion"
 
-#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Trovu"
 
-#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1204 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Serĉu:"
 
-#: ../pidgin/gtkconv.c:1338
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-
-#: ../pidgin/gtkconv.c:1346
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1675
 msgid "Un-Ignore"
 msgstr "Malignoru"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1678
 msgid "Ignore"
 msgstr "Ignoru"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1698
 msgid "Get Away Message"
 msgstr "Montru Formesaĝon"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1721
 msgid "Last said"
 msgstr "Laste diris"
 
-#: ../pidgin/gtkconv.c:2495
+#: ../pidgin/gtkconv.c:2665
 msgid "Unable to save icon file to disk."
 msgstr "Ne eblas konservi piktogramodosieron al disko."
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2716
 msgid "Save Icon"
 msgstr "Konservu Piktogramon"
 
-#: ../pidgin/gtkconv.c:2614
+#: ../pidgin/gtkconv.c:2768
 msgid "Animate"
 msgstr "Animaciigi"
 
-#: ../pidgin/gtkconv.c:2619
+#: ../pidgin/gtkconv.c:2773
 msgid "Hide Icon"
 msgstr "Kaŝu Piktogramon"
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2776
 msgid "Save Icon As..."
 msgstr "Konservu Piktogramon Kiel..."
 
-#: ../pidgin/gtkconv.c:2626
+#: ../pidgin/gtkconv.c:2780
 msgid "Set Custom Icon..."
 msgstr "Difinu Propran Piktogramon..."
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2793
 msgid "Remove Custom Icon"
 msgstr "Forigu Propran Piktogramon"
 
+#: ../pidgin/gtkconv.c:2924
+msgid "Show All"
+msgstr ""
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2943
 msgid "/_Conversation"
 msgstr "/_Konversacio"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2945
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Konversacio/Nova Tuj _Mesaĝo..."
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2950
 msgid "/Conversation/_Find..."
 msgstr "/Konversacio/_Trovu..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/View _Log"
 msgstr "/Konversacio/Montru _Protokolon"
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2953
 msgid "/Conversation/_Save As..."
 msgstr "/Konversacio/_Konservu Kiel..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2955
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Konversacio/Fo_rviŝu Dialogon"
 
-#: ../pidgin/gtkconv.c:2790
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konversacio/Se_ndu Dosieron..."
 
-#: ../pidgin/gtkconv.c:2791
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Konversacio/Aldonu Kunul-_Atentigon..."
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/_Get Info"
 msgstr "/Konversatio/_Ricevu Informon"
 
-#: ../pidgin/gtkconv.c:2795
+#: ../pidgin/gtkconv.c:2964
 msgid "/Conversation/In_vite..."
 msgstr "/Konversacio/In_vitu..."
 
-#: ../pidgin/gtkconv.c:2797
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/M_ore"
 msgstr "/Konversacio/_Pli"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2970
 msgid "/Conversation/Al_ias..."
 msgstr "/Konversacio/Al_inomo..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2972
 msgid "/Conversation/_Block..."
 msgstr "/KConversacio/_Bloku..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/_Unblock..."
 msgstr "/KConversacio/_Malbloku..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2976
 msgid "/Conversation/_Add..."
 msgstr "/Konversacio/_Aldonu..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2978
 msgid "/Conversation/_Remove..."
 msgstr "/Konversacio/_Forigu..."
 
-#: ../pidgin/gtkconv.c:2814
+#: ../pidgin/gtkconv.c:2983
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Konversacio/Enmetu Ligi_lon..."
+
+#: ../pidgin/gtkconv.c:2985
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Konversacio/Enm_etu Bildon..."
+
+#: ../pidgin/gtkconv.c:2991
 msgid "/Conversation/_Close"
 msgstr "/Konversacio/_Fermu"
 
 #. Options
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2995
 msgid "/_Options"
 msgstr "/_Opcioj"
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2996
 msgid "/Options/Enable _Logging"
 msgstr "/Opcioj/Ŝaltu _Protokoladon"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2997
 msgid "/Options/Enable _Sounds"
 msgstr "/Opcioj/Ŝaltu _Sonojn"
 
-#: ../pidgin/gtkconv.c:2821
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Opcioj/Montru Kunul-P_iktogramon"
-
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2999
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opcioj/Montru Formato-_Illistelojn"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:3000
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opcioj/Montru Te_mpomarkojn"
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:3124
 msgid "/Conversation/More"
 msgstr "/Konversacio/Pli"
 
+#: ../pidgin/gtkconv.c:3180
+#, fuzzy
+msgid "/Options"
+msgstr "/_Opcioj"
+
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2944 ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:3215 ../pidgin/gtkconv.c:3247
 msgid "/Conversation"
 msgstr "/Konversacio"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:3255
 msgid "/Conversation/View Log"
 msgstr "/Konversacio/Montru Protokoladon"
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:3261
 msgid "/Conversation/Send File..."
 msgstr "/Konversacio/Sendu Dosieron..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:3265
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Konversacio/Aldonu Kunul-Atentijon..."
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Get Info"
 msgstr "/Konversacio/Ricevu Informon"
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:3275
 msgid "/Conversation/Invite..."
 msgstr "/Konversacio/Invitu..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Alias..."
 msgstr "/Konversacio/Alinomo..."
 
-#: ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Block..."
 msgstr "/Konversacio/Bloku..."
 
-#: ../pidgin/gtkconv.c:3018
+#: ../pidgin/gtkconv.c:3289
 msgid "/Conversation/Unblock..."
 msgstr "/Konversacio/Malbloku..."
 
-#: ../pidgin/gtkconv.c:3022
+#: ../pidgin/gtkconv.c:3293
 msgid "/Conversation/Add..."
 msgstr "/Konversacion/Aldonu..."
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3297
 msgid "/Conversation/Remove..."
 msgstr "/Konversacio/Forigu..."
 
-#: ../pidgin/gtkconv.c:3030
+#: ../pidgin/gtkconv.c:3303
+msgid "/Conversation/Insert Link..."
+msgstr "/Konversacio/Enmetu Ligilon..."
+
+#: ../pidgin/gtkconv.c:3307
+msgid "/Conversation/Insert Image..."
+msgstr "/Konversacio/Enmetu Bildon..."
+
+#: ../pidgin/gtkconv.c:3313
 msgid "/Options/Enable Logging"
 msgstr "/Opcioj/Ŝaltu Protokoladon"
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3316
 msgid "/Options/Enable Sounds"
 msgstr "/Opcioj/Ŝaltu Sonojn"
 
-#: ../pidgin/gtkconv.c:3046
+#: ../pidgin/gtkconv.c:3329
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opcioj/Montru Formato-Illistelojn"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3332
 msgid "/Options/Show Timestamps"
 msgstr "/Opcioj/Montru Tempomarkojn"
 
-#: ../pidgin/gtkconv.c:3052
-msgid "/Options/Show Buddy Icon"
-msgstr "/Opcioj/Montru Kunul-Piktogramon"
-
-#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+#: ../pidgin/gtkconv.c:3409 ../pidgin/gtkconv.c:3451
 msgid "User is typing..."
 msgstr "Uzanto tajpas..."
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3454
 msgid "User has typed something and stopped"
 msgstr "Uzanto tajpis ion kaj haltis"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3358
-msgid "_Send To"
+#: ../pidgin/gtkconv.c:3637 ../pidgin/gtkconv.c:8103
+#, fuzzy
+msgid "S_end To"
 msgstr "_Sendu Al"
 
-#: ../pidgin/gtkconv.c:4065
+#: ../pidgin/gtkconv.c:4349
 msgid "_Send"
 msgstr "_Sendu"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4213
+#: ../pidgin/gtkconv.c:4453
 msgid "0 people in room"
 msgstr "0 homo en ĉambro"
 
-#: ../pidgin/gtkconv.c:5303 ../pidgin/gtkconv.c:5424
+#: ../pidgin/gtkconv.c:5823 ../pidgin/gtkconv.c:5944
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d homo en ĉambro"
 msgstr[1] "%d homoj en ĉambro"
 
-#: ../pidgin/gtkconv.c:5980 ../pidgin/gtkstatusbox.c:607
+#: ../pidgin/gtkconv.c:6550 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Tajpante"
 
-#: ../pidgin/gtkconv.c:5986
+#: ../pidgin/gtkconv.c:6554
 msgid "Stopped Typing"
 msgstr "Ekmaltajpas"
 
-#: ../pidgin/gtkconv.c:5991
+#: ../pidgin/gtkconv.c:6557
 msgid "Nick Said"
 msgstr "Karesnomo Diris"
 
-#: ../pidgin/gtkconv.c:5996 ../pidgin/gtkdocklet.c:500
+#: ../pidgin/gtkconv.c:6560 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Nelegitaj mesaĝoj"
 
-#: ../pidgin/gtkconv.c:6001
+#: ../pidgin/gtkconv.c:6563
 msgid "New Event"
 msgstr "Nova Evento"
 
-#: ../pidgin/gtkconv.c:7122
+#: ../pidgin/gtkconv.c:7654
+msgid "clear: Clears all conversation scrollbacks."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:7817
 msgid "Confirm close"
 msgstr "Konfirmu fermon"
 
-#: ../pidgin/gtkconv.c:7154
+#: ../pidgin/gtkconv.c:7849
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Vi havas nelegitajn mesaĝojn. Ĉu vi certas vi volas fermi la fenestron?"
 
-#: ../pidgin/gtkconv.c:7689
+#: ../pidgin/gtkconv.c:8436
 msgid "Close other tabs"
 msgstr "Fermu aliajn langetojn"
 
-#: ../pidgin/gtkconv.c:7695
+#: ../pidgin/gtkconv.c:8442
 msgid "Close all tabs"
 msgstr "Fermu ĉiujn langetojn"
 
-#: ../pidgin/gtkconv.c:7703
+#: ../pidgin/gtkconv.c:8450
 msgid "Detach this tab"
 msgstr "Deigu tiun langeton"
 
-#: ../pidgin/gtkconv.c:7709
+#: ../pidgin/gtkconv.c:8456
 msgid "Close this tab"
 msgstr "Fermu tiun langeton"
 
-#: ../pidgin/gtkconv.c:8012
+#: ../pidgin/gtkconv.c:8951
 msgid "Close conversation"
 msgstr "Fermu konversacion"
 
-#: ../pidgin/gtkconv.c:8476
+#: ../pidgin/gtkconv.c:9553
 msgid "Last created window"
 msgstr "Lasta kreita fenestro"
 
-#: ../pidgin/gtkconv.c:8478
+#: ../pidgin/gtkconv.c:9555
 msgid "Separate IM and Chat windows"
 msgstr "Disigu TM-aj kaj Babilejajn fenestrojn"
 
-#: ../pidgin/gtkconv.c:8480 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:9557 ../pidgin/gtkprefs.c:1417
 msgid "New window"
 msgstr "Nova fenestro"
 
-#: ../pidgin/gtkconv.c:8482
+#: ../pidgin/gtkconv.c:9559
 msgid "By group"
 msgstr "Laŭ grupo"
 
-#: ../pidgin/gtkconv.c:8484
+#: ../pidgin/gtkconv.c:9561
 msgid "By account"
 msgstr "Laŭ konto"
 
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Konservu Sencimigo-Protokolon"
 
-#: ../pidgin/gtkdebug.c:594
+#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Maligu"
 
-#: ../pidgin/gtkdebug.c:597
+#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Emfazu trovojn"
 
-#: ../pidgin/gtkdebug.c:664
+#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "Nur _Piktogramo"
 
-#: ../pidgin/gtkdebug.c:665
+#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "Nur _Teksto"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "_Ambaŭ Piktogramo & Teksto"
 
-#: ../pidgin/gtkdebug.c:802
+#: ../pidgin/gtkdebug.c:775
 msgid "Filter"
 msgstr "Filtrilo"
 
-#: ../pidgin/gtkdebug.c:821
+#: ../pidgin/gtkdebug.c:794
 msgid "Right click for more options."
 msgstr "Dektra klako por plia opcioj."
 
-#: ../pidgin/gtkdebug.c:851
+#: ../pidgin/gtkdebug.c:824
 msgid "Level "
 msgstr "Nivelo "
 
-#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
 msgid "Select the debug filter level."
 msgstr "Elektu sencimigfiltrilo nivelo."
 
-#: ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:833
 msgid "All"
 msgstr "Ĉiuj"
 
-#: ../pidgin/gtkdebug.c:861
+#: ../pidgin/gtkdebug.c:834
 msgid "Misc"
 msgstr "Diversaĵoj"
 
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:836
 msgid "Warning"
 msgstr "Averto"
 
-#: ../pidgin/gtkdebug.c:864
+#: ../pidgin/gtkdebug.c:837
 msgid "Error "
 msgstr "Eraro "
 
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:838
 msgid "Fatal Error"
 msgstr "Fatala Eraro"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "ĉefa programisto"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
-#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
+#: ../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:86
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../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 "programisto"
 
-#: ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:87
+msgid "support"
+msgstr "subteno"
+
+#: ../pidgin/gtkdialogs.c:88
+msgid "support/QA"
+msgstr "subteno/Kvalitkontrolo"
+
+#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "programisto kaj retestro"
 
-#: ../pidgin/gtkdialogs.c:84
-msgid "support"
-msgstr "subteno"
-
-#: ../pidgin/gtkdialogs.c:85
-msgid "support/QA"
-msgstr "subteno/Kvalitkontrolo"
-
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:99
+msgid "Senior Contributor/QA"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
 msgstr "win32 portebliĝo"
 
-#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "vartulo"
 
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:111
 msgid "libfaim maintainer"
 msgstr "libfaim vartulo"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "artifikulo kaj speciala pelilo"
 
-#: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "Jabber programisto"
-
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:115
+#, fuzzy
+msgid "XMPP developer"
+msgstr "programisto"
+
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "originala aŭtoro"
 
-#: ../pidgin/gtkdialogs.c:121
+#: ../pidgin/gtkdialogs.c:133
 msgid "Afrikaans"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:122
+#: ../pidgin/gtkdialogs.c:134
 msgid "Arabic"
 msgstr "Araba"
 
-#: ../pidgin/gtkdialogs.c:123 ../pidgin/gtkdialogs.c:124
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:135
+msgid "Belarusian Latin"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:224
 msgid "Bulgarian"
 msgstr "Bulgara"
 
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
 msgstr "Bengala"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:142
 msgid "Bosnian"
 msgstr "Bosna"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:226
 msgid "Catalan"
 msgstr "Kataluna"
 
-#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
 msgstr "Valenciana"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:227
 msgid "Czech"
 msgstr "Ĉeĥa"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr "Dana"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:228
 msgid "German"
 msgstr "Germana"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
 msgid "Greek"
 msgstr "Greka"
 
-#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:156
 msgid "Australian English"
 msgstr "Aŭstrala Angla"
 
-#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:157
 msgid "Canadian English"
 msgstr "Kanada Angla"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:158
 msgid "British English"
 msgstr "Brita Angla"
 
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:159
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Spanish"
 msgstr "Hispana"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:161
+#, fuzzy
+msgid "Estonian"
+msgstr "Bosna"
+
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
 msgstr "Eŭska"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:166
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 msgid "Finnish"
 msgstr "Finna"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "French"
 msgstr "Franca"
 
-#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:239
 msgid "Galician"
 msgstr "Galega"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr "Guĝarata"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:172
+msgid "Gujarati Language Team"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:240
 msgid "Hebrew"
 msgstr "Hebrea"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:174
 msgid "Hindi"
 msgstr "Hindia"
 
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:241
 msgid "Hungarian"
 msgstr "Hungara"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:176
 msgid "Indonesian"
 msgstr "Indonezia"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:242
 msgid "Italian"
 msgstr "Itala"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244 ../pidgin/gtkdialogs.c:245
 msgid "Japanese"
 msgstr "Japana"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:246
 msgid "Georgian"
 msgstr "Kartvela"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:179
+#, fuzzy
+msgid "Ubuntu Georgian Translators"
+msgstr "Aktualaj Tradukantoj"
+
+#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada"
 msgstr "Kanara"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:180
+msgid "Kannada Translation team"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:248
 msgid "Korean"
 msgstr "Korea"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
 msgstr "Kurda"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:250
 msgid "Lithuanian"
 msgstr "Litova"
 
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:251
 msgid "Macedonian"
 msgstr "Makedona"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:252
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norvega"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:189
 msgid "Nepali"
 msgstr "Nepala"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:190
 msgid "Dutch, Flemish"
 msgstr "Nederlanda, Flandra"
 
-#: ../pidgin/gtkdialogs.c:175
-msgid "Norwegian"
+#: ../pidgin/gtkdialogs.c:191
+#, fuzzy
+msgid "Norwegian Nynorsk"
 msgstr "Norvega"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:253
 msgid "Polish"
 msgstr "Pola"
 
-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:195
 msgid "Portuguese"
 msgstr "Portugala"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:196
 msgid "Portuguese-Brazil"
 msgstr "Brazil-Portugala"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:197
 msgid "Pashto"
 msgstr "Paŝtua"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:198
 msgid "Romanian"
 msgstr "Rumana"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Russian"
 msgstr "Rusa"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:256 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Slovak"
 msgstr "Slovaka"
 
-#: ../pidgin/gtkdialogs.c:185
-msgid "Slovack"
-msgstr "Slovaka"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:259
 msgid "Slovenian"
 msgstr "Slovena"
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:203
 msgid "Albanian"
 msgstr "Albana"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
 msgid "Serbian"
 msgstr "Serba"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:261
 msgid "Swedish"
 msgstr "Sveda"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:207
 msgid "Tamil"
 msgstr "Tamila"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:208
 msgid "Telugu"
 msgstr "Telugua"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:209
 msgid "Thai"
 msgstr "Taja"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:262
 msgid "Turkish"
 msgstr "Turka"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:211
 msgid "Vietnamese"
 msgstr "Vjetnama"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:211
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh kaj la Gnome-Vi Teamo"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:263
 msgid "Simplified Chinese"
 msgstr "Simpligita Ĉina"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:213 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
+msgid "Hong Kong Chinese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:264
 msgid "Traditional Chinese"
 msgstr "Tradicia Ĉina"
 
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:223
 msgid "Amharic"
 msgstr "Amhara"
 
-#: ../pidgin/gtkdialogs.c:323
+#: ../pidgin/gtkdialogs.c:351
+#, c-format
 msgid "About %s"
 msgstr "Pri %s"
 
-#: ../pidgin/gtkdialogs.c:359
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %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>"
+#: ../pidgin/gtkdialogs.c:394
+#, fuzzy, 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 ""
 "%s estas modula mesaĝokliento, kapablas uzi AIM, MSN, Yahoo!, Jabber, ICQ, "
 "IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
@@ -12277,47 +14654,48 @@
 "'COPYRIGHT' pri kompleta listo de kontribuantoj.  Ni provizas nenian "
 "garantion pri tiu programaro.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 ĉe irc.freenode.net<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:412
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin ĉe irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:383
+#: ../pidgin/gtkdialogs.c:417
 msgid "Current Developers"
 msgstr "Aktualaj Programistoj"
 
-#: ../pidgin/gtkdialogs.c:398
+#: ../pidgin/gtkdialogs.c:432
 msgid "Crazy Patch Writers"
 msgstr "Frenezaj Flikistoj"
 
-#: ../pidgin/gtkdialogs.c:413
+#: ../pidgin/gtkdialogs.c:447
 msgid "Retired Developers"
 msgstr "Emeritaj Programistoj"
 
-#: ../pidgin/gtkdialogs.c:428
+#: ../pidgin/gtkdialogs.c:462
+#, fuzzy
+msgid "Retired Crazy Patch Writers"
+msgstr "Frenezaj Flikistoj"
+
+#: ../pidgin/gtkdialogs.c:477
 msgid "Artists"
 msgstr "Artistoj"
 
-#: ../pidgin/gtkdialogs.c:443
+#: ../pidgin/gtkdialogs.c:492
 msgid "Current Translators"
 msgstr "Aktualaj Tradukantoj"
 
-#: ../pidgin/gtkdialogs.c:463
+#: ../pidgin/gtkdialogs.c:512
 msgid "Past Translators"
 msgstr "Pastintaj Tradukantoj"
 
-#: ../pidgin/gtkdialogs.c:481
+#: ../pidgin/gtkdialogs.c:530
 msgid "Debugging Information"
 msgstr "Sencimiga Informo"
 
-#: ../pidgin/gtkdialogs.c:855
+#: ../pidgin/gtkdialogs.c:900
 msgid "Get User Info"
 msgstr "Ricevu Uzanto-Informon"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:902
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -12325,11 +14703,11 @@
 "B.v. enigi la ekrannomon aŭ alinomon de persono kiesn informon vi dezrias "
 "rigardi."
 
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:992
 msgid "View User Log"
 msgstr "Rigardu Uzanto-Protokolon"
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:994
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -12337,32 +14715,32 @@
 "B.v. enigi la ekrannomon aŭ alinomon de persono kiesn protokolon vi dezrias "
 "rigardi."
 
-#: ../pidgin/gtkdialogs.c:967
+#: ../pidgin/gtkdialogs.c:1014
 msgid "Alias Contact"
 msgstr "Alinomo Kontakto"
 
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:1015
 msgid "Enter an alias for this contact."
 msgstr "Enigu alinomon por tiu kontakto."
 
-#: ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:1037
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enigu alinomon por %s."
 
-#: ../pidgin/gtkdialogs.c:990
+#: ../pidgin/gtkdialogs.c:1039
 msgid "Alias Buddy"
 msgstr "Alinomu Kunulon"
 
-#: ../pidgin/gtkdialogs.c:1009
+#: ../pidgin/gtkdialogs.c:1060
 msgid "Alias Chat"
 msgstr "Alinomu Babilejon"
 
-#: ../pidgin/gtkdialogs.c:1010
+#: ../pidgin/gtkdialogs.c:1061
 msgid "Enter an alias for this chat."
 msgstr "Enigu alinomon por tiu babilejon."
 
-#: ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1100
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12377,15 +14755,15 @@
 "Vi estas foriganta la kontaktojn enhavantajn %s kaj %d aliaj kunuloj de via "
 "kunullisto. Ĉu vi volas daŭrigi?"
 
-#: ../pidgin/gtkdialogs.c:1055
+#: ../pidgin/gtkdialogs.c:1108
 msgid "Remove Contact"
 msgstr "Forigu Kontakton"
 
-#: ../pidgin/gtkdialogs.c:1056
+#: ../pidgin/gtkdialogs.c:1111
 msgid "_Remove Contact"
 msgstr "_Forigu Kontakton"
 
-#: ../pidgin/gtkdialogs.c:1086
+#: ../pidgin/gtkdialogs.c:1142
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -12394,15 +14772,15 @@
 "Vi estas kunfandanta la grupon nomita %s en la grupo nomita %s. Ĉu vi volas "
 "daŭrigi?"
 
-#: ../pidgin/gtkdialogs.c:1093
+#: ../pidgin/gtkdialogs.c:1149
 msgid "Merge Groups"
 msgstr "Kunfandu Grupojn"
 
-#: ../pidgin/gtkdialogs.c:1094
+#: ../pidgin/gtkdialogs.c:1152
 msgid "_Merge Groups"
 msgstr "_Kunfandu Grupojn"
 
-#: ../pidgin/gtkdialogs.c:1144
+#: ../pidgin/gtkdialogs.c:1202
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12411,40 +14789,40 @@
 "Vi estas foriganta la grupon %s kaj tutajn membrojn de via kunullisto. Ĉu vi "
 "volas daŭrigi?"
 
-#: ../pidgin/gtkdialogs.c:1147
+#: ../pidgin/gtkdialogs.c:1205
 msgid "Remove Group"
 msgstr "Forigu Grupon"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1208
 msgid "_Remove Group"
 msgstr "_Forigu Grupon"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1241
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Vi estas foriganta %s de via kunullisto.  Ĉu vi volas daŭrigi?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1244
 msgid "Remove Buddy"
 msgstr "Forigu Kunulon"
 
-#: ../pidgin/gtkdialogs.c:1185
+#: ../pidgin/gtkdialogs.c:1247
 msgid "_Remove Buddy"
 msgstr "_Forigu Kunulon"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1268
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Vi estas foriganta %s de via kunullisto.  Ĉu vi volas daŭrigi?"
 
-#: ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1271
 msgid "Remove Chat"
 msgstr "Forigu Babilejon"
 
-#: ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1274
 msgid "_Remove Chat"
 msgstr "_Forigu Babilejon"
 
@@ -12452,156 +14830,154 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "Dektre-klaku por pliaj nelegitaj mesaĝoj...\n"
 
-#: ../pidgin/gtkdocklet.c:443
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "Ŝanĝu staton"
 
-#: ../pidgin/gtkdocklet.c:495
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "Montru kunulliston"
 
-#: ../pidgin/gtkdocklet.c:521
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "Nova mesaĝo..."
 
-#: ../pidgin/gtkdocklet.c:536
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "Malsonorigu"
 
-#: ../pidgin/gtkdocklet.c:543
-msgid "Blink on new message"
+#: ../pidgin/gtkdocklet.c:535
+#, fuzzy
+msgid "Blink on New Message"
 msgstr "Flagri je nova mesaĝo"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "Finu"
 
-#: ../pidgin/gtkft.c:153
+#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "Malkomencita"
 
-#: ../pidgin/gtkft.c:273
+#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Ricevante Kiel:</b>"
 
-#: ../pidgin/gtkft.c:275
+#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Ricevante De:</b>"
 
-#: ../pidgin/gtkft.c:279
+#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sendante Al:</b>"
 
-#: ../pidgin/gtkft.c:281
+#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>Sendante Kiel:</b>"
 
-#: ../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 "Eraro okazis malfermante la dosiero."
 
-#: ../pidgin/gtkft.c:539
+#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Eraro lanĉante %s: %s"
 
-#: ../pidgin/gtkft.c:548
+#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "Eraro lanĉante %s"
 
-#: ../pidgin/gtkft.c:549
+#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr ""
 
-#: ../pidgin/gtkft.c:696
+#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Dosiernomo:"
 
-#: ../pidgin/gtkft.c:697
+#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "Loka Doerisero:"
 
-#: ../pidgin/gtkft.c:699
+#: ../pidgin/gtkft.c:700
 msgid "Speed:"
 msgstr "Rapideco:"
 
-#: ../pidgin/gtkft.c:700
-msgid "Time Elapsed:"
-msgstr "Pasita Tempo:"
-
 #: ../pidgin/gtkft.c:701
+msgid "Time Elapsed:"
+msgstr "Pasita Tempo:"
+
+#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Resta Tempo:"
 
-#: ../pidgin/gtkft.c:786
+#: ../pidgin/gtkft.c:784
 msgid "Close this window when all transfers _finish"
 msgstr "Fermu tiun fenestron kiam all transmetoj _finas"
 
-#: ../pidgin/gtkft.c:796
+#: ../pidgin/gtkft.c:794
 msgid "C_lear finished transfers"
 msgstr "F_orviŝu finitajn transmetojn"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:805
+#: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
 msgstr "Dosiero-transmeto _detaloj"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Paŭzo"
 
 #. Resume button
-#: ../pidgin/gtkft.c:845
+#: ../pidgin/gtkft.c:843
 msgid "_Resume"
 msgstr "_Rekomenci"
 
-#: ../pidgin/gtkimhtml.c:793
+#: ../pidgin/gtkimhtml.c:816
 msgid "Paste as Plain _Text"
 msgstr "Enmetu keil Plena _Teksto"
 
-#: ../pidgin/gtkimhtml.c:810
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "_Reset formatting"
 msgstr "_Restarigu formatumon"
 
-#: ../pidgin/gtkimhtml.c:1295
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Hyperlink color"
 msgstr "Ligila koloro"
 
-#: ../pidgin/gtkimhtml.c:1296
+#: ../pidgin/gtkimhtml.c:1374
 msgid "Color to draw hyperlinks."
 msgstr "Koloro ligila."
 
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Hyperlink prelight color"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1300
+#: ../pidgin/gtkimhtml.c:1378
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1516
+#: ../pidgin/gtkimhtml.c:1598
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiu Retadreson"
 
-#: ../pidgin/gtkimhtml.c:1528
+#: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
 msgstr "_Malfermu Ligilon en Retumilo"
 
-#: ../pidgin/gtkimhtml.c:1538
+#: ../pidgin/gtkimhtml.c:1620
 msgid "_Copy Link Location"
 msgstr "_Kopiu Ligilo-Lokon"
 
-#: ../pidgin/gtkimhtml.c:3271
+#: ../pidgin/gtkimhtml.c:3369
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12611,7 +14987,7 @@
 "\n"
 "Apriorigas kiel PNG."
 
-#: ../pidgin/gtkimhtml.c:3274
+#: ../pidgin/gtkimhtml.c:3372
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12621,7 +14997,7 @@
 "\n"
 "Apriorigas kiel PNG."
 
-#: ../pidgin/gtkimhtml.c:3287
+#: ../pidgin/gtkimhtml.c:3401
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12632,7 +15008,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3290
+#: ../pidgin/gtkimhtml.c:3404
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -12643,35 +15019,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3370 ../pidgin/gtkimhtml.c:3382
+#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
 msgid "Save Image"
 msgstr "Konservu Bildon"
 
-#: ../pidgin/gtkimhtml.c:3410
+#: ../pidgin/gtkimhtml.c:3522
 msgid "_Save Image..."
 msgstr "_Konservi Bildon..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:163
 msgid "Select Font"
 msgstr "Elektu Tiparon"
 
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:242
 msgid "Select Text Color"
 msgstr "Elektu Tekstan Koloron"
 
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:321
 msgid "Select Background Color"
 msgstr "Elektu Malantaŭan Koloron"
 
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:410
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "_Description"
 msgstr "_Priskribo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:405
+#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -12679,120 +15055,213 @@
 "B.v. enigi la URL-n kaj priskribon de la ligilo kiun vi volas enmeti. La "
 "priskribo estas fakultativa."
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:425
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "B.v. enigi la URL-n kies ligilon vi volas enmeti."
 
-#: ../pidgin/gtkimhtmltoolbar.c:414
+#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Insert Link"
 msgstr "Enmetu Ligilon"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1260
 msgid "_Insert"
 msgstr "_Enmetu"
 
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:514
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Malsukcesis konservi bildon: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
 msgid "Insert Image"
 msgstr "Enmetu Bildon"
 
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:761
 msgid "This theme has no available smileys."
 msgstr "Tiu temo havas neniujn disponeblajn ridmienojn"
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:778
 msgid "Smile!"
 msgstr "Ridetu!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:843 ../pidgin/gtkimhtmltoolbar.c:1217
+#, fuzzy
+msgid "_Font"
+msgstr "Tiparoj"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1051
+#, fuzzy
+msgid "Group Items"
+msgstr "Grupo ID"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1051
+msgid "Ungroup Items"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Grasa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Kursiva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1087 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Substrekita"
 
-#: ../pidgin/gtkimhtmltoolbar.c:960
-msgid "Larger font size"
-msgstr "Pligranda tiparo grandeco"
-
-#: ../pidgin/gtkimhtmltoolbar.c:972
-msgid "Smaller font size"
-msgstr "Malpligranda tiparo grandeco"
-
-#: ../pidgin/gtkimhtmltoolbar.c:989
-msgid "Font face"
+#: ../pidgin/gtkimhtmltoolbar.c:1088
+msgid "Strikethrough"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Increase Font Size"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1091
+msgid "Decrease Font Size"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+#, fuzzy
+msgid "Font Face"
 msgstr "Tiparo aspekto"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1001
-msgid "Foreground font color"
-msgstr "Antaŭa tiparo koloro"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1013
-msgid "Background color"
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+#, fuzzy
+msgid "Background Color"
 msgstr "Malantaŭa tiparo koloro"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1029
-msgid "Reset formatting"
+#: ../pidgin/gtkimhtmltoolbar.c:1095
+#, fuzzy
+msgid "Foreground Color"
+msgstr "Antaŭa tiparo koloro"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1097
+#, fuzzy
+msgid "Reset Formatting"
 msgstr "Restartigu formatumon"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1044
-msgid "Insert link"
-msgstr "Enmetu ligilon"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-msgid "Insert image"
-msgstr "Enmetu bildon"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1065
-msgid "Insert smiley"
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+#, fuzzy
+msgid "Insert IM Image"
+msgstr "Enmetu Bildon"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1101
+#, fuzzy
+msgid "Insert Smiley"
 msgstr "Enmetu ridmienon"
 
-#: ../pidgin/gtklog.c:262
+#: ../pidgin/gtkimhtmltoolbar.c:1177
+#, fuzzy
+msgid "<b>_Bold</b>"
+msgstr "<b>Pasvorton:</b>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+#, fuzzy
+msgid "<i>_Italic</i>"
+msgstr " <i>(ircop)</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
+#, fuzzy
+msgid "<u>_Underline</u>"
+msgstr "Substrekita"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1180
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1181
+#, fuzzy
+msgid "<span size='larger'>_Larger</span>"
+msgstr ""
+"<span size='larger' weight='bold'>Eraro konservante bildon</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1183
+#, fuzzy
+msgid "_Normal"
+msgstr "Normala"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1185
+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:1189
+#, fuzzy
+msgid "_Font face"
+msgstr "Tiparo aspekto"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1190
+#, fuzzy
+msgid "Foreground _color"
+msgstr "Antaŭa tiparo koloro"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1191
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "Malantaŭa tiparo koloro"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1268
+#, fuzzy
+msgid "_Image"
+msgstr "Konservu Bildon"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1274
+#, fuzzy
+msgid "_Link"
+msgstr "Sa_lutnomo"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1280
+msgid "_Horizontal rule"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1302
+#, fuzzy
+msgid "_Smile!"
+msgstr "Ridetu!"
+
+#: ../pidgin/gtklog.c:293
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr "Ĉu vi certas vi volas forigi elektitajn konservitajn statuojn?"
 
-#: ../pidgin/gtklog.c:273
+#: ../pidgin/gtklog.c:304
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr "Ĉu vi certas vi volas forigi elektitajn konservitajn statuojn?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:309
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr "Ĉu vi certas vi volas forigi elektitajn konservitajn statuojn?"
 
-#: ../pidgin/gtklog.c:419
+#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Konversacio en %s ĉe %s</span>"
 
-#: ../pidgin/gtklog.c:422
+#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Konversacio kun %s ĉe %s</span>"
 
-#: ../pidgin/gtklog.c:469
+#: ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:516
+#: ../pidgin/gtklog.c:550
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -12800,49 +15269,51 @@
 "Sistemeventoj nur estos protokolita se la \"Protokolu ĉiujn ŝanĝojn al "
 "sistem protokolo\" agordo estas ŝaltita."
 
-#: ../pidgin/gtklog.c:520
+#: ../pidgin/gtklog.c:554
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
 
-#: ../pidgin/gtklog.c:523
+#: ../pidgin/gtklog.c:557
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 
-#: ../pidgin/gtklog.c:527
+#: ../pidgin/gtklog.c:561
 msgid "No logs were found"
 msgstr "Neniu protokolo trovita"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:542
+#: ../pidgin/gtklog.c:576
 msgid "_Browse logs folder"
 msgstr ""
 
-#: ../pidgin/gtklog.c:606
+#: ../pidgin/gtklog.c:640
 msgid "Total log size:"
 msgstr "Tuta protokolo grandeco:"
 
-#: ../pidgin/gtklog.c:675
+#: ../pidgin/gtklog.c:709
 #, c-format
 msgid "Conversations in %s"
 msgstr "Konversacioj en %s"
 
-#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
 #, c-format
 msgid "Conversations with %s"
 msgstr "Konversacioj kun %s"
 
-#: ../pidgin/gtklog.c:760
+#: ../pidgin/gtklog.c:804
 msgid "System Log"
 msgstr "Sistemo Protokolo"
 
-#: ../pidgin/gtkmain.c:364
+#: ../pidgin/gtkmain.c:386
+#, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Provu `%s -h' por plia informo.\n"
 
-#: ../pidgin/gtkmain.c:366
+#: ../pidgin/gtkmain.c:388
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12850,9 +15321,11 @@
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
+"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -12867,88 +15340,91 @@
 "                      konto(j)n uzendajn, disigitajn per komoj)\n"
 "  -v, --version       vidigu la aktualan version kaj finu\n"
 
-#: ../pidgin/gtkmain.c:550
-#, c-format
-msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+#: ../pidgin/gtkmain.c:516
+#, c-format
+msgid ""
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
-"If you can reproduce the crash, please notify the Pidgin\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%ssimpleticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "If you need further assistance, please IM either SeanEgn or \n"
 "LSchiere (via AIM).  Contact information for Sean and Luke \n"
 "on other protocols is at\n"
-"%scontactinfo.php\n"
-msgstr ""
-
-#: ../pidgin/gtknotify.c:337
+"%swiki/DeveloperPages\n"
+msgstr ""
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
+#, fuzzy
+msgid "Pidgin"
+msgstr "Porko"
+
+#: ../pidgin/gtknotify.c:349
 msgid "Open All Messages"
 msgstr "Malfermu Ĉiujn Retmesaĝojn"
 
-#: ../pidgin/gtknotify.c:389
+#: ../pidgin/gtknotify.c:402
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Vi ricevis retmesaĝon!</span>"
 
-#: ../pidgin/gtknotify.c:483
-msgid "Sender"
-msgstr "Sendanto"
-
-#: ../pidgin/gtknotify.c:509
+#: ../pidgin/gtknotify.c:537
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s havas %d novan mesaĝon."
 msgstr[1] "%s havas %d novajn mesaĝojn."
 
-#: ../pidgin/gtknotify.c:520
-#, 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:909
+#: ../pidgin/gtknotify.c:562
+#, fuzzy, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
+msgstr[0] "<b>Kromaĵo Detaloj</b>"
+msgstr[1] "<b>Kromaĵo Detaloj</b>"
+
+#: ../pidgin/gtknotify.c:989
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "La retumila komando \"%s\" estas malvalida."
 
-#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
-#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
+#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
 msgid "Unable to open URL"
 msgstr "Malfermeblas URL"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Eraro lanĉante \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1145
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "La 'Mana' foliumilo komando estis elektita, sed nenia komando estis difinita."
 
-#: ../pidgin/gtkplugin.c:264
+#: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
 msgstr "La jenajn kromaĵoj estos malŝarĝitaj."
 
-#: ../pidgin/gtkplugin.c:283
+#: ../pidgin/gtkplugin.c:284
 msgid "Multiple plugins will be unloaded."
 msgstr "Pluraj kromaĵoj estos elŝarĝitaj."
 
-#: ../pidgin/gtkplugin.c:285
+#: ../pidgin/gtkplugin.c:288
 msgid "Unload Plugins"
 msgstr "Elŝarĝi Kormaĵojn"
 
-#: ../pidgin/gtkplugin.c:397
+#: ../pidgin/gtkplugin.c:400
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -12959,7 +15435,7 @@
 "<span weight=\"bold\">Retsituo:</span>\t\t%s\n"
 "<span weight=\"bold\">Dosiernomo:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:407
+#: ../pidgin/gtkplugin.c:410
 #, c-format
 msgid ""
 "%s\n"
@@ -12970,116 +15446,127 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Eraro: %s\n"
 "Kontrolu kromaĵan retsituon por ĝisdatigo .</span>"
 
-#: ../pidgin/gtkplugin.c:533
+#: ../pidgin/gtkplugin.c:536
 msgid "Configure Pl_ugin"
 msgstr "Agrod_u Kromaĵon"
 
-#: ../pidgin/gtkplugin.c:596
+#: ../pidgin/gtkplugin.c:599
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Kromaĵo Detaloj</b>"
 
-#: ../pidgin/gtkpounce.c:155
+#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Elektu dosieron"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:522
+#: ../pidgin/gtkpounce.c:532
 msgid "Pounce on Whom"
 msgstr "Atentigi Kiun"
 
-#: ../pidgin/gtkpounce.c:549
+#: ../pidgin/gtkpounce.c:559
 msgid "_Buddy name:"
 msgstr "K_unul nomo:"
 
-#: ../pidgin/gtkpounce.c:583
+#: ../pidgin/gtkpounce.c:593
 msgid "Si_gns on"
 msgstr "En_salutas"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:595
 msgid "Signs o_ff"
 msgstr "A_udiaŭas"
 
-#: ../pidgin/gtkpounce.c:587
+#: ../pidgin/gtkpounce.c:597
 msgid "Goes a_way"
 msgstr "Foriĝ_as"
 
-#: ../pidgin/gtkpounce.c:589
+#: ../pidgin/gtkpounce.c:599
 msgid "Ret_urns from away"
 msgstr "Ek_malforiĝas"
 
-#: ../pidgin/gtkpounce.c:591
+#: ../pidgin/gtkpounce.c:601
 msgid "Becomes _idle"
 msgstr "Eksen_faras"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:603
 msgid "Is no longer i_dle"
 msgstr "Ekfa_ras"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:605
 msgid "Starts _typing"
 msgstr "Ta_jpas"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:607
 msgid "P_auses while typing"
 msgstr "P_aŭzas tajpante"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:609
 msgid "Stops t_yping"
 msgstr "Maltajpas"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:611
 msgid "Sends a _message"
 msgstr "Sendas mesagôn"
 
-#: ../pidgin/gtkpounce.c:644
+#: ../pidgin/gtkpounce.c:654
 msgid "Ope_n an IM window"
 msgstr "Malfermu TM-n fenestron"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:656
 msgid "_Pop up a notification"
 msgstr "Ŝ_prucigu avizon"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:658
 msgid "Send a _message"
 msgstr "Sendu mesaĝon"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:660
 msgid "E_xecute a command"
 msgstr "Lanĉu komandon"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:662
 msgid "P_lay a sound"
 msgstr "Ludu sonon"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:668
 msgid "Brows_e..."
 msgstr "Fol_iumi..."
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:670
 msgid "Br_owse..."
 msgstr "Fol_iumi..."
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:671
 msgid "Pre_view"
 msgstr "Antaŭvidu"
 
-#: ../pidgin/gtkpounce.c:784
-msgid "P_ounce only when my status is not available"
+#: ../pidgin/gtkpounce.c:798
+#, fuzzy
+msgid "P_ounce only when my status is not Available"
 msgstr "Atentigi nur kiam mia stato ne disponeblas"
 
-#: ../pidgin/gtkpounce.c:789
+#: ../pidgin/gtkpounce.c:803
 msgid "_Recurring"
 msgstr "_Rikuranta"
 
-#: ../pidgin/gtkpounce.c:1243
+#: ../pidgin/gtkpounce.c:1246
 msgid "Pounce Target"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:509
+#: ../pidgin/gtkprefs.c:386
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
+#, fuzzy
+msgid "Default"
+msgstr "GNOME Aprioro"
+
+#: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:638
+#: ../pidgin/gtkprefs.c:644
+msgid "Install Theme"
+msgstr ""
+
+#: ../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."
@@ -13087,239 +15574,261 @@
 "Elektu ridmienotemon kiun vi deziras uzi el la listo sube. Novaj temoj estas "
 "instaleblaj per treni kal faligi ilin sur la temo listo."
 
-#: ../pidgin/gtkprefs.c:673
+#: ../pidgin/gtkprefs.c:732
 msgid "Icon"
 msgstr "Piktogramo"
 
-#: ../pidgin/gtkprefs.c:816
+#: ../pidgin/gtkprefs.c:894
 msgid "System Tray Icon"
 msgstr "Sistemlistela Piktogramo"
 
-#: ../pidgin/gtkprefs.c:817
+#: ../pidgin/gtkprefs.c:895
 msgid "_Show system tray icon:"
 msgstr "_Montru sistemlistelan piktogramon:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
-msgid "Always"
-msgstr "Ĉiam"
-
-#: ../pidgin/gtkprefs.c:821
+#: ../pidgin/gtkprefs.c:899
 msgid "On unread messages"
 msgstr "Je nelegitaj mesaĝoj"
 
-#: ../pidgin/gtkprefs.c:826
+#: ../pidgin/gtkprefs.c:904
 msgid "Conversation Window Hiding"
 msgstr "Konversacio Fenestroj Kaŝeco"
 
-#: ../pidgin/gtkprefs.c:827
+#: ../pidgin/gtkprefs.c:905
 msgid "_Hide new IM conversations:"
 msgstr "_Kaŝu novajn TM-ajn konversaciojn:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
 msgid "When away"
 msgstr "Kiam fora"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:838
+#: ../pidgin/gtkprefs.c:916
 msgid "Tabs"
 msgstr "Langetoj"
 
-#: ../pidgin/gtkprefs.c:840
+#: ../pidgin/gtkprefs.c:918
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Montru TM-ojn kaj babilojn en lange_taj fenestroj"
 
-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:932
 msgid "Show close b_utton on tabs"
 msgstr "Montru fermi b_utonon en langetoj"
 
-#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:935
 msgid "_Placement:"
 msgstr "_Pozicio:"
 
-#: ../pidgin/gtkprefs.c:859
+#: ../pidgin/gtkprefs.c:937
 msgid "Top"
 msgstr "Supre"
 
-#: ../pidgin/gtkprefs.c:860
+#: ../pidgin/gtkprefs.c:938
 msgid "Bottom"
 msgstr "Malsupre"
 
-#: ../pidgin/gtkprefs.c:861
+#: ../pidgin/gtkprefs.c:939
 msgid "Left"
 msgstr "Maldekstre"
 
-#: ../pidgin/gtkprefs.c:862
+#: ../pidgin/gtkprefs.c:940
 msgid "Right"
 msgstr "Dekstre"
 
-#: ../pidgin/gtkprefs.c:864
+#: ../pidgin/gtkprefs.c:942
 msgid "Left Vertical"
 msgstr "Maldekstra Vertikale"
 
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:943
 msgid "Right Vertical"
 msgstr "Dekstra Vertikale"
 
-#: ../pidgin/gtkprefs.c:872
+#: ../pidgin/gtkprefs.c:950
 msgid "N_ew conversations:"
 msgstr "Novaj konv_ersacioj:"
 
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:995
 msgid "Show _formatting on incoming messages"
 msgstr "Montru _formatecon en enirantaj mesaĝoj"
 
-#: ../pidgin/gtkprefs.c:903
-msgid "Show buddy _icons"
-msgstr "Montru kunul _piktogramojn"
-
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:997
+msgid "Close IMs immediately when the tab is closed"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1000
+#, fuzzy
+msgid "Show _detailed information"
+msgstr "Montru Ensalutan Informon"
+
+#: ../pidgin/gtkprefs.c:1002
 msgid "Enable buddy ic_on animation"
 msgstr "Ŝaltu kunul pikt_ogramoanimacion"
 
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:1009
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Avizu kunulojn vi estas tajpante al ili"
 
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:1012
 msgid "Highlight _misspelled words"
 msgstr "Emfazu misliterumitajn vortojn"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:1016
 msgid "Use smooth-scrolling"
 msgstr "Uzu dolĉan rulumon"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:1019
 msgid "F_lash window when IMs are received"
 msgstr "Fu_lmu ekranon kiam TM-oj riceviĝas"
 
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:1021
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "Startigu konversacio-fenestron"
+
+#: ../pidgin/gtkprefs.c:1025
+#, fuzzy
+msgid "Font"
+msgstr "Tiparoj"
+
+#: ../pidgin/gtkprefs.c:1027
+msgid "Use document font from _theme"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1029
+msgid "Use font from _theme"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1031
+#, fuzzy
+msgid "Conversation _font:"
+msgstr "Konversacio Enskribigo"
+
+#: ../pidgin/gtkprefs.c:1045
 msgid "Default Formatting"
 msgstr "Apriora Formatumon"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:1064
+#, fuzzy
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
+"that support formatting."
 msgstr ""
 "Tiel aspektos vian elirantan mesaĝo tekston kiam vi uzas protokolojn kiuj "
 "subtenas formateblecon. :)"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1130
 msgid "ST_UN server:"
 msgstr "ST_UN servilo:"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1142
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ekzemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1146
 msgid "_Autodetect IP address"
 msgstr "_Aŭtodetekti IP adreson"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1155
 msgid "Public _IP:"
 msgstr "Publika _IP:"
 
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1184
 msgid "Ports"
 msgstr "Pordoj"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Mane difinu intervalon de pordoj aŭskultendaj"
 
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1190
 msgid "_Start port:"
 msgstr "_Komenca pordo:"
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1197
 msgid "_End port:"
 msgstr "_Fina pordo:"
 
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1205
 msgid "Proxy Server"
 msgstr "Prokura Servilo"
 
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1209
 msgid "No proxy"
 msgstr "Sen prokurilo"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1265
 msgid "_User:"
 msgstr "_Uzanto:"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1330
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1331
 msgid "Opera"
 msgstr "Opero"
 
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1332
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1333
 msgid "Mozilla"
 msgstr "Mozilo"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1334
 msgid "Konqueror"
 msgstr "Konkerilo"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1335
 msgid "GNOME Default"
 msgstr "GNOME Aprioro"
 
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1336
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1337
 msgid "Firefox"
 msgstr "Fajrovulpo"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1338
 msgid "Firebird"
 msgstr "Fajrobirdo"
 
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1339
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1348
 msgid "Manual"
 msgstr "Mane"
 
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1401
 msgid "Browser Selection"
 msgstr "Retumilo Elekto"
 
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1405
 msgid "_Browser:"
 msgstr "_Retumilo:"
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1413
 msgid "_Open link in:"
 msgstr "_Malfermu ligilon per:"
 
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1415
 msgid "Browser default"
 msgstr "Retumilo aprioro"
 
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1416
 msgid "Existing window"
 msgstr "Aktuala fenestro"
 
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1418
 msgid "New tab"
 msgstr "Nova langeto"
 
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1432
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -13328,75 +15837,63 @@
 "_Mane:\n"
 "(%s por URL)"
 
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log _format:"
 msgstr "Protokolo _formato:"
 
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1477
 msgid "Log all _instant messages"
 msgstr "Protokolu ĉiujn _tujmesaĝojn"
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all c_hats"
 msgstr "Protokolu ĉiujn _babilojn"
 
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1481
 msgid "Log all _status changes to system log"
 msgstr "Protokolu ĉiujn _statoŝanĝojn al sistemprotokolo"
 
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1627
 msgid "Sound Selection"
 msgstr "Sono Elekto"
 
-#: ../pidgin/gtkprefs.c:1521
+#: ../pidgin/gtkprefs.c:1637
 msgid "Quietest"
 msgstr "Pli Malaŭta"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1639
 msgid "Quieter"
 msgstr "Pli Malaŭte"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1641
 msgid "Quiet"
 msgstr "Malaŭte"
 
-#: ../pidgin/gtkprefs.c:1529
+#: ../pidgin/gtkprefs.c:1645
 msgid "Loud"
 msgstr "Laŭte"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1647
 msgid "Louder"
 msgstr "Pli Laŭte"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1649
 msgid "Loudest"
 msgstr "Pli Laŭta"
 
-#: ../pidgin/gtkprefs.c:1596
-msgid "Sound Method"
-msgstr "Sono Metodo"
-
-#: ../pidgin/gtkprefs.c:1597
+#: ../pidgin/gtkprefs.c:1715
 msgid "_Method:"
 msgstr "_Metodo:"
 
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1717
 msgid "Console beep"
 msgstr "Konzolo pepo"
 
-#: ../pidgin/gtkprefs.c:1601
-msgid "Automatic"
-msgstr "Aŭtomate"
-
-#: ../pidgin/gtkprefs.c:1604
-msgid "Command"
-msgstr "Komando"
-
-#: ../pidgin/gtkprefs.c:1605
+#: ../pidgin/gtkprefs.c:1724
 msgid "No sounds"
 msgstr "Sen Sono"
 
-#: ../pidgin/gtkprefs.c:1613
+#: ../pidgin/gtkprefs.c:1732
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13405,180 +15902,145 @@
 "Sono k_omando:\n"
 "(%s por dosiernomo)"
 
-#: ../pidgin/gtkprefs.c:1639
-msgid "Sound Options"
-msgstr "Son-opcioj"
-
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1759
 msgid "Sounds when conversation has _focus"
 msgstr "Sonu kiam konversacio _fokusas"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1761
 msgid "Enable sounds:"
 msgstr "Ŝaltu Sonojn:"
 
-#: ../pidgin/gtkprefs.c:1644
-msgid "Only when available"
-msgstr "Nur kiam disponebla"
-
-#: ../pidgin/gtkprefs.c:1645
-msgid "Only when not available"
-msgstr "Nur kiam nedisponebla"
-
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1772
 msgid "Volume:"
 msgstr "Laŭteco:"
 
-#: ../pidgin/gtkprefs.c:1681
-msgid "Sound Events"
-msgstr "Soneventoj"
-
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1852
 msgid "Play"
 msgstr "Ludu"
 
-#: ../pidgin/gtkprefs.c:1739
-msgid "Event"
-msgstr "Evento"
-
-#: ../pidgin/gtkprefs.c:1758
-msgid "Test"
-msgstr "Provo"
-
-#: ../pidgin/gtkprefs.c:1762
-msgid "Reset"
-msgstr "Restarigu"
-
-#: ../pidgin/gtkprefs.c:1766
-msgid "Choose..."
-msgstr "Elektu..."
-
-#: ../pidgin/gtkprefs.c:1809
+#: ../pidgin/gtkprefs.c:1929
 msgid "_Report idle time:"
 msgstr "_Raportu senfaran tempon:"
 
-#: ../pidgin/gtkprefs.c:1814
+#: ../pidgin/gtkprefs.c:1934
 msgid "Based on keyboard or mouse use"
 msgstr "Laŭ klavaro aŭ muso uzo"
 
-#: ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkprefs.c:1943
 msgid "_Auto-reply:"
 msgstr "_Aŭto-respondo:"
 
-#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1947
 msgid "When both away and idle"
 msgstr "Kiam ambaŭ fora kaj senfara"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1833
+#: ../pidgin/gtkprefs.c:1953
 msgid "Auto-away"
 msgstr "Aŭto-fora"
 
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1955
 msgid "Change status when _idle"
 msgstr "Ŝanĝu staton kiam _senfara"
 
-#: ../pidgin/gtkprefs.c:1839
-msgid "_Minutes before changing status:"
+#: ../pidgin/gtkprefs.c:1959
+#, fuzzy
+msgid "_Minutes before becoming idle:"
 msgstr "_Minutoj antaŭe ŝanĝenda staton:"
 
-#: ../pidgin/gtkprefs.c:1847
+#: ../pidgin/gtkprefs.c:1967
 msgid "Change _status to:"
 msgstr "Ŝangû _staton al:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1988
 msgid "Status at Startup"
 msgstr "Stato je ensaluto"
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1990
 msgid "Use status from last _exit at startup"
 msgstr "Uzu stato de lasta malsaluto je sensaluto"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1996
 msgid "Status to a_pply at startup:"
 msgstr "Stato aplikenda je ensaluto:"
 
-#: ../pidgin/gtkprefs.c:1914
+#: ../pidgin/gtkprefs.c:2034
 msgid "Interface"
 msgstr "Interfaco"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:2036
 msgid "Smiley Themes"
 msgstr "Ridmieno-temo"
 
-#: ../pidgin/gtkprefs.c:1917
-msgid "Sounds"
-msgstr "Sonoj"
-
-#: ../pidgin/gtkprefs.c:1923
+#: ../pidgin/gtkprefs.c:2043
 msgid "Browser"
 msgstr "Retumilo"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:2047
 msgid "Status / Idle"
 msgstr "Stato / Senfara"
 
-#: ../pidgin/gtkprivacy.c:79
+#: ../pidgin/gtkprivacy.c:80
 msgid "Allow all users to contact me"
 msgstr "Permesu ĉiujn uzantojn kontakti min"
 
-#: ../pidgin/gtkprivacy.c:80
+#: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users on my buddy list"
 msgstr "Permesu nur uzantojn en mia kunul listo"
 
-#: ../pidgin/gtkprivacy.c:81
+#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users below"
 msgstr "Permesu nur la jenajn uzantojn"
 
-#: ../pidgin/gtkprivacy.c:82
+#: ../pidgin/gtkprivacy.c:83
 msgid "Block all users"
 msgstr "Bloku ĉiujn uzantojn"
 
-#: ../pidgin/gtkprivacy.c:83
+#: ../pidgin/gtkprivacy.c:84
 msgid "Block only the users below"
 msgstr "Bloku nur la jenajn uzantojn"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:370
 msgid "Privacy"
 msgstr "Privataj aferoj"
 
-#: ../pidgin/gtkprivacy.c:385
+#: ../pidgin/gtkprivacy.c:382
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Ŝanĝoj al privatecaj agordoj efikas tuj."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:397
+#: ../pidgin/gtkprivacy.c:394
 msgid "Set privacy for:"
 msgstr "Difinu privatecon por:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
 msgid "Permit User"
 msgstr "Permesu Uzanton"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:558
 msgid "Type a user you permit to contact you."
 msgstr "Enigu uzanton kiun vi permesas kontakti vin."
 
-#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:559
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "B.v. enigi la nomon de uzanto kiu vi deziras ebligi kontakti vin."
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "_Permesu"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:568
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Permesu %s kontakti vin?"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Ĉu vi certas vi deziras permesi %s-n kontakti vin?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
 msgid "Block User"
 msgstr "Bloku Uzanton"
 
@@ -13590,201 +16052,160 @@
 msgid "Please enter the name of the user you wish to block."
 msgstr "B.v. enmetu la nomon de uzanto kiun vi deziras bloki."
 
-#: ../pidgin/gtkprivacy.c:608
+#: ../pidgin/gtkprivacy.c:609
 #, c-format
 msgid "Block %s?"
 msgstr "Bloku %s?"
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Ĉu vi certas vi volas bloki %s?"
 
-#: ../pidgin/gtkrequest.c:271
+#: ../pidgin/gtkrequest.c:272
 msgid "Apply"
 msgstr "Apliku"
 
-#: ../pidgin/gtkrequest.c:1469
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Tiu dosiero jam ekzistas"
 
-#: ../pidgin/gtkrequest.c:1470
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Ĉu vi deziras anstataŭigi ĝin?"
 
-#: ../pidgin/gtkrequest.c:1471
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Anstataŭigu"
 
-#: ../pidgin/gtkrequest.c:1472
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Elektu Novan Nomon"
 
-#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Elektu Dosierujon..."
 
-#: ../pidgin/gtkroomlist.c:376
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:375
 msgid "Room List"
 msgstr "Babilejoj Listo"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:446
+#: ../pidgin/gtkroomlist.c:443
 msgid "_Get List"
 msgstr "_Ricevu Liston"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:454
+#: ../pidgin/gtkroomlist.c:451
 msgid "_Add Chat"
 msgstr "_Aldonu Babilejon"
 
-#: ../pidgin/gtksavedstatuses.c:331
+#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Ĉu vi certas vi volas forigi elektitajn konservitajn statuojn?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
 msgid "_Use"
 msgstr "_Uzu"
 
-#: ../pidgin/gtksavedstatuses.c:725
+#: ../pidgin/gtksavedstatuses.c:780
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Titolo jam uzata. Vi devas elekti unikan titolon."
 
-#: ../pidgin/gtksavedstatuses.c:913
+#: ../pidgin/gtksavedstatuses.c:970
 msgid "Different"
 msgstr "Malsama"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1159
 msgid "_Title:"
 msgstr "_Titolo:"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
 msgid "_Status:"
 msgstr "_Stato:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1210
 msgid "Use a _different status for some accounts"
 msgstr "Uzu _malsimilan staton por kelkaj kontoj"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1274
 msgid "Sa_ve & Use"
 msgstr "Konser_vu & Uzu"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1480
 #, c-format
 msgid "Status for %s"
 msgstr "Stato por %s"
 
-#: ../pidgin/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Kunul ensalutas"
-
-#: ../pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Kunul elsalutas"
-
-#: ../pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "Mesaĝo ricevita"
-
-#: ../pidgin/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Ricevita mesaĝo komencas konversacio"
-
-#: ../pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "Mesaĝo sendita"
-
-#: ../pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Persono eniras babilejon"
-
-#: ../pidgin/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Persono eliras babilejon"
-
-#: ../pidgin/gtksound.c:70
-msgid "You talk in chat"
-msgstr "Vi parolas en babilejo"
-
-#: ../pidgin/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Aliaj parolas en babilejo"
-
-#: ../pidgin/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "Iun diras vian ekrannomon en babilejo"
-
-#: ../pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer Malsukceso"
-
-#: ../pidgin/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "GStreamer malsukcesis ekon."
-
-#: ../pidgin/gtkstatusbox.c:611
+#: ../pidgin/gtkstatusbox.c:664
 msgid "Waiting for network connection"
 msgstr "Atendante retkonekto"
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:632
+#, fuzzy
+msgid "Google Talk"
+msgstr "Inversiga Etikedo"
+
+#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "La jena eraro okazis ŝargante %s: %s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
 msgid "Failed to load image"
 msgstr "Malsukcesis ŝargi bildon"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ne povas sendi dosierujon %s."
 
-#: ../pidgin/gtkutils.c:1421
+#: ../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:1453 ../pidgin/gtkutils.c:1462
-#: ../pidgin/gtkutils.c:1467
+"individually."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1550
 msgid "You have dragged an image"
 msgstr "Vi trenis bildon"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../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:1458 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Set as buddy icon"
 msgstr "Difinu kiel kunul piktogramo"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
 msgid "Send image file"
 msgstr "Sendu bilddosieron"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
 msgid "Insert in message"
 msgstr "Enmetu en mesaĝon"
 
-#: ../pidgin/gtkutils.c:1463
+#: ../pidgin/gtkutils.c:1544
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Ĉu vi deziras meti ĝin kiel la kunul piktogramo por tiu uzanto?"
 
-#: ../pidgin/gtkutils.c:1468
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1470
+#: ../pidgin/gtkutils.c:1551
+#, fuzzy
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr "Ĉu vi deziras meti ĝin kiel la kunul piktogramo por tiu uzanto?"
+
+#: ../pidgin/gtkutils.c:1552
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -13795,17 +16216,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:1524
+#: ../pidgin/gtkutils.c:1610
 msgid "Cannot send launcher"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1524
+#: ../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:2291
+#: ../pidgin/gtkutils.c:2345
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -13816,91 +16237,109 @@
 "<b>Dosiero grandeco:</b> %s\n"
 "<b>Bildo grandeco:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2611
+#: ../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:2613
+#: ../pidgin/gtkutils.c:2643
 msgid "Icon Error"
 msgstr "Piktogramo Eraro"
 
-#: ../pidgin/gtkutils.c:2614
+#: ../pidgin/gtkutils.c:2644
 msgid "Could not set icon"
 msgstr "Ne eblis difini piktogramon"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2744
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Malsukcesis malfermi dosieron '%s': %s"
 
-#: ../pidgin/gtkutils.c:2764
+#: ../pidgin/gtkutils.c:2793
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
-#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Konservu Dosieron"
 
-#: ../pidgin/gtkwhiteboard.c:863
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Elektu koloron"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "_Alinomo"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "Fermu _langetojn"
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "_Ricevu Informon"
 
+#: ../pidgin/pidginstock.c:92
+msgid "_Invite"
+msgstr "_Ivitu"
+
 #: ../pidgin/pidginstock.c:93
-msgid "_Invite"
-msgstr "_Ivitu"
+msgid "_Modify"
+msgstr "Ŝ_anĝu..."
 
 #: ../pidgin/pidginstock.c:94
-msgid "_Modify"
-msgstr "Ŝ_anĝu..."
-
-#: ../pidgin/pidginstock.c:95
 msgid "_Open Mail"
 msgstr "_Malfermu retmesaĝon"
 
-#: ../pidgin/plugins/cap/cap.c:449
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
+#, fuzzy
+msgid "Pidgin smileys"
+msgstr "Pidgwin Opcioj"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+#, fuzzy
+msgid "none"
+msgstr "(neniu)"
+
+#: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
 msgstr "Montru Statistikojn"
 
-#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "Respondo Verŝajneco:"
 
-#: ../pidgin/plugins/cap/cap.c:810
+#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "Statistikoj Agordo"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
 msgstr ""
 
-#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:149
+#: ../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 "minutoj"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:820
+#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr ""
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:827
+#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "Sojlo:"
 
@@ -13910,18 +16349,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:934
+#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr ""
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr ""
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../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."
@@ -13972,20 +16411,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "Kontakta Prioritato"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "Permesas kontroli la poentojn rilatajn al diversaj kunulstatoj."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -14021,7 +16460,7 @@
 msgid "Received Messages"
 msgstr "Ricevitaj Mesaĝoj"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "Elektu Koloron por %s"
@@ -14046,11 +16485,18 @@
 msgid "Conversation Placement"
 msgstr "Konversacio Loko"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. 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\"."
+msgstr ""
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Nombro de konversacioj po fenestro"
 
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Apartigu TM-n kaj Babil-n fenestrojn kiam lokante laŭ nombro"
 
@@ -14060,54 +16506,24 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:135
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr ""
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:137
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr ""
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:139
+#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gaiminc.c:91
-msgid "Pidgin Demonstration Plugin"
-msgstr "Piĝin Demonstraĵa Kromaĵo"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Ekzempla kormaĵo kiu umas - vidu priskribon."
-
-#. *  description
-#: ../pidgin/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"Estas mojosa kromaĵo kiu multe umas:\n"
-"- Ĝi diras kiu skribis la programon kiam vi ensalutas\n"
-"- Ĝi inversigas ĉiajn enirantan tekston\n"
-"- Ĝi sendas mesaĝon al homoj en via listo tuj kiam ili ensalutas"
-
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
@@ -14132,19 +16548,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:289
+#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Musgestoj"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:292
+#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Provizu subteno por musgestoj"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:294
+#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -14159,24 +16575,29 @@
 msgstr "Tuj Mesaĝilo"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Elektu personon el via adresaro sube, aŭ aldonu novan personon."
 
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
+msgid "Group:"
+msgstr "Grupo:"
+
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
 msgid "New Person"
 msgstr "Nova persono"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 msgid "Select Buddy"
 msgstr "Elektu Kunulon"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+#: ../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."
@@ -14185,43 +16606,43 @@
 "personon."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "Uzanto _detaloj"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "K_uniĝu Kunulon"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
-msgid "Unable to send e-mail"
-msgstr "Ne eblas sendi retmesaĝon"
-
 #: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
+msgid "Unable to send e-mail"
+msgstr "Ne eblas sendi retmesaĝon"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Aldonu al adresaro"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "Sendu retmesaĝon"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr ""
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Elektu ĉiujn kontojn kiuj kunuloj endas aŭto-aldonita al."
 
@@ -14231,7 +16652,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr ""
 
@@ -14239,37 +16660,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "B.v. enigi la kunul ekrannomo kaj kontotipo sube."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
 msgstr "Konto tipo:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
 msgstr "Opcia informo:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
 msgstr "Antaŭ nomo:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
 msgstr "Familia nomo:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 msgid "E-mail:"
 msgstr "Retadreso:"
 
@@ -14292,7 +16713,14 @@
 msgid "Test to see that all ui signals are working properly."
 msgstr "Provu por vidi ĉu ĉiuj ui signaloj bone funkcias."
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/gtkbuddynote.c:36
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr "Kunul Notoj"
+
+#: ../pidgin/plugins/history.c:192
 msgid "History"
 msgstr "Historio"
 
@@ -14338,11 +16766,11 @@
 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 "_TM fenestroj"
 
-#: ../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 "B_abilfenestroj"
 
@@ -14356,32 +16784,32 @@
 msgid "Music messaging session confirmed."
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Muziko Mesaĝilo"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "La jena eraro okazis:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Muzika Mesaĝilo Agordo"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "Orkestruma Redaktilo Vojo"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "_Apliku"
 
@@ -14393,12 +16821,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Muzika Mesaĝilo Kromaĵo por kunlaboranta verkado."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+#: ../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."
@@ -14407,74 +16835,74 @@
 "pecon redaktante komunan orkestrumon realtempe."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Avizu Por"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Nur kiam iun diras vian ekran nomon"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Fokusitaj fenestoj"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Avizmetodoj"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Prefik_su ĉenon en fenestrotitolo:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Enmetu n_ombron de novajn mesaĝoj en fenestrotitolo"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Enmetu nombron de novaj mesaĝoj en _X eco"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Dinifu fenestrtraktilan \"_URĜANTA\" indikon"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "Startigu konversacio-fenestron"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Avizo Forigo"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Forigu kiam konversacio fenestro ricevas _fokuson"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Forigu kiam konversacio fenestro _ricevas alklakon"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Forigu kiam _tajpante en konversacio fenestro"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Forigu kiam _mesaĝo sendiĝas"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Forigu je ŝaĝo al konversacio l_angeto"
 
@@ -14484,7 +16912,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:895
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Mesaĝavizo"
 
@@ -14492,10 +16920,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Provizas diversajn rimedojn por atentigi vin pro nelegitaj mesaĝoj."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Piĝin Demonstraĵa Kromaĵo"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "Ekzempla kormaĵo kiu umas - vidu priskribon."
+
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"Estas mojosa kromaĵo kiu multe umas:\n"
+"- Ĝi diras kiu skribis la programon kiam vi ensalutas\n"
+"- Ĝi inversigas ĉiajn enirantan tekston\n"
+"- Ĝi sendas mesaĝon al homoj en via listo tuj kiam ili ensalutas"
+
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "Kursoro Koloro"
@@ -14508,89 +16966,93 @@
 msgid "Hyperlink Color"
 msgstr "Ligilo Koloro"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "Konversacio Enskribigo"
 
-#: ../pidgin/plugins/pidginrc.c:77
-msgid "Conversation History"
-msgstr "Konversacio Historio"
-
-#: ../pidgin/plugins/pidginrc.c:78
-msgid "Log Viewer"
-msgstr "Protokolo Legilo"
-
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "Peto Dialogujo"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "Avizo Dialogujo"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:322
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "Elektu Koloron"
 
-#: ../pidgin/plugins/pidginrc.c:361
+#: ../pidgin/plugins/pidginrc.c:294
+msgid "Select Interface Font"
+msgstr "Elektu InterfacoTiparon"
+
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "Elektu Tiparon por %s"
 
-#: ../pidgin/plugins/pidginrc.c:398
-msgid "Select Interface Font"
-msgstr "Elektu InterfacoTiparon"
-
-#: ../pidgin/plugins/pidginrc.c:453
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "GTK+ Interfaco Tiparo"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "Interfaco koloroj"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Fenestraĵo Grandecoj"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "Tiparoj"
 
-#: ../pidgin/plugins/pidginrc.c:576
-msgid "Tools"
-msgstr "Iloj"
-
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:491
+msgid "Gtkrc File Tools"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Skribu agordojn al %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "Relegu gtkrc dosierojn"
 
-#: ../pidgin/plugins/pidginrc.c:616
+#: ../pidgin/plugins/pidginrc.c:538
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Piĝin GTK+ Etoso Kontrolo"
 
-#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541
 msgid "Provides access to commonly used gtkrc settings."
 msgstr ""
 
@@ -14604,32 +17066,25 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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
-msgid "You are using %s version %s.  The current version is %s.<hr>"
+#, fuzzy, c-format
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\"%s\">%s</a><hr>"
 msgstr "Vi uzas %s version %s.  La aktuala versio estas %s.<hr>"
 
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
+#: ../pidgin/plugins/relnot.c:79
+#, fuzzy, c-format
+msgid "<b>ChangeLog:</b><br>%s"
 msgstr ""
 "<b>Ŝanĝprotokolo:</b>\n"
 "%s<br><br>"
 
-#: ../pidgin/plugins/relnot.c:82
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
-msgstr ""
-"Vi povas obteni version %s el:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
-
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Nova Versio Disponebla"
 
@@ -14639,87 +17094,87 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Eldonavizo"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Kontrolu ofte por novaj eldonoj"
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:150
+#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
 "Kontrolu ofte por noaj eldonoj kaj avizu la uzanton kun la ŝanĝprotokolo."
 
-#: ../pidgin/plugins/spellchk.c:1965
+#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "Duobligo Korekto"
 
-#: ../pidgin/plugins/spellchk.c:1966
+#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "La elektita vorto jam ekzistas en la korektolisto."
 
-#: ../pidgin/plugins/spellchk.c:2180
+#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Teksto anstataŭigoj"
 
-#: ../pidgin/plugins/spellchk.c:2203
+#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "Vi tajpas"
 
-#: ../pidgin/plugins/spellchk.c:2217
+#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "Vi sendas"
 
-#: ../pidgin/plugins/spellchk.c:2231
+#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Nur plenaj vortoj"
 
-#: ../pidgin/plugins/spellchk.c:2243
+#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "Usklecodistinge"
 
-#: ../pidgin/plugins/spellchk.c:2269
+#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Aldonu novan teksto-anstataŭigon"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "Vi _tajpas:"
 
-#: ../pidgin/plugins/spellchk.c:2302
+#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "Vi _sendas:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2314
+#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "_Ekzakta uskleca kongruo (malŝaltita por aŭtomata usklecotrakto)"
 
-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "Nur anstataŭigu _planajn vortojn"
 
-#: ../pidgin/plugins/spellchk.c:2341
+#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "Ĝenerala Teksto Anstataŭigo Opcioj"
 
-#: ../pidgin/plugins/spellchk.c:2342
+#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Ŝaltu anstataŭigon de lasta vorto je sendo"
 
-#: ../pidgin/plugins/spellchk.c:2367
+#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "Teksto anstataŭigo"
 
-#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Anstataŭigu tekston en elirantaj mesaĝoj laŭ uzantodfinitaj reguloj."
 
@@ -14729,7 +17184,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "Kunul Tiktakilo"
 
@@ -14737,11 +17192,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr ""
 
-#: ../pidgin/plugins/timestamp.c:136
+#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
 msgstr "Montru Tempomarkojn Ĉiu"
 
@@ -14751,19 +17206,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:195
+#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "Tempomarko"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:198
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr "Montru iChat-ajn Tempomarkojn"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:200
+#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Montru iChat-stilajn tempomarkojn ĉiuj N minutoj."
 
@@ -14772,7 +17227,8 @@
 msgstr "Tempomarko Formato Opcioj"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-msgid "_Force (traditional %s) 24-hour time format"
+#, fuzzy
+msgid "_Force 24-hour time format"
 msgstr "_Devigi (tradicia %s) 24-horan tempoformaton"
 
 #: ../pidgin/plugins/timestamp_format.c:33
@@ -14803,19 +17259,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:144
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Mesaĝo Tempomarko Formatoj"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:147
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Agordu mesaĝo-tempomarko-formatojn."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:149
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -14823,44 +17279,44 @@
 "Tiu kromaĵo ebligas la uzanto agordi konversaciajn kaj protokolajn mesaĝajn "
 "tempmarkajn formatojn."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Maltravidebleco:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "TM Konversacio Fenestroj"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "_TM fenestra travidebleco"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Ĉiam super"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Kunullisto fenestro"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr ""
 
@@ -14870,19 +17326,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Travidebleco"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variebla Travidebleco por la kunullisto kaj konversacioj."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -14890,52 +17346,53 @@
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Rultempa Versio"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Eko"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr ""
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr ""
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr ""
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr ""
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr ""
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
-msgid "Pidgwin Options"
-msgstr "Pidgwin Opcioj"
-
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+#, fuzzy
+msgid "Windows Pidgin Options"
+msgstr "Pidgwin Opcioj"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opcioj apartaj al Piĝin Vindoza"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
 
-#: ../pidgin/plugins/xmppconsole.c:665
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
 
@@ -14945,7 +17402,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../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 Konzolo"
@@ -14982,17 +17439,186 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
-#~ msgid "/Conversation/Insert Lin_k..."
-#~ msgstr "/Konversacio/Enmetu Ligi_lon..."
-
-#~ msgid "/Conversation/Insert Imag_e..."
-#~ msgstr "/Konversacio/Enm_etu Bildon..."
-
-#~ msgid "/Conversation/Insert Link..."
-#~ msgstr "/Konversacio/Enmetu Ligilon..."
-
-#~ msgid "/Conversation/Insert Image..."
-#~ msgstr "/Konversacio/Enmetu Bildon..."
+#~ msgid "Toggle offline buddies"
+#~ msgstr "Inversigi senkonektajn kunulojn"
+
+#~ msgid "Sort by status"
+#~ msgstr "Ordigi laŭ stato"
+
+#~ msgid "Sort alphabetically"
+#~ msgstr "Ordigi alfabete"
+
+#~ msgid "Sort by log size"
+#~ msgstr "Oridgi laŭ protokolo grandeco"
+
+#~ msgid ""
+#~ "%s was disconnected due to the following error:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s estis diskonektigita pro la jena eraro:\n"
+#~ "%s"
+
+#~ msgid "Commands are not supported yet. Message was NOT sent."
+#~ msgstr "Komandoj estas ne akceptitaj nune. Mesaĝo NE estis sendita."
+
+#~ msgid "Timestamps"
+#~ msgstr "Tempomarkojn"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "Autoreply"
+#~ msgstr "Aŭtomate-respondo"
+
+#~ msgid "Set autoreply message for %s"
+#~ msgstr "Difini aŭtomatan mesaĝon por %s"
+
+#~ msgid "Set Autoreply Message"
+#~ msgstr "Difini Aŭtomatan Mesaĝon"
+
+#~ msgid "Set _Autoreply Message"
+#~ msgstr "Difinu _Aŭtomatan Mesaĝon"
+
+#~ msgid "Autoreply message"
+#~ msgstr "Aŭtomata respondo mesaĝo"
+
+#~ msgid "Send autoreply messages when"
+#~ msgstr "Sendu aŭtomatorespondajn mesaĝojn kiam"
+
+#~ msgid "When my account is _idle"
+#~ msgstr "Kiam mia konto _senfaras"
+
+#~ msgid "_Default reply"
+#~ msgstr "Apriora respon_do"
+
+#~ msgid "Status message"
+#~ msgstr "Stato mesaĝo"
+
+#~ msgid "Jabber Account"
+#~ msgstr "Jabber Konto"
+
+#~ msgid "Cannot join %s:"
+#~ msgstr "Ne povas aliĝi %s:"
+
+#~ msgid "Change Jabber Password"
+#~ msgstr "Ŝanĝu Jabber-n Pasvorton"
+
+#~ msgid "Jabber Protocol Plugin"
+#~ msgstr "Jabber Protokol-Kromaĵo"
+
+#~ msgid "Has you"
+#~ msgstr "Havas vin"
+
+#~ msgid "User information for %s unavailable:"
+#~ msgstr "Uzantoinformo des %s ne disponeblas:"
+
+#~ msgid "You have been signed off for an unknown reason."
+#~ msgstr "Vi estas malsalutigita pro nekonata kialo."
+
+#~ msgid "_Connect"
+#~ msgstr "_Konektu"
+
+#~ msgid "Are you sure to exit this Qun?"
+#~ msgstr "Ĉu vi certas vi volas forigi tiun Qun-on?"
+
+#~ msgid "Go ahead"
+#~ msgstr "Daŭrigu"
+
+#~ msgid "Server ACK"
+#~ msgstr "Servilo ACK"
+
+#~ msgid "Send IM fail\n"
+#~ msgstr "TM Sendo malsukcesis\n"
+
+#~ msgid "%s Address"
+#~ msgstr "%s Adreso"
+
+#~ msgid "QQ: Available"
+#~ msgstr "QQ: Disponebla"
+
+#~ msgid "QQ: Away"
+#~ msgstr "QQ: Fora"
+
+#~ msgid "QQ: Invisible"
+#~ msgstr "QQ: Nevidebla"
+
+#~ msgid "QQ: Offline"
+#~ msgstr "QQ: Senkonekta"
+
+#~ msgid "Connection refused"
+#~ msgstr "Konekto malakceptita"
+
+#~ msgid "Would like to add him?"
+#~ msgstr "Ĉu vi deziras aldoni ŝlin?"
+
+#~ msgid "%s just sent you a Buzz!"
+#~ msgstr "%s ĵus sendis al vi Zumon!!"
+
+#~ msgid "You have just sent a Buzz!"
+#~ msgstr "Vi ĵus sendis Zumon!"
+
+#~ msgid "Unavailable"
+#~ msgstr "Nedisponebla"
+
+#~ msgid "Alias..."
+#~ msgstr "Alinomo..."
+
+#~ msgid "Add a _Buddy"
+#~ msgstr "Aldonu K_unulon"
+
+#~ msgid "Add a C_hat"
+#~ msgstr "Aldonu Babile_jon"
+
+#~ msgid "/Accounts/Add\\/Edit"
+#~ msgstr "/Kontoj/Aldonu\\/Redaktu"
+
+#~ msgid "/Tools/Buddy Pounces"
+#~ msgstr "/Iloj/Kunul Atentigoj"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/Opcioj/Montru Kunul-P_iktogramon"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/Opcioj/Montru Kunul-Piktogramon"
+
+#~ msgid "Jabber developer"
+#~ msgstr "Jabber programisto"
+
+#~ msgid "Slovack"
+#~ msgstr "Slovaka"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 ĉe irc.freenode.net<BR><BR>"
+
+#~ msgid "Smaller font size"
+#~ msgstr "Malpligranda tiparo grandeco"
+
+#~ msgid "Insert link"
+#~ msgstr "Enmetu ligilon"
+
+#~ msgid "Insert image"
+#~ msgstr "Enmetu bildon"
+
+#~ msgid "Show buddy _icons"
+#~ msgstr "Montru kunul _piktogramojn"
+
+#~ msgid "Conversation History"
+#~ msgstr "Konversacio Historio"
+
+#~ msgid "Log Viewer"
+#~ msgstr "Protokolo Legilo"
+
+#~ msgid "Tools"
+#~ msgstr "Iloj"
+
+#~ msgid ""
+#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
+#~ "pidgin.im</a>."
+#~ msgstr ""
+#~ "Vi povas obteni version %s el:<br><a href=\"http://pidgin.im/\">http://"
+#~ "pidgin.im</a>."
 
 #~ msgid "Group not removed"
 #~ msgstr "Grupo ne forigita"
@@ -15019,9 +17645,3 @@
 
 #~ msgid "TOC has sent a PAUSE command."
 #~ msgstr "TOC sendis PAŬZO komandon."
-
-#~ msgid "Buzz!!"
-#~ msgstr "Zum!!"
-
-#~ msgid "Normal authentication failed!"
-#~ msgstr "Normala aŭtentokontrolo malsukcesis!"